split uart_bitbang2 into multiple files.

avr/apps/network/main.asm

@@ -111,6 +111,8 @@ 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
@@ -138,6 +140,13 @@ 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
@@ -162,6 +171,26 @@ 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
@@ -233,7 +262,6 @@ appNetworkHandleStateUp:
   ret
 
 
-
 ; ---------------------------------------------------------------------------
 ; @routine appNetworkSendMsgNextState
 ;

avr/apps/stats/main.asm

@@ -53,6 +53,19 @@ 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

avr/defs_all.asm

@@ -7,6 +7,7 @@
 ; * 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

avr/devices/0BUILD

@@ -26,10 +26,12 @@
     all
     c01
     n16
+    n20
     n21
     n22
     n23
     n24
+    n25
     t03
   </subdirs>
 

avr/devices/all/defs.asm

@@ -7,7 +7,6 @@
 ; * Please see toplevel file COPYING of that project for license details.   *
 ; ***************************************************************************
 
-
 ; ---------------------------------------------------------------------------
 ; Value types
 

avr/devices/all/includes.asm

@@ -54,7 +54,8 @@
 #ifdef MODULES_UART_BITBANG
 .include "modules/uart_bitbang2/defs.asm"
 .include "modules/uart_bitbang2/iface.asm"
-.include "modules/uart_bitbang2/lowlevel.asm"
+.include "modules/uart_bitbang2/bytelevel.asm"
+.include "modules/uart_bitbang2/msglevel.asm"
 #endif
 
 #ifdef MODULES_UART_HW
@@ -196,6 +197,7 @@
 .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
 
 

avr/devices/c01/main/main.asm

@@ -16,6 +16,7 @@
 .include "include/m8515def.inc" ; Define device ATmega8515
 .list
 
+.include "version.asm"
 .include "../defs.asm"
 .include "./data.asm"
 
@@ -48,11 +49,6 @@
 ; ---------------------------------------------------------------------------
 ; 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

avr/devices/n16/boot/boot.asm

@@ -12,8 +12,9 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "../defs.asm"
-.include "defs_all.asm"
+.include "devices/all/defs.asm"
 
 
 
@@ -32,10 +33,6 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings
 
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n16/main/main.asm

@@ -30,6 +30,7 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "../defs.asm"
 
 .include "devices/all/defs.asm"
@@ -51,11 +52,6 @@
 ; ---------------------------------------------------------------------------
 ; 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

avr/devices/n20/boot.asm

@@ -12,8 +12,9 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "./defs.asm"
-.include "defs_all.asm"
+.include "devices/all/defs.asm"
 
 
 
@@ -32,9 +33,6 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings
 
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
 
 
 
@@ -113,6 +111,7 @@ 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"
@@ -121,7 +120,6 @@ main:
 
 
 
-
 systemSetSpeed:
 .if clock == 8000000
   ldi r16, (1<<CLKPCE)

avr/devices/n20/main.asm

@@ -30,8 +30,11 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "./defs.asm"
-.include "defs_all.asm"
+.include "devices/all/defs.asm"
+
+.include "common/utils_wait.asm"
 
 
 
@@ -41,31 +44,37 @@
 ; ---------------------------------------------------------------------------
 ; generic
 
+.equ NET_BUFFERS_NUM            = 4
+.equ NET_BUFFERS_SIZE           = 32
 
-.include "common/utils_wait.asm"
 
 
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used
 
-.equ FIRMWARE_VERSION_MAJOR       = 0
+; #define MODULES_TIMER
-.equ FIRMWARE_VERSION_MINOR       = 0
+#define MODULES_CLOCK
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
-
-#define MODULES_TIMER
-#define MODULES_COM
-#define MODULES_COM_WITH_ADDR_PROTO
 #define MODULES_LED_SIMPLE
-#define MODULES_TWI_MASTER
+#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_SI7021
-#define MODULES_STATS
+;#define MODULES_STATS
 ;#define MODULES_OWI_MASTER
 ;#define MODULES_DS18B20
-#define MODULES_MOTION
+;#define MODULES_MOTION
-#define MODULES_CCS811
+;#define MODULES_TCRT1000
+;#define MODULES_CCS811
+
+#define APPS_NETWORK
+;#define APPS_MOTION
+;#define APPS_DOOR
+;#define APPS_REPORTSENSORS
+#define APPS_STATS
+
+
 
 ; ---------------------------------------------------------------------------
 ; defines for values
@@ -86,6 +95,8 @@
 
 .equ VALUE_ID_DEBUG        = 0x7f
 
+.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
+
 
 
 ; ***************************************************************************
@@ -102,7 +113,7 @@
 ;	rjmp main ; Reset vector
         rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
 	reti ; EXT_INT0
-	rjmp uartBitbangIsrPcint0 ; PCI0
+	rjmp UART_BitBang_PcintIsr ; PCI0
 	reti ; PCI1
 	reti ; WATCHDOG
 	reti ; ICP1
@@ -126,351 +137,82 @@ devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; v
 firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 
-firmwareStart:   rjmp main
+; ---------------------------------------------------------------------------
+; @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
+
+
+
 
 
 ; ***************************************************************************
 ; includes
 
-.include "common/utils.asm"
+.include "devices/all/hw_tn84.asm"
-.include "common/utils_wait_fixed.asm"
+.include "devices/all/includes.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
 
 
 
 ; ---------------------------------------------------------------------------
-; timer list
+; defines for network interface
 
-
+.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
-
 

avr/devices/n21/boot/boot.asm

@@ -12,6 +12,7 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "../defs.asm"
 .include "devices/all/defs.asm"
 
@@ -32,10 +33,6 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings
 
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n21/main/main.asm

@@ -30,6 +30,7 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "../defs.asm"
 .include "./data.asm"
 
@@ -53,11 +54,6 @@
 ; ---------------------------------------------------------------------------
 ; 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

avr/devices/n22/boot/boot.asm

@@ -14,8 +14,9 @@
 .include "include/tn85def.inc" ; Define device ATtiny85
 .list
 
+.include "version.asm"
 .include "../defs.asm"
-.include "defs_all.asm"
+.include "devices/all/defs.asm"
 
 
 
@@ -33,9 +34,6 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings
 
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n22/main/main.asm

@@ -22,6 +22,7 @@
 .include "include/tn85def.inc" ; Define device ATtiny85
 .list
 
+.include "version.asm"
 .include "../defs.asm"
 ;.include "./data.asm"
 
@@ -44,11 +45,6 @@
 ; ---------------------------------------------------------------------------
 ; 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

avr/devices/n23/boot/boot.asm

@@ -12,8 +12,9 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "../defs.asm"
-.include "defs_all.asm"
+.include "devices/all/defs.asm"
 
 
 #define COM_ACCEPT_ALL_DEST
@@ -33,10 +34,6 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings
 
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n23/main/main.asm

@@ -30,6 +30,7 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "../defs.asm"
 .include "./data.asm"
 
@@ -55,11 +56,6 @@
 ; ---------------------------------------------------------------------------
 ; 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

avr/devices/n24/boot/boot.asm

@@ -1,3 +1,13 @@
+; ***************************************************************************
+; 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
 ;
@@ -12,8 +22,9 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
+.include "version.asm"
 .include "../defs.asm"
-.include "defs_all.asm"
+.include "devices/all/defs.asm"
 
 
 #define COM_ACCEPT_ALL_DEST
@@ -35,10 +46,6 @@
 ; ---------------------------------------------------------------------------
 ; firmware settings
 
-.equ FIRMWARE_VERSION_MAJOR       = 0
-.equ FIRMWARE_VERSION_MINOR       = 0
-.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
-
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n24/defs.asm

@@ -13,7 +13,7 @@
 ;                                 AtTiny84
 ;                                 --------
 ;                            VCC  1     14  GND
-;                  AUX-PB2   PB0  2     13  PA0  AUX-PA0
+;                  AUX-PB0   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

avr/devices/n24/main/main.asm

@@ -33,6 +33,7 @@
 .include "../defs.asm"
 .include "./data.asm"
 
+.include "version.asm"
 .include "devices/all/defs.asm"
 .include "common/utils_wait.asm"
 
@@ -55,11 +56,6 @@
 ; ---------------------------------------------------------------------------
 ; 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

avr/devices/n25/.gitignore

@@ -0,0 +1,2 @@
+*.eep.hex
+*.obj

avr/devices/n25/0BUILD

@@ -0,0 +1,21 @@
+<?xml?>
+
+<gwbuild>
+
+  <subdirs>
+    boot
+    main
+  </subdirs>
+
+  <data dist="true" install="$(datadir)/aqhome/devices/nodes">
+    aqua_n25.xml
+  </data>
+
+  <extradist>
+    defs.asm
+    README
+  </extradist>
+  
+
+</gwbuild>
+

avr/devices/n25/README

@@ -0,0 +1,18 @@
+
+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

avr/devices/n25/aqua_n25.xml

@@ -0,0 +1,33 @@
+
+<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>

avr/devices/n25/boot/0BUILD

@@ -0,0 +1,32 @@
+<?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>
+
+

avr/devices/n25/boot/boot.asm

@@ -0,0 +1,136 @@
+; ***************************************************************************
+; 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
+
+

avr/devices/n25/defs.asm

@@ -0,0 +1,90 @@
+; ***************************************************************************
+; 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
+
+

avr/devices/n25/main/0BUILD

@@ -0,0 +1,33 @@
+<?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>
+
+

avr/devices/n25/main/main.asm

@@ -0,0 +1,205 @@
+; ***************************************************************************
+; 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
+
+
+
+

avr/devices/t03/main/main.asm

@@ -30,8 +30,10 @@
 .list
 
 .include "../defs.asm"
-.include "defs_all.asm"
+.include "version.asm"
+;.include "defs_all.asm"
 
+.include "devices/all/defs.asm"
 .include "common/utils_wait.asm"
 .include "common/utils_io.asm"
 
@@ -47,10 +49,6 @@
 ; ---------------------------------------------------------------------------
 ; 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
 

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_HANDLED_LOW         = 18
+.equ NET_IFACE_OFFS_ERR_MSGSIZE_LOW     = 18
-.equ NET_IFACE_OFFS_HANDLED_HIGH        = 19
+.equ NET_IFACE_OFFS_ERR_MSGSIZE_HIGH    = 19
 .equ NET_IFACE_OFFS_ERR_MISSED_LOW      = 20
 .equ NET_IFACE_OFFS_ERR_MISSED_HIGH     = 21
 

avr/modules/network/msg/0BUILD

@@ -12,6 +12,7 @@
     debug-w.asm
     device-w.asm
     memstats-w.asm
+    pong-w.asm
     reboot-d.asm
     reboot-r.asm
     recvstats-w.asm

avr/modules/network/msg/pong-w.asm

@@ -0,0 +1,37 @@
+; ***************************************************************************
+; 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
+
+
+

avr/modules/uart_bitbang2/0BUILD

@@ -3,10 +3,11 @@
 <gwbuild>
 
   <extradist>
+    bytelevel.asm
     defs.asm
     iface.asm
-    lowlevel.asm
     main.asm
+    msglevel.asm
   </extradist>
 
 </gwbuild>

avr/modules/uart_bitbang2/bytelevel.asm

@@ -10,7 +10,9 @@
 
 
 ; ***************************************************************************
-; code
+; macros
+
+
 
 ; ---------------------------------------------------------------------------
 ; @macro UART_BB_M_WAIT_FOR_PIN_LOW IN_REG_DATA, IN_PINNUM
@@ -66,7 +68,10 @@ l_end:
 
 
 
+; ***************************************************************************
+; code
 
+.cseg
 
 
 ; ---------------------------------------------------------------------------
@@ -93,7 +98,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:                         ; 9 for low bit
+uartBitbang_SendByte_loop:                         ; 11 for low bit
     lsr r16                                        ; 1+ bit to send -> CARRY
     brcs uartBitbang_SendByte_setHigh              ; HI: +2, LO: +1
 uartBitbang_SendByte_setLow:
@@ -108,9 +113,11 @@ 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: 10 cycles
+  brne uartBitbang_SendByte_loop                   ; +2, sum per loop: 11 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
@@ -214,116 +221,6 @@ 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
 ;
@@ -366,3 +263,4 @@ uartBitbang_WaitForOneBitLength:
 
 
 
+

avr/modules/uart_bitbang2/iface.asm

@@ -25,8 +25,7 @@
 
 .dseg
 
-uart_bitbang_iface: .byte NET_IFACE_SIZE
+uart_bitbang_iface:     .byte NET_IFACE_SIZE
-
 
 
 
@@ -124,7 +123,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_SendPacket               ; (R16, R17, R21, R22, X)
+  rcall uartBitbang_SendMsg                  ; (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)
@@ -145,73 +144,38 @@ uartBitBang_sendNextPkg_end:
 ;
 ; Receive packet.
 ;
-; @return CFLAG set if okay (packet received), cleared on error
+; @param Y pointer to start of interface data
-; @clobbers R16, R17, X (R18, R19, R20, R21, R22, R24, R25)
+; @clobbers R16, R17, R18, R19, R20, R21, R22, R24, R25, X
 
 uartBitbang_receiveNextPkg:
-  rcall NET_Buffer_Alloc                          ; (R16, R17, X)
+  rcall NET_Buffer_Alloc                          ; R16=buffer num (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
-    rcall uartBitbang_receiveAndCheckPkg          ; (r16, r17, r18, r19, r20, r21, r22, X)
+    ldd r18, Y+NET_IFACE_OFFS_ADDRESS
-  pop r17                                         ; pop buffer number to R17
+    ldi r19, NET_BUFFERS_SIZE-1
-  brcs uartBitbang_receiveNextPkg_gotPkg
+    rcall uartBitbang_ReceiveAndCheckMsg          ; (R16, R17, R19, R20, R21, R22, R24, R25)
-  tst r16                                         ; error code=0: pkg not for me
+  pop r16
-  breq uartBitbang_receiveNextPkg_RelBuffer
+  brcc 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
+  brcs uartBitbang_receiveNextPkg_end
-  brcc uartBitbang_receiveNextPkg_incCntRelBuffer
+  push r16
-  ldi r16, NET_IFACE_OFFS_PACKETSIN_LOW
+    ldi r16, NET_IFACE_OFFS_ERR_MISSED_LOW
-  rcall NET_Interface_IncCounter16                ; (R24, R25)
+    rcall NET_Interface_IncCounter16              ; (R24, R25)
-  sec
+  pop r16
+  ; fall-through to release buffer
+uartBitbang_receiveNextPkg_relBuffer:
+  rcall NET_Buffer_ReleaseByNum                   ; (R16, X)
 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
-
-
 
 
 

avr/modules/uart_bitbang2/msglevel.asm

@@ -0,0 +1,175 @@
+; ***************************************************************************
+; 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
+
+
+
+
+
+
+

avr/version.asm

@@ -0,0 +1,15 @@
+; ***************************************************************************
+; 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
+

devices/nodes/aqua_n21.xml

@@ -10,6 +10,18 @@
     <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>
 

flashnode.sh

@@ -16,12 +16,26 @@ 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="-U flash:w:./0-build/avr/devices/n21/boot/n21_boot.hex"
+       FILE_ARG="-U flash:w:./0-build/avr/devices/n21/boot/n21_boot.hex"
        ;;
   n22)
        DEVICE_ARG="-p t85"