Merge pull request #122 from adafruit/revert-120-protobuf-update-cb2c…

…ef2f75250030846d16af39d45113f0b80cd1 Roll back #120, Revert ".proto file wrappers updated"
adafruit · Aug 20, 2021 · 49d4bc4 · 49d4bc4
2 parents c4c3c5f + a4cd962
commit 49d4bc4
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 13 deletions.
diff --git a/src/wippersnapper/description/v1/description.pb.c b/src/wippersnapper/description/v1/description.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Fri Aug 20 16:39:13 2021. */
+/* Generated by nanopb-0.4.5-dev at Thu Aug 19 19:40:02 2021. */
 
 #include "wippersnapper/description/v1/description.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

diff --git a/src/wippersnapper/description/v1/description.pb.h b/src/wippersnapper/description/v1/description.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5-dev at Fri Aug 20 16:39:13 2021. */
+/* Generated by nanopb-0.4.5-dev at Thu Aug 19 19:40:02 2021. */
 
 #ifndef PB_WIPPERSNAPPER_DESCRIPTION_V1_WIPPERSNAPPER_DESCRIPTION_V1_DESCRIPTION_PB_H_INCLUDED
 #define PB_WIPPERSNAPPER_DESCRIPTION_V1_WIPPERSNAPPER_DESCRIPTION_V1_DESCRIPTION_PB_H_INCLUDED

diff --git a/src/wippersnapper/i2c/v1/i2c.pb.c b/src/wippersnapper/i2c/v1/i2c.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Fri Aug 20 16:39:13 2021. */
+/* Generated by nanopb-0.4.5-dev at Thu Aug 19 19:40:02 2021. */
 
 #include "wippersnapper/i2c/v1/i2c.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

diff --git a/src/wippersnapper/i2c/v1/i2c.pb.h b/src/wippersnapper/i2c/v1/i2c.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5-dev at Fri Aug 20 16:39:13 2021. */
+/* Generated by nanopb-0.4.5-dev at Thu Aug 19 19:40:02 2021. */
 
 #ifndef PB_WIPPERSNAPPER_I2C_V1_WIPPERSNAPPER_I2C_V1_I2C_PB_H_INCLUDED
 #define PB_WIPPERSNAPPER_I2C_V1_WIPPERSNAPPER_I2C_V1_I2C_PB_H_INCLUDED

diff --git a/src/wippersnapper/pin/v1/pin.pb.c b/src/wippersnapper/pin/v1/pin.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Fri Aug 20 16:39:13 2021. */
+/* Generated by nanopb-0.4.5-dev at Thu Aug 19 19:40:02 2021. */
 
 #include "wippersnapper/pin/v1/pin.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

diff --git a/src/wippersnapper/pin/v1/pin.pb.h b/src/wippersnapper/pin/v1/pin.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5-dev at Fri Aug 20 16:39:13 2021. */
+/* Generated by nanopb-0.4.5-dev at Thu Aug 19 19:40:02 2021. */
 
 #ifndef PB_WIPPERSNAPPER_PIN_V1_WIPPERSNAPPER_PIN_V1_PIN_PB_H_INCLUDED
 #define PB_WIPPERSNAPPER_PIN_V1_WIPPERSNAPPER_PIN_V1_PIN_PB_H_INCLUDED
@@ -88,6 +88,8 @@ typedef struct _wippersnapper_pin_v1_PWMPinEvent {
 typedef struct _wippersnapper_pin_v1_PinEvent {
     char pin_name[5];
     char pin_value[12];
+    wippersnapper_pin_v1_Mode mode;
+    float pin_value_volts;
 } wippersnapper_pin_v1_PinEvent;
 
 
@@ -120,7 +122,7 @@ extern "C" {
 /* Initializer values for message structs */
 #define wippersnapper_pin_v1_ConfigurePinRequests_init_default {{{NULL}, NULL}}
 #define wippersnapper_pin_v1_ConfigurePinRequest_init_default {"", _wippersnapper_pin_v1_Mode_MIN, _wippersnapper_pin_v1_ConfigurePinRequest_Direction_MIN, _wippersnapper_pin_v1_ConfigurePinRequest_Pull_MIN, 0, _wippersnapper_pin_v1_ConfigurePinRequest_RequestType_MIN, 0, _wippersnapper_pin_v1_ConfigurePinRequest_AnalogReadMode_MIN}
-#define wippersnapper_pin_v1_PinEvent_init_default {"", ""}
+#define wippersnapper_pin_v1_PinEvent_init_default {"", "", _wippersnapper_pin_v1_Mode_MIN, 0}
 #define wippersnapper_pin_v1_ConfigureReferenceVoltage_init_default {0}
 #define wippersnapper_pin_v1_PinEvents_init_default {{{NULL}, NULL}}
 #define wippersnapper_pin_v1_ConfigurePWMPinRequest_init_default {"", 0, 0, 0}
@@ -129,7 +131,7 @@ extern "C" {
 #define wippersnapper_pin_v1_PWMPinEvents_init_default {{{NULL}, NULL}}
 #define wippersnapper_pin_v1_ConfigurePinRequests_init_zero {{{NULL}, NULL}}
 #define wippersnapper_pin_v1_ConfigurePinRequest_init_zero {"", _wippersnapper_pin_v1_Mode_MIN, _wippersnapper_pin_v1_ConfigurePinRequest_Direction_MIN, _wippersnapper_pin_v1_ConfigurePinRequest_Pull_MIN, 0, _wippersnapper_pin_v1_ConfigurePinRequest_RequestType_MIN, 0, _wippersnapper_pin_v1_ConfigurePinRequest_AnalogReadMode_MIN}
-#define wippersnapper_pin_v1_PinEvent_init_zero  {"", ""}
+#define wippersnapper_pin_v1_PinEvent_init_zero  {"", "", _wippersnapper_pin_v1_Mode_MIN, 0}
 #define wippersnapper_pin_v1_ConfigureReferenceVoltage_init_zero {0}
 #define wippersnapper_pin_v1_PinEvents_init_zero {{{NULL}, NULL}}
 #define wippersnapper_pin_v1_ConfigurePWMPinRequest_init_zero {"", 0, 0, 0}
@@ -158,6 +160,8 @@ extern "C" {
 #define wippersnapper_pin_v1_PWMPinEvent_duty_cycle_tag 2
 #define wippersnapper_pin_v1_PinEvent_pin_name_tag 1
 #define wippersnapper_pin_v1_PinEvent_pin_value_tag 2
+#define wippersnapper_pin_v1_PinEvent_mode_tag   3
+#define wippersnapper_pin_v1_PinEvent_pin_value_volts_tag 4
 
 /* Struct field encoding specification for nanopb */
 #define wippersnapper_pin_v1_ConfigurePinRequests_FIELDLIST(X, a) \
@@ -180,7 +184,9 @@ X(a, STATIC,   SINGULAR, UENUM,    analog_read_mode,   8)
 
 #define wippersnapper_pin_v1_PinEvent_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, STRING,   pin_name,          1) \
-X(a, STATIC,   SINGULAR, STRING,   pin_value,         2)
+X(a, STATIC,   SINGULAR, STRING,   pin_value,         2) \
+X(a, STATIC,   SINGULAR, UENUM,    mode,              3) \
+X(a, STATIC,   SINGULAR, FLOAT,    pin_value_volts,   4)
 #define wippersnapper_pin_v1_PinEvent_CALLBACK NULL
 #define wippersnapper_pin_v1_PinEvent_DEFAULT NULL
 
@@ -244,7 +250,7 @@ extern const pb_msgdesc_t wippersnapper_pin_v1_PWMPinEvents_msg;
 /* Maximum encoded size of messages (where known) */
 /* wippersnapper_pin_v1_ConfigurePinRequests_size depends on runtime parameters */
 #define wippersnapper_pin_v1_ConfigurePinRequest_size 26
-#define wippersnapper_pin_v1_PinEvent_size       19
+#define wippersnapper_pin_v1_PinEvent_size       26
 #define wippersnapper_pin_v1_ConfigureReferenceVoltage_size 5
 /* wippersnapper_pin_v1_PinEvents_size depends on runtime parameters */
 #define wippersnapper_pin_v1_ConfigurePWMPinRequest_size 30

diff --git a/src/wippersnapper/signal/v1/signal.pb.c b/src/wippersnapper/signal/v1/signal.pb.c
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Fri Aug 20 16:39:13 2021. */
+/* Generated by nanopb-0.4.5-dev at Thu Aug 19 19:40:02 2021. */
 
 #include "wippersnapper/signal/v1/signal.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

diff --git a/src/wippersnapper/signal/v1/signal.pb.h b/src/wippersnapper/signal/v1/signal.pb.h
@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5-dev at Fri Aug 20 16:39:13 2021. */
+/* Generated by nanopb-0.4.5-dev at Thu Aug 19 19:40:02 2021. */
 
 #ifndef PB_WIPPERSNAPPER_SIGNAL_V1_WIPPERSNAPPER_SIGNAL_V1_SIGNAL_PB_H_INCLUDED
 #define PB_WIPPERSNAPPER_SIGNAL_V1_WIPPERSNAPPER_SIGNAL_V1_SIGNAL_PB_H_INCLUDED
@@ -150,7 +150,7 @@ extern const pb_msgdesc_t wippersnapper_signal_v1_CreateSignalRequest_msg;
 #define wippersnapper_signal_v1_I2CResponse_size 8
 #define wippersnapper_signal_v1_SensorEvent_size 51
 #if defined(wippersnapper_pin_v1_ConfigurePinRequests_size) && defined(wippersnapper_pin_v1_PinEvents_size) && defined(wippersnapper_pin_v1_ConfigurePWMPinRequests_size) && defined(wippersnapper_pin_v1_PWMPinEvents_size)
-union wippersnapper_signal_v1_CreateSignalRequest_payload_size_union {char f6[(6 + wippersnapper_pin_v1_ConfigurePinRequests_size)]; char f7[(6 + wippersnapper_pin_v1_PinEvents_size)]; char f10[(6 + wippersnapper_pin_v1_ConfigurePWMPinRequests_size)]; char f12[(6 + wippersnapper_pin_v1_PWMPinEvents_size)]; char f0[21];};
+union wippersnapper_signal_v1_CreateSignalRequest_payload_size_union {char f6[(6 + wippersnapper_pin_v1_ConfigurePinRequests_size)]; char f7[(6 + wippersnapper_pin_v1_PinEvents_size)]; char f10[(6 + wippersnapper_pin_v1_ConfigurePWMPinRequests_size)]; char f12[(6 + wippersnapper_pin_v1_PWMPinEvents_size)]; char f0[28];};
 #define wippersnapper_signal_v1_CreateSignalRequest_size (0 + sizeof(union wippersnapper_signal_v1_CreateSignalRequest_payload_size_union))
 #endif