First try to unify ATTN handling.

c01: added defs when using uart_bitbang2.
avr: some ideas for autosync.
2025-05-29 14:32:48 +02:00 · 2025-05-29 14:32:29 +02:00 · 2025-05-29 12:47:41 +02:00
43 changed files with 1041 additions and 1027 deletions
--- a/avr/apps/network/main.asm
+++ b/avr/apps/network/main.asm
@@ -111,8 +111,6 @@ AppNetwork_HandleMsg:
  sbiw xh:xl, NETMSG_OFFS_CMD
  cpi r16, NETMSG_CMD_REBOOT_REQUEST
  breq AppNetwork_HandleMsg_handleRebootMsg
-  cpi r16, NETMSG_CMD_PING
-  breq AppNetwork_HandleMsg_handlePingMsg
  cpi r16, NETMSG_CMD_NEED_ADDRESS
  brcs AppNetwork_HandleMsg_clcRet         ; lower than "HAVE_NEED"
  cpi r16, NETMSG_CMD_ADDRESS_RANGE
@@ -140,13 +138,6 @@ AppNetwork_HandleMsg_handleRebootMsg:
    pop xh
  pop xl
  ret
-AppNetwork_HandleMsg_handlePingMsg:
-  push xl
-    push xh
-      rcall appNetworkHandlePingRequest
-    pop xh
-  pop xl
-  ret
 AppNetwork_HandleMsg_clcRet:
  clc
  ret
@@ -171,26 +162,6 @@ appNetworkHandleRebootRequest_end:



-appNetworkHandlePingRequest:
-  adiw xh:xl, NETMSG_OFFS_SRCADDR
-  ld r17, X
-  push r17
-    rcall NET_Buffer_Alloc               ; (R16, R17, X)
-  pop r17
-  brcc appNetworkHandlePingRequest_end   ; jmp on error
-  push r16                               ; buffer num
-    mov r16, r17                         ; DEST addr
-    adiw xh:xl, 1
-    ldi yl, LOW(netInterfaceData)
-    ldi yh, HIGH(netInterfaceData)
-    rcall NETMSG_Pong_Write              ; (R16, R17, R18, R19, R20, X)
-    sbiw xh:xl, 1
-  pop r16                                ; buffer num
-  rcall NET_Interface_AddOrReleaseOutMsg ; (R16, R17, R18, X)
-appNetworkHandlePingRequest_end:
-  ret
-
-

 appNetworkTimerTable:
  rjmp appNetworkHandleStateInitialWait
@@ -262,6 +233,7 @@ appNetworkHandleStateUp:
  ret


+
 ; ---------------------------------------------------------------------------
 ; @routine appNetworkSendMsgNextState
 ;
--- a/avr/apps/stats/main.asm
+++ b/avr/apps/stats/main.asm
@@ -53,19 +53,6 @@ AppStats_Fini:
 ;

 AppStats_OnEveryMinute:
-  push r15
-    in r15, SREG
-    cli
-    rcall AppStats_OnEveryMinute_noIrq
-    out SREG, r15
-  pop r15
-  ret
-
-AppStats_OnEveryMinute_noIrq:
-  ldi yl, LOW(netInterfaceData)
-  ldi yh, HIGH(netInterfaceData)
-  rcall AppNetwork_SendRxdStats     ; debug
-  
  lds r16, appStatsTimer
  inc r16
  cpi r16, APP_STATS_INTERVAL_MINS
--- a/avr/defs_all.asm
+++ b/avr/defs_all.asm
@@ -7,7 +7,6 @@
 ; * Please see toplevel file COPYING of that project for license details.   *
 ; ***************************************************************************

-.error "Dont include this, use devices/all/defs.asm instead"


 .equ AQHOME_VALUETYPE_UNKNOWN  = 0
--- a/avr/devices/0BUILD
+++ b/avr/devices/0BUILD
@@ -26,12 +26,10 @@
    all
    c01
    n16
-    n20
    n21
    n22
    n23
    n24
-    n25
    t03
  </subdirs>

--- a/avr/devices/all/attn.asm
+++ b/avr/devices/all/attn.asm
@@ -0,0 +1,278 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+; not used for now
+
+
+
+; ***************************************************************************
+; macros
+
+
+.macro mAttnInitInt0
+  ; select falling edge of ATTN
+  inr r16, MCUCR
+  cbr r16, (1<<ISC01) | (1<<ISC00)
+  sbr r16, (1<<ISC01) | (0<<ISC00)
+  outr MCUCR, r16
+.endmacro
+
+
+
+.macro mAttnInitPCI
+  in r16, GIMSK                           ; enable pin change irq PCIE0 or PCIE1
+  ori r16, (1<<COM_IRQ_GIMSK_ATTN)
+  out GIMSK, R16
+  ldi r16, (1<<COM_IRQ_GIFR_ATTN)         ; clear pending irq by writing 1 to ATTN bit
+  out GIFR, r16
+.endmacro
+
+
+
+.macro mAttnEnableIrqInt0
+  inr r16, COM_IRQ_ADDR_ATTN
+  sbr r16, (1<<ATTN_IRQ_BIT)
+  outr COM_IRQ_ADDR_ATTN, r16
+.endmacro
+
+
+
+.macro mAttnEnableIrqPCI
+  sbi COM_IRQ_ADDR_ATTN, ATTN_IRQ_BIT ; enable pin change irq for ATTN line
+.endmacro
+
+
+
+.macro mAttnDisableIrqInt0
+  inr r16, COM_IRQ_ADDR_ATTN        ; disable irq for ATTN line
+  cbr r16, (1<<ATTN_IRQ_BIT)
+  outr COM_IRQ_ADDR_ATTN, r16
+.endmacro
+
+
+
+.macro mAttnDisableIrqPCI
+  cbi COM_IRQ_ADDR_ATTN, ATTN_IRQ_BIT ; disable pin change irq for ATTN line
+.endmacro
+
+
+
+
+
+
+; ***************************************************************************
+; code
+
+.cseg
+
+
+; ---------------------------------------------------------------------------
+; @routine ATTN_Init @global
+;
+; @clobbers R16
+
+ATTN_Init:
+.ifdef INT0
+  .if ATTN_IRQ_BIT == INT0
+    mAttnInitInt0
+  .else
+    mAttnInitPCI
+  .endif
+.else
+  mAttnInitPCI
+.endif
+  
+  rcall ATTN_SetHighEnableIrq
+  sec
+  ret
+; @end
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ATTN_SetLowDisableIrq @global
+;
+; @clobbers R16
+
+ATTN_SetLowDisableIrq:
+.ifdef INT0
+  .if ATTN_IRQ_BIT == INT0
+    mAttnDisableIrqInt0
+  .else
+    mAttnDisableIrqPCI
+  .endif
+.else
+  mAttnDisableIrqPCI
+.endif
+
+  sbi ATTN_DDR, ATTN_PIN            ; set ATTN as output
+  cbi ATTN_OUTPUT, ATTN_PIN         ; set ATTN low
+  
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ATTN_SetHighEnableIrq @global
+;
+; @clobbers R16
+
+ATTN_SetHighEnableIrq:
+  cbi ATTN_DDR, ATTN_PIN           ; set ATTN as input
+.ifdef ATTN_PUE
+  cbi ATTN_PUE, ATTN_PIN           ; disable pullup on ATTN
+.else
+  cbi ATTN_OUTPUT, ATTN_PIN        ; disable pullup on ATTN
+.endif
+
+.ifdef INT0
+  .if ATTN_IRQ_BIT == INT0
+    mAttnEnableIrqInt0
+  .else
+    mAttnEnableIrqPCI
+  .endif
+.else
+  mAttnEnableIrqPCI
+.endif
+
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ATTN_IsHigh @global
+;
+; @return CFLAG set if ATTN is high
+; @clobbers none
+
+ATTN_IsHigh:
+  clc
+  sbic ATTN_INPUT, ATTN_PIN     ; ATTN low?
+    sec                         ; yes, set CF
+  ret
+; @end
+
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ATTN_WaitForStateSeconds
+;
+; Wait for ATTN state max given seconds
+;
+; @return CFLAG set if okay (data available), cleared on error
+; @param  R16 expected state (0xff for high, 0 for low)
+; @param r20 maximum number of seconds to wait
+; @clobbers: r20, r22
+
+ATTN_WaitForStateSeconds:
+ATTN_WaitForStateSeconds_loop:
+    push r20
+      rcall ATTN_WaitForState1s              ; (r20, r22)
+    pop r20
+    brcs ATTN_WaitForStateSeconds_gotit
+    sbi LED_PIN, LED_PINNUM                ; toggle (doen't work on AtMega8515)
+    dec r20
+  brne ATTN_WaitForStateSeconds_loop
+  clc
+ATTN_WaitForStateSeconds_gotit:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ATTN_WaitForState1s
+;
+; Wait for ATTN state for max 1s
+;
+; @param  R16 expected state (0xff for high, 0 for low)
+; @return CFLAG set if okay (ATTN state reached), cleared on error
+; @clobbers: r20, r22
+
+ATTN_WaitForState1s:
+  ldi r20, 100
+ATTN_WaitForState1s_loop:
+    push r20
+      rcall ATTN_WaitForState10ms   ; (R20, R22)
+    pop r20
+    brcs ATTN_WaitForState1s_gotit
+    dec r20
+  brne ATTN_WaitForState1s_loop
+  clc
+ATTN_WaitForState1s_gotit:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ATTN_WaitForState10ms
+;
+; Wait for ATTN state for max 10 milliseconds.
+;
+; @param  R16 expected state (0xff for high, 0 for low)
+; @return CFLAG set if okay (ATTN state reached), cleared on error
+; @clobbers: r20, r22
+
+ATTN_WaitForState10ms:
+.if clock == 8000000
+  ldi r20, 80
+.endif
+.if clock == 1000000
+  ldi r20, 10
+.endif
+ATTN_WaitForState10ms_loop:
+    push r20
+      rcall ATTN_WaitForState1000Cycles  ; (r20, r22)
+    pop r20
+    brcs ATTN_WaitForState10ms_gotit
+    dec r20
+  brne ATTN_WaitForState10ms_loop
+  clc
+ATTN_WaitForState10ms_gotit:
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine ATTN_WaitForStateState1000Cycles
+;
+; Wait for ATTN state for max 1000 clock cycles
+; (about 1ms at 1MHz, 0.125ms at 8MHz)
+;
+; @param  R16 expected state (0xff for high, 0 for low)
+; @return CFLAG set if okay (packet received), cleared on error
+; @clobbers: r20, r22
+
+ATTN_WaitForState1000Cycles:
+  ldi r20, 90                                     ; 1
+ATTN_WaitForState1000Cycles_loop:
+    push r17                                      ; +2
+      in r17, COM_ATTN_INPUT                      ; +1
+      eor r17, r16                                ; +1
+      andi r17, (1<<COM_ATTN_PIN)                 ; +1
+    pop r17                                       ; +2
+    breq ATTN_WaitForState1000Cycles_stateReached ; +1
+    dec r20                                       ; +1
+  brne ATTN_WaitForState1000Cycles_loop           ; +2
+  clc
+  ret
+ATTN_WaitForState1000Cycles_stateReached:
+  sec
+  ret
+; @end
+
+
+
+
--- a/avr/devices/all/defs.asm
+++ b/avr/devices/all/defs.asm
@@ -7,6 +7,7 @@
 ; * Please see toplevel file COPYING of that project for license details.   *
 ; ***************************************************************************

+
 ; ---------------------------------------------------------------------------
 ; Value types

--- a/avr/devices/all/includes.asm
+++ b/avr/devices/all/includes.asm
@@ -54,8 +54,7 @@
 #ifdef MODULES_UART_BITBANG
 .include "modules/uart_bitbang2/defs.asm"
 .include "modules/uart_bitbang2/iface.asm"
-.include "modules/uart_bitbang2/bytelevel.asm"
-.include "modules/uart_bitbang2/msglevel.asm"
+.include "modules/uart_bitbang2/lowlevel.asm"
 #endif

 #ifdef MODULES_UART_HW
@@ -197,7 +196,6 @@
 .include "apps/network/main.asm"
 .include "modules/network/msg/reboot-d.asm"
 .include "modules/network/msg/reboot-r.asm"
-.include "modules/network/msg/pong-w.asm"
 #endif


--- a/avr/devices/c01/defs.asm
+++ b/avr/devices/c01/defs.asm
@@ -67,6 +67,12 @@
 .equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
 .equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter

+.equ COM_DATA_DDR       = DDRD   ; use RX pin
+.equ COM_DATA_INPUT     = PIND
+.equ COM_DATA_OUTPUT    = PORTD
+.equ COM_DATA_PIN       = PORTD0
+
+
 .equ COM_ATTN_DDR       = DDRD
 .equ COM_ATTN_INPUT     = PIND
 .equ COM_ATTN_OUTPUT    = PORTD
--- a/avr/devices/c01/main/main.asm
+++ b/avr/devices/c01/main/main.asm
@@ -16,7 +16,6 @@
 .include "include/m8515def.inc" ; Define device ATmega8515
 .list

-.include "version.asm"
 .include "../defs.asm"
 .include "./data.asm"

@@ -49,6 +48,11 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
 ; #define MODULES_TIMER
 #define MODULES_CLOCK
 #define MODULES_XRAM
@@ -57,6 +61,8 @@
 #define MODULES_NETWORK
 ;#define MODULES_COMONUART0
 #define MODULES_UART_HW
+;#define MODULES_UART_BITBANG
+
 #define MODULES_SPI_HW
 #define MODULES_ILI9341
 ;#define MODULES_FONT_8X8
@@ -217,6 +223,6 @@ onEveryLoop:
 ; defines for network interface

 .equ netInterfaceData = netUartIface
-
+;.equ netInterfaceData = uart_bitbang_iface


--- a/avr/devices/n16/boot/boot.asm
+++ b/avr/devices/n16/boot/boot.asm
@@ -12,9 +12,8 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "../defs.asm"
-.include "devices/all/defs.asm"
+.include "defs_all.asm"



@@ -33,6 +32,10 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+


 ; ---------------------------------------------------------------------------
--- a/avr/devices/n16/main/main.asm
+++ b/avr/devices/n16/main/main.asm
@@ -30,7 +30,6 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "../defs.asm"

 .include "devices/all/defs.asm"
@@ -52,6 +51,11 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
 #define MODULES_CLOCK
 #define MODULES_LED_SIMPLE
 #define MODULES_NETWORK
--- a/avr/devices/n20/boot.asm
+++ b/avr/devices/n20/boot.asm
@@ -12,9 +12,8 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "./defs.asm"
-.include "devices/all/defs.asm"
+.include "defs_all.asm"



@@ -33,6 +32,9 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1



@@ -111,7 +113,6 @@ main:
 .include "modules/flash/io_attn.asm"
 .include "modules/flash/io_bitbang.asm"
 .include "modules/flash/flash1p.asm"
-.include "modules/flash/flashxp.asm"
 .include "modules/flash/flashprocess.asm"
 .include "modules/flash/wait.asm"
 .include "modules/bootloader/main.asm"
@@ -120,6 +121,7 @@ main:



+
 systemSetSpeed:
 .if clock == 8000000
  ldi r16, (1<<CLKPCE)
--- a/avr/devices/n20/main.asm
+++ b/avr/devices/n20/main.asm
@@ -30,11 +30,8 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "./defs.asm"
-.include "devices/all/defs.asm"
-
-.include "common/utils_wait.asm"
+.include "defs_all.asm"



@@ -44,37 +41,31 @@
 ; ---------------------------------------------------------------------------
 ; generic

-.equ NET_BUFFERS_NUM            = 4
-.equ NET_BUFFERS_SIZE           = 32

+.include "common/utils_wait.asm"


 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

-; #define MODULES_TIMER
-#define MODULES_CLOCK
+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
+#define MODULES_TIMER
+#define MODULES_COM
+#define MODULES_COM_WITH_ADDR_PROTO
 #define MODULES_LED_SIMPLE
-#define MODULES_NETWORK
-#define MODULES_UART_BITBANG
-;#define MODULES_TWI_MASTER
+#define MODULES_TWI_MASTER
 ;#define MODULES_LCD
-;#define LCD_MINIMAL_FONT
-;#define MODULES_SI7021
-;#define MODULES_STATS
+#define LCD_MINIMAL_FONT
+#define MODULES_SI7021
+#define MODULES_STATS
 ;#define MODULES_OWI_MASTER
 ;#define MODULES_DS18B20
-;#define MODULES_MOTION
-;#define MODULES_TCRT1000
-;#define MODULES_CCS811
-
-#define APPS_NETWORK
-;#define APPS_MOTION
-;#define APPS_DOOR
-;#define APPS_REPORTSENSORS
-#define APPS_STATS
-
-
+#define MODULES_MOTION
+#define MODULES_CCS811

 ; ---------------------------------------------------------------------------
 ; defines for values
@@ -95,8 +86,6 @@

 .equ VALUE_ID_DEBUG        = 0x7f

-.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
-


 ; ***************************************************************************
@@ -113,7 +102,7 @@
 ;	rjmp main ; Reset vector
        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
 	reti ; EXT_INT0
-	rjmp UART_BitBang_PcintIsr ; PCI0
+	rjmp uartBitbangIsrPcint0 ; PCI0
 	reti ; PCI1
 	reti ; WATCHDOG
 	reti ; ICP1
@@ -137,82 +126,351 @@ 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:
-  rjmp main
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onSystemStart
-
-onSystemStart:
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onMessageReceived
-;
-; Called on every message received
-
-onMessageReceived:
-  clc
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onEvery100ms
-;
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-onEverySecond:
-onEveryMinute:
-onEveryHour:
-onEveryDay:
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onEveryLoop
-;
-; Called on every loop (i.e. after awakening from sleep).
-;
-onEveryLoop:
-  ret
-; @end
-
-
-
+firmwareStart:   rjmp main


 ; ***************************************************************************
 ; includes

-.include "devices/all/hw_tn84.asm"
-.include "devices/all/includes.asm"
+.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 "modules/basetimer/main.asm"
+
+#ifdef MODULES_TIMER
+  .include "modules/timer/main.asm"
+#endif
+#ifdef MODULES_LED
+.include "modules/led/main.asm"
+#endif
+#ifdef MODULES_LED_SIMPLE
+.include "modules/led_simple/main.asm"
+#endif
+#ifdef MODULES_COM
+  .include "modules/com2/defs.asm"
+  .include "modules/com2/main.asm"
+  .include "modules/com2/buffer.asm"
+  .include "modules/uart_bitbang/defs.asm"
+  .include "modules/uart_bitbang/main.asm"
+  .include "modules/uart_bitbang/bytelevel.asm"
+  .include "modules/uart_bitbang/packetlevel.asm"
+  #ifdef MODULES_COM_WITH_ADDR_PROTO
+    .include "modules/comproto/defs.asm"
+    .include "modules/comproto/main.asm"
+    .include "modules/comproto/addr.asm"
+    .include "modules/comproto/msg_recvstats.asm"
+    .include "modules/comproto/msg_sendstats.asm"
+    .include "modules/comproto/msg_sysstats.asm"
+    .include "modules/comproto/msg_memstats.asm"
+    .include "modules/comproto/msg_pong.asm"
+    .include "modules/comproto/msg_value.asm"
+    .include "modules/comproto/msg_device.asm"
+    .include "modules/comproto/msg_reboot.asm"
+  #endif
+  #ifdef MODULES_LCD
+    .include "modules/com2/screen.asm"
+    .include "modules/comproto/screen.asm"
+  #endif
+#endif
+#ifdef MODULES_TWI_MASTER
+  .include "modules/twimaster/main.asm"
+#endif
+#ifdef MODULES_OWI_MASTER
+  .include "modules/owimaster/main.asm"
+#endif
+#ifdef MODULES_LCD
+  .include "modules/lcd/main.asm"
+#endif
+#ifdef MODULES_SI7021
+  .include "modules/si7021/main.asm"
+#endif
+#ifdef MODULES_DS18B20
+  .include "modules/ds18b20/main.asm"
+#endif
+#ifdef MODULES_STATS
+  .include "modules/stats/main.asm"
+#endif
+#ifdef MODULES_CNY70
+  .include "modules/cny70/main.asm"
+#endif
+#ifdef MODULES_REED
+  .include "modules/reed/main.asm"
+#endif
+
+#ifdef MODULES_MOTION
+  .include "modules/motion/main.asm"
+#endif
+
+#ifdef MODULES_CCS811
+  .include "modules/ccs811/main.asm"
+#endif
+
+; test
+;#include "modules/uart_irq/defs.asm"
+;#include "modules/uart_irq/iface.asm"
+;#include "modules/uart_irq/iface1.asm"
+
+
+; ***************************************************************************
+; data in SRAM
+
+.dseg
+
+programRamBegin:
+#ifdef MODULES_LCD
+  screenCounter:               .byte 1
+#endif
+
+programRamEnd:
+
+
+
+#ifdef MODULES_LCD
+  sramTimerWriteStats:         .byte 2
+  sramTimerScreen:             .byte 2
+#endif
+#ifdef MODULES_SI7021
+  sramTimerSI7021Measure:      .byte 2
+  sramTimerSI7021SendTemp:     .byte 2
+  sramTimerSI7021SendHumidity: .byte 2
+#endif
+#ifdef MODULES_CNY70
+  sramTimerCny70SendAdc:       .byte 2
+#endif
+#ifdef MODULES_LCD
+  sramPeriodicalLcdMark:       .byte 2
+#endif
+#ifdef MODULES_DS18B20
+  sramDs18b20Timer:            .byte 2
+  sramSendDs18b20TempTimer:    .byte 2
+#endif
+
+#ifdef MODULES_CCS811
+  sramCcs811Timer:             .byte 2
+#endif
+
+
+; ***************************************************************************
+; data in FLASH
+
+.cseg



 ; ---------------------------------------------------------------------------
-; defines for network interface
+; timer list

-.equ netInterfaceData = uart_bitbang_iface
+
+timerList:
+;     SRAM variable/counter        routine                     flags                secs (0=don't start or restart)
+#ifdef MODULES_COM_WITH_ADDR_PROTO
+  .dw cproAddresModeTimer,         CPRO_Address_OnTimer,       0,                   0     ; (no restart)
+#endif
+#ifdef MODULES_STATS
+  .dw statsSendTimer,              Stats_Timer,                TIMER_FLAGS_IF_ADDR, 9000   ; every 15m
+#endif
+#ifdef MODULES_LCD
+;  .dw sramPeriodicalLcdMark,       periodicalLcdMark,          0,                    20   ; every 2s
+;  .dw sramTimerWriteStats,         writeStats,                 0,                   100
+  .dw sramTimerScreen,              printScreen,                TIMER_FLAGS_IF_ADDR,  50    ; every 5s
+#endif
+#ifdef MODULES_SI7021
+  .dw sramTimerSI7021Measure,      SI7021_OnTimer,             0,                   300    ; every 30s
+  .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
+#ifdef MODULES_CCS811
+  .dw sramCcs811Timer,             CCS811_OnTimer,             0,                   10     ; every 1s
+#endif
+  .dw 0 ; end of list





+.include "main_all.asm"



+systemSetSpeed:
+.if clock == 8000000
+  ldi r16, (1<<CLKPCE)
+  ldi r17, 0
+  out CLKPR, r16
+  out CLKPR, r17
+.endif
+  ret
+
+
+systemSetBootSpeed:
+.if clock == 8000000
+  ldi r16, (1<<CLKPCE)
+  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
+  out CLKPR, r16
+  out CLKPR, r17
+.endif
+  ret
+
+
+
+; ---------------------------------------------------------------------------
+; Called on first time run, i.e. on system start. No arguments, no results.
+
+onSystemStart:
+  ldi xh, HIGH(programRamBegin)
+  ldi xl, LOW(programRamBegin)
+  clr r16
+  ldi r17, (programRamEnd-programRamBegin)
+  rcall Utils_FillSram
+  ret
+
+
+#ifdef MODULES_LCD
+
+printScreen:
+  lds r16, screenCounter
+  tst r16
+  brne printScreen_l1
+  rcall CPRO_Screen
+  rjmp printScreen_counter
+printScreen_l1:
+  cpi r16, 1
+  brne printScreen_l2
+  rcall COM2_Screen_RecvStats
+  rjmp printScreen_counter
+printScreen_l2:
+;  cpi r16, 2
+;  brne printScreen_l3
+;  rcall COM2_Screen_SendStats
+;  rjmp printScreen_counter
+printScreen_l3:
+  ; add more screens here
+
+printScreen_counter:
+  lds r16, screenCounter
+  inc r16
+  cpi r16, 2 ; number of screens
+  brcs printScreen_store
+  clr r16
+printScreen_store:
+  sts screenCounter, r16
+printScreen_end:
+  ret
+
+
+;periodicalLcdMark:
+;  rcall printTimerMark
+;  ret
+
+
+;writeStats:
+;  rcall printSendStats
+;  ret
+#endif
+
+
+#ifdef MODULES_SI7021
+
+sendSI7021Humidity:
+  rcall SI7021_SendHumidity
+  brcs sendSI7021Humidity_okay
+  ; set timer to 1s to retry later
+  ldi xl, LOW(sramTimerSI7021SendHumidity)
+  ldi xh, HIGH(sramTimerSI7021SendHumidity)
+  rjmp Timer_SetValueTo1s
+sendSI7021Humidity_okay:
+  ret
+
+
+sendSI7021Temp:
+  rcall SI7021_SendTemp
+  brcs sendSI7021Temp_okay
+  ; set timer to 1s to retry later
+  ldi xl, LOW(sramTimerSI7021SendTemp)
+  ldi xh, HIGH(sramTimerSI7021SendTemp)
+  rjmp Timer_SetValueTo1s
+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
+
+
+; ---------------------------------------------------------------------------
+; Called every 100ms. Add your routine calls here. No arguments, no results.
+
+onEvery100ms:
+#ifdef MODULES_LED_SIMPLE
+  rcall LedSimple_Every100ms
+#endif
+
+#ifdef MODULES_REED
+  rcall REED_Every100ms
+#endif
+
+#ifdef MODULES_MOTION
+  rcall Motion_Every100ms
+#endif
+  ret
+
+
+
+; ---------------------------------------------------------------------------
+; @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.
+;
+; @return CFLAG set if message handled, cleared otherwise
+; @param X  pointer to received buffer
+; @clobbers all
+
+onPacketReceived:
+#ifdef MODULES_MOTION_LIGHT
+  rcall MotionLight_OnPacketReceived
+  brcs onPacketReceived_end
+#endif
+
+#ifdef MODULES_SK6812
+  rcall SK6812_OnPacketReceived
+  brcs onPacketReceived_end
+#endif
+
+#ifdef MODULES_REED
+  rcall REED_OnPacketReceived
+  brcs onPacketReceived_end
+#endif
+
+#ifdef MODULES_COM
+  rcall CPRO_OnPacketReceived
+  brcs onPacketReceived_end
+#endif
+
+  clc
+onPacketReceived_end:
+  ret
+; @end
+

--- a/avr/devices/n21/boot/boot.asm
+++ b/avr/devices/n21/boot/boot.asm
@@ -12,7 +12,6 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "../defs.asm"
 .include "devices/all/defs.asm"

@@ -33,6 +32,10 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+


 ; ---------------------------------------------------------------------------
--- a/avr/devices/n21/main/main.asm
+++ b/avr/devices/n21/main/main.asm
@@ -30,7 +30,6 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "../defs.asm"
 .include "./data.asm"

@@ -54,6 +53,11 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
 ; #define MODULES_TIMER
 #define MODULES_CLOCK
 #define MODULES_LED_SIMPLE
--- a/avr/devices/n22/boot/boot.asm
+++ b/avr/devices/n22/boot/boot.asm
@@ -14,9 +14,8 @@
 .include "include/tn85def.inc" ; Define device ATtiny85
 .list

-.include "version.asm"
 .include "../defs.asm"
-.include "devices/all/defs.asm"
+.include "defs_all.asm"



@@ -34,6 +33,9 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1


 ; ---------------------------------------------------------------------------
--- a/avr/devices/n22/main/main.asm
+++ b/avr/devices/n22/main/main.asm
@@ -22,7 +22,6 @@
 .include "include/tn85def.inc" ; Define device ATtiny85
 .list

-.include "version.asm"
 .include "../defs.asm"
 ;.include "./data.asm"

@@ -45,6 +44,11 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
 #define MODULES_CLOCK
 #define MODULES_LED_SIMPLE
 #define MODULES_NETWORK
--- a/avr/devices/n23/boot/boot.asm
+++ b/avr/devices/n23/boot/boot.asm
@@ -12,9 +12,8 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "../defs.asm"
-.include "devices/all/defs.asm"
+.include "defs_all.asm"


 #define COM_ACCEPT_ALL_DEST
@@ -34,6 +33,10 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+


 ; ---------------------------------------------------------------------------
--- a/avr/devices/n23/main/main.asm
+++ b/avr/devices/n23/main/main.asm
@@ -30,7 +30,6 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "../defs.asm"
 .include "./data.asm"

@@ -56,6 +55,11 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
 ; #define MODULES_TIMER
 #define MODULES_CLOCK
 #define MODULES_LED_SIMPLE
--- a/avr/devices/n24/boot/boot.asm
+++ b/avr/devices/n24/boot/boot.asm
@@ -1,13 +1,3 @@
-; ***************************************************************************
-; copyright   : (C) 2025 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
 ; ***************************************************************************
 ; Source file for base system node on AtTiny 84
 ;
@@ -22,9 +12,8 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list

-.include "version.asm"
 .include "../defs.asm"
-.include "devices/all/defs.asm"
+.include "defs_all.asm"


 #define COM_ACCEPT_ALL_DEST
@@ -46,6 +35,10 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+


 ; ---------------------------------------------------------------------------
--- a/avr/devices/n24/defs.asm
+++ b/avr/devices/n24/defs.asm
@@ -13,7 +13,7 @@
 ;                                 AtTiny84
 ;                                 --------
 ;                            VCC  1     14  GND
-;                  AUX-PB0   PB0  2     13  PA0  AUX-PA0
+;                  AUX-PB2   PB0  2     13  PA0  AUX-PA0
 ;                  PIR       PB1  3     12  PA1  COM-DATA
 ;                  /RESET    PB3  4     11  PA2  AUX-PA2
 ;                            PB2  5     10  PA3  LED
--- a/avr/devices/n24/main/main.asm
+++ b/avr/devices/n24/main/main.asm
@@ -33,7 +33,6 @@
 .include "../defs.asm"
 .include "./data.asm"

-.include "version.asm"
 .include "devices/all/defs.asm"
 .include "common/utils_wait.asm"

@@ -56,6 +55,11 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
 ; #define MODULES_TIMER
 #define MODULES_CLOCK
 #define MODULES_LED_SIMPLE
--- a/avr/devices/n25/.gitignore
+++ b/avr/devices/n25/.gitignore
@@ -1,2 +0,0 @@
-*.eep.hex
-*.obj
--- a/avr/devices/n25/0BUILD
+++ b/avr/devices/n25/0BUILD
@@ -1,21 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <subdirs>
-    boot
-    main
-  </subdirs>
-
-  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
-    aqua_n25.xml
-  </data>
-
-  <extradist>
-    defs.asm
-    README
-  </extradist>
-  
-
-</gwbuild>
-
--- a/avr/devices/n25/README
+++ b/avr/devices/n25/README
@@ -1,18 +0,0 @@
-
-N25
-===
-
- Role: LED strip controller
- MCU: AtTiny84
- Connection: RJ45
- Predecessor: N22, N16
- UART: uart_bitbang2
- Periphery:
-  - LED strip connection (SK6812)
-  - OWI interface
-    - DS18B20 temperature sensor
- Apps:
-  - NETWORK:       Basic network functionality (address setup etc.)
-  - REPORTSENSORS: report sensor data from temperature sensor etc.
-  - STATS        : periodically send stats data
-  - MA_LIGHT     : motion activated light
--- a/avr/devices/n25/aqua_n25.xml
+++ b/avr/devices/n25/aqua_n25.xml
@@ -1,33 +0,0 @@
-
-<device name="aqua_n25" driver="nodes">
-  <manufacturer>AQUA</manufacturer>
-  <devicetype>N</devicetype>
-  <deviceversion>25</deviceversion>
-  
-  <values>
-    <value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
-
-    <value name="NUMLEDS"      id="0x82" type="actor"  dataType="int" />
-    <value name="RGBWVALUE"    id="0x83" type="actor"  dataType="dword" />
-
-    <value name="MALRGBWVALUE" id="0x84" type="actor"  dataType="dword" />
-    <value name="MALONTIME"    id="0x85" type="actor"  dataType="uint16" />
-    <value name="MALSOURCE1"   id="0x86" type="actor"  dataType="uint16" />
-    <value name="MALSOURCE2"   id="0x87" type="actor"  dataType="uint16" />
-
-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="stats_heap_used"        id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_heap_free"        id="0xe8" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_noram_errors"     id="0xe9" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
-  </values>
-
-</device>
--- a/avr/devices/n25/boot/0BUILD
+++ b/avr/devices/n25/boot/0BUILD
@@ -1,32 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="n22_boot" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      boot.asm
-    </sources>
-
-
-  </target>
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-  </extradist>
-  
-
-</gwbuild>
-
-
--- a/avr/devices/n25/boot/boot.asm
+++ b/avr/devices/n25/boot/boot.asm
@@ -1,136 +0,0 @@
-; ***************************************************************************
-; Source file for base system node on AtTiny 84
-;
-; This is for the maintenance system (i.e. the flash loader).
-;
-; All definitions and changes should go into this file.
-;
-;
-; ***************************************************************************
-
-.equ clock=1000000 ; Define the clock frequency
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "version.asm"
-.include "../defs.asm"
-.include "devices/all/defs.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.include "common/utils_wait.asm"
-.include "modules/com2/defs.asm"
-.include "modules/comproto/defs.asm"
-
-
-; ---------------------------------------------------------------------------
-; firmware settings
-
-
-
-; ---------------------------------------------------------------------------
-; LED
-
-.equ LED_DDR             = DDRA
-.equ LED_PORT            = PORTA
-.equ LED_PIN             = PINA
-.equ LED_PINNUM          = PORTA3
-
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 0x0000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-  rjmp main ; Reset vector
-  reti ; EXT_INT0
-  reti ; PCI0
-  reti ; OC1A
-  reti ; OVF1
-  reti ; OVF0
-  reti ; ERDY
-  reti ; ACI
-  reti ; ADCC
-  reti ; OC1B
-  reti ; OC0A
-  reti ; OC0B
-  reti ; WATCHDOG
-  reti ; USI_STR
-  reti ; USI_OVF
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-firmwareStart:   rjmp main ; will be overwritten when flashing
-
-
-
-; ***************************************************************************
-; main code
-
-
-.org BOOTLOADER_ADDR
-
-
-main:
-  rjmp bootLoader ; this routine is in modules/bootloader/main.asm
-
-
-
-; ***************************************************************************
-; includes
-
-.include "common/utils_wait_fixed.asm"
-.include "common/utils_copy_from_flash.asm"
-.include "common/utils_copy_sdram.asm"
-
-.include "modules/flash/defs.asm"
-.include "modules/flash/eeprom.asm"
-.include "modules/flash/io.asm"
-.include "modules/flash/io_attn.asm"
-.include "modules/flash/io_bitbang.asm"
-.include "modules/flash/flashxp.asm"
-.include "modules/flash/flash1p.asm"
-.include "modules/flash/flashprocess.asm"
-.include "modules/flash/wait.asm"
-.include "modules/bootloader/main.asm"
-.include "modules/network/msg/defs.asm"
-.include "modules/network/msg/crc.asm"
-
-
-
-systemSetSpeed:
-.if clock == 8000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, 0
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-
-.if clock == 1000000
-  ldi r16, (1<<CLKPCE)
-  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
-  out CLKPR, r16
-  out CLKPR, r17
-.endif
-  ret
-
-
--- a/avr/devices/n25/defs.asm
+++ b/avr/devices/n25/defs.asm
@@ -1,90 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2025 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-; ***************************************************************************
-;
-;                                 AtTiny84
-;                                 --------
-;                            VCC  1     14  GND
-;                  OWI       PB0  2     13  PA0
-;                            PB1  3     12  PA1  COM-DATA
-;                            PB3  4     11  PA2         
-;                            PB2  5     10  PA3  LED
-;                  COM_ATTN  PA7  6      9  PA4  LED_CLK
-;                  LED_DATA  PA6  7      8  PA5
-;                                 --------
-;
-; ***************************************************************************
-
-
-
-.equ BOOTLOADER_ADDR = 0xd00
-
-
-.equ FIRMWARE_VARIANT_BOOT        = 0
-.equ FIRMWARE_VARIANT_LEDSTRIPS   = 1
-
-.equ DEVICEINFO_ID       = 'N'
-.equ DEVICEINFO_VERSION  = 25
-.equ DEVICEINFO_REVISION = 0
-
-
-; ---------------------------------------------------------------------------
-; LED module
-
-.equ LED_SIMPLE_ONTIME  = 1
-.equ LED_SIMPLE_OFFTIME = 50
-.equ LED_SIMPLE_DDR     = DDRA
-.equ LED_SIMPLE_PORT    = PORTA
-.equ LED_SIMPLE_PORTIN  = PINA
-.equ LED_SIMPLE_PINNUM  = PORTA3
-
-
-
-; ---------------------------------------------------------------------------
-; COM module
-
-.equ COM_BIT_LENGTH      = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400
-.equ COM_HALFBIT_LENGTH  = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter
-
-.equ COM_DATA_DDR       = DDRA
-.equ COM_DATA_INPUT     = PINA
-.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_DATA_PIN       = PORTA1
-
-.equ COM_ATTN_DDR       = DDRA
-.equ COM_ATTN_INPUT     = PINA
-.equ COM_ATTN_OUTPUT    = PORTA
-.equ COM_ATTN_PIN       = PORTA7
-
-.equ COM_IRQ_ADDR_ATTN   = PCMSK0
-.equ COM_IRQ_BIT_ATTN    = PCINT7       ; bit 7 in PCMSK0 (PCINT7)
-.equ COM_IRQ_GIFR_ATTN   = PCIF0
-.equ COM_IRQ_GIMSK_ATTN  = PCIE0
-
-
-
-; ---------------------------------------------------------------------------
-; 1-Wire Master
-;
-
-.equ OWI_DDR     = DDRB
-.equ OWI_PORTOUT = PORTB
-.equ OWI_PORTIN  = PINB
-.equ OWI_PINNUM  = PORTB0
-
-
-; ---------------------------------------------------------------------------
-; SK6812
-
-.equ SK6812_DDR    = DDRA
-.equ SK6812_PORT   = PORTA
-.equ SK6812_PINNUM = PORTA6
-
-
--- a/avr/devices/n25/main/0BUILD
+++ b/avr/devices/n25/main/0BUILD
@@ -1,33 +0,0 @@
-<?xml?>
-
-<gwbuild>
-
-  <target type="AvrHexFile" name="n22_firmware" >
-
-    <includes type="avrasm" >
-      -I $(builddir)
-      -I $(srcdir)
-      -I $(topsrcdir)/avr
-      -I $(topbuilddir)/avr
-    </includes>
-
-
-    <sources type="avrasm" >
-      main.asm
-    </sources>
-
-
-  </target>
-
-
-
-  <subdirs>
-  </subdirs>
-
-  <extradist>
-  </extradist>
-  
-
-</gwbuild>
-
-
--- a/avr/devices/n25/main/main.asm
+++ b/avr/devices/n25/main/main.asm
@@ -1,205 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2025 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-; ***************************************************************************
-; Source file for LED controller node on AtTiny 84
-;
-; This is for the full system (i.e. not the boot loader).
-; ***************************************************************************
-
-.equ clock=8000000 ; Define the clock frequency
-
-
-
-.nolist
-.include "include/tn84def.inc" ; Define device ATtiny84
-.list
-
-.include "version.asm"
-.include "../defs.asm"
-;.include "./data.asm"
-
-.include "devices/all/defs.asm"
-.include "common/utils_wait.asm"
-
-
-
-; ***************************************************************************
-; defines
-
-; ---------------------------------------------------------------------------
-; generic
-
-.equ NET_BUFFERS_NUM            = 6
-.equ NET_BUFFERS_SIZE           = 32
-
-
-
-; ---------------------------------------------------------------------------
-; firmware settings including list of modules used
-
-
-#define MODULES_CLOCK
-#define MODULES_LED_SIMPLE
-#define MODULES_NETWORK
-#define MODULES_UART_BITBANG
-#define MODULES_OWI_MASTER
-#define MODULES_DS18B20
-#define MODULES_SK6812
-;#define MODULES_MOTION_LIGHT
-
-#define APPS_NETWORK
-#define APPS_REPORTSENSORS
-#define APPS_STATS
-#define APPS_MA_LIGHT
-
-
-
-; ---------------------------------------------------------------------------
-; defines for modules
-
-;.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
-.equ VALUE_ID_LED_NUMLEDS      = 0x82
-.equ VALUE_ID_LED_RGBW_VALUE   = 0x83
-.equ VALUE_ID_MAL_RGBW_VALUE   = 0x84
-.equ VALUE_ID_MAL_ONTIME       = 0x85
-.equ VALUE_ID_MAL_SOURCE1      = 0x86
-.equ VALUE_ID_MAL_SOURCE2      = 0x87
-
-.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
-
-
-; ***************************************************************************
-; code segment
-
-.cseg
-.org 000000
-
-
-
-; ---------------------------------------------------------------------------
-; Reset and interrupt vectors
-
-        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
-	reti ; EXT_INT0
-	rjmp UART_BitBang_PcintIsr ; PCI0
-	reti ; OC1A
-	reti ; OVF1
-	reti ; OVF0
-	reti ; ERDY
-	reti ; ACI
-        reti ; ADCC
-	reti ; OC1B
-        rjmp baseTimerIrqOC0A ; OC0A
-	reti ; OC0B
-	reti ; WATCHDOG
-	reti ; USI_STR
-	reti ; USI_OVF
-
-
-devInfoBlock:        ; 12 bytes
-devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
-firmwareVersion:     .db FIRMWARE_VARIANT_LEDSTRIPS, FIRMWARE_VERSION_MAJOR
-                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
-
-; ---------------------------------------------------------------------------
-; @routine firmwareStart @global
-
-firmwareStart:
-  rjmp main
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onSystemStart
-
-onSystemStart:
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onMessageReceived
-;
-; Called on every message received
-
-onMessageReceived:
-  clc
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onEvery100ms
-;
-; Called every 100ms. Add your routine calls here. No arguments, no results.
-
-onEvery100ms:
-onEveryMinute:
-onEveryHour:
-onEveryDay:
-  ret
-; @end
-
-onEverySecond:
-  ret
-  ; debug
-  ldi r19, 0x00           ; G
-  ldi r18, 0xff           ; R
-  ldi r20, 0x55           ; B
-  ldi r21, 0xaa           ; W
-  rcall SK6812_SetAllColor ; r23 (r16, r17)
-  ret
-
-
-
-; ---------------------------------------------------------------------------
-; @routine onEveryLoop
-;
-; Called on every loop (i.e. after awakening from sleep).
-;
-onEveryLoop:
-  ret
-; @end
-
-
-
-
-
-; ***************************************************************************
-; includes
-
-.include "devices/all/hw_tn84.asm"
-.include "devices/all/includes.asm"
-.include "common/debug.asm"
-
-
-
-; ---------------------------------------------------------------------------
-; defines for network interface
-
-.equ netInterfaceData = uart_bitbang_iface
-
-
-
-
--- a/avr/devices/t03/main/main.asm
+++ b/avr/devices/t03/main/main.asm
@@ -30,10 +30,8 @@
 .list

 .include "../defs.asm"
-.include "version.asm"
-;.include "defs_all.asm"
+.include "defs_all.asm"

-.include "devices/all/defs.asm"
 .include "common/utils_wait.asm"
 .include "common/utils_io.asm"

@@ -49,6 +47,10 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used

+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+

 #define MAIN_WITHOUT_MSG_HANDLING ; we do message handling ourselfes

--- a/avr/modules/flash/io_softuart.asm
+++ b/avr/modules/flash/io_softuart.asm
@@ -0,0 +1,170 @@
+; ***************************************************************************
+; copyright   : (C) 2025 by Martin Preuss
+; email       : martin@libchipcard.de
+;
+; ***************************************************************************
+; * This file is part of the project "AqHome".                              *
+; * Please see toplevel file COPYING of that project for license details.   *
+; ***************************************************************************
+
+
+.equ UARTSOFT_WAITFORSYNCSTART = 200
+
+
+; ***************************************************************************
+; code
+
+
+.cseg
+
+
+
+
+
+uartSoftWaitAndReadSyncByte:
+; wait for begin of startbit
+  ldi r24, LOW(UARTSOFT_WAITFORSYNCSTART)
+  ldi r25, HIGH(UARTSOFT_WAITFORSYNCSTART)
+uartSoftWaitAndReadSyncByte_loop0:
+    sbis COM_DATA_INPUT, COM_DATA_PIN
+      rjmp uartSoftWaitAndReadSyncByte_gotStartBit
+    sbiw r25:r24, 1
+  brne uartSoftWaitAndReadSyncByte_loop0
+uartSoftWaitAndReadSyncByte_error:                     ; timeout
+  clc
+  ret
+
+uartSoftWaitAndReadSyncByte_gotStartBit:
+  clr r25
+  clr r24
+; count cycles while DATA low (count length of startBit)
+uartSoftWaitAndReadSyncByte_loopLow:                   ; 5 cycles per loop +3 cycles to leave loop
+    sbic COM_DATA_INPUT, COM_DATA_PIN                  ; +2 (skip)/+1 (no skip)
+      rjmp uartSoftWaitAndReadSyncByte_startDataBit1   ; +0 (skip) / +2 (no skip)
+    adiw r25:r24, 1                                    ; +1
+  brne uartSoftWaitAndReadSyncByte_loopLow             ; +2
+  rjmp uartSoftWaitAndReadSyncByte_error
+
+uartSoftWaitAndReadSyncByte_startDataBit1:
+  clr r25
+  clr r24
+  ldi r17, 4
+uartSoftWaitAndReadSyncByte_loopData:
+  ; count cycles while DATA high (count length of dataBit)
+  uartSoftWaitAndReadSyncByte_loopDataHigh:              ; 5 cycles per loop +3 cycles to leave loop
+      sbis COM_DATA_INPUT, COM_DATA_PIN                  ; +2 (skip)/+1 (no skip)
+        rjmp uartSoftWaitAndReadSyncByte_startLowDataBit ; +0 (skip) / +2 (no skip)
+      adiw r25:r24, 1                                    ; +1
+    brne uartSoftWaitAndReadSyncByte_loopDataHigh               ; +2
+  ; too long LOW
+    rjmp uartSoftWaitAndReadSyncByte_error
+  uartSoftWaitAndReadSyncByte_startLowDataBit:
+  ; count cycles while DATA low (count length of dataBit)
+uartSoftWaitAndReadSyncByte_loopDataLow:                 ; 5 cycles per loop +3 cycles to leave loop
+      sbic COM_DATA_INPUT, COM_DATA_PIN                   ; +2 (skip)/+1 (no skip)
+        rjmp uartSoftWaitAndReadSyncByte_startHighDataBit ; +0 (skip) / +2 (no skip)
+      adiw r25:r24, 1                                     ; +1
+    brne uartSoftWaitAndReadSyncByte_loop4                ; +2
+  ; too long LOW
+    rjmp uartSoftWaitAndReadSyncByte_error
+uartSoftWaitAndReadSyncByte_startHighDataBit:
+    dec r17
+  brne uartSoftWaitAndReadSyncByte_loopData 
+; calc average (8 values)
+  lsr r25  ; /2
+  ror r24
+  lsr r25  ; /4
+  ror r24
+  lsr r25  ; /8
+  ror r24
+  sec
+  ret
+; @end
+
+
+
+
+
+
+
+
+uartSoftReceiveByte:
+; wait for begin of startbit
+  ldi r24, LOW(UARTSOFT_WAITFORSYNCSTART)
+  ldi r25, HIGH(UARTSOFT_WAITFORSYNCSTART)
+uartSoftReceiveByte_waitForBeginOfStartBit:
+    sbis COM_DATA_INPUT, COM_DATA_PIN
+      rjmp uartSoftReceiveByte_gotBeginOfStartBit
+    sbiw r25:r24, 1
+  brne uartSoftReceiveByte_waitForBeginOfStartBit
+uartSoftReceiveByte_error:                             ; timeout
+  clc
+  ret
+
+uartSoftReceiveByte_gotBeginOfStartBit:
+  clr r25
+  clr r24
+; count cycles while DATA low (count length of startBit)
+uartSoftReceiveByte_waitForEndOfStartBit:              ; 5 cycles per loop
+    sbic COM_DATA_INPUT, COM_DATA_PIN                  ; +2 (skip)/+1 (no skip)
+      rjmp uartSoftReceiveByte_gotEndOfStartBit        ; +0 (skip) / +2 (no skip)
+    adiw r25:r24, 1                                    ; +1
+  brne uartSoftWaitAndReadSyncByte_loopLow             ; +2
+  rjmp uartSoftReceiveByte_error
+uartSoftReceiveByte_gotEndOfStartBit:
+; r25:r24=counter equivalent for length of startbit
+  clr r16
+  ldi r17, 8
+uartSoftReceiveByte_bitLoop:
+  ; TODO: receive 8bits, wait for start of endbit
+  
+  ret
+
+
+
+
+
+
+
+
+
+uartSoftCountDataLow:                                  ; 5 cycles per loop +5 cycles outside (+3 cycles RCALL)
+    sbic COM_DATA_INPUT, COM_DATA_PIN                  ; +2 (skip)/+1 (no skip)
+      rjmp uartSoftCountDataLow_ok                     ; +0 (skip) / +2 (no skip)
+    adiw r25:r24, 1                                    ; +1
+  brne uartSoftCountDataLow                            ; +2
+  clc
+  ret
+uartSoftCountDataLow_ok:
+  sec
+  ret
+; @end
+
+
+
+uartSoftCountDataHigh:                                 ; 5 cycles per loop +5 cycles outside (+3 cycles RCALL)
+    sbis COM_DATA_INPUT, COM_DATA_PIN                  ; +2 (skip)/+1 (no skip)
+      rjmp uartSoftCountDataHigh_ok                    ; +0 (skip) / +2 (no skip)
+    adiw r25:r24, 1                                    ; +1
+  brne uartSoftCountDataHigh                           ; +2
+  clc
+  ret
+uartSoftCountDataHigh_ok:
+  sec                                                  ; +1
+  ret                                                  ; +4
+; @end
+
+
+
+uartSoftWaitBitTime:                                   ; 5 cycles per loop +5 cycles outside (+3 cycles RCALL)
+uartSoftWaitBitTime_loop:
+    nop                                                ; +1
+    nop                                                ; +1
+    sbiw r25:r24, 1                                    ; +1
+  brne uartSoftWaitBitTime_loop                        ; +2
+  nop                                                  ; +1
+  ret                                                  ; +4
+; @end
+
+
+
--- a/avr/modules/network/defs.asm
+++ b/avr/modules/network/defs.asm
@@ -40,8 +40,8 @@
 .equ NET_IFACE_OFFS_ERR_IO_HIGH         = 15
 .equ NET_IFACE_OFFS_ERR_NOBUF_LOW       = 16
 .equ NET_IFACE_OFFS_ERR_NOBUF_HIGH      = 17
-.equ NET_IFACE_OFFS_ERR_MSGSIZE_LOW     = 18
-.equ NET_IFACE_OFFS_ERR_MSGSIZE_HIGH    = 19
+.equ NET_IFACE_OFFS_HANDLED_LOW         = 18
+.equ NET_IFACE_OFFS_HANDLED_HIGH        = 19
 .equ NET_IFACE_OFFS_ERR_MISSED_LOW      = 20
 .equ NET_IFACE_OFFS_ERR_MISSED_HIGH     = 21

--- a/avr/modules/network/msg/0BUILD
+++ b/avr/modules/network/msg/0BUILD
@@ -12,7 +12,6 @@
    debug-w.asm
    device-w.asm
    memstats-w.asm
-    pong-w.asm
    reboot-d.asm
    reboot-r.asm
    recvstats-w.asm
--- a/avr/modules/network/msg/pong-w.asm
+++ b/avr/modules/network/msg/pong-w.asm
@@ -1,37 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2025 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-; ---------------------------------------------------------------------------
-; @routine NETMSG_Pong_Write @global
-;
-; @param  R16 dest addr
-; @param Y pointer to device to write msg for and to
-; @param X pointer to buffer to write to
-; @clobbers R16 (R17, R18, R19, R20, R21, Z)
-
-NETMSG_Pong_Write:
-  st X+, r16                          ; dest address
-  ldi r16, 6                          ; msg code+src address+4 payload bytes
-  st X+, r16                          ; msg len
-  ldi r16, NETMSG_CMD_PONG
-  st X+, r16                          ; msg code
-  ldd r16, Y+NET_IFACE_OFFS_ADDRESS
-  st X+, r16                          ; src address
-  rcall NETMSG_Common_AddUidToBuffer  ; (R16, R18, R19, R20, R21)
-
-  sbiw xh:xl, 8 ; go back to beginning of message (1 byte dst addr, 1 byte length, 6 bytes payload)
-  rcall NETMSG_CalcAndAddChecksumByte ; (R16, R17, R18, R19, R20, X)
-  sbiw xh:xl, 9 ; go back to beginning of message (1 byte dst addr, 1 byte length, 6 bytes payload, 1 byte crc)
-  ret
-; @end
-
-
-
--- a/avr/modules/uart_bitbang2/0BUILD
+++ b/avr/modules/uart_bitbang2/0BUILD
@@ -3,11 +3,10 @@
 <gwbuild>

  <extradist>
-    bytelevel.asm
    defs.asm
    iface.asm
+    lowlevel.asm
    main.asm
-    msglevel.asm
  </extradist>

 </gwbuild>
--- a/avr/modules/uart_bitbang2/iface.asm
+++ b/avr/modules/uart_bitbang2/iface.asm
@@ -25,7 +25,8 @@

 .dseg

-uart_bitbang_iface:     .byte NET_IFACE_SIZE
+uart_bitbang_iface: .byte NET_IFACE_SIZE
+



@@ -123,7 +124,7 @@ uartBitBang_sendNextPkg:
  rcall NET_Buffer_Locate                    ; get pointer to buffer (R17)
  brcc uartBitBang_sendNextPkg_end
  adiw xh:xl, 1                              ; skip buffer header
-  rcall uartBitbang_SendMsg                  ; (R16, R17, R21, R22, X)
+  rcall uartBitbang_SendPacket               ; (R16, R17, R21, R22, X)
  brcc uartBitBang_sendNextPkg_error
  rcall NET_Interface_GetNextOutgoingMsgNum  ; remove from stack (R17, R18, X)
  rcall NET_Buffer_ReleaseByNum              ; release buffer (R16, X)
@@ -144,38 +145,73 @@ uartBitBang_sendNextPkg_end:
 ;
 ; Receive packet.
 ;
-; @param Y pointer to start of interface data
-; @clobbers R16, R17, R18, R19, R20, R21, R22, R24, R25, X
+; @return CFLAG set if okay (packet received), cleared on error
+; @clobbers R16, R17, X (R18, R19, R20, R21, R22, R24, R25)

 uartBitbang_receiveNextPkg:
-  rcall NET_Buffer_Alloc                          ; R16=buffer num (R16, R17, X)
+  rcall NET_Buffer_Alloc                          ; (R16, R17, X)
  brcs uartBitbang_receiveNextPkg_gotBuffer
  ldi r16, NET_IFACE_OFFS_ERR_NOBUF_LOW
  rcall NET_Interface_IncCounter16                ; (R24, R25)
+  clc
  rjmp uartBitbang_receiveNextPkg_end
 uartBitbang_receiveNextPkg_gotBuffer:
  push r16                                        ; buffer number
    adiw xh:xl, 1
-    ldd r18, Y+NET_IFACE_OFFS_ADDRESS
-    ldi r19, NET_BUFFERS_SIZE-1
-    rcall uartBitbang_ReceiveAndCheckMsg          ; (R16, R17, R19, R20, R21, R22, R24, R25)
-  pop r16
-  brcc uartBitbang_receiveNextPkg_relBuffer
-  rcall NET_AddIncomingMsgNum                     ; (R17, R18, X)
-  brcs uartBitbang_receiveNextPkg_end
-  push r16
-    ldi r16, NET_IFACE_OFFS_ERR_MISSED_LOW
-    rcall NET_Interface_IncCounter16              ; (R24, R25)
-  pop r16
-  ; fall-through to release buffer
-uartBitbang_receiveNextPkg_relBuffer:
+    rcall uartBitbang_receiveAndCheckPkg          ; (r16, r17, r18, r19, r20, r21, r22, X)
+  pop r17                                         ; pop buffer number to R17
+  brcs uartBitbang_receiveNextPkg_gotPkg
+  tst r16                                         ; error code=0: pkg not for me
+  breq uartBitbang_receiveNextPkg_RelBuffer
+uartBitbang_receiveNextPkg_incCntRelBuffer:
+  rcall NET_Interface_IncCounter16                ; (R24, R25)
+uartBitbang_receiveNextPkg_RelBuffer:
+  mov r16, r17
  rcall NET_Buffer_ReleaseByNum                   ; (R16, X)
+  clc
+  rjmp uartBitbang_receiveNextPkg_end
+uartBitbang_receiveNextPkg_gotPkg:
+  mov r16, r17
+  rcall NET_AddIncomingMsgNum                     ; (R17, R18, X)
+  ldi r16, NET_IFACE_OFFS_ERR_NOBUF_LOW
+  brcc uartBitbang_receiveNextPkg_incCntRelBuffer
+  ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW
+  rcall NET_Interface_IncCounter16                ; (R24, R25)
+  sec
 uartBitbang_receiveNextPkg_end:
  ret
 ; @end



+; ---------------------------------------------------------------------------
+; @routine uartBitbang_receiveAndCheckPkg
+;
+; Receive a packet into buffer pointed to by X and CRC check it.
+; Expects interrupts to be disabled.
+;
+; @param X   buffer to receive to
+; @param Y pointer to start of interface data
+; @return CFLAG set if okay (packet received), cleared on error
+; @return R16 error var offset if CFLAG is cleared
+; @clobbers: r16 (r17, r18, r19, r20, r21, r22, X)
+
+uartBitbang_receiveAndCheckPkg:
+  ldd r16, Y+NET_IFACE_OFFS_ADDRESS
+  ldi r17, (NET_BUFFERS_SIZE-2)
+  push xl
+    push xh
+      rcall uartBitbang_ReceivePacketIntoBuffer ; (r16, r17, r18, r19, r20, r21, r22, X)
+    pop xh
+  pop xl
+  brcc uartBitbang_receiveAndCheckPkg_end
+  rcall NETMSG_CheckMessageInBuffer             ; (R16, R17, R18, R19, R20, X)
+  ldi r16, NET_IFACE_OFFS_ERR_CONTENT_LOW
+uartBitbang_receiveAndCheckPkg_end:
+  ret
+; @end
+
+



--- a/avr/modules/uart_bitbang2/bytelevel.asm
+++ b/avr/modules/uart_bitbang2/bytelevel.asm
@@ -10,9 +10,7 @@


 ; ***************************************************************************
-; macros
-
-
+; code

 ; ---------------------------------------------------------------------------
 ; @macro UART_BB_M_WAIT_FOR_PIN_LOW IN_REG_DATA, IN_PINNUM
@@ -68,10 +66,7 @@ l_end:



-; ***************************************************************************
-; code

-.cseg


 ; ---------------------------------------------------------------------------
@@ -98,7 +93,7 @@ uartBitbang_SendByte:
  cbi COM_DATA_OUTPUT, COM_DATA_PIN                ; +2 set DATA low
  Utils_WaitNanoSecs COM_BIT_LENGTH, 1, r22        ; wait for one bit duration
  ; send data bits
-uartBitbang_SendByte_loop:                         ; 11 for low bit
+uartBitbang_SendByte_loop:                         ; 9 for low bit
    lsr r16                                        ; 1+ bit to send -> CARRY
    brcs uartBitbang_SendByte_setHigh              ; HI: +2, LO: +1
 uartBitbang_SendByte_setLow:
@@ -113,11 +108,9 @@ uartBitbang_SendByte_setHigh:
    sbis COM_DATA_INPUT, COM_DATA_PIN              ; +1 if no skip, +2 if skipped
      rjmp uartBitbang_SendByte_error              ; +2 if error (collision: we wanted line to be high but it is low)
    Utils_WaitNanoSecs COM_HALFBIT_LENGTH, 11, r22
-    cbi COM_DATA_DDR, COM_DATA_PIN                 ; +2 set DATA as input, pullup R makes it ONE
-    Utils_WaitNanoSecs COM_BIT_LENGTH, 8, r22
 uartBitbang_SendByte_loopEnd:
    dec r21                                        ; +1
-  brne uartBitbang_SendByte_loop                   ; +2, sum per loop: 11 cycles
+  brne uartBitbang_SendByte_loop                   ; +2, sum per loop: 10 cycles
  ; send stopbit
  cbi COM_DATA_DDR, COM_DATA_PIN                   ; +2 set DATA as input, pullup R makes it ONE
  Utils_WaitNanoSecs COM_BIT_LENGTH, 0, r22        ; wait for one bit length
@@ -221,6 +214,116 @@ uartBitbang_WaitForAttnHigh:



+
+
+; ---------------------------------------------------------------------------
+; @routine uartBitbang_ReceivePacketIntoBuffer
+;
+; Receive a packet into buffer pointed to by X.
+; Expects interrupts to be disabled.
+;
+; @param R16 COM address to listen to
+; @param R17 maximum value for accepted msg data (i.e. buffersize minus 3)
+; @param X   buffer to receive to
+; @return CFLAG set if okay (packet received), cleared on error
+; @return R16 error code if CFLAG is cleared (COM2_ERROR_NOTFORME, COM2_ERROR_IOERROR, COM2_ERROR_DATAERROR)
+; @clobbers: r16, r17, r18, X (r19, r20, r21, r22)
+
+uartBitbang_ReceivePacketIntoBuffer:
+  mov r18, r17
+  push r16
+    ; read destination address
+    rcall uartBitbang_ReceiveByte             ; read byte (R16, R17, R20, R21, R22)
+  pop r17                                     ; pop from R16 to R17
+  brcc uartBitbang_ReceivePacketIntoBuffer_ioError
+#ifndef COM_ACCEPT_ALL_DEST                    ; accept every destination address
+  ; compare destination address (accept "FF" and own address)
+  cp r16, r17
+  breq uartBitbang_ReceivePacketIntoBuffer_acceptAddr
+  cpi r16, 0xff
+  breq uartBitbang_ReceivePacketIntoBuffer_acceptAddr
+  clr r16
+  rjmp uartBitbang_ReceivePacketIntoBuffer_error        ; clc/ret
+#endif
+uartBitbang_ReceivePacketIntoBuffer_acceptAddr:
+  st X+, r16                                  ; store dest address, lock buffer
+  ; read msg length
+  rcall uartBitbang_ReceiveByte               ; read packet length (R16, R17, R20, R21, R22)
+  brcc uartBitbang_ReceivePacketIntoBuffer_ioError
+  st X+, r16
+  cp r16, r18                                 ; (COM2_BUFFER_SIZE-3)
+  brcc uartBitbang_ReceivePacketIntoBuffer_contentError ; packet too long
+  inc r16                                     ; account for checksum byte
+  mov r17, r16
+uartBitbang_ReceivePacketIntoBuffer_loop:
+    push r17
+      rcall uartBitbang_ReceiveByte           ; read byte (R16, R17, R20, R21, R22)
+    pop r17
+    brcc uartBitbang_ReceivePacketIntoBuffer_ioError
+    st X+, r16
+    dec r17
+  brne uartBitbang_ReceivePacketIntoBuffer_loop
+  sec
+  ret
+uartBitbang_ReceivePacketIntoBuffer_ioError:
+  ldi r16, NET_IFACE_OFFS_ERR_IO_LOW
+  rjmp uartBitbang_ReceivePacketIntoBuffer_error
+uartBitbang_ReceivePacketIntoBuffer_contentError:
+  ldi r16, NET_IFACE_OFFS_ERR_CONTENT_LOW
+uartBitbang_ReceivePacketIntoBuffer_error:
+  clc
+  ret
+; @end
+
+
+
+; ---------------------------------------------------------------------------
+; @routine uartBitbang_SendPacket
+;
+; Send packet over wire, handle ATTN line.
+;
+; @param  X ptr to buffer to send
+; @return CFLAGS set if okay, cleared otherwise (index of error variable in R16)
+; @return R16 index of error variable (if CFLAGS cleared)
+; @clobbers R16, R22 (R17, R21, X)
+
+uartBitbang_SendPacket:
+  rcall uartBitbang_AcquireBus
+  brcc uartBitbang_SendPacket_lineBusyError
+  
+  rcall uartBitbang_WaitForOneBitLength          ; wait for one bit duration (R22)
+  rcall uartBitbang_WaitForOneBitLength          ; wait for one bit duration (R22)
+  rcall uartBitbang_WaitForOneBitLength          ; wait for one bit duration (R22)
+
+  adiw xh:xl, NETMSG_OFFS_MSGLEN
+  ld r17, X
+  sbiw xh:xl, NETMSG_OFFS_MSGLEN
+  inc r17                                        ; account for dest addr
+  inc r17                                        ; account for msglen byte
+  inc r17                                        ; account for crc byte
+
+uartBitbang_SendPacket_loop:
+    ld r16, X+
+    rcall uartBitbang_SendByte                   ; send byte (R16, R21, R22)
+    brcc uartBitbang_SendPacket_releaseBusRet
+    dec r17
+  brne uartBitbang_SendPacket_loop
+  sec
+uartBitbang_SendPacket_releaseBusRet:
+  cbi COM_ATTN_DDR, COM_ATTN_PIN                 ; release ATTN line (by setting direction to IN)
+  brcc uartBitbang_SendPacket_ioError
+  ; packet successfully sent
+  ret
+uartBitbang_SendPacket_ioError:
+  ldi r16, NET_IFACE_OFFS_ERR_COLLISIONS_LOW
+  ret
+uartBitbang_SendPacket_lineBusyError:
+  ldi r16, NET_IFACE_OFFS_ERR_BUSY_LOW
+  ret
+; @end
+
+
+
 ; ---------------------------------------------------------------------------
 ; @routine uartBitbang_AcquireBus
 ;
@@ -263,4 +366,3 @@ uartBitbang_WaitForOneBitLength:



-
--- a/avr/modules/uart_bitbang2/msglevel.asm
+++ b/avr/modules/uart_bitbang2/msglevel.asm
@@ -1,175 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2025 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-; ***************************************************************************
-; code
-
-
-
-; ---------------------------------------------------------------------------
-; @routine uartBitbang_ReceiveAndCheckMsg
-;
-; Receive a packet into buffer pointed to by X.
-; Expects interrupts to be disabled.
-;
-; @param R18 COM address to listen to
-; @param R19 max buffer size
-; @param X   buffer to receive to
-; @return CFLAG set if msg received, cleared on error
-; @clobbers R16, R19 (R17, R20, R21, R22, R24, R25)
-
-uartBitbang_ReceiveAndCheckMsg:
-  push xl
-    push xh
-      rcall uartBitbang_RawReceiveMsg        ; (R16, R17, R19, R20, R21, R22, R24, R25, X)
-    pop xh
-  pop xl
-  brcs uartBitbang_ReceiveAndCheckMsg_recvd
-  ; fall-through, return with CF cleared (from uartBitbang_RawReceiveMsg)
-  ret
-uartBitbang_ReceiveAndCheckMsg_recvd:
-  push xl
-    push xh
-      rcall NETMSG_CheckMessageInBuffer      ; (R16, R17, R18, R19, R20, X)
-    pop xh
-  pop xl
-  brcs uartBitbang_ReceiveAndCheckMsg_msgOk
-  ldi r16, NET_IFACE_OFFS_ERR_CONTENT_LOW
-  rcall NET_Interface_IncCounter16          ; (R24, R25)
-  clc
-  ret
-uartBitbang_ReceiveAndCheckMsg_msgOk:
-  ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW
-  rcall NET_Interface_IncCounter16          ; (R24, R25)
-  sec
-  ret
-; @end
-
-
-
-; ---------------------------------------------------------------------------
-; @routine uartBitbang_RawReceiveMsg
-;
-; Receive a packet into buffer pointed to by X.
-; Expects interrupts to be disabled.
-;
-; @param R18 COM address to listen to
-; @param R19 max buffer size
-; @param X   buffer to receive to
-; @return CFLAG set if msg received, cleared on error (see R16)
-; @return R16   if CFLAG cleared: 0=message not for this node, otherwise error
-; @clobbers R16, R19 (R17, R20, R21, R22, R24, R25, X)
-
-uartBitbang_RawReceiveMsg:
-  cpi r19, 3
-  brcs uartBitbang_RawReceiveMsg_eBadSize
-  ; read destination address
-  rcall uartBitbang_ReceiveByte             ; read byte (R16, R17, R20, R21, R22)
-  brcc uartBitbang_RawReceiveMsg_eIo
-  cp r16, r18
-  breq uartBitbang_RawReceiveMsg_forMe
-  cpi r16, 0xff
-  breq uartBitbang_RawReceiveMsg_forMe
-  clr r16
-  rjmp uartBitbang_RawReceiveMsg_clcRet
-uartBitbang_RawReceiveMsg_forMe:
-  subi r19, 1
-  brcs uartBitbang_RawReceiveMsg_eBadSize
-  st X+, r16
-  ; read size of msg payload (e.g. number of msg bytes following minus CRC byte)
-  rcall uartBitbang_ReceiveByte             ; read byte (R16, R17, R20, R21, R22)
-  brcc uartBitbang_RawReceiveMsg_eIo
-  inc r16                                   ; account for crc byte
-  subi r19, 1
-  brcs uartBitbang_RawReceiveMsg_eBadSize
-  st X+, r16                                ; store msg payload size
-  sub r19, r16                              ; check msg size against remaining buffer size
-  brcs uartBitbang_RawReceiveMsg_eBadSize
-  mov r19, r16
-uartBitbang_RawReceiveMsg_loop:
-    rcall uartBitbang_ReceiveByte           ; read byte (R16, R17, R20, R21, R22)
-    brcc uartBitbang_RawReceiveMsg_eIo
-    st X+, r16                              ; store msg
-    dec r19
-  brne uartBitbang_RawReceiveMsg_loop
-  sec
-  rjmp uartBitbang_RawReceiveMsg_end
-uartBitbang_RawReceiveMsg_eBadSize:
-  ldi r16, NET_IFACE_OFFS_ERR_MSGSIZE_LOW
-  rjmp uartBitbang_RawReceiveMsg_incCounterRet
-uartBitbang_RawReceiveMsg_eIo:
-  ldi r16, NET_IFACE_OFFS_ERR_IO_LOW
-uartBitbang_RawReceiveMsg_incCounterRet:
-  rcall NET_Interface_IncCounter16          ; (R24, R25)
-uartBitbang_RawReceiveMsg_clcRet:
-  clc
-uartBitbang_RawReceiveMsg_end:
-  ret
-; @end
-
-
-
-
-
-
-; ---------------------------------------------------------------------------
-; @routine uartBitbang_SendMsg
-;
-; Send packet over wire, handle ATTN line.
-;
-; @param  X ptr to buffer to send
-; @return CFLAGS set if okay, cleared otherwise (index of error variable in R16)
-; @return R16 index of error variable (if CFLAGS cleared)
-; @clobbers R16, R22 (R17, R21, X)
-
-uartBitbang_SendMsg:
-  rcall uartBitbang_AcquireBus
-  brcc uartBitbang_SendMsg_lineBusyError
-  
-  rcall uartBitbang_WaitForOneBitLength          ; wait for one bit duration (R22)
-  rcall uartBitbang_WaitForOneBitLength          ; wait for one bit duration (R22)
-  rcall uartBitbang_WaitForOneBitLength          ; wait for one bit duration (R22)
-
-  adiw xh:xl, NETMSG_OFFS_MSGLEN
-  ld r17, X
-  sbiw xh:xl, NETMSG_OFFS_MSGLEN
-  inc r17                                        ; account for dest addr
-  inc r17                                        ; account for msglen byte
-  inc r17                                        ; account for crc byte
-
-uartBitbang_SendMsg_loop:
-    rcall uartBitbang_WaitForOneBitLength        ; wait for one bit duration (R22)
-
-    ld r16, X+
-    rcall uartBitbang_SendByte                   ; send byte (R16, R21, R22)
-    brcc uartBitbang_SendMsg_releaseBusRet
-    dec r17
-  brne uartBitbang_SendMsg_loop
-  sec
-uartBitbang_SendMsg_releaseBusRet:
-  cbi COM_ATTN_DDR, COM_ATTN_PIN                 ; release ATTN line (by setting direction to IN)
-  brcc uartBitbang_SendMsg_ioError
-  ; packet successfully sent
-  ret
-uartBitbang_SendMsg_ioError:
-  ldi r16, NET_IFACE_OFFS_ERR_COLLISIONS_LOW
-  ret
-uartBitbang_SendMsg_lineBusyError:
-  ldi r16, NET_IFACE_OFFS_ERR_BUSY_LOW
-  ret
-; @end
-
-
-
-
-
-
-
--- a/avr/version.asm
+++ b/avr/version.asm
@@ -1,15 +0,0 @@
-; ***************************************************************************
-; copyright   : (C) 2025 by Martin Preuss
-; email       : martin@libchipcard.de
-;
-; ***************************************************************************
-; * This file is part of the project "AqHome".                              *
-; * Please see toplevel file COPYING of that project for license details.   *
-; ***************************************************************************
-
-
-
-.equ FIRMWARE_VERSION_MAJOR       = 1
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 0
-
--- a/devices/nodes/aqua_n21.xml
+++ b/devices/nodes/aqua_n21.xml
@@ -10,18 +10,6 @@
    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
    <value name="DOOR"         id="0x08" type="sensor" dataType="rational" modality="door"                  denom="1" />

-    <value name="stats_packets_in"       id="0xe0" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_packets_out"      id="0xe1" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_content_errors"   id="0xe2" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_io_errors"        id="0xe3" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_nobuf_errors"     id="0xe4" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_busy_errors"      id="0xe6" type="sensor" dataType="uint16" denom="1" />
-
-    <value name="stats_heap_used"        id="0xe7" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_heap_free"        id="0xe8" type="sensor" dataType="uint16" denom="1" />
-    <value name="stats_noram_errors"     id="0xe9" type="sensor" dataType="uint16" denom="1" />
-
    <value name="LEDTIMING"    id="0x88" type="actor"  dataType="uint16" />
  </values>

--- a/flashnode.sh
+++ b/flashnode.sh
@@ -16,26 +16,12 @@ case $NODE in
       LFUSE_ARG="-U lfuse:w:0xE4:m"
       FILE_ARG="-U flash:w:./0-build/avr/devices/c01/boot/c01_boot.hex"
       ;;
-  n16)
-       DEVICE_ARG="-p t84"
-       HFUSE_ARG="-U hfuse:w:0xD7:m"
-       LFUSE_ARG=""
-       EFUSE_ARG="-U efuse:w:0xFE:m"
-       FILE_ARG="-U flash:w:./0-build/avr/devices/n16/boot/n16_boot.hex"
-       ;;
-  n20)
-       DEVICE_ARG="-p t84"
-       HFUSE_ARG="-U hfuse:w:0xD7:m"
-       LFUSE_ARG=""
-       EFUSE_ARG="-U efuse:w:0xFE:m"
-       FILE_ARG="-U flash:w:./0-build/avr/devices/n20/n20_boot.hex"
-       ;;
  n21)
       DEVICE_ARG="-p t84"
       HFUSE_ARG="-U hfuse:w:0xD7:m"
       LFUSE_ARG=""
       EFUSE_ARG="-U efuse:w:0xFE:m"
-       FILE_ARG="-U flash:w:./0-build/avr/devices/n21/boot/n21_boot.hex"
+       FILE="-U flash:w:./0-build/avr/devices/n21/boot/n21_boot.hex"
       ;;
  n22)
       DEVICE_ARG="-p t85"
Author	SHA1	Message	Date
Martin Preuss	deddf42379	First try to unify ATTN handling.	2025-05-29 14:32:48 +02:00
Martin Preuss	e584245965	c01: added defs when using uart_bitbang2.	2025-05-29 14:32:29 +02:00
Martin Preuss	46720d791c	avr: some ideas for autosync.	2025-05-29 12:47:41 +02:00