Revert ".proto file wrappers updated"

Author: brentru

src/wippersnapper/description/v1/description.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Mon Oct 25 13:37:21 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 2021. */
 
 #include "wippersnapper/description/v1/description.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/wippersnapper/description/v1/description.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5-dev at Mon Oct 25 13:37:21 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 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

src/wippersnapper/i2c/v1/i2c.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Mon Oct 25 13:37:21 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 2021. */
 
 #include "wippersnapper/i2c/v1/i2c.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40
@@ -45,10 +45,13 @@ PB_BIND(wippersnapper_i2c_v1_DPS310InitRequest, wippersnapper_i2c_v1_DPS310InitR
 PB_BIND(wippersnapper_i2c_v1_DPS310DeinitRequest, wippersnapper_i2c_v1_DPS310DeinitRequest, AUTO)
 
 
+PB_BIND(wippersnapper_i2c_v1_SensorDetails, wippersnapper_i2c_v1_SensorDetails, AUTO)
+
+
 PB_BIND(wippersnapper_i2c_v1_SensorEvent, wippersnapper_i2c_v1_SensorEvent, AUTO)
 
 
-PB_BIND(wippersnapper_i2c_v1_I2CDeviceEvent, wippersnapper_i2c_v1_I2CDeviceEvent, AUTO)
+PB_BIND(wippersnapper_i2c_v1_I2CSensorEvent, wippersnapper_i2c_v1_I2CSensorEvent, AUTO)
 
 
 

src/wippersnapper/i2c/v1/i2c.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5-dev at Mon Oct 25 13:37:21 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 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
@@ -86,18 +86,37 @@ typedef struct _wippersnapper_i2c_v1_I2CDeviceDeinitResponse {
     uint32_t i2c_address;
 } wippersnapper_i2c_v1_I2CDeviceDeinitResponse;
 
-typedef struct _wippersnapper_i2c_v1_I2CDeviceEvent {
-    uint32_t sensor_address;
-    pb_callback_t sensor_event;
-} wippersnapper_i2c_v1_I2CDeviceEvent;
-
 typedef struct _wippersnapper_i2c_v1_I2CDeviceInitResponse {
     bool is_success;
 } wippersnapper_i2c_v1_I2CDeviceInitResponse;
 
+typedef struct _wippersnapper_i2c_v1_SensorDetails {
+    pb_callback_t name;
+    int32_t version;
+    int32_t id;
+    wippersnapper_i2c_v1_SensorType type;
+    float max_value;
+    float min_value;
+    float resolution;
+    int32_t min_delay;
+} wippersnapper_i2c_v1_SensorDetails;
+
 typedef struct _wippersnapper_i2c_v1_SensorEvent {
+    int32_t version;
+    int32_t sensor_id;
     wippersnapper_i2c_v1_SensorType type;
-    float value;
+    int32_t timestamp;
+    pb_size_t which_event_data;
+    union {
+        float temperature;
+        float distance;
+        float light;
+        float pressure;
+        float relative_humidity;
+        float current;
+        float voltage;
+        uint32_t raw_value;
+    } event_data;
 } wippersnapper_i2c_v1_SensorEvent;
 
 typedef struct _wippersnapper_i2c_v1_I2CDeviceDeinitRequest {
@@ -119,6 +138,12 @@ typedef struct _wippersnapper_i2c_v1_I2CDeviceInitRequest {
     wippersnapper_i2c_v1_DPS310InitRequest dps310_init;
 } wippersnapper_i2c_v1_I2CDeviceInitRequest;
 
+typedef struct _wippersnapper_i2c_v1_I2CSensorEvent {
+    uint32_t sensor_address;
+    bool has_event;
+    wippersnapper_i2c_v1_SensorEvent event;
+} wippersnapper_i2c_v1_I2CSensorEvent;
+
 
 /* Helper constants for enums */
 #define _wippersnapper_i2c_v1_SensorType_MIN wippersnapper_i2c_v1_SensorType_SENSOR_TYPE_UNSPECIFIED
@@ -144,8 +169,9 @@ extern "C" {
 #define wippersnapper_i2c_v1_AHTDeinitRequest_init_default {0, 0}
 #define wippersnapper_i2c_v1_DPS310InitRequest_init_default {0, 0, 0, 0}
 #define wippersnapper_i2c_v1_DPS310DeinitRequest_init_default {0, 0}
-#define wippersnapper_i2c_v1_SensorEvent_init_default {_wippersnapper_i2c_v1_SensorType_MIN, 0}
-#define wippersnapper_i2c_v1_I2CDeviceEvent_init_default {0, {{NULL}, NULL}}
+#define wippersnapper_i2c_v1_SensorDetails_init_default {{{NULL}, NULL}, 0, 0, _wippersnapper_i2c_v1_SensorType_MIN, 0, 0, 0, 0}
+#define wippersnapper_i2c_v1_SensorEvent_init_default {0, 0, _wippersnapper_i2c_v1_SensorType_MIN, 0, 0, {0}}
+#define wippersnapper_i2c_v1_I2CSensorEvent_init_default {0, false, wippersnapper_i2c_v1_SensorEvent_init_default}
 #define wippersnapper_i2c_v1_I2CBusInitRequest_init_zero {0, 0, 0, 0}
 #define wippersnapper_i2c_v1_I2CBusInitResponse_init_zero {0}
 #define wippersnapper_i2c_v1_I2CBusSetFrequency_init_zero {0, 0}
@@ -159,8 +185,9 @@ extern "C" {
 #define wippersnapper_i2c_v1_AHTDeinitRequest_init_zero {0, 0}
 #define wippersnapper_i2c_v1_DPS310InitRequest_init_zero {0, 0, 0, 0}
 #define wippersnapper_i2c_v1_DPS310DeinitRequest_init_zero {0, 0}
-#define wippersnapper_i2c_v1_SensorEvent_init_zero {_wippersnapper_i2c_v1_SensorType_MIN, 0}
-#define wippersnapper_i2c_v1_I2CDeviceEvent_init_zero {0, {{NULL}, NULL}}
+#define wippersnapper_i2c_v1_SensorDetails_init_zero {{{NULL}, NULL}, 0, 0, _wippersnapper_i2c_v1_SensorType_MIN, 0, 0, 0, 0}
+#define wippersnapper_i2c_v1_SensorEvent_init_zero {0, 0, _wippersnapper_i2c_v1_SensorType_MIN, 0, 0, {0}}
+#define wippersnapper_i2c_v1_I2CSensorEvent_init_zero {0, false, wippersnapper_i2c_v1_SensorEvent_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define wippersnapper_i2c_v1_AHTDeinitRequest_disable_temperature_tag 1
@@ -186,11 +213,27 @@ extern "C" {
 #define wippersnapper_i2c_v1_I2CBusSetFrequency_bus_id_tag 2
 #define wippersnapper_i2c_v1_I2CDeviceDeinitResponse_is_success_tag 1
 #define wippersnapper_i2c_v1_I2CDeviceDeinitResponse_i2c_address_tag 2
-#define wippersnapper_i2c_v1_I2CDeviceEvent_sensor_address_tag 1
-#define wippersnapper_i2c_v1_I2CDeviceEvent_sensor_event_tag 2
 #define wippersnapper_i2c_v1_I2CDeviceInitResponse_is_success_tag 1
-#define wippersnapper_i2c_v1_SensorEvent_type_tag 1
-#define wippersnapper_i2c_v1_SensorEvent_value_tag 2
+#define wippersnapper_i2c_v1_SensorDetails_name_tag 1
+#define wippersnapper_i2c_v1_SensorDetails_version_tag 2
+#define wippersnapper_i2c_v1_SensorDetails_id_tag 3
+#define wippersnapper_i2c_v1_SensorDetails_type_tag 4
+#define wippersnapper_i2c_v1_SensorDetails_max_value_tag 5
+#define wippersnapper_i2c_v1_SensorDetails_min_value_tag 6
+#define wippersnapper_i2c_v1_SensorDetails_resolution_tag 7
+#define wippersnapper_i2c_v1_SensorDetails_min_delay_tag 8
+#define wippersnapper_i2c_v1_SensorEvent_version_tag 1
+#define wippersnapper_i2c_v1_SensorEvent_sensor_id_tag 2
+#define wippersnapper_i2c_v1_SensorEvent_type_tag 3
+#define wippersnapper_i2c_v1_SensorEvent_timestamp_tag 4
+#define wippersnapper_i2c_v1_SensorEvent_temperature_tag 5
+#define wippersnapper_i2c_v1_SensorEvent_distance_tag 6
+#define wippersnapper_i2c_v1_SensorEvent_light_tag 7
+#define wippersnapper_i2c_v1_SensorEvent_pressure_tag 8
+#define wippersnapper_i2c_v1_SensorEvent_relative_humidity_tag 9
+#define wippersnapper_i2c_v1_SensorEvent_current_tag 10
+#define wippersnapper_i2c_v1_SensorEvent_voltage_tag 11
+#define wippersnapper_i2c_v1_SensorEvent_raw_value_tag 12
 #define wippersnapper_i2c_v1_I2CDeviceDeinitRequest_i2c_port_number_tag 1
 #define wippersnapper_i2c_v1_I2CDeviceDeinitRequest_i2c_address_tag 2
 #define wippersnapper_i2c_v1_I2CDeviceDeinitRequest_detach_device_tag 3
@@ -200,6 +243,8 @@ extern "C" {
 #define wippersnapper_i2c_v1_I2CDeviceInitRequest_i2c_address_tag 2
 #define wippersnapper_i2c_v1_I2CDeviceInitRequest_aht_init_tag 3
 #define wippersnapper_i2c_v1_I2CDeviceInitRequest_dps310_init_tag 4
+#define wippersnapper_i2c_v1_I2CSensorEvent_sensor_address_tag 1
+#define wippersnapper_i2c_v1_I2CSensorEvent_event_tag 2
 
 /* Struct field encoding specification for nanopb */
 #define wippersnapper_i2c_v1_I2CBusInitRequest_FIELDLIST(X, a) \
@@ -291,18 +336,40 @@ X(a, STATIC,   SINGULAR, BOOL,     disable_temperature,   2)
 #define wippersnapper_i2c_v1_DPS310DeinitRequest_CALLBACK NULL
 #define wippersnapper_i2c_v1_DPS310DeinitRequest_DEFAULT NULL
 
+#define wippersnapper_i2c_v1_SensorDetails_FIELDLIST(X, a) \
+X(a, CALLBACK, SINGULAR, STRING,   name,              1) \
+X(a, STATIC,   SINGULAR, INT32,    version,           2) \
+X(a, STATIC,   SINGULAR, INT32,    id,                3) \
+X(a, STATIC,   SINGULAR, UENUM,    type,              4) \
+X(a, STATIC,   SINGULAR, FLOAT,    max_value,         5) \
+X(a, STATIC,   SINGULAR, FLOAT,    min_value,         6) \
+X(a, STATIC,   SINGULAR, FLOAT,    resolution,        7) \
+X(a, STATIC,   SINGULAR, INT32,    min_delay,         8)
+#define wippersnapper_i2c_v1_SensorDetails_CALLBACK pb_default_field_callback
+#define wippersnapper_i2c_v1_SensorDetails_DEFAULT NULL
+
 #define wippersnapper_i2c_v1_SensorEvent_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    type,              1) \
-X(a, STATIC,   SINGULAR, FLOAT,    value,             2)
+X(a, STATIC,   SINGULAR, INT32,    version,           1) \
+X(a, STATIC,   SINGULAR, INT32,    sensor_id,         2) \
+X(a, STATIC,   SINGULAR, UENUM,    type,              3) \
+X(a, STATIC,   SINGULAR, INT32,    timestamp,         4) \
+X(a, STATIC,   ONEOF,    FLOAT,    (event_data,temperature,event_data.temperature),   5) \
+X(a, STATIC,   ONEOF,    FLOAT,    (event_data,distance,event_data.distance),   6) \
+X(a, STATIC,   ONEOF,    FLOAT,    (event_data,light,event_data.light),   7) \
+X(a, STATIC,   ONEOF,    FLOAT,    (event_data,pressure,event_data.pressure),   8) \
+X(a, STATIC,   ONEOF,    FLOAT,    (event_data,relative_humidity,event_data.relative_humidity),   9) \
+X(a, STATIC,   ONEOF,    FLOAT,    (event_data,current,event_data.current),  10) \
+X(a, STATIC,   ONEOF,    FLOAT,    (event_data,voltage,event_data.voltage),  11) \
+X(a, STATIC,   ONEOF,    UINT32,   (event_data,raw_value,event_data.raw_value),  12)
 #define wippersnapper_i2c_v1_SensorEvent_CALLBACK NULL
 #define wippersnapper_i2c_v1_SensorEvent_DEFAULT NULL
 
-#define wippersnapper_i2c_v1_I2CDeviceEvent_FIELDLIST(X, a) \
+#define wippersnapper_i2c_v1_I2CSensorEvent_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   sensor_address,    1) \
-X(a, CALLBACK, REPEATED, MESSAGE,  sensor_event,      2)
-#define wippersnapper_i2c_v1_I2CDeviceEvent_CALLBACK pb_default_field_callback
-#define wippersnapper_i2c_v1_I2CDeviceEvent_DEFAULT NULL
-#define wippersnapper_i2c_v1_I2CDeviceEvent_sensor_event_MSGTYPE wippersnapper_i2c_v1_SensorEvent
+X(a, STATIC,   OPTIONAL, MESSAGE,  event,             2)
+#define wippersnapper_i2c_v1_I2CSensorEvent_CALLBACK NULL
+#define wippersnapper_i2c_v1_I2CSensorEvent_DEFAULT NULL
+#define wippersnapper_i2c_v1_I2CSensorEvent_event_MSGTYPE wippersnapper_i2c_v1_SensorEvent
 
 extern const pb_msgdesc_t wippersnapper_i2c_v1_I2CBusInitRequest_msg;
 extern const pb_msgdesc_t wippersnapper_i2c_v1_I2CBusInitResponse_msg;
@@ -317,8 +384,9 @@ extern const pb_msgdesc_t wippersnapper_i2c_v1_AHTInitRequest_msg;
 extern const pb_msgdesc_t wippersnapper_i2c_v1_AHTDeinitRequest_msg;
 extern const pb_msgdesc_t wippersnapper_i2c_v1_DPS310InitRequest_msg;
 extern const pb_msgdesc_t wippersnapper_i2c_v1_DPS310DeinitRequest_msg;
+extern const pb_msgdesc_t wippersnapper_i2c_v1_SensorDetails_msg;
 extern const pb_msgdesc_t wippersnapper_i2c_v1_SensorEvent_msg;
-extern const pb_msgdesc_t wippersnapper_i2c_v1_I2CDeviceEvent_msg;
+extern const pb_msgdesc_t wippersnapper_i2c_v1_I2CSensorEvent_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define wippersnapper_i2c_v1_I2CBusInitRequest_fields &wippersnapper_i2c_v1_I2CBusInitRequest_msg
@@ -334,8 +402,9 @@ extern const pb_msgdesc_t wippersnapper_i2c_v1_I2CDeviceEvent_msg;
 #define wippersnapper_i2c_v1_AHTDeinitRequest_fields &wippersnapper_i2c_v1_AHTDeinitRequest_msg
 #define wippersnapper_i2c_v1_DPS310InitRequest_fields &wippersnapper_i2c_v1_DPS310InitRequest_msg
 #define wippersnapper_i2c_v1_DPS310DeinitRequest_fields &wippersnapper_i2c_v1_DPS310DeinitRequest_msg
+#define wippersnapper_i2c_v1_SensorDetails_fields &wippersnapper_i2c_v1_SensorDetails_msg
 #define wippersnapper_i2c_v1_SensorEvent_fields &wippersnapper_i2c_v1_SensorEvent_msg
-#define wippersnapper_i2c_v1_I2CDeviceEvent_fields &wippersnapper_i2c_v1_I2CDeviceEvent_msg
+#define wippersnapper_i2c_v1_I2CSensorEvent_fields &wippersnapper_i2c_v1_I2CSensorEvent_msg
 
 /* Maximum encoded size of messages (where known) */
 #define wippersnapper_i2c_v1_I2CBusInitRequest_size 39
@@ -351,8 +420,9 @@ extern const pb_msgdesc_t wippersnapper_i2c_v1_I2CDeviceEvent_msg;
 #define wippersnapper_i2c_v1_AHTDeinitRequest_size 4
 #define wippersnapper_i2c_v1_DPS310InitRequest_size 14
 #define wippersnapper_i2c_v1_DPS310DeinitRequest_size 4
-#define wippersnapper_i2c_v1_SensorEvent_size    7
-/* wippersnapper_i2c_v1_I2CDeviceEvent_size depends on runtime parameters */
+/* wippersnapper_i2c_v1_SensorDetails_size depends on runtime parameters */
+#define wippersnapper_i2c_v1_SensorEvent_size    41
+#define wippersnapper_i2c_v1_I2CSensorEvent_size 49
 
 #ifdef __cplusplus
 } /* extern "C" */

src/wippersnapper/pin/v1/pin.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Mon Oct 25 13:37:21 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 2021. */
 
 #include "wippersnapper/pin/v1/pin.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/wippersnapper/pin/v1/pin.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.5-dev at Mon Oct 25 13:37:21 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 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

src/wippersnapper/signal/v1/signal.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.5-dev at Mon Oct 25 13:37:21 2021. */
+/* Generated by nanopb-0.4.5-dev at Fri Oct 15 20:43:36 2021. */
 
 #include "wippersnapper/signal/v1/signal.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40
@@ -12,6 +12,9 @@ PB_BIND(wippersnapper_signal_v1_I2CRequest, wippersnapper_signal_v1_I2CRequest,
 PB_BIND(wippersnapper_signal_v1_I2CResponse, wippersnapper_signal_v1_I2CResponse, 2)
 
 
+PB_BIND(wippersnapper_signal_v1_SensorEvent, wippersnapper_signal_v1_SensorEvent, AUTO)
+
+
 PB_BIND(wippersnapper_signal_v1_CreateSignalRequest, wippersnapper_signal_v1_CreateSignalRequest, AUTO)