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

main: init bmp280. cleanup.

Browse Source
This commit is contained in:
Martin Preuss
2023-01-30 01:03:02 +01:00
parent 4864d16482
commit b34f3ce2cb
1 changed files with 76 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
avr/main.asm
View File

@@ -39,6 +39,8 @@
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; TWI master module ; TWI master module
.equ LCD_TWI_ADDRESS = 0x3c
.equ TWI_DDR_SCL = DDRA .equ TWI_DDR_SCL = DDRA
.equ TWI_PORT_SCL = PORTA .equ TWI_PORT_SCL = PORTA
.equ TWI_PIN_SCL = PINA .equ TWI_PIN_SCL = PINA
@@ -52,6 +54,12 @@
; ---------------------------------------------------------------------------
; BMP 280
.equ BMP280_ADDR = 0x76
; *************************************************************************** ; ***************************************************************************
; code segment ; code segment
@@ -92,6 +100,7 @@
.include "com.asm" .include "com.asm"
.include "twimaster.asm" .include "twimaster.asm"
.include "lcd.asm" .include "lcd.asm"
.include "bmp280.asm"
@@ -192,6 +201,7 @@ initModules:
rcall Com_Init rcall Com_Init
rcall TWI_Master_Init rcall TWI_Master_Init
rcall LCD_Init rcall LCD_Init
rcall BMP280_Init
ret ret
@@ -282,16 +292,6 @@ onEverySecond:
; USED: depending on called routines ; USED: depending on called routines
onEvery10s: onEvery10s:
in r15, SREG ; debug
cli
push r15
ldi r16, 219
rcall COM_EnqueuePing
pop r15
out SREG, r15
rcall printSendStats
ret ret
@@ -308,8 +308,17 @@ onEvery10s:
; USED: depending on called routines ; USED: depending on called routines
onEveryMinute: onEveryMinute:
ldi r16, 219 in r15, SREG ; debug
rcall COM_EnqueueComSendStats cli
push r15
ldi r16, 219
rcall COM_EnqueueComSendStats
rcall printSendStats
;ldi r16, 219
;rcall COM_EnqueuePing
pop r15
out SREG, r15
ret ret
@@ -327,8 +336,6 @@ onEveryMinute:
; USED: depending on called routines ; USED: depending on called routines
onPacketReceived: onPacketReceived:
sbi DDRA, PORTA2 ; debug
sbi PINA, PORTA2 ; debug (toggle)
clc ; not handled clc ; not handled
ret ret
@@ -382,57 +389,61 @@ debugSendByte:
printSendStats: printSendStats:
ldi r18, 0 push r15
ldi r19, 2 in r15, SREG ; debug
rcall LCD_SetCursor cli
ldi zl, LOW(textStatsPacketsIn) ldi r18, 0
ldi zh, HIGH(textStatsPacketsIn) ldi r19, 2
rcall LCD_PrintFromFlash rcall LCD_SetCursor
lds r18, comStatsPacketsIn ldi zl, LOW(textStatsPacketsIn)
lds r19, comStatsPacketsIn+1 ldi zh, HIGH(textStatsPacketsIn)
rcall LCD_PrintHexWord rcall LCD_PrintFromFlash
lds r18, comStatsPacketsIn
ldi r18, 0 lds r19, comStatsPacketsIn+1
ldi r19, 3 rcall LCD_PrintHexWord
rcall LCD_SetCursor
ldi zl, LOW(textStatsPacketsRecvErr) ldi r18, 0
ldi zh, HIGH(textStatsPacketsRecvErr) ldi r19, 3
rcall LCD_PrintFromFlash rcall LCD_SetCursor
lds r18, comStatsRecvErrs ldi zl, LOW(textStatsPacketsRecvErr)
lds r19, comStatsRecvErrs+1 ldi zh, HIGH(textStatsPacketsRecvErr)
rcall LCD_PrintHexWord rcall LCD_PrintFromFlash
lds r18, comStatsRecvErrs
lds r19, comStatsRecvErrs+1
ldi r18, 0 rcall LCD_PrintHexWord
ldi r19, 5
rcall LCD_SetCursor
ldi zl, LOW(textStatsPacketsOut) ldi r18, 0
ldi zh, HIGH(textStatsPacketsOut) ldi r19, 5
rcall LCD_PrintFromFlash rcall LCD_SetCursor
lds r18, comStatsPacketsOut ldi zl, LOW(textStatsPacketsOut)
lds r19, comStatsPacketsOut+1 ldi zh, HIGH(textStatsPacketsOut)
rcall LCD_PrintHexWord rcall LCD_PrintFromFlash
lds r18, comStatsPacketsOut
ldi r18, 0 lds r19, comStatsPacketsOut+1
ldi r19, 6 rcall LCD_PrintHexWord
rcall LCD_SetCursor
ldi zl, LOW(textStatsCollisions) ldi r18, 0
ldi zh, HIGH(textStatsCollisions) ldi r19, 6
rcall LCD_PrintFromFlash rcall LCD_SetCursor
lds r18, comStatsCollisions ldi zl, LOW(textStatsCollisions)
lds r19, comStatsCollisions+1 ldi zh, HIGH(textStatsCollisions)
rcall LCD_PrintHexWord rcall LCD_PrintFromFlash
lds r18, comStatsCollisions
ldi r18, 0 lds r19, comStatsCollisions+1
ldi r19, 7 rcall LCD_PrintHexWord
rcall LCD_SetCursor
ldi zl, LOW(textStatsAborted) ldi r18, 0
ldi zh, HIGH(textStatsAborted) ldi r19, 7
rcall LCD_PrintFromFlash rcall LCD_SetCursor
lds r18, comStatsAborted ldi zl, LOW(textStatsAborted)
lds r19, comStatsAborted+1 ldi zh, HIGH(textStatsAborted)
rcall LCD_PrintHexWord rcall LCD_PrintFromFlash
lds r18, comStatsAborted
lds r19, comStatsAborted+1
rcall LCD_PrintHexWord
pop r15
out SREG, r15
ret ret