moving base messages into a separate proto description

hytech-racing · Sep 19, 2024 · 27c4106 · 27c4106
1 parent 1ca5c66
commit 27c4106
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 8 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 hytech_msgs.pb.*
+base_msgs.pb.*
 ./hytech_msgs.proto
diff --git a/README.md b/README.md
@@ -0,0 +1,4 @@
+
+`base_msgs.proto`: contains all base messages that can compose the top-level messages
+
+`hytech_msgs.proto`: contains all messages that will show up on foxglove / be sent individually at any point. 
diff --git a/flake.nix b/flake.nix
@@ -19,7 +19,7 @@
       nanopb_runner = pkgs.writeShellScriptBin "run-nanopb" ''
         #!${pkgs.stdenv.shell}
         export PATH="${pkgs.protobuf}/bin:$PATH"
-        ${pkgs.nanopb}/bin/nanopb_generator.py -I=./proto hytech_msgs.proto
+        ${pkgs.nanopb}/bin/nanopb_generator.py -I=./proto hytech_msgs.proto base_msgs.proto
       '';
     in
     {

diff --git a/proto/base_msgs.proto b/proto/base_msgs.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+package hytech_msgs;
+
+message veh_vec_float
+{
+    float FL = 1;
+    float FR = 2;
+    float RL = 3;
+    float RR = 4;
+}
diff --git a/proto/hytech_msgs.proto b/proto/hytech_msgs.proto
@@ -1,6 +1,8 @@
 syntax = "proto3";
 package hytech_msgs;
 
+import "base_msgs.proto";
+
 message SpeedControlOut {
     float pos_torque_limit_nm = 1;
     float neg_torque_limit_nm = 2;
@@ -12,13 +14,7 @@ message SpeedControlIn {
     float brake_percent = 2;
 }
 
-message veh_vec_float
-{
-    float FL = 1;
-    float FR = 2;
-    float RL = 3;
-    float RR = 4;
-}
+
 
 message MCUOutputData
 {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,4 @@

		`base_msgs.proto`: contains all base messages that can compose the top-level messages

		`hytech_msgs.proto`: contains all messages that will show up on foxglove / be sent individually at any point.