Merge pull request #55 from cornellrocketryteam/09-25-formatting_sens…

…ors_actuators_directories_and_adding_necessary_files Formatting sensors/actuators directories and adding necessary files. Also updating BUILD bazel files in /sensors and /actuators.
cornellrocketryteam · Sep 26, 2024 · d432dc1 · d432dc1
2 parents a7a137b + c8e26b8
commit d432dc1
Show file tree

Hide file tree

Showing 15 changed files with 48 additions and 13 deletions.
diff --git a/actuators/BUILD b/actuators/BUILD
@@ -0,0 +1,28 @@
+cc_library(
+    name = "actuator",
+    hdrs = ["actuator.h"],
+    deps = [],
+    visibility = [
+        "//fill:__subpackages__",
+        ],
+)
+
+cc_library(
+    name = "ball_valve",
+    srcs = ["ball_valve.cc"],
+    hdrs = ["ball_valve.h"],
+    deps = [":actuator"],
+    visibility = [
+        "//fill:__subpackages__",
+        ],
+)
+
+cc_library(
+    name = "sol_valve",
+    srcs = ["sol_valve.cc"],
+    hdrs = ["sol_valve.h"],
+    deps = [":actuator"],
+    visibility = [
+        "//fill:__subpackages__",
+        ],
+)
diff --git a/actuators/actuator.h b/actuators/actuator.h
diff --git a/actuators/ball_valve.cc b/actuators/ball_valve.cc
diff --git a/actuators/ball_valve.h b/actuators/ball_valve.h
diff --git a/actuators/qd.cc b/actuators/qd.cc
diff --git a/actuators/sol_valve.cc b/actuators/sol_valve.cc
diff --git a/actuators/sol_valve.h b/actuators/sol_valve.h
diff --git a/fill/BUILD b/fill/BUILD
@@ -24,7 +24,7 @@ cc_binary(
     deps = [
         ":telemetry_reader",
         "//protos:command_cc_grpc",
-        "//sensors:ducer",
+        "//sensors:ptd",
         "@abseil-cpp//absl/flags:flag",
         "@abseil-cpp//absl/flags:parse",
         "@abseil-cpp//absl/strings:str_format",

diff --git a/fill/fill_station.cc b/fill/fill_station.cc
@@ -6,7 +6,7 @@
 #include <thread>
 
 #include "telemetry_reader.h"
-#include "sensors/ducer.h"
+#include "sensors/ptd.h"
 
 #include "absl/flags/flag.h"
 #include "absl/flags/parse.h"

diff --git a/sensors/BUILD b/sensors/BUILD
@@ -4,18 +4,26 @@ cc_library(
     deps = [],
     visibility = [
         "//fill:__subpackages__",
-        "//ground:__subpackages__",
         ],
 )
 
 cc_library(
-    name = "ducer",
-    srcs = ["ducer.cc"],
-    hdrs = ["ducer.h"],
+    name = "load_cell",
+    srcs = ["load_cell.cc"],
+    hdrs = ["load_cell.h"],
+    deps = [":sensor"],
+    visibility = [
+        "//fill:__subpackages__",
+        ],
+)
+
+cc_library(
+    name = "ptd",
+    srcs = ["ptd.cc"],
+    hdrs = ["ptd.h"],
     deps = [":sensor"],
     visibility = [
         "//fill:__subpackages__",
-        "//ground:__subpackages__",
         ],
 )
 
@@ -28,6 +36,5 @@ cc_library(
         ],
     visibility = [
         "//fill:__subpackages__",
-        "//ground:__subpackages__",
         ],
 )
diff --git a/sensors/load_cell.cc b/sensors/load_cell.cc
diff --git a/sensors/load_cell.h b/sensors/load_cell.h
diff --git a/sensors/ducer.cc → sensors/ptd.cc b/sensors/ducer.cc → sensors/ptd.cc
@@ -1,6 +1,6 @@
-#include "ducer.h"
+#include "ptd.h"
 
-float Ducer::Read() {
+float PTD::Read() {
   float reading = 3.14;
   cache_.push_back(reading);
   return reading;

diff --git a/sensors/ducer.h → sensors/ptd.h b/sensors/ducer.h → sensors/ptd.h
@@ -1,6 +1,6 @@
 #include "sensor.h"
 
-class Ducer : public Sensor {
+class PTD : public Sensor {
  public:
   float Read();
 };
diff --git a/sensors/sensor.h b/sensors/sensor.h
@@ -5,10 +5,10 @@
 
 class Sensor {
   public:
-  virtual ~Sensor() {}
+    virtual ~Sensor() {}
     virtual float Read() = 0;
   protected:
     // cache for rolling averages
     std::vector<float> cache_;
 };
-#endif
+#endif