diff --git a/src/c3nav/mesh/consumers.py b/src/c3nav/mesh/consumers.py index 4c7ff8d1..5d9ccc15 100644 --- a/src/c3nav/mesh/consumers.py +++ b/src/c3nav/mesh/consumers.py @@ -262,7 +262,8 @@ class MeshConsumer(AsyncWebsocketConsumer): node_status.ota_recipient = None else: print('queue chunk sending') - await self.ota_set_chunks(node_status.ota_recipient.update, min_chunk=msg.highest_chunk+1) + await self.ota_set_chunks(node_status.ota_recipient.update, + min_chunk=msg.next_expected_chunk) if isinstance(msg, messages.OTARequestFragmentsMessage): print('got OTA fragment request', msg) diff --git a/src/c3nav/mesh/messages.py b/src/c3nav/mesh/messages.py index 7d38fc9b..e2c8959b 100644 --- a/src/c3nav/mesh/messages.py +++ b/src/c3nav/mesh/messages.py @@ -296,7 +296,7 @@ class OTAStatusMessage(MeshMessage, msg_type=MeshMessageType.OTA_STATUS): """ report OTA status """ update_id: int = field(metadata={"format": SimpleFormat('I')}) received_bytes: int = field(metadata={"format": SimpleFormat('I')}) - highest_chunk: int = field(metadata={"format": SimpleFormat('H')}) + next_expected_chunk: int = field(metadata={"format": SimpleFormat('H')}) auto_apply: bool = field(metadata={"format": BoolFormat()}) auto_reboot: bool = field(metadata={"format": BoolFormat()}) status: OTADeviceStatus = field(metadata={"format": EnumFormat('B')})