@@ -87,8 +87,7 @@ typedef struct _wippersnapper_uart_GenericUartInputConfig {
87
87
pb_callback_t name ; /* * The name used to identify the device. */
88
88
wippersnapper_uart_GenericDeviceLineEnding line_ending ; /* * The line ending used by the device. */
89
89
int32_t period ; /* * The period to poll the device, in milliseconds */
90
- pb_size_t i2c_device_sensor_types_count ;
91
- wippersnapper_sensor_SensorType i2c_device_sensor_types [15 ]; /* * SI Types for each sensor on the I2c device. */
90
+ pb_callback_t sensor_types ; /* * SI Types for each sensor on the UART device. */
92
91
} wippersnapper_uart_GenericUartInputConfig ;
93
92
94
93
/* *
@@ -218,7 +217,7 @@ extern "C" {
218
217
#define wippersnapper_uart_UartSerialConfig_format_ENUMTYPE wippersnapper_uart_UartPacketFormat
219
218
220
219
#define wippersnapper_uart_GenericUartInputConfig_line_ending_ENUMTYPE wippersnapper_uart_GenericDeviceLineEnding
221
- #define wippersnapper_uart_GenericUartInputConfig_i2c_device_sensor_types_ENUMTYPE wippersnapper_sensor_SensorType
220
+ #define wippersnapper_uart_GenericUartInputConfig_sensor_types_ENUMTYPE wippersnapper_sensor_SensorType
222
221
223
222
224
223
#define wippersnapper_uart_PM25AQIConfig_i2c_device_sensor_types_ENUMTYPE wippersnapper_sensor_SensorType
@@ -239,7 +238,7 @@ extern "C" {
239
238
240
239
/* Initializer values for message structs */
241
240
#define wippersnapper_uart_UartSerialConfig_init_default {"", "", 0, 0, _wippersnapper_uart_UartPacketFormat_MIN, 0, 0, 0}
242
- #define wippersnapper_uart_GenericUartInputConfig_init_default {{{NULL}, NULL}, _wippersnapper_uart_GenericDeviceLineEnding_MIN, 0, 0, {_wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN }}
241
+ #define wippersnapper_uart_GenericUartInputConfig_init_default {{{NULL}, NULL}, _wippersnapper_uart_GenericDeviceLineEnding_MIN, 0, {{NULL}, NULL }}
243
242
#define wippersnapper_uart_TrinamicDynamixelConfig_init_default {0}
244
243
#define wippersnapper_uart_PM25AQIConfig_init_default {0, 0, 0, {_wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN}}
245
244
#define wippersnapper_uart_UartDeviceConfig_init_default {_wippersnapper_uart_UartDeviceType_MIN, "", 0, {wippersnapper_uart_GenericUartInputConfig_init_default}}
@@ -250,7 +249,7 @@ extern "C" {
250
249
#define wippersnapper_uart_UartWritten_init_default {0, _wippersnapper_uart_UartDeviceType_MIN, "", 0}
251
250
#define wippersnapper_uart_UartInputEvent_init_default {0, _wippersnapper_uart_UartDeviceType_MIN, "", 0, {wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default}}
252
251
#define wippersnapper_uart_UartSerialConfig_init_zero {"", "", 0, 0, _wippersnapper_uart_UartPacketFormat_MIN, 0, 0, 0}
253
- #define wippersnapper_uart_GenericUartInputConfig_init_zero {{{NULL}, NULL}, _wippersnapper_uart_GenericDeviceLineEnding_MIN, 0, 0, {_wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN }}
252
+ #define wippersnapper_uart_GenericUartInputConfig_init_zero {{{NULL}, NULL}, _wippersnapper_uart_GenericDeviceLineEnding_MIN, 0, {{NULL}, NULL }}
254
253
#define wippersnapper_uart_TrinamicDynamixelConfig_init_zero {0}
255
254
#define wippersnapper_uart_PM25AQIConfig_init_zero {0, 0, 0, {_wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN, _wippersnapper_sensor_SensorType_MIN}}
256
255
#define wippersnapper_uart_UartDeviceConfig_init_zero {_wippersnapper_uart_UartDeviceType_MIN, "", 0, {wippersnapper_uart_GenericUartInputConfig_init_zero}}
@@ -273,7 +272,7 @@ extern "C" {
273
272
#define wippersnapper_uart_GenericUartInputConfig_name_tag 1
274
273
#define wippersnapper_uart_GenericUartInputConfig_line_ending_tag 2
275
274
#define wippersnapper_uart_GenericUartInputConfig_period_tag 3
276
- #define wippersnapper_uart_GenericUartInputConfig_i2c_device_sensor_types_tag 4
275
+ #define wippersnapper_uart_GenericUartInputConfig_sensor_types_tag 4
277
276
#define wippersnapper_uart_TrinamicDynamixelConfig_device_id_tag 1
278
277
#define wippersnapper_uart_PM25AQIConfig_is_pm1006_tag 1
279
278
#define wippersnapper_uart_PM25AQIConfig_period_tag 2
@@ -324,7 +323,7 @@ X(a, STATIC, SINGULAR, BOOL, sw_serial_invert, 8)
324
323
X(a, CALLBACK, SINGULAR, STRING, name, 1) \
325
324
X(a, STATIC, SINGULAR, UENUM, line_ending, 2) \
326
325
X(a, STATIC, SINGULAR, INT32, period, 3) \
327
- X(a, STATIC, REPEATED, UENUM, i2c_device_sensor_types, 4)
326
+ X(a, CALLBACK, REPEATED, UENUM, sensor_types, 4)
328
327
#define wippersnapper_uart_GenericUartInputConfig_CALLBACK pb_default_field_callback
329
328
#define wippersnapper_uart_GenericUartInputConfig_DEFAULT NULL
330
329
0 commit comments