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

Implemented address assignment protocol.

Browse Source
This commit is contained in:
Martin Preuss
2023-02-05 23:42:59 +01:00
parent c1aee1e2c5
commit 716248c4e1
6 changed files with 655 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
avr/main.asm
View File

@@ -73,7 +73,8 @@ initModules:
#endif
#ifdef MODULES_COM
rcall Com_Init
rcall Com_Init ; init COM module
rcall CPRO_Init ; init COM protocol module
#endif
#ifdef MODULES_TWI_MASTER
rcall TWI_Master_Init
@@ -181,21 +182,40 @@ printSendStats:
ldi r18, 0
ldi r19, 3
rcall LCD_SetCursor
ldi zl, LOW(textRandom)
ldi zh, HIGH(textRandom)
ldi zl, LOW(textAddress)
ldi zh, HIGH(textAddress)
rcall LCD_PrintFromFlash
rcall Utils_PseudoRandom
lds r16, comAddress
rcall LCD_PrintHexByte
ldi r16, 32
rcall LCD_PrintChar
lds r18, utilsSeed
lds r19, utilsSeed+1
rcall LCD_PrintHexWord
lds r16, cproMode
rcall LCD_PrintHexByte
lds r16, cproAddressWaitCounter
rcall LCD_PrintHexByte
ldi r16, 32
rcall LCD_PrintChar
lds r16, cproAddrRangeBegin
rcall LCD_PrintHexByte
ldi r18, 0
ldi r19, 4
rcall LCD_SetCursor
ldi zl, LOW(textBitmap)
ldi zh, HIGH(textBitmap)
rcall LCD_PrintFromFlash
lds r16, cproUsedAddresses
rcall LCD_PrintHexByte
lds r16, cproUsedAddresses+1
rcall LCD_PrintHexByte
lds r16, cproUsedAddresses+2
rcall LCD_PrintHexByte
lds r16, cproUsedAddresses+3
rcall LCD_PrintHexByte
#ifdef MODULES_COM
ldi r18, 0
ldi r19, 4
ldi r19, 5
rcall LCD_SetCursor
ldi zl, LOW(textStatsPacketsIn)
ldi zh, HIGH(textStatsPacketsIn)
@@ -204,17 +224,6 @@ printSendStats:
lds r19, comStatsPacketsIn+1
rcall LCD_PrintHexWord
ldi r18, 0
ldi r19, 5
rcall LCD_SetCursor
ldi zl, LOW(textStatsPacketsRecvErr)
ldi zh, HIGH(textStatsPacketsRecvErr)
rcall LCD_PrintFromFlash
lds r18, comStatsRecvErrs
lds r19, comStatsRecvErrs+1
rcall LCD_PrintHexWord
ldi r18, 0
ldi r19, 6
rcall LCD_SetCursor
@@ -224,16 +233,6 @@ printSendStats:
lds r18, comStatsPacketsOut
lds r19, comStatsPacketsOut+1
rcall LCD_PrintHexWord
ldi r18, 0
ldi r19, 7
rcall LCD_SetCursor
ldi zl, LOW(textStatsCollisions)
ldi zh, HIGH(textStatsCollisions)
rcall LCD_PrintFromFlash
lds r18, comStatsCollisions
lds r19, comStatsCollisions+1
rcall LCD_PrintHexWord
#endif
pop r15
@@ -285,10 +284,10 @@ textSi7021Firmware: .db "SI: ", 0, 0
textStatsPacketsIn: .db "In : ", 0
textStatsPacketsRecvErr: .db "RecvErr: ", 0
textStatsPacketsOut: .db "Out : ", 0
textStatsCollisions: .db "Coll : ", 0
textStatsAborted: .db "Aborted: ", 0
textUid: .db "UID : ", 0
textRandom: .db "RANDOM : ", 0
textAddress: .db "ADDR :", 0, 0
textBitmap: .db "BITMAP :", 0, 0