diff --git a/debugging_tool/server.py b/debugging_tool/server.py index 1848d9a..9c4398a 100644 --- a/debugging_tool/server.py +++ b/debugging_tool/server.py @@ -60,7 +60,7 @@ class Message: if message_type == 0: return "REGISTER" elif message_type == 1: - return f"STRIKE {self.payload[5]}" + return f"STRIKE {self.payload[1]}" elif message_type == 2: return f"SOLVED" else: diff --git a/debugging_tool/sketch_can_debugger/sketch_can_debugger.ino b/debugging_tool/sketch_can_debugger/sketch_can_debugger.ino index 6dba8fc..946302b 100644 --- a/debugging_tool/sketch_can_debugger/sketch_can_debugger.ino +++ b/debugging_tool/sketch_can_debugger/sketch_can_debugger.ino @@ -14,13 +14,11 @@ void setup() { } void loop() { - char message[9]; - message[8] = '\0'; struct can_frame receive_frame; if (mcp2515.readMessage(&receive_frame) == MCP2515::ERROR_OK) { Serial.print("message "); Serial.print(receive_frame.can_id, DEC); - for (int i = 0; i < 8; i++) { + for (int i = 0; i < receive_frame.can_dlc; i++) { Serial.print(" "); Serial.print(receive_frame.data[i], DEC); }