From ee94d8a5830636bc6c341b783e7f8c9d6bbe64c0 Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Fri, 13 Sep 2024 01:08:07 +0200
Subject: [PATCH] avr: finalized label names.

---
 avr/devices/n00/n00_main.asm | 10 ++---
 avr/devices/n06/n06_main.asm | 10 ++---
 avr/devices/n11/n11_main.asm | 72 ++++++++++++++++++++++++++++--------
 avr/devices/n12/n12_main.asm | 52 +++++++++++++++++---------
 avr/modules/si7021/main.asm  |  4 +-
 5 files changed, 104 insertions(+), 44 deletions(-)

diff --git a/avr/devices/n00/n00_main.asm b/avr/devices/n00/n00_main.asm
index 11dd1dd..18ef59f 100644
--- a/avr/devices/n00/n00_main.asm
+++ b/avr/devices/n00/n00_main.asm
@@ -70,12 +70,12 @@
 ; ---------------------------------------------------------------------------
 ; defines for values
 
-.equ VALUE_ID_TEMP1 = 0x01
-.equ VALUE_ID_HUM1  = 0x02
+.equ VALUE_ID_SI7021_TEMP = 0x01
+.equ VALUE_ID_SI7021_HUM  = 0x02
 
-.equ VALUE_ID_ADC   = 0x03
-.equ VALUE_ID_REED1 = 0x04
-.equ VALUE_ID_REED2 = 0x05
+.equ VALUE_ID_ADC         = 0x03
+.equ VALUE_ID_REED1       = 0x04
+.equ VALUE_ID_REED2       = 0x05
 
 
 
diff --git a/avr/devices/n06/n06_main.asm b/avr/devices/n06/n06_main.asm
index 5a942bf..e76a440 100644
--- a/avr/devices/n06/n06_main.asm
+++ b/avr/devices/n06/n06_main.asm
@@ -70,12 +70,12 @@
 ; ---------------------------------------------------------------------------
 ; defines for values
 
-.equ VALUE_ID_TEMP1 = 0x01
-.equ VALUE_ID_HUM1  = 0x02
+.equ VALUE_ID_SI7021_TEMP = 0x01
+.equ VALUE_ID_SI7021_HUM  = 0x02
 
-.equ VALUE_ID_ADC   = 0x03
-.equ VALUE_ID_REED1 = 0x04
-.equ VALUE_ID_REED2 = 0x05
+.equ VALUE_ID_ADC         = 0x03
+.equ VALUE_ID_REED1       = 0x04
+.equ VALUE_ID_REED2       = 0x05
 
 
 
diff --git a/avr/devices/n11/n11_main.asm b/avr/devices/n11/n11_main.asm
index f8a77fa..1e2d887 100644
--- a/avr/devices/n11/n11_main.asm
+++ b/avr/devices/n11/n11_main.asm
@@ -71,14 +71,16 @@
 ; ---------------------------------------------------------------------------
 ; defines for values
 
-.equ VALUE_ID_TEMP1 = 0x01
-.equ VALUE_ID_HUM1  = 0x02
+.equ VALUE_ID_SI7021_TEMP  = 0x01
+.equ VALUE_ID_SI7021_HUM   = 0x02
 
 .equ VALUE_ID_ADC          = 0x03
 .equ VALUE_ID_REED1        = 0x04
 .equ VALUE_ID_REED2        = 0x05
 .equ VALUE_ID_DS18B20_TEMP = 0x06
 
+.equ VALUE_ID_REED_CONF    = 0x81
+
 
 
 ; ***************************************************************************
@@ -216,10 +218,11 @@ sramTimerEnqueueValues:        .byte 2
 
 .cseg
 
+#ifdef MODULES_LED
 ledA3Flash:    .db DDRA+0x20, PORTA+0x20, PINA+0x20, (1<<PORTA3)
 blinkPattern:  .db 2, 50, 0xff, 0xff   ; 1 short blink, 5s pause, restart
 ;blinkPattern2: .db 2, 2, 0xff, 0xff   ; 1 short blink, short pause, restart
-
+#endif
 
 
 
@@ -274,10 +277,7 @@ periodicalLcdMark:
 
 
 writeStats:
-#ifdef MODULES_DS18B20
-  rcall printDs
-#endif
-;  rcall printSendStats
+  rcall printSendStats
   ret
 #endif
 
@@ -304,7 +304,6 @@ sendSI7021Temp:
   rjmp Timer_SetValueTo1s
 sendSI7021Temp_okay:
   ret
-
 #endif
 
 
@@ -347,20 +346,63 @@ onEvery100ms:
 
 
 ; ---------------------------------------------------------------------------
-; onPacketReceived:
+; @routine onPacketReceived:
 ;
 ; Called after a packet was received via COM module. Add your routine calls here.
 ;
 ; The packet will be released in any case after return from this call.
-; IN:
-; - X  : pointer to received buffer
-; OUT:
-; - CFLAG: set if handled, cleared otherwise
-; USED: depending on called routines
+;
+; @return CFLAG set if message handled, cleared otherwise
+; @param X  pointer to received buffer
+; @clobbers all
 
 onPacketReceived:
-  rcall CPRO_OnPacketReceived
+  ; get msg code
+  adiw xh:xl, COM2_MSG_OFFS_CMD
+  ld r16, x
+  sbiw xh:xl, COM2_MSG_OFFS_CMD
+
+  cpi r16, CPRO_CMD_VALUE_SET
+  brne onPacketReceived_l1
+  ; msg code is CPRO_CMD_VALUE_SET
+  rjmp onSetValueReceived
+
+onPacketReceived_l1:
+  rjmp CPRO_OnPacketReceived
+; @end
+
+
+
+onSetValueReceived:
+  adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUEID
+  ld r16, X
+  sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUEID
+  cpi r16, VALUE_ID_REED_CONF
+  brne onSetValueReceived_l1
+#ifdef MODULES_REED
+  rjmp onSetReedConf
+#else
+  ret
+#endif
+onSetValueReceived_l1:
+  clc
   ret
 
 
+#ifdef MODULES_REED
+onSetReedConf:
+  ; get new value
+  adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
+  ld r16, X
+  sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
+  ; set config
+  rcall REED_SetConfig
+  ; send ACK
+  ldi r16, CPRO_CMD_VALUE_SET_ACK
+  rcall CPRO_SendSetValueResponse
+  sec
+  ret
+#endif
+
+
 
diff --git a/avr/devices/n12/n12_main.asm b/avr/devices/n12/n12_main.asm
index 140c22d..d3b2f1c 100644
--- a/avr/devices/n12/n12_main.asm
+++ b/avr/devices/n12/n12_main.asm
@@ -58,14 +58,14 @@
 ; ---------------------------------------------------------------------------
 ; defines for modules
 
-.equ VALUE_ID_TEMP1 = 0x01
-.equ VALUE_ID_HUM1  = 0x02
+.equ VALUE_ID_SI7021_TEMP = 0x01
+.equ VALUE_ID_SI7021_HUM  = 0x02
 
-.equ VALUE_ID_ADC   = 0x03
-.equ VALUE_ID_REED1 = 0x04
-.equ VALUE_ID_REED2 = 0x05
+.equ VALUE_ID_ADC         = 0x03
+.equ VALUE_ID_REED1       = 0x04
+.equ VALUE_ID_REED2       = 0x05
 
-.equ VALUE_ID_REED_CONF = 0x81
+.equ VALUE_ID_REED_CONF   = 0x81
 
 
 
@@ -195,6 +195,7 @@ sramTimerEnqueueValues:      .byte 2
 #endif
 #ifdef MODULES_DS18B20
   sramDs18b20Timer:            .byte 2
+  sramSendDs18b20TempTimer:    .byte 2
 #endif
 
 
@@ -229,14 +230,15 @@ timerList:
 #endif
 #ifdef MODULES_SI7021
   .dw sramTimerSI7021Measure,      SI7021_OnTimer,             0,                   300    ; every 30s
-  .dw sramTimerSI7021SendTemp,     sendTemp,                   TIMER_FLAGS_IF_ADDR, 600    ; every 60s
-  .dw sramTimerSI7021SendHumidity, sendHumidity,               TIMER_FLAGS_IF_ADDR, 600    ; every 60s
+  .dw sramTimerSI7021SendTemp,     sendSI7021Temp,             TIMER_FLAGS_IF_ADDR, 600    ; every 60s
+  .dw sramTimerSI7021SendHumidity, sendSI7021Humidity,         TIMER_FLAGS_IF_ADDR, 600    ; every 60s
 #endif
 #ifdef MODULES_CNY70
   .dw sramTimerCny70SendAdc,       CNY70_OnTimer,              TIMER_FLAGS_IF_ADDR, 50     ; every 5s
 #endif
 #ifdef MODULES_DS18B20
   .dw sramDs18b20Timer,            Ds18b20_OnTimer,            0,                   300    ; every 30s
+  .dw sramSendDs18b20TempTimer,    sendDs18b20Temp,            TIMER_FLAGS_IF_ADDR, 600    ; every 60s
 #endif
   .dw 0 ; end of list
 
@@ -266,30 +268,41 @@ writeStats:
 #endif
 
 
-
 #ifdef MODULES_SI7021
 
-sendHumidity:
+sendSI7021Humidity:
   rcall SI7021_SendHumidity
-  brcs sendHumidity_okay
+  brcs sendSI7021Humidity_okay
   ; set timer to 1s to retry later
   ldi xl, LOW(sramTimerSI7021SendHumidity)
   ldi xh, HIGH(sramTimerSI7021SendHumidity)
   rjmp Timer_SetValueTo1s
-sendHumidity_okay:
+sendSI7021Humidity_okay:
   ret
 
 
-sendTemp:
+sendSI7021Temp:
   rcall SI7021_SendTemp
-  brcs sendTemp_okay
+  brcs sendSI7021Temp_okay
   ; set timer to 1s to retry later
   ldi xl, LOW(sramTimerSI7021SendTemp)
   ldi xh, HIGH(sramTimerSI7021SendTemp)
   rjmp Timer_SetValueTo1s
-sendTemp_okay:
+sendSI7021Temp_okay:
   ret
+#endif
 
+
+#ifdef MODULES_DS18B20
+sendDs18b20Temp:
+  rcall Ds18b20_SendTemp
+  brcs sendDs18b20Temp_okay
+  ; set timer to 1s to retry later
+  ldi xl, LOW(sramSendDs18b20TempTimer)
+  ldi xh, HIGH(sramSendDs18b20TempTimer)
+  rjmp Timer_SetValueTo1s
+sendDs18b20Temp_okay:
+  ret
 #endif
 
 
@@ -340,7 +353,7 @@ onPacketReceived:
   cpi r16, CPRO_CMD_VALUE_SET
   brne onPacketReceived_l1
   ; msg code is CPRO_CMD_VALUE_SET
-  ; TODO
+  rjmp onSetValueReceived
 
 onPacketReceived_l1:
   rjmp CPRO_OnPacketReceived
@@ -348,19 +361,23 @@ onPacketReceived_l1:
 
 
 
-
 onSetValueReceived:
   adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUEID
   ld r16, X
   sbiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUEID
   cpi r16, VALUE_ID_REED_CONF
   brne onSetValueReceived_l1
+#ifdef MODULES_REED
   rjmp onSetReedConf
+#else
+  ret
+#endif
 onSetValueReceived_l1:
   clc
   ret
 
 
+#ifdef MODULES_REED
 onSetReedConf:
   ; get new value
   adiw xh:xl, CPRO_PACKET_VALUE_OFFS_VALUE
@@ -373,5 +390,6 @@ onSetReedConf:
   rcall CPRO_SendSetValueResponse
   sec
   ret
+#endif
 
 
diff --git a/avr/modules/si7021/main.asm b/avr/modules/si7021/main.asm
index 13b91b3..efa15b6 100644
--- a/avr/modules/si7021/main.asm
+++ b/avr/modules/si7021/main.asm
@@ -451,7 +451,7 @@ SI7021_SendTemp:
   ret
 SI7021_SendTemp_haveValue:
   ldi r16, 0xff                      ; destination address
-  ldi r17, VALUE_ID_TEMP1            ; value id
+  ldi r17, VALUE_ID_SI7021_TEMP            ; value id
   ldi r22, AQHOME_VALUETYPE_TEMP
   lds r18, si7021LastTemp            ; value
   lds r19, si7021LastTemp+1
@@ -469,7 +469,7 @@ SI7021_SendHumidity:
   ret
 SI7021_SendHumidity_haveValue:
   ldi r16, 0xff                      ; destination address
-  ldi r17, VALUE_ID_HUM1             ; value id
+  ldi r17, VALUE_ID_SI7021_HUM       ; value id
   ldi r22, AQHOME_VALUETYPE_HUMIDITY
   lds r18, si7021LastHumidity        ; value
   lds r19, si7021LastHumidity+1