Skip to content

Commit 05b91a7

Browse files
committed
have new commits match experiment 2 style
1 parent af9a040 commit 05b91a7

File tree

5 files changed

+5
-10
lines changed

5 files changed

+5
-10
lines changed

proto/wippersnapper/error.options

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# error.options
2-
ws.error.Error submsg_callback:true
2+
ws.error.ErrorB2D submsg_callback:true

proto/wippersnapper/error.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,8 @@ message ErrorD2B {
6464
ComponentType type = 1;
6565
oneof component_id {
6666
string pin = 2;
67-
wippersnapper.i2c.I2cDeviceDescriptor i2c = 3;
68-
wippersnapper.uart.UartDescriptor uart = 4;
67+
ws.i2c.DeviceDescriptor i2c = 3;
68+
ws.uart.Descriptor uart = 4;
6969
}
7070
string error = 5;
7171

proto/wippersnapper/signal.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ message BrokerToDevice {
4949
message DeviceToBroker {
5050
oneof payload {
5151
// System Events
52-
wippersnapper.error.ErrorD2B error = 10;
52+
ws.error.ErrorD2B error = 10;
5353

5454
// Device Interactions
5555
ws.checkin.D2B checkin = 20;

proto/wippersnapper/uart.options

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,7 @@
11
# uart.options
22
ws.uart.DeviceConfig.device_id max_size: 32
3-
ws.uart.Added.device_id max_size: 32
4-
ws.uart.Remove.device_id max_size: 32
5-
ws.uart.Write.device_id max_size: 32
6-
ws.uart.Written.device_id max_size: 32
73
ws.uart.SerialConfig.pin_rx max_size: 16
84
ws.uart.SerialConfig.pin_tx max_size: 16
95
ws.uart.GenericInputConfig.sensor_types max_count:15
106
ws.uart.PM25AQIConfig.sensor_types max_count:15
11-
ws.uart.InputEvent.device_id max_size: 16
127
ws.uart.InputEvent.events max_count:15

proto/wippersnapper/uart.proto

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ message DeviceConfig {
149149
*/
150150
message Descriptor {
151151
uint32 uart_nbr = 1; /** The UART port number (eg: 0, 1, 2, etc.) that the device is attached to. */
152-
UartDeviceType type = 2; /** The category of device attached to the UART port, corresponds to its driver type. */
152+
DeviceType type = 2; /** The category of device attached to the UART port, corresponds to its driver type. */
153153
string device_id = 3; /** The unique identifier string for the UART device. */
154154
}
155155

0 commit comments

Comments
 (0)