Migrated to core.proto v2.0

BinghamtonRover · May 21, 2024 · 7c3a4bc · 7c3a4bc
1 parent bf09ef5
commit 7c3a4bc
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 75 deletions.
diff --git a/Protobuf b/Protobuf
diff --git a/core.pb.c b/core.pb.c
@@ -12,12 +12,5 @@ PB_BIND(Connect, Connect, AUTO)
 PB_BIND(Disconnect, Disconnect, AUTO)
 
 
-PB_BIND(UpdateSetting, UpdateSetting, AUTO)
-
-
-PB_BIND(ProtoColor, ProtoColor, AUTO)
-
-
-
 
 
diff --git a/core.pb.h b/core.pb.h
@@ -23,20 +23,6 @@ typedef enum _Device {
     Device_DRIVE = 9
 } Device;
 
-/* / Changes the way the rover listens to incoming commands.
-/ 
-/ - When IDLE, all subsystems will ignore all commands
-/ - When MANUAL, all subsystems will accept all commands
-/ - When AUTONOMOUS, the rover will ignore commands from the dashboard */
-typedef enum _RoverStatus {
-    RoverStatus_DISCONNECTED = 0, /* no signal at all means disconnected */
-    RoverStatus_IDLE = 1, /* Yellow button should be lit. */
-    RoverStatus_MANUAL = 2, /* Must show blue LEDs. Green button should be lit. */
-    RoverStatus_AUTONOMOUS = 3, /* See [AutonomyState] for LED colors */
-    RoverStatus_POWER_OFF = 4, /* Press the red button to turn off the Pis on the rover */
-    RoverStatus_RESTART = 5 /* Reboots the program that receives this message */
-} RoverStatus;
-
 /* Struct definitions */
 /* Used for a simple handshake between devices. */
 typedef struct _Connect {
@@ -49,22 +35,6 @@ typedef struct _Disconnect {
     Device sender;
 } Disconnect;
 
-typedef struct _ProtoColor {
-    float red;
-    float green;
-    float blue;
-} ProtoColor;
-
-/* / Update a sensitive setting, such as the rover's status.
-/ 
-/ This message must be triggered manually and the recipient (usually the subsystems Pi)
-/ must respond with the exact same message to confirm its receipt. */
-typedef struct _UpdateSetting {
-    RoverStatus status;
-    bool has_color;
-    ProtoColor color;
-} UpdateSetting;
-
 
 #ifdef __cplusplus
 extern "C" {
@@ -75,38 +45,22 @@ extern "C" {
 #define _Device_MAX Device_DRIVE
 #define _Device_ARRAYSIZE ((Device)(Device_DRIVE+1))
 
-#define _RoverStatus_MIN RoverStatus_DISCONNECTED
-#define _RoverStatus_MAX RoverStatus_RESTART
-#define _RoverStatus_ARRAYSIZE ((RoverStatus)(RoverStatus_RESTART+1))
-
 #define Connect_sender_ENUMTYPE Device
 #define Connect_receiver_ENUMTYPE Device
 
 #define Disconnect_sender_ENUMTYPE Device
 
-#define UpdateSetting_status_ENUMTYPE RoverStatus
-
-
 
 /* Initializer values for message structs */
 #define Connect_init_default                     {_Device_MIN, _Device_MIN}
 #define Disconnect_init_default                  {_Device_MIN}
-#define UpdateSetting_init_default               {_RoverStatus_MIN, false, ProtoColor_init_default}
-#define ProtoColor_init_default                  {0, 0, 0}
 #define Connect_init_zero                        {_Device_MIN, _Device_MIN}
 #define Disconnect_init_zero                     {_Device_MIN}
-#define UpdateSetting_init_zero                  {_RoverStatus_MIN, false, ProtoColor_init_zero}
-#define ProtoColor_init_zero                     {0, 0, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define Connect_sender_tag                       1
 #define Connect_receiver_tag                     2
 #define Disconnect_sender_tag                    1
-#define ProtoColor_red_tag                       1
-#define ProtoColor_green_tag                     2
-#define ProtoColor_blue_tag                      3
-#define UpdateSetting_status_tag                 1
-#define UpdateSetting_color_tag                  2
 
 /* Struct field encoding specification for nanopb */
 #define Connect_FIELDLIST(X, a) \
@@ -120,37 +74,17 @@ X(a, STATIC,   SINGULAR, UENUM,    sender,            1)
 #define Disconnect_CALLBACK NULL
 #define Disconnect_DEFAULT NULL
 
-#define UpdateSetting_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    status,            1) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  color,             2)
-#define UpdateSetting_CALLBACK NULL
-#define UpdateSetting_DEFAULT NULL
-#define UpdateSetting_color_MSGTYPE ProtoColor
-
-#define ProtoColor_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, FLOAT,    red,               1) \
-X(a, STATIC,   SINGULAR, FLOAT,    green,             2) \
-X(a, STATIC,   SINGULAR, FLOAT,    blue,              3)
-#define ProtoColor_CALLBACK NULL
-#define ProtoColor_DEFAULT NULL
-
 extern const pb_msgdesc_t Connect_msg;
 extern const pb_msgdesc_t Disconnect_msg;
-extern const pb_msgdesc_t UpdateSetting_msg;
-extern const pb_msgdesc_t ProtoColor_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define Connect_fields &Connect_msg
 #define Disconnect_fields &Disconnect_msg
-#define UpdateSetting_fields &UpdateSetting_msg
-#define ProtoColor_fields &ProtoColor_msg
 
 /* Maximum encoded size of messages (where known) */
-#define CORE_PB_H_MAX_SIZE                       UpdateSetting_size
+#define CORE_PB_H_MAX_SIZE                       Connect_size
 #define Connect_size                             4
 #define Disconnect_size                          2
-#define ProtoColor_size                          15
-#define UpdateSetting_size                       19
 
 #ifdef __cplusplus
 } /* extern "C" */

diff --git a/proto.bat b/proto.bat
@@ -0,0 +1,2 @@
+@echo off
+python Protobuf\generate_arduino.py -s utils -p core