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

avr: decreased verbosity. minor fixes.

Browse Source 
- address claiming modes now work
This commit is contained in:
Martin Preuss
2023-04-12 23:32:08 +02:00
parent ded08b8c47
commit 86b45a58e5
8 changed files with 70 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
avr/att84_temp1.asm
View File

@@ -64,7 +64,7 @@
#define MODULES_COM_WITH_ADDR_PROTO
#define MODULES_LED
#define MODULES_TWI_MASTER
#define MODULES_LCD
;#define MODULES_LCD
#define MODULES_SI7021
#define MODULES_STATS
@@ -223,20 +223,37 @@
; includes
.include "utils.asm"
.include "timer.asm"
#ifdef MODULES_TIMER
.include "timer.asm"
#endif
#ifdef MODULES_LED
.include "led.asm"
.include "com2.asm"
.include "comproto.asm"
.include "comproto_addr.asm"
.include "comproto_recvstats.asm"
.include "comproto_sysstats.asm"
.include "comproto_memstats.asm"
.include "comproto_pong.asm"
;.include "comproto_values.asm"
.include "twimaster.asm"
.include "lcd.asm"
.include "si7021.asm"
.include "stats.asm"
#endif
#ifdef MODULES_COM
.include "com2.asm"
#ifdef MODULES_COM_WITH_ADDR_PROTO
.include "comproto.asm"
.include "comproto_addr.asm"
.include "comproto_recvstats.asm"
.include "comproto_sendstats.asm"
.include "comproto_sysstats.asm"
.include "comproto_memstats.asm"
.include "comproto_pong.asm"
; .include "comproto_values.asm"
#endif
#endif
#ifdef MODULES_TWI_MASTER
.include "twimaster.asm"
#endif
#ifdef MODULES_LCD
.include "lcd.asm"
#endif
#ifdef MODULES_SI7021
.include "si7021.asm"
#endif
#ifdef MODULES_STATS
.include "stats.asm"
#endif
@@ -264,7 +281,7 @@ sramTimerSI7021Measure: .byte 2
ledA3Flash: .db DDRA+0x20, PORTA+0x20, PINA+0x20, (1<<PORTA3)
blinkPattern: .db 2, 50, 0xff, 0xff ; 1 short blink, 2s pause, restart
;blinkPattern2: .db 10, 20, 0xff, 0xff ; 1 long blink, 2s pause, restart
blinkPattern2: .db 2, 2, 0xff, 0xff ; 1 short blink, short pause, restart
@@ -285,7 +302,7 @@ timerList:
.dw sramPeriodicalLcdMark, periodicalLcdMark, 0, 1 ; every sec
.dw sramTimerWriteStats, writeStats, 0, 10
#endif
; .dw sramTimerSI7021Measure, SI7021_PeriodicMeasurement, 0, 30 ; every 30s
.dw sramTimerSI7021Measure, SI7021_PeriodicMeasurement, 0, 30 ; every 30s
; .dw sramTimerEnqueueValues, Main_SendValueMsg, TIMER_FLAGS_IF_ADDR, 60 ; every 1m
.dw 0 ; end of list
@@ -300,21 +317,6 @@ timerList:
; Called on first time run, i.e. on system start. No arguments, no results.
onSystemStart:
ldi r16, 2 ; DEBUG: set static address
sts com2Address, r16
; rcall printStartSendPackage
; ldi r16, 0xff ; send to everybody
; ldi xl, LOW(com2SendBuffer)
; ldi xh, HIGH(com2SendBuffer)
; rcall CPRO_WriteComRecvStats
; rcall printStartSendPackage
; rcall COM2_SendPacket
; rcall printEndSendPackage
; rcall printSendStats
ret
@@ -322,14 +324,12 @@ onSystemStart:
periodicalLcdMark:
rcall printTimerMark
ret
#endif
writeStats:
sbi PINA, PORTA2 ; debug (toggle)
rcall printSendStats
ret
#endif
@@ -364,8 +364,7 @@ onEvery100ms:
; USED: depending on called routines
onPacketReceived:
; rcall CPRO_OnPacketReceived
rcall CPRO_OnPacketReceived
ret