Kelder/obus
32
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Don't return None when unknown message type, add new messages for info module

Browse source
This commit is contained in:
redfast00 2020-09-09 23:14:50 +02:00
parent 8ecc0433ed
commit 11a9c1b3c8
No known key found for this signature in database
GPG key ID: 5946E0E34FD0553C
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
debugging_tool/server.py
View file

@ -43,7 +43,7 @@ class Message:
return (self.received_from >> 0) & 0b1111_1111 return (self.received_from >> 0) & 0b1111_1111
def human_readable_type(self): def human_readable_type(self):
return ['controller', 'puzzle', 'needy', 'RESERVED TYPE'][self.sender_type()] return [('controller' if self.sender_id() == 0 else 'info'), 'puzzle', 'needy', 'RESERVED TYPE'][self.sender_type()]
def _parse_state_update(self): def _parse_state_update(self):
timeleft = self.payload[1] << 0x18 | self.payload[2] << 0x10 | self.payload[3] << 0x08 | self.payload[4] timeleft = self.payload[1] << 0x18 | self.payload[2] << 0x10 | self.payload[3] << 0x08 | self.payload[4]
@ -56,7 +56,7 @@ class Message:
sender_type = self.sender_type() sender_type = self.sender_type()
message_type = self.payload[0] message_type = self.payload[0]
try: try:
if sender_type == 0b00: # controller if sender_type == 0b00 and self.sender_id() == 0: # controller
if message_type == 0: if message_type == 0:
return "ACK" return "ACK"
elif message_type == 1: elif message_type == 1:
@ -71,6 +71,8 @@ class Message:
return "TIMEOUT " + self._parse_state_update() return "TIMEOUT " + self._parse_state_update()
elif message_type == 6: elif message_type == 6:
return "STRIKEOUT " + self._parse_state_update() return "STRIKEOUT " + self._parse_state_update()
elif message_type == 7:
return "INFO START"
elif sender_type == 0b01: # puzzle elif sender_type == 0b01: # puzzle
if message_type == 0: if message_type == 0:
return "REGISTER" return "REGISTER"
@ -78,9 +80,18 @@ class Message:
return f"STRIKE {self.payload[1]}" return f"STRIKE {self.payload[1]}"
elif message_type == 2: elif message_type == 2:
return f"SOLVED" return f"SOLVED"
elif sender_type == 0b10: # needy
if message_type == 0:
return "REGISTER"
elif message_type == 1:
return f"STRIKE {self.payload[1]}"
elif sender_type == 0b00 and self.sender_id() != 0: # info
if message_type == 0:
return "FREE INFO MESSAGE"
except: except:
print("Unexpected error: ", sys.exc_info()[0]) print("Unexpected error: ", sys.exc_info()[0])
return "PARSE ERROR" return "PARSE ERROR"
def serialize(self): def serialize(self):
return { return {