From 090917ea099d1db10fd4f5332776baa5f089cefd Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Thu, 5 Sep 2024 23:04:24 +0200 Subject: [PATCH] ave: removed unneeded defs, beautifications. --- avr/modules/comproto/defs.asm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/avr/modules/comproto/defs.asm b/avr/modules/comproto/defs.asm index 661682d..df353c6 100644 --- a/avr/modules/comproto/defs.asm +++ b/avr/modules/comproto/defs.asm @@ -16,12 +16,16 @@ ; defines +; --------------------------------------------------------------------------- +; message codes + .equ CPRO_CMD_PING = 10 .equ CPRO_CMD_PONG = 11 .equ CPRO_CMD_COMSENDSTATS = 20 .equ CPRO_CMD_COMRECVSTATS = 21 .equ CPRO_CMD_TWIBUSMEMBER = 30 .equ CPRO_CMD_DEBUG = 40 + .equ CPRO_CMD_NEED_ADDRESS = 60 .equ CPRO_CMD_HAVE_ADDRESS = 61 .equ CPRO_CMD_CLAIM_ADDRESS = 62 @@ -47,24 +51,25 @@ .equ CPRO_CMD_VALUE_SET_NACK = 103 -.equ CPRO_CMD_CONFIG_MODULE_REQUEST = 100 -.equ CPRO_CMD_CONFIG_MODULE_RESPONSE = 101 - +; --------------------------------------------------------------------------- +; offsets in CPRO_CMD_VALUE_* messages .equ CPRO_PACKET_SETVALUE_OFFS_VALUEID = 6 .equ CPRO_PACKET_SETVALUE_OFFS_VALUE = 8 .equ CPRO_PACKET_SETVALUE_OFFS_DENOM = 10 +; --------------------------------------------------------------------------- +; offsets in CPRO_*_ADDRESS messages + .equ CPRO_PACKET_HAVEADDR_OFFS_ADDRESS = COM2_MSG_OFFS_PAYLOAD+4 .equ CPRO_PACKET_CLAIMADDR_OFFS_ADDRESS = COM2_MSG_OFFS_PAYLOAD+4 .equ CPRO_PACKET_DENYADDR_OFFS_ADDRESS = COM2_MSG_OFFS_PAYLOAD+4 .equ CPRO_PACKET_REBOOTREQ_OFFS_UID = COM2_MSG_OFFS_PAYLOAD+0 -.equ CPRO_PACKET_CFGMOD_REQUEST_OFFS_MODID = COM2_MSG_OFFS_PAYLOAD+0 -.equ CPRO_PACKET_CFGMOD_REQUEST_OFFS_MODCMD = COM2_MSG_OFFS_PAYLOAD+1 -.equ CPRO_PACKET_CFGMOD_REQUEST_OFFS_DATA = COM2_MSG_OFFS_PAYLOAD+2 +; --------------------------------------------------------------------------- +; wait times for address protocol .equ CPRO_WAITTIME_INITIAL = 10 .equ CPRO_WAITTIME_GETADDR = 130 @@ -72,7 +77,9 @@ .equ CPRO_WAITTIME_RECLAIMADDR = 10 -; current mode of operation +; --------------------------------------------------------------------------- +; modes of operation + .equ CPRO_MODE_NOADDRESS = 0x00 ; no address, yet .equ CPRO_MODE_NORMAL = 0x01 ; normal operation .equ CPRO_MODE_SEND_NEED_ADDR = 0x02 ; wait to send need address