martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr: echoing messages via tty now basically works.

Browse Source
This commit is contained in:
Martin Preuss
2025-02-13 23:52:55 +01:00
parent a7990db831
commit 6e25647c0a
6 changed files with 163 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avr/modules/network/msg/common.asm
View File

@@ -49,7 +49,7 @@ NETMSG_CalcAndAddChecksumByte:
; ---------------------------------------------------------------------------
; @routine netMsgCheckMessageInBuffer
; @routine NETMSG_CheckMessageInBuffer
;
; check message in buffer
;
@@ -57,7 +57,7 @@ NETMSG_CalcAndAddChecksumByte:
; @param X pointer to packet buffer
; @clobbers R16, R17 (R18, R19, R20, X)
netMsgCheckMessageInBuffer:
NETMSG_CheckMessageInBuffer:
rcall netMsgCalcMsgChecksum ; (R16, R17, R18, R19, R20, X)
ld r17, X
cp r16, r17 ; should be equal

1
avr/modules/network/msg/device-w.asm
View File

@@ -13,6 +13,7 @@
; @routine NETMSG_Device_Write
;
; @param Y pointer to device to write msg for
; @param X pointer to buffer to write to
; @clobbers R16, R18 (R17, R19, R20, R21, Z)
NETMSG_Device_Write:

41
avr/modules/network/msg/recvstats-w.asm Normal file
View File

@@ -0,0 +1,41 @@
; ***************************************************************************
; copyright : (C) 2025 by Martin Preuss
; email : martin@libchipcard.de
;
; ***************************************************************************
; * This file is part of the project "AqHome". *
; * Please see toplevel file COPYING of that project for license details. *
; ***************************************************************************
; ---------------------------------------------------------------------------
; @routine NETMSG_RecvStats_Write @global
;
; @param Y pointer to device to write msg for and to
; @param X pointer to buffer to write to
; @clobbers R16, R18 (R17, R19, R20, R21, Z)
NETMSG_RecvStats_Write:
ldi r16, 0xff
st X+, r16 ; dest address
ldi r16, 18 ; msg code+src address+10 payload bytes
st X+, r16 ; msg len
ldi r16, NETMSG_CMD_RECVSTATS
st X+, r16 ; msg code
ldd r16, Y+NET_IFACE_OFFS_ADDRESS
st X+, r16 ; src address
rcall NETMSG_Common_AddUidToBuffer ; (R16, R18, R19, R20, R21)
adiw yh:yl, NET_IFACE_OFFS_PACKETSIN_LOW
ldi r18, 12
rcall Utils_Copy_SDRAM ; (R17, R18, X, Y)
sbiw yh:yl, NET_IFACE_OFFS_PACKETSIN_LOW+12
sbiw xh:xl, 20 ; go back to beginning of message (1 byte dst addr, 1 byte length, 18 bytes payload)
rcall NETMSG_CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
sbiw xh:xl, 21 ; go back to beginning of message (1 byte dst addr, 1 byte length, 18 bytes payload, 1 byte crc)
ret
; @end

7
avr/modules/network/msg/sendstats-w.asm
View File

@@ -13,6 +13,7 @@
; @routine NETMSG_SendStats_Write @global
;
; @param Y pointer to device to write msg for and to
; @param X pointer to buffer to write to
; @clobbers R16, R18 (R17, R19, R20, R21, Z)
NETMSG_SendStats_Write:
@@ -27,12 +28,12 @@ NETMSG_SendStats_Write:
rcall NETMSG_Common_AddUidToBuffer ; (R16, R18, R19, R20, R21)
adiw yh:yl, NET_IFACE_OFFS_PACKETSOUT_LOW
ldi r18, 6
rcall Utils_Copy_SDRAM
rcall Utils_Copy_SDRAM ; (R17, R18, X, Y)
sbiw yh:yl, NET_IFACE_OFFS_PACKETSOUT_LOW+6
sbiw xh:xl, 13 ; go back to beginning of message (1 byte dst addr, 1 byte length, 12 bytes payload)
sbiw xh:xl, 14 ; go back to beginning of message (1 byte dst addr, 1 byte length, 12 bytes payload)
rcall NETMSG_CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
sbiw xh:xl, 14 ; go back to beginning of message (1 byte dst addr, 1 byte length, 12 bytes payload, 1 byte crc)
sbiw xh:xl, 15 ; go back to beginning of message (1 byte dst addr, 1 byte length, 12 bytes payload, 1 byte crc)
ret
; @end