Skip to content

Commit c17c5a3

Browse files
committed
Update i2c.proto
1 parent f43e194 commit c17c5a3

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

src/protos/i2c.pb.h

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ typedef struct _wippersnapper_i2c_I2cDeviceRemove {
104104
typedef struct _wippersnapper_i2c_I2cDeviceRemoved {
105105
bool has_i2c_device_description;
106106
wippersnapper_i2c_I2cDeviceDescriptor i2c_device_description; /* * The I2c device's address and metadata. */
107-
wippersnapper_i2c_I2cBusStatus i2c_bus_status; /* * The I2c bus' status. * */
108-
wippersnapper_i2c_I2cDeviceStatus i2c_device_status; /* * The I2c device's status. * */
107+
bool did_remove; /* * True if the I2C device was successfully removed from the controller, False otherwise. * */
109108
} wippersnapper_i2c_I2cDeviceRemoved;
110109

111110
/* *
@@ -144,8 +143,6 @@ extern "C" {
144143
#define wippersnapper_i2c_I2cDeviceAddedOrReplaced_i2c_device_status_ENUMTYPE wippersnapper_i2c_I2cDeviceStatus
145144

146145

147-
#define wippersnapper_i2c_I2cDeviceRemoved_i2c_bus_status_ENUMTYPE wippersnapper_i2c_I2cBusStatus
148-
#define wippersnapper_i2c_I2cDeviceRemoved_i2c_device_status_ENUMTYPE wippersnapper_i2c_I2cDeviceStatus
149146

150147

151148

@@ -157,7 +154,7 @@ extern "C" {
157154
#define wippersnapper_i2c_I2cDeviceAddOrReplace_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, "", 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}}
158155
#define wippersnapper_i2c_I2cDeviceAddedOrReplaced_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, _wippersnapper_i2c_I2cBusStatus_MIN, _wippersnapper_i2c_I2cDeviceStatus_MIN}
159156
#define wippersnapper_i2c_I2cDeviceRemove_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default}
160-
#define wippersnapper_i2c_I2cDeviceRemoved_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, _wippersnapper_i2c_I2cBusStatus_MIN, _wippersnapper_i2c_I2cDeviceStatus_MIN}
157+
#define wippersnapper_i2c_I2cDeviceRemoved_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, 0}
161158
#define wippersnapper_i2c_I2cDeviceEvent_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, 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}}
162159
#define wippersnapper_i2c_I2cDeviceDescriptor_init_zero {"", "", 0, 0, 0}
163160
#define wippersnapper_i2c_I2cBusDescriptor_init_zero {"", ""}
@@ -166,7 +163,7 @@ extern "C" {
166163
#define wippersnapper_i2c_I2cDeviceAddOrReplace_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, "", 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}}
167164
#define wippersnapper_i2c_I2cDeviceAddedOrReplaced_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, _wippersnapper_i2c_I2cBusStatus_MIN, _wippersnapper_i2c_I2cDeviceStatus_MIN}
168165
#define wippersnapper_i2c_I2cDeviceRemove_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero}
169-
#define wippersnapper_i2c_I2cDeviceRemoved_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, _wippersnapper_i2c_I2cBusStatus_MIN, _wippersnapper_i2c_I2cDeviceStatus_MIN}
166+
#define wippersnapper_i2c_I2cDeviceRemoved_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, 0}
170167
#define wippersnapper_i2c_I2cDeviceEvent_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, 0, {wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero}}
171168

172169
/* Field tags (for use in manual encoding/decoding) */
@@ -193,8 +190,7 @@ extern "C" {
193190
#define wippersnapper_i2c_I2cDeviceAddedOrReplaced_i2c_device_status_tag 3
194191
#define wippersnapper_i2c_I2cDeviceRemove_i2c_device_description_tag 1
195192
#define wippersnapper_i2c_I2cDeviceRemoved_i2c_device_description_tag 1
196-
#define wippersnapper_i2c_I2cDeviceRemoved_i2c_bus_status_tag 2
197-
#define wippersnapper_i2c_I2cDeviceRemoved_i2c_device_status_tag 3
193+
#define wippersnapper_i2c_I2cDeviceRemoved_did_remove_tag 2
198194
#define wippersnapper_i2c_I2cDeviceEvent_i2c_device_description_tag 1
199195
#define wippersnapper_i2c_I2cDeviceEvent_i2c_device_events_tag 2
200196

@@ -256,8 +252,7 @@ X(a, STATIC, OPTIONAL, MESSAGE, i2c_device_description, 1)
256252

257253
#define wippersnapper_i2c_I2cDeviceRemoved_FIELDLIST(X, a) \
258254
X(a, STATIC, OPTIONAL, MESSAGE, i2c_device_description, 1) \
259-
X(a, STATIC, SINGULAR, UENUM, i2c_bus_status, 2) \
260-
X(a, STATIC, SINGULAR, UENUM, i2c_device_status, 3)
255+
X(a, STATIC, SINGULAR, BOOL, did_remove, 2)
261256
#define wippersnapper_i2c_I2cDeviceRemoved_CALLBACK NULL
262257
#define wippersnapper_i2c_I2cDeviceRemoved_DEFAULT NULL
263258
#define wippersnapper_i2c_I2cDeviceRemoved_i2c_device_description_MSGTYPE wippersnapper_i2c_I2cDeviceDescriptor
@@ -300,7 +295,7 @@ extern const pb_msgdesc_t wippersnapper_i2c_I2cDeviceEvent_msg;
300295
#define wippersnapper_i2c_I2cDeviceAddedOrReplaced_size 56
301296
#define wippersnapper_i2c_I2cDeviceDescriptor_size 50
302297
#define wippersnapper_i2c_I2cDeviceRemove_size 52
303-
#define wippersnapper_i2c_I2cDeviceRemoved_size 56
298+
#define wippersnapper_i2c_I2cDeviceRemoved_size 54
304299
#if defined(wippersnapper_sensor_SensorEvent_size)
305300
#define wippersnapper_i2c_I2cDeviceEvent_size (142 + 15*wippersnapper_sensor_SensorEvent_size)
306301
#endif

0 commit comments

Comments
 (0)