2025-summer/team-3
12
Fork 0
Code Issues Pull requests Projects Releases Activity

some fixes in the mesh messages code… it'S 2:40am i don'T remember what…

Browse source
This commit is contained in:
Laura Klünder 2023-11-26 02:40:44 +01:00
parent bec24c3982
commit 9cd8328130
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/c3nav/mesh/baseformats.py
View file

@ -195,7 +195,7 @@ class ChipRevFormat(SimpleFormat):
def __init__(self): def __init__(self):
super().__init__('H') super().__init__('H')
def decode(self, data: bytes) -> tuple[bool, bytes]: def decode(self, data: bytes) -> tuple[tuple[int,int], bytes]:
value, data = super().decode(data) value, data = super().decode(data)
return (value // 100, value % 100), data return (value // 100, value % 100), data

6
src/c3nav/mesh/messages.py
View file

@ -18,6 +18,8 @@ MESH_CHILDREN_ADDRESS = '00:00:00:00:ff:ff'
MESH_BROADCAST_ADDRESS = 'ff:ff:ff:ff:ff:ff' MESH_BROADCAST_ADDRESS = 'ff:ff:ff:ff:ff:ff'
NO_LAYER = 0xFF NO_LAYER = 0xFF
OTA_CHUNK_SIZE = 512
@unique @unique
class MeshMessageType(IntEnum): class MeshMessageType(IntEnum):
@ -132,8 +134,6 @@ class NoopMessage(MeshMessage, msg_type=MeshMessageType.NOOP):
pass pass
@dataclass @dataclass
class EchoRequestMessage(MeshMessage, msg_type=MeshMessageType.ECHO_REQUEST): class EchoRequestMessage(MeshMessage, msg_type=MeshMessageType.ECHO_REQUEST):
""" repeat back string """ """ repeat back string """
@ -308,7 +308,7 @@ class OTAFragmentMessage(MeshMessage, msg_type=MeshMessageType.OTA_FRAGMENT):
""" supply OTA fragment """ """ supply OTA fragment """
update_id: int = field(metadata={"format": SimpleFormat('I')}) update_id: int = field(metadata={"format": SimpleFormat('I')})
chunk: int = field(metadata={"format": SimpleFormat('H')}) chunk: int = field(metadata={"format": SimpleFormat('H')})
data: str = field(metadata={"format": VarBytesFormat(max_size=512)}) data: bytes = field(metadata={"format": VarBytesFormat(max_size=OTA_CHUNK_SIZE)})
@dataclass @dataclass