From c3f2fef2ca35aac49d2271b436c144b1b059aa6a Mon Sep 17 00:00:00 2001 From: Matthew Garrett Date: Sat, 16 Feb 2019 12:12:21 -0800 Subject: [PATCH] Change sequence number to uint32 Some devices seem to use sequence numbers that are above the signed integer maximum, so see if this works with a uint32. --- lakeside/lakeside.proto | 6 +- lakeside/lakeside_pb2.py | 128 +++++++++++++++++++-------------------- setup.py | 2 +- 3 files changed, 68 insertions(+), 68 deletions(-) diff --git a/lakeside/lakeside.proto b/lakeside/lakeside.proto index 631cdd6..aee1062 100644 --- a/lakeside/lakeside.proto +++ b/lakeside/lakeside.proto @@ -32,7 +32,7 @@ message BulbInfo { } message T1012Packet { - required int32 sequence = 1; + required uint32 sequence = 1; required string code = 2; optional Ping ping = 3; optional BulbInfo bulbinfo = 5; @@ -76,7 +76,7 @@ message T1013BulbInfo { } message T1013Packet { - required int32 sequence = 1; + required uint32 sequence = 1; required string code = 2; optional Ping ping = 3; optional T1013BulbInfo bulbinfo = 5; @@ -107,7 +107,7 @@ message SwitchInfo { } message T1201Packet { - required int32 sequence = 1; + required uint32 sequence = 1; required string code = 2; optional Ping ping = 3; optional SwitchInfo switchinfo = 5; diff --git a/lakeside/lakeside_pb2.py b/lakeside/lakeside_pb2.py index 2f35c94..1bc340f 100644 --- a/lakeside/lakeside_pb2.py +++ b/lakeside/lakeside_pb2.py @@ -19,7 +19,7 @@ name='lakeside.proto', package='lakeside', syntax='proto2', - serialized_pb=_b('\n\x0elakeside.proto\x12\x08lakeside\"\x14\n\x04Ping\x12\x0c\n\x04type\x18\x01 \x02(\x05\"5\n\nBulbValues\x12\x12\n\nbrightness\x18\x01 \x02(\x05\x12\x13\n\x0btemperature\x18\x02 \x01(\x05\"\x9c\x01\n\tBulbState\x12\x0f\n\x07\x63ommand\x18\x01 \x02(\x05\x12$\n\x06values\x18\x02 \x01(\x0b\x32\x14.lakeside.BulbValues\x12\r\n\x05power\x18\x03 \x01(\x05\x12\x10\n\x08unknown1\x18\x04 \x01(\x05\x12%\n\x07values2\x18\x05 \x01(\x0b\x32\x14.lakeside.BulbValues\x12\x10\n\x08unknown2\x18\x06 \x01(\x05\"l\n\nBulbPacket\x12\x10\n\x08unknown1\x18\x01 \x02(\x05\x12&\n\tbulbstate\x18\x02 \x01(\x0b\x32\x13.lakeside.BulbState\x12$\n\x07\x62ulbset\x18\x03 \x01(\x0b\x32\x13.lakeside.BulbState\">\n\x08\x42ulbInfo\x12\x0c\n\x04type\x18\x01 \x02(\x05\x12$\n\x06packet\x18\x02 \x01(\x0b\x32\x14.lakeside.BulbPacket\"q\n\x0bT1012Packet\x12\x10\n\x08sequence\x18\x01 \x02(\x05\x12\x0c\n\x04\x63ode\x18\x02 \x02(\t\x12\x1c\n\x04ping\x18\x03 \x01(\x0b\x32\x0e.lakeside.Ping\x12$\n\x08\x62ulbinfo\x18\x05 \x01(\x0b\x32\x12.lakeside.BulbInfo\"\xa6\x01\n\tT1013Info\x12\x0f\n\x07\x63ommand\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x01(\x05\x12\r\n\x05power\x18\x03 \x01(\x05\x12$\n\x06values\x18\x04 \x01(\x0b\x32\x14.lakeside.BulbValues\x12$\n\x06\x63olors\x18\x05 \x01(\x0b\x32\x14.lakeside.T1013Color\x12\x10\n\x08unknown7\x18\x07 \x01(\x05\x12\x0c\n\x04rssi\x18\x08 \x01(\x05\"\x89\x01\n\x0cT1013Control\x12\x0f\n\x07\x63ommand\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x01(\x05\x12$\n\x06values\x18\x03 \x01(\x0b\x32\x14.lakeside.BulbValues\x12$\n\x06\x63olors\x18\x04 \x01(\x0b\x32\x14.lakeside.T1013Color\x12\r\n\x05power\x18\x05 \x01(\x05\"J\n\nT1013Color\x12\x0b\n\x03red\x18\x01 \x02(\x05\x12\r\n\x05green\x18\x02 \x02(\x05\x12\x0c\n\x04\x62lue\x18\x03 \x02(\x05\x12\x12\n\nbrightness\x18\x04 \x02(\x05\"|\n\nT1013State\x12\x10\n\x08unknown1\x18\x01 \x02(\x05\x12!\n\x04info\x18\x02 \x01(\x0b\x32\x13.lakeside.T1013Info\x12\'\n\x07\x63ontrol\x18\x03 \x01(\x0b\x32\x16.lakeside.T1013Control\x12\x10\n\x08unknown5\x18\x05 \x01(\x05\"C\n\rT1013BulbInfo\x12\x0c\n\x04type\x18\x01 \x02(\x05\x12$\n\x06packet\x18\x02 \x01(\x0b\x32\x14.lakeside.T1013State\"v\n\x0bT1013Packet\x12\x10\n\x08sequence\x18\x01 \x02(\x05\x12\x0c\n\x04\x63ode\x18\x02 \x02(\t\x12\x1c\n\x04ping\x18\x03 \x01(\x0b\x32\x0e.lakeside.Ping\x12)\n\x08\x62ulbinfo\x18\x05 \x01(\x0b\x32\x17.lakeside.T1013BulbInfo\"-\n\x0bSwitchState\x12\x0f\n\x07\x63ommand\x18\x01 \x01(\x05\x12\r\n\x05state\x18\x02 \x01(\x05\"e\n\x0cSwitchStatus\x12\x10\n\x08unknown1\x18\x01 \x01(\x05\x12\r\n\x05power\x18\x02 \x01(\x05\x12\x10\n\x08unknown3\x18\x03 \x01(\x05\x12\x10\n\x08unknown4\x18\x04 \x01(\x05\x12\x10\n\x08unknown5\x18\x05 \x01(\x05\"x\n\x0cSwitchPacket\x12\x10\n\x08unknown1\x18\x01 \x02(\x05\x12(\n\tswitchset\x18\x03 \x01(\x0b\x32\x15.lakeside.SwitchState\x12,\n\x0cswitchstatus\x18\x05 \x01(\x0b\x32\x16.lakeside.SwitchStatus\"B\n\nSwitchInfo\x12\x0c\n\x04type\x18\x01 \x02(\x05\x12&\n\x06packet\x18\x02 \x01(\x0b\x32\x16.lakeside.SwitchPacket\"u\n\x0bT1201Packet\x12\x10\n\x08sequence\x18\x01 \x02(\x05\x12\x0c\n\x04\x63ode\x18\x02 \x02(\t\x12\x1c\n\x04ping\x18\x03 \x01(\x0b\x32\x0e.lakeside.Ping\x12(\n\nswitchinfo\x18\x05 \x01(\x0b\x32\x14.lakeside.SwitchInfo') + serialized_pb=_b('\n\x0elakeside.proto\x12\x08lakeside\"\x14\n\x04Ping\x12\x0c\n\x04type\x18\x01 \x02(\x05\"5\n\nBulbValues\x12\x12\n\nbrightness\x18\x01 \x02(\x05\x12\x13\n\x0btemperature\x18\x02 \x01(\x05\"\x9c\x01\n\tBulbState\x12\x0f\n\x07\x63ommand\x18\x01 \x02(\x05\x12$\n\x06values\x18\x02 \x01(\x0b\x32\x14.lakeside.BulbValues\x12\r\n\x05power\x18\x03 \x01(\x05\x12\x10\n\x08unknown1\x18\x04 \x01(\x05\x12%\n\x07values2\x18\x05 \x01(\x0b\x32\x14.lakeside.BulbValues\x12\x10\n\x08unknown2\x18\x06 \x01(\x05\"l\n\nBulbPacket\x12\x10\n\x08unknown1\x18\x01 \x02(\x05\x12&\n\tbulbstate\x18\x02 \x01(\x0b\x32\x13.lakeside.BulbState\x12$\n\x07\x62ulbset\x18\x03 \x01(\x0b\x32\x13.lakeside.BulbState\">\n\x08\x42ulbInfo\x12\x0c\n\x04type\x18\x01 \x02(\x05\x12$\n\x06packet\x18\x02 \x01(\x0b\x32\x14.lakeside.BulbPacket\"q\n\x0bT1012Packet\x12\x10\n\x08sequence\x18\x01 \x02(\r\x12\x0c\n\x04\x63ode\x18\x02 \x02(\t\x12\x1c\n\x04ping\x18\x03 \x01(\x0b\x32\x0e.lakeside.Ping\x12$\n\x08\x62ulbinfo\x18\x05 \x01(\x0b\x32\x12.lakeside.BulbInfo\"\xa6\x01\n\tT1013Info\x12\x0f\n\x07\x63ommand\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x01(\x05\x12\r\n\x05power\x18\x03 \x01(\x05\x12$\n\x06values\x18\x04 \x01(\x0b\x32\x14.lakeside.BulbValues\x12$\n\x06\x63olors\x18\x05 \x01(\x0b\x32\x14.lakeside.T1013Color\x12\x10\n\x08unknown7\x18\x07 \x01(\x05\x12\x0c\n\x04rssi\x18\x08 \x01(\x05\"\x89\x01\n\x0cT1013Control\x12\x0f\n\x07\x63ommand\x18\x01 \x02(\x05\x12\r\n\x05\x63olor\x18\x02 \x01(\x05\x12$\n\x06values\x18\x03 \x01(\x0b\x32\x14.lakeside.BulbValues\x12$\n\x06\x63olors\x18\x04 \x01(\x0b\x32\x14.lakeside.T1013Color\x12\r\n\x05power\x18\x05 \x01(\x05\"J\n\nT1013Color\x12\x0b\n\x03red\x18\x01 \x02(\x05\x12\r\n\x05green\x18\x02 \x02(\x05\x12\x0c\n\x04\x62lue\x18\x03 \x02(\x05\x12\x12\n\nbrightness\x18\x04 \x02(\x05\"|\n\nT1013State\x12\x10\n\x08unknown1\x18\x01 \x02(\x05\x12!\n\x04info\x18\x02 \x01(\x0b\x32\x13.lakeside.T1013Info\x12\'\n\x07\x63ontrol\x18\x03 \x01(\x0b\x32\x16.lakeside.T1013Control\x12\x10\n\x08unknown5\x18\x05 \x01(\x05\"C\n\rT1013BulbInfo\x12\x0c\n\x04type\x18\x01 \x02(\x05\x12$\n\x06packet\x18\x02 \x01(\x0b\x32\x14.lakeside.T1013State\"v\n\x0bT1013Packet\x12\x10\n\x08sequence\x18\x01 \x02(\r\x12\x0c\n\x04\x63ode\x18\x02 \x02(\t\x12\x1c\n\x04ping\x18\x03 \x01(\x0b\x32\x0e.lakeside.Ping\x12)\n\x08\x62ulbinfo\x18\x05 \x01(\x0b\x32\x17.lakeside.T1013BulbInfo\"-\n\x0bSwitchState\x12\x0f\n\x07\x63ommand\x18\x01 \x01(\x05\x12\r\n\x05state\x18\x02 \x01(\x05\"e\n\x0cSwitchStatus\x12\x10\n\x08unknown1\x18\x01 \x01(\x05\x12\r\n\x05power\x18\x02 \x01(\x05\x12\x10\n\x08unknown3\x18\x03 \x01(\x05\x12\x10\n\x08unknown4\x18\x04 \x01(\x05\x12\x10\n\x08unknown5\x18\x05 \x01(\x05\"x\n\x0cSwitchPacket\x12\x10\n\x08unknown1\x18\x01 \x02(\x05\x12(\n\tswitchset\x18\x03 \x01(\x0b\x32\x15.lakeside.SwitchState\x12,\n\x0cswitchstatus\x18\x05 \x01(\x0b\x32\x16.lakeside.SwitchStatus\"B\n\nSwitchInfo\x12\x0c\n\x04type\x18\x01 \x02(\x05\x12&\n\x06packet\x18\x02 \x01(\x0b\x32\x16.lakeside.SwitchPacket\"u\n\x0bT1201Packet\x12\x10\n\x08sequence\x18\x01 \x02(\r\x12\x0c\n\x04\x63ode\x18\x02 \x02(\t\x12\x1c\n\x04ping\x18\x03 \x01(\x0b\x32\x0e.lakeside.Ping\x12(\n\nswitchinfo\x18\x05 \x01(\x0b\x32\x14.lakeside.SwitchInfo') ) @@ -38,7 +38,7 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -69,14 +69,14 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='temperature', full_name='lakeside.BulbValues.temperature', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -107,42 +107,42 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='values', full_name='lakeside.BulbState.values', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='power', full_name='lakeside.BulbState.power', index=2, number=3, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='unknown1', full_name='lakeside.BulbState.unknown1', index=3, number=4, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='values2', full_name='lakeside.BulbState.values2', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='unknown2', full_name='lakeside.BulbState.unknown2', index=5, number=6, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -173,21 +173,21 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bulbstate', full_name='lakeside.BulbPacket.bulbstate', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bulbset', full_name='lakeside.BulbPacket.bulbset', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -218,14 +218,14 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='packet', full_name='lakeside.BulbInfo.packet', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -252,32 +252,32 @@ fields=[ _descriptor.FieldDescriptor( name='sequence', full_name='lakeside.T1012Packet.sequence', index=0, - number=1, type=5, cpp_type=1, label=2, + number=1, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='code', full_name='lakeside.T1012Packet.code', index=1, number=2, type=9, cpp_type=9, label=2, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='ping', full_name='lakeside.T1012Packet.ping', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bulbinfo', full_name='lakeside.T1012Packet.bulbinfo', index=3, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -308,49 +308,49 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='color', full_name='lakeside.T1013Info.color', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='power', full_name='lakeside.T1013Info.power', index=2, number=3, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='values', full_name='lakeside.T1013Info.values', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='colors', full_name='lakeside.T1013Info.colors', index=4, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='unknown7', full_name='lakeside.T1013Info.unknown7', index=5, number=7, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='rssi', full_name='lakeside.T1013Info.rssi', index=6, number=8, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -381,35 +381,35 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='color', full_name='lakeside.T1013Control.color', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='values', full_name='lakeside.T1013Control.values', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='colors', full_name='lakeside.T1013Control.colors', index=3, number=4, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='power', full_name='lakeside.T1013Control.power', index=4, number=5, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -440,28 +440,28 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='green', full_name='lakeside.T1013Color.green', index=1, number=2, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='blue', full_name='lakeside.T1013Color.blue', index=2, number=3, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='brightness', full_name='lakeside.T1013Color.brightness', index=3, number=4, type=5, cpp_type=1, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -492,28 +492,28 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='info', full_name='lakeside.T1013State.info', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='control', full_name='lakeside.T1013State.control', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='unknown5', full_name='lakeside.T1013State.unknown5', index=3, number=5, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -544,14 +544,14 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='packet', full_name='lakeside.T1013BulbInfo.packet', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -578,32 +578,32 @@ fields=[ _descriptor.FieldDescriptor( name='sequence', full_name='lakeside.T1013Packet.sequence', index=0, - number=1, type=5, cpp_type=1, label=2, + number=1, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='code', full_name='lakeside.T1013Packet.code', index=1, number=2, type=9, cpp_type=9, label=2, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='ping', full_name='lakeside.T1013Packet.ping', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='bulbinfo', full_name='lakeside.T1013Packet.bulbinfo', index=3, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -634,14 +634,14 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='state', full_name='lakeside.SwitchState.state', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -672,35 +672,35 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='power', full_name='lakeside.SwitchStatus.power', index=1, number=2, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='unknown3', full_name='lakeside.SwitchStatus.unknown3', index=2, number=3, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='unknown4', full_name='lakeside.SwitchStatus.unknown4', index=3, number=4, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='unknown5', full_name='lakeside.SwitchStatus.unknown5', index=4, number=5, type=5, cpp_type=1, label=1, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -731,21 +731,21 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='switchset', full_name='lakeside.SwitchPacket.switchset', index=1, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='switchstatus', full_name='lakeside.SwitchPacket.switchstatus', index=2, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -776,14 +776,14 @@ has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='packet', full_name='lakeside.SwitchInfo.packet', index=1, number=2, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], @@ -810,32 +810,32 @@ fields=[ _descriptor.FieldDescriptor( name='sequence', full_name='lakeside.T1201Packet.sequence', index=0, - number=1, type=5, cpp_type=1, label=2, + number=1, type=13, cpp_type=3, label=2, has_default_value=False, default_value=0, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='code', full_name='lakeside.T1201Packet.code', index=1, number=2, type=9, cpp_type=9, label=2, has_default_value=False, default_value=_b("").decode('utf-8'), message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='ping', full_name='lakeside.T1201Packet.ping', index=2, number=3, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), _descriptor.FieldDescriptor( name='switchinfo', full_name='lakeside.T1201Packet.switchinfo', index=3, number=5, type=11, cpp_type=10, label=1, has_default_value=False, default_value=None, message_type=None, enum_type=None, containing_type=None, is_extension=False, extension_scope=None, - options=None), + options=None, file=DESCRIPTOR), ], extensions=[ ], diff --git a/setup.py b/setup.py index 8e95183..ecc25ac 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ setup( name='lakeside', - version="0.11", + version="0.12", author='Matthew Garrett', author_email='mjg59@google.com', url='http://github.com/google/python-lakeside',