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

avr: use new code in latest nodes.

Browse Source
This commit is contained in:
Martin Preuss
2025-04-29 00:35:45 +02:00
parent 2357b63b42
commit 1e90682605
22 changed files with 1194 additions and 1304 deletions
Download Patch File Download Diff File Expand all files Collapse all files

294
avr/devices/n23/main/main.asm
View File

@@ -33,7 +33,7 @@
.include "../defs.asm"
.include "./data.asm"
.include "defs_all.asm"
.include "devices/all/defs.asm"
.include "common/utils_wait.asm"
@@ -44,10 +44,12 @@
; ---------------------------------------------------------------------------
; generic
.equ NET_BUFFERS_NUM = 6
.equ NET_BUFFERS_SIZE = 28
.equ NET_BUFFERS_NUM = 6
.equ NET_BUFFERS_SIZE = 28
.equ PROGRAM_SENSOR_INTERVAL_SECS = 60
.equ PROGRAM_STATS_INTERVAL_MINS = 10
.equ PROGRAM_TIMER_VALUE = 60
; ---------------------------------------------------------------------------
@@ -58,18 +60,25 @@
.equ FIRMWARE_VERSION_PATCHLEVEL = 1
#define MODULES_TIMER
; #define MODULES_TIMER
#define MODULES_CLOCK
#define MODULES_LED_SIMPLE
#define MODULES_NETWORK
#define MODULES_UART_BITBANG
#define MODULES_TWI_MASTER
;#define MODULES_LCD
#define LCD_MINIMAL_FONT
;#define LCD_MINIMAL_FONT
#define MODULES_SI7021
#define MODULES_STATS
;#define MODULES_STATS
;#define MODULES_OWI_MASTER
;#define MODULES_DS18B20
#define MODULES_MOTION
;#define MODULES_CCS811
#define APPS_NETWORK
#define APPS_MOTION
; ---------------------------------------------------------------------------
; defines for values
@@ -91,6 +100,8 @@
; ***************************************************************************
; code segment
@@ -129,49 +140,21 @@ devInfoVersion: .db DEVICEINFO_VERSION, DEVICEINFO_REVISION ; v
firmwareVersion: .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
.db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
; ---------------------------------------------------------------------------
; @routine firmwareStart @global
firmwareStart:
cli
; setup stack
.ifdef SPH ; if SPH is defined
ldi r16, High(RAMEND)
out SPH, r16 ; init MSB stack pointer
.endif
ldi r16, Low(RAMEND)
out SPL, r16 ; init LSB stack pointer
rjmp main
; @end
rcall systemSetSpeed
rcall initHardware
; rcall watchdogOff ; turn off watchdog timer (sometimes it stays on after reboot)
rcall Utils_Init
rcall Utils_SetupUid
ldi r16, PROGRAM_TIMER_VALUE
sts programRamSensorTimer, r16
; ---------------------------------------------------------------------------
; @routine onSystemStart
rcall initModules
sbi LED_SIMPLE_DDR, LED_SIMPLE_PINNUM ; out
sbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; off
sei
main_loop:
; only modify SE, SM1 and SM0
cli
in r16, MCUCR
ldi r17, (1<<SE) | (1<<SM1) | (1<<SM0)
neg r17
and r16, r17
ori r16, (1<<SE) ; sleep mode "idle", enable
out MCUCR, r16
sei ; make sure interrupts really are enabled
sleep ; sleep, wait for interrupt
rcall BaseTimer_Run ; let basetimer run
rcall handleMessages ; handle incoming messages
; rcall ComOnUart0_Run
rjmp main_loop
onSystemStart:
ret
; @end
@@ -196,14 +179,15 @@ systemSetSpeed:
.endif
ret
; @end
; ---------------------------------------------------------------------------
; @routine initHardware
; @routine systemInitHardware
;
initHardware:
systemInitHardware:
; set all ports as inputs and enable internal pull-up resistors
ldi r16, 0xff
clr r17
@@ -227,46 +211,24 @@ initHardware:
; ---------------------------------------------------------------------------
; @routine initModules
; @routine onMessageReceived
;
; Called on every message received
initModules:
; init drivers
rcall BaseTimer_Init
rcall Clock_Init
rcall LedSimple_Init
rcall NET_Init
rcall UART_BitBang_Init
rcall Motion_Init
rcall SI7021_Init
; init apps
ldi yl, LOW(uart_bitbang_iface)
ldi yh, HIGH(uart_bitbang_iface)
rcall AppNetwork_Init
rcall AppMotion_Init
onMessageReceived:
clc
ret
; @end
; ---------------------------------------------------------------------------
; @routine onSystemTimerTick
; @routine onEvery100ms
;
; Called every 100ms. Add your routine calls here. No arguments, no results.
onSystemTimerTick:
rcall Clock_Every100ms ; generates calls to onEverySecond/Minute/Hour/Day
rcall LedSimple_Every100ms
rcall UART_BitBang_Every100ms
ldi yl, LOW(uart_bitbang_iface)
ldi yh, HIGH(uart_bitbang_iface)
rcall AppNetwork_Every100ms
rcall AppMotion_Every100ms
onEvery100ms:
; nothing to do here (all done in devices/all/main.asm)
ret
; @end
@@ -277,18 +239,19 @@ onSystemTimerTick:
onEverySecond:
lds r16, programRamSensorTimer
dec r16
brne onEverySecond_store
ldi r16, PROGRAM_TIMER_VALUE
inc r16
cpi r16, PROGRAM_SENSOR_INTERVAL_SECS
brcs onEverySecond_store
clr r16
onEverySecond_store:
sts programRamSensorTimer, r16
cpi r16, 59
cpi r16, 1
breq onEverySecond_measureValue1
cpi r16, 29
breq onEverySecond_measureValue2
cpi r16, 19
breq onEverySecond_measureValue2
cpi r16, 39
breq onEverySecond_sendValue1
cpi r16, 9
cpi r16, 49
breq onEverySecond_sendValue2
ret
onEverySecond_measureValue1:
@@ -296,152 +259,63 @@ onEverySecond_measureValue1:
onEverySecond_measureValue2:
rjmp SI7021_MeasureHumidity
onEverySecond_sendValue1:
rjmp sendTemperature
rjmp SI7021_SendTemperature
onEverySecond_sendValue2:
rjmp sendHumidity
rjmp SI7021_SendHumidity
; @end
; ---------------------------------------------------------------------------
; @routine onEveryMinute
onEveryMinute:
rcall checkSendStats
ret
; @end
onEveryHour:
onEveryDay:
ret
; ---------------------------------------------------------------------------
; @routine handleMessages
handleMessages:
rcall NET_GetNextIncomingMsgNum ; R16=msg num
brcc handleMessages_end
rcall NET_Buffer_Locate ; X=buffer addr (R17)
push r16
; handle messages
ldi yl, LOW(uart_bitbang_iface)
ldi yh, HIGH(uart_bitbang_iface)
rcall AppNetwork_HandleMsg
; add more here
pop r16
rcall NET_Buffer_ReleaseByNum
sec
handleMessages_end:
checkSendStats:
lds r16, programRamStatsTimer
inc r16
cpi r16, PROGRAM_STATS_INTERVAL_MINS
brcs checkSendStats_store
clr r16
checkSendStats_store:
sts programRamStatsTimer, r16
ldi yl, LOW(netInterfaceData)
ldi yh, HIGH(netInterfaceData)
cpi r16, 1
breq checkSendStats_sendDevice
cpi r16, 2
breq checkSendStats_sendTxdStats
cpi r16, 3
breq checkSendStats_sendRxdStats
ret
; @end
; ---------------------------------------------------------------------------
; @routine sendTemperature
sendTemperature:
ldi r16, SI7021_VALUE_TEMP
rcall SI7021_GetValue
brcc sendTemperature_end
ldi r17, VALUE_ID_SI7021_TEMP ; VALUE ID
ldi r22, AQHOME_VALUETYPE_TEMP ; VALUE TYPE
rcall sendValue
sendTemperature_end:
ret
; @end
; ---------------------------------------------------------------------------
; @routine sendHumidity
sendHumidity:
ldi r16, SI7021_VALUE_HUMIDITY
rcall SI7021_GetValue
brcc sendHumidity_end
ldi r17, VALUE_ID_SI7021_HUM ; VALUE ID
ldi r22, AQHOME_VALUETYPE_HUMIDITY ; VALUE TYPE
rcall sendValue
sendHumidity_end:
ret
; @end
; ---------------------------------------------------------------------------
; @routine sendValue
;
; @param R17 value id
; @param R19:R18 value
; @param R21:R20 denom (e.g. 100, meaning value must be divided by 100)
; @param R22 value type
sendValue:
push r17
rcall NET_Buffer_Alloc ; (R16, R17, X)
pop r17
brcc sendValue_end ; jmp on error
push r16 ; buffer num
ldi r16, 0xff ; DEST addr
adiw xh:xl, 1
ldi yl, LOW(netInterfaceData)
ldi yh, HIGH(netInterfaceData)
rcall NETMSG_ValueWriteReport ; (R16, R17, R18, R19, R20, R21, R23, R24, R25)
sbiw xh:xl, 1
pop r16 ; buffer num
rcall NET_Interface_AddOutgoingMsgNum ; (R17, R18, X)
brcs sendValue_end ; jump if okay
rcall NET_Buffer_ReleaseByNum ; otherwise release buffer
clc
sendValue_end:
ret
; @end
checkSendStats_sendTxdStats:
rjmp AppNetwork_SendTxdStats
checkSendStats_sendRxdStats:
rjmp AppNetwork_SendRxdStats
checkSendStats_sendDevice:
rjmp AppNetwork_SendDevice
; ***************************************************************************
; includes
.include "common/utils.asm"
.include "common/utils_wait_fixed.asm"
.include "common/utils_copy_from_flash.asm"
.include "common/utils_copy_sdram.asm"
.include "common/crc8.asm"
.include "common/m_fixedbuffers.asm"
.include "common/m_ringbuffer_y.asm"
.include "common/ringbuffer_y.asm"
.include "modules/network/defs.asm"
.include "modules/network/data.asm"
.include "modules/network/iface.asm"
.include "modules/network/main.asm"
.include "modules/network/buffer.asm"
.include "modules/network/msg/defs.asm"
.include "modules/network/msg/common.asm"
.include "modules/network/msg/crc.asm"
.include "modules/network/msg/value-w.asm"
.include "modules/network/msg/addr-r.asm"
.include "modules/network/msg/addr-w.asm"
.include "modules/uart_bitbang2/defs.asm"
.include "modules/uart_bitbang2/iface.asm"
.include "modules/uart_bitbang2/lowlevel.asm"
.include "modules/basetimer/main.asm"
.include "modules/clock/main.asm"
.include "modules/led_simple/main.asm"
.include "modules/twimaster/main.asm"
.include "modules/si7021/main2.asm"
#ifdef MODULES_STATS
; .include "modules/stats/main.asm"
#endif
.include "modules/motion/main2.asm"
#ifdef MODULES_CCS811
.include "modules/ccs811/main.asm"
#endif
.include "modules/f_keepup/main.asm"
.include "modules/valsched/main.asm"
.include "./motion.asm"
.include "./network.asm"
.include "devices/all/includes.asm"
.include "apps/network/stats.asm"
.include "modules/network/msg/sendstats-w.asm"
.include "modules/network/msg/recvstats-w.asm"
.include "modules/network/msg/device-w.asm"