Skip to content

Commit 6b93efc

Browse files
committed
⬆️ Upgrade protobuf to match ee1df09fb542fd9ba27271cfa5aebc75bd9842a3
1 parent 49e110d commit 6b93efc

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/protos/analogio.pb.h

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
/* *
1515
AnalogIOAdd adds an analog pin to the device. */
1616
typedef struct _wippersnapper_analogio_AnalogIOAdd {
17-
pb_callback_t pin_name; /* * Name of the pin. */
17+
char pin_name[64]; /* * Name of the pin. */
1818
float period; /* * Time between reads, in seconds. */
1919
wippersnapper_sensor_SensorType read_mode; /* * Desired read mode for the pin. */
2020
} wippersnapper_analogio_AnalogIOAdd;
@@ -39,10 +39,10 @@ extern "C" {
3939
#endif
4040

4141
/* Initializer values for message structs */
42-
#define wippersnapper_analogio_AnalogIOAdd_init_default {{{NULL}, NULL}, 0, _wippersnapper_sensor_SensorType_MIN}
42+
#define wippersnapper_analogio_AnalogIOAdd_init_default {"", 0, _wippersnapper_sensor_SensorType_MIN}
4343
#define wippersnapper_analogio_AnalogIORemove_init_default {{{NULL}, NULL}}
4444
#define wippersnapper_analogio_AnalogIOEvent_init_default {{{NULL}, NULL}, false, wippersnapper_sensor_SensorEvent_init_default}
45-
#define wippersnapper_analogio_AnalogIOAdd_init_zero {{{NULL}, NULL}, 0, _wippersnapper_sensor_SensorType_MIN}
45+
#define wippersnapper_analogio_AnalogIOAdd_init_zero {"", 0, _wippersnapper_sensor_SensorType_MIN}
4646
#define wippersnapper_analogio_AnalogIORemove_init_zero {{{NULL}, NULL}}
4747
#define wippersnapper_analogio_AnalogIOEvent_init_zero {{{NULL}, NULL}, false, wippersnapper_sensor_SensorEvent_init_zero}
4848

@@ -56,10 +56,10 @@ extern "C" {
5656

5757
/* Struct field encoding specification for nanopb */
5858
#define wippersnapper_analogio_AnalogIOAdd_FIELDLIST(X, a) \
59-
X(a, CALLBACK, SINGULAR, STRING, pin_name, 1) \
59+
X(a, STATIC, SINGULAR, STRING, pin_name, 1) \
6060
X(a, STATIC, SINGULAR, FLOAT, period, 2) \
6161
X(a, STATIC, SINGULAR, UENUM, read_mode, 3)
62-
#define wippersnapper_analogio_AnalogIOAdd_CALLBACK pb_default_field_callback
62+
#define wippersnapper_analogio_AnalogIOAdd_CALLBACK NULL
6363
#define wippersnapper_analogio_AnalogIOAdd_DEFAULT NULL
6464

6565
#define wippersnapper_analogio_AnalogIORemove_FIELDLIST(X, a) \
@@ -84,9 +84,10 @@ extern const pb_msgdesc_t wippersnapper_analogio_AnalogIOEvent_msg;
8484
#define wippersnapper_analogio_AnalogIOEvent_fields &wippersnapper_analogio_AnalogIOEvent_msg
8585

8686
/* Maximum encoded size of messages (where known) */
87-
/* wippersnapper_analogio_AnalogIOAdd_size depends on runtime parameters */
8887
/* wippersnapper_analogio_AnalogIORemove_size depends on runtime parameters */
8988
/* wippersnapper_analogio_AnalogIOEvent_size depends on runtime parameters */
89+
#define WIPPERSNAPPER_ANALOGIO_ANALOGIO_PB_H_MAX_SIZE wippersnapper_analogio_AnalogIOAdd_size
90+
#define wippersnapper_analogio_AnalogIOAdd_size 72
9091

9192
#ifdef __cplusplus
9293
} /* extern "C" */

src/protos/signal.pb.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -251,13 +251,13 @@ extern const pb_msgdesc_t wippersnapper_signal_DeviceToBroker_msg;
251251
#define wippersnapper_signal_DeviceToBroker_fields &wippersnapper_signal_DeviceToBroker_msg
252252

253253
/* Maximum encoded size of messages (where known) */
254-
#if defined(wippersnapper_digitalio_DigitalIOEvent_size) && defined(wippersnapper_digitalio_DigitalIOWrite_size) && defined(wippersnapper_analogio_AnalogIOAdd_size) && defined(wippersnapper_analogio_AnalogIORemove_size) && defined(wippersnapper_uart_UARTAdd_size) && defined(wippersnapper_uart_UARTRemove_size)
255-
union wippersnapper_signal_BrokerToDevice_payload_size_union {char f12[(6 + wippersnapper_digitalio_DigitalIOEvent_size)]; char f13[(6 + wippersnapper_digitalio_DigitalIOWrite_size)]; char f20[(7 + wippersnapper_analogio_AnalogIOAdd_size)]; char f21[(7 + wippersnapper_analogio_AnalogIORemove_size)]; char f80[(7 + wippersnapper_uart_UARTAdd_size)]; char f81[(7 + wippersnapper_uart_UARTRemove_size)]; char f0[83];};
254+
#if defined(wippersnapper_digitalio_DigitalIOEvent_size) && defined(wippersnapper_digitalio_DigitalIOWrite_size) && defined(wippersnapper_analogio_AnalogIORemove_size) && defined(wippersnapper_uart_UARTAdd_size) && defined(wippersnapper_uart_UARTRemove_size)
255+
union wippersnapper_signal_BrokerToDevice_payload_size_union {char f12[(6 + wippersnapper_digitalio_DigitalIOEvent_size)]; char f13[(6 + wippersnapper_digitalio_DigitalIOWrite_size)]; char f21[(7 + wippersnapper_analogio_AnalogIORemove_size)]; char f80[(7 + wippersnapper_uart_UARTAdd_size)]; char f81[(7 + wippersnapper_uart_UARTRemove_size)]; char f0[83];};
256256
#endif
257257
#if defined(wippersnapper_digitalio_DigitalIOEvent_size) && defined(wippersnapper_analogio_AnalogIOEvent_size) && defined(wippersnapper_ds18x20_Ds18x20Event_size) && defined(wippersnapper_uart_UARTAdded_size) && defined(wippersnapper_uart_UARTEvent_size) && defined(wippersnapper_i2c_I2cDeviceEvent_size)
258258
union wippersnapper_signal_DeviceToBroker_payload_size_union {char f10[(6 + wippersnapper_digitalio_DigitalIOEvent_size)]; char f20[(7 + wippersnapper_analogio_AnalogIOEvent_size)]; char f80[(7 + wippersnapper_ds18x20_Ds18x20Event_size)]; char f90[(7 + wippersnapper_uart_UARTAdded_size)]; char f100[(7 + wippersnapper_uart_UARTEvent_size)]; char f113[(7 + wippersnapper_i2c_I2cDeviceEvent_size)]; char f0[2406];};
259259
#endif
260-
#if defined(wippersnapper_digitalio_DigitalIOEvent_size) && defined(wippersnapper_digitalio_DigitalIOWrite_size) && defined(wippersnapper_analogio_AnalogIOAdd_size) && defined(wippersnapper_analogio_AnalogIORemove_size) && defined(wippersnapper_uart_UARTAdd_size) && defined(wippersnapper_uart_UARTRemove_size)
260+
#if defined(wippersnapper_digitalio_DigitalIOEvent_size) && defined(wippersnapper_digitalio_DigitalIOWrite_size) && defined(wippersnapper_analogio_AnalogIORemove_size) && defined(wippersnapper_uart_UARTAdd_size) && defined(wippersnapper_uart_UARTRemove_size)
261261
#define WIPPERSNAPPER_SIGNAL_SIGNAL_PB_H_MAX_SIZE wippersnapper_signal_BrokerToDevice_size
262262
#define wippersnapper_signal_BrokerToDevice_size (0 + sizeof(union wippersnapper_signal_BrokerToDevice_payload_size_union))
263263
#endif

0 commit comments

Comments
 (0)