Skip to content

Commit b9f7c12

Browse files
committed
⬆️ Upgrade protos, 7dd0fe6
1 parent 6b93efc commit b9f7c12

File tree

2 files changed

+17
-15
lines changed

2 files changed

+17
-15
lines changed

src/protos/analogio.pb.h

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ typedef struct _wippersnapper_analogio_AnalogIOAdd {
2222
/* *
2323
AnalogIORemove removes an analog pin from the device. */
2424
typedef struct _wippersnapper_analogio_AnalogIORemove {
25-
pb_callback_t pin_name; /* * Name of the pin. */
25+
char pin_name[64]; /* * Name of the pin. */
2626
} wippersnapper_analogio_AnalogIORemove;
2727

2828
/* *
2929
AnalogIOEvent is contains a value, sent when an analog pin is read. */
3030
typedef struct _wippersnapper_analogio_AnalogIOEvent {
31-
pb_callback_t pin_name; /* * Name of the pin. */
31+
char pin_name[64]; /* * Name of the pin. */
3232
bool has_sensor_event;
3333
wippersnapper_sensor_SensorEvent sensor_event; /* * Reading(s) from an analog pin. */
3434
} wippersnapper_analogio_AnalogIOEvent;
@@ -40,11 +40,11 @@ extern "C" {
4040

4141
/* Initializer values for message structs */
4242
#define wippersnapper_analogio_AnalogIOAdd_init_default {"", 0, _wippersnapper_sensor_SensorType_MIN}
43-
#define wippersnapper_analogio_AnalogIORemove_init_default {{{NULL}, NULL}}
44-
#define wippersnapper_analogio_AnalogIOEvent_init_default {{{NULL}, NULL}, false, wippersnapper_sensor_SensorEvent_init_default}
43+
#define wippersnapper_analogio_AnalogIORemove_init_default {""}
44+
#define wippersnapper_analogio_AnalogIOEvent_init_default {"", false, wippersnapper_sensor_SensorEvent_init_default}
4545
#define wippersnapper_analogio_AnalogIOAdd_init_zero {"", 0, _wippersnapper_sensor_SensorType_MIN}
46-
#define wippersnapper_analogio_AnalogIORemove_init_zero {{{NULL}, NULL}}
47-
#define wippersnapper_analogio_AnalogIOEvent_init_zero {{{NULL}, NULL}, false, wippersnapper_sensor_SensorEvent_init_zero}
46+
#define wippersnapper_analogio_AnalogIORemove_init_zero {""}
47+
#define wippersnapper_analogio_AnalogIOEvent_init_zero {"", false, wippersnapper_sensor_SensorEvent_init_zero}
4848

4949
/* Field tags (for use in manual encoding/decoding) */
5050
#define wippersnapper_analogio_AnalogIOAdd_pin_name_tag 1
@@ -63,14 +63,14 @@ X(a, STATIC, SINGULAR, UENUM, read_mode, 3)
6363
#define wippersnapper_analogio_AnalogIOAdd_DEFAULT NULL
6464

6565
#define wippersnapper_analogio_AnalogIORemove_FIELDLIST(X, a) \
66-
X(a, CALLBACK, SINGULAR, STRING, pin_name, 1)
67-
#define wippersnapper_analogio_AnalogIORemove_CALLBACK pb_default_field_callback
66+
X(a, STATIC, SINGULAR, STRING, pin_name, 1)
67+
#define wippersnapper_analogio_AnalogIORemove_CALLBACK NULL
6868
#define wippersnapper_analogio_AnalogIORemove_DEFAULT NULL
6969

7070
#define wippersnapper_analogio_AnalogIOEvent_FIELDLIST(X, a) \
71-
X(a, CALLBACK, SINGULAR, STRING, pin_name, 1) \
71+
X(a, STATIC, SINGULAR, STRING, pin_name, 1) \
7272
X(a, STATIC, OPTIONAL, MESSAGE, sensor_event, 2)
73-
#define wippersnapper_analogio_AnalogIOEvent_CALLBACK pb_default_field_callback
73+
#define wippersnapper_analogio_AnalogIOEvent_CALLBACK NULL
7474
#define wippersnapper_analogio_AnalogIOEvent_DEFAULT NULL
7575
#define wippersnapper_analogio_AnalogIOEvent_sensor_event_MSGTYPE wippersnapper_sensor_SensorEvent
7676

@@ -84,10 +84,12 @@ 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_AnalogIORemove_size depends on runtime parameters */
88-
/* wippersnapper_analogio_AnalogIOEvent_size depends on runtime parameters */
8987
#define WIPPERSNAPPER_ANALOGIO_ANALOGIO_PB_H_MAX_SIZE wippersnapper_analogio_AnalogIOAdd_size
9088
#define wippersnapper_analogio_AnalogIOAdd_size 72
89+
#define wippersnapper_analogio_AnalogIORemove_size 65
90+
#if defined(wippersnapper_sensor_SensorEvent_size)
91+
#define wippersnapper_analogio_AnalogIOEvent_size (71 + wippersnapper_sensor_SensorEvent_size)
92+
#endif
9193

9294
#ifdef __cplusplus
9395
} /* 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_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];};
254+
#if defined(wippersnapper_digitalio_DigitalIOEvent_size) && defined(wippersnapper_digitalio_DigitalIOWrite_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 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_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_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)