andreil/katapult
1
0
Fork 0
mirror of https://github.com/andreili/katapult.git synced 2025-08-24 03:44:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

canbus: use Klipper's admin ids

Browse Source 
Rather than use different admin IDs from Klipper, use different commands.

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Eric Callahan 2022-04-25 17:04:48 -04:00
parent b944d094b3
commit 6351e2b1be
No known key found for this signature in database
GPG Key ID: 7027245FBBDDF59A
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/generic/canbus.c
View File

@ -92,8 +92,8 @@ canboot_sendf(uint8_t* data, uint16_t size)
// Available commands and responses // Available commands and responses
#define CANBUS_CMD_QUERY_UNASSIGNED 0x00 #define CANBUS_CMD_QUERY_UNASSIGNED 0x00
#define CANBUS_CMD_SET_NODEID 0x01 #define CANBUS_CMD_SET_NODEID_CANBOOT 0x11
#define CANBUS_CMD_CLEAR_NODE_ID 0x02 #define CANBUS_CMD_CLEAR_NODE_ID_CANBOOT 0x12
#define CANBUS_RESP_NEED_NODEID 0x20 #define CANBUS_RESP_NEED_NODEID 0x20
// Helper to verify a UUID in a command matches this chip's UUID // Helper to verify a UUID in a command matches this chip's UUID
@ -117,9 +117,10 @@ can_process_query_unassigned(uint32_t id, uint32_t len, uint8_t *data)
uint8_t send[8]; uint8_t send[8];
send[0] = CANBUS_RESP_NEED_NODEID; send[0] = CANBUS_RESP_NEED_NODEID;
memcpy(&send[1], canbus_uuid, sizeof(canbus_uuid)); memcpy(&send[1], canbus_uuid, sizeof(canbus_uuid));
send[7] = 1;
// Send with retry // Send with retry
for (;;) { for (;;) {
int ret = canbus_send(CANBUS_ID_ADMIN_RESP, 7, send); int ret = canbus_send(CANBUS_ID_ADMIN_RESP, 8, send);
if (ret >= 0) if (ret >= 0)
return; return;
} }
@ -166,10 +167,10 @@ can_process(uint32_t id, uint32_t len, uint8_t *data)
case CANBUS_CMD_QUERY_UNASSIGNED: case CANBUS_CMD_QUERY_UNASSIGNED:
can_process_query_unassigned(id, len, data); can_process_query_unassigned(id, len, data);
break; break;
case CANBUS_CMD_SET_NODEID: case CANBUS_CMD_SET_NODEID_CANBOOT:
can_process_set_nodeid(id, len, data); can_process_set_nodeid(id, len, data);
break; break;
case CANBUS_CMD_CLEAR_NODE_ID: case CANBUS_CMD_CLEAR_NODE_ID_CANBOOT:
can_process_clear_node_id(); can_process_clear_node_id();
break; break;
} }

4
src/generic/canbus.h
View File

@ -3,8 +3,8 @@
#include <stdint.h> // uint32_t #include <stdint.h> // uint32_t
#define CANBUS_ID_ADMIN 0x3da #define CANBUS_ID_ADMIN 0x3f0
#define CANBUS_ID_ADMIN_RESP 0x3db #define CANBUS_ID_ADMIN_RESP 0x3f1
#define CANBUS_UUID_LEN 6 #define CANBUS_UUID_LEN 6
// callbacks provided by board specific code // callbacks provided by board specific code