mainly built-fixes.

aqhome/data/datafile/df_direct/0BUILD

@@ -50,6 +50,7 @@
 
     <headers dist="true" >
       df_direct.h
+      df_direct_p.h
     </headers>
   
   

aqhome/msg/0BUILD

@@ -59,6 +59,7 @@
       msg_sysstats.h
       msg_value.h
       msg_value2.h
+      msg_value3.h
       msg_device.h
       msg_flashready.h
       msg_flashstart.h

avr/common/0BUILD

@@ -7,8 +7,11 @@
     ringbuffer.asm
     shared.asm
     utils.asm
+    utils_copy_from_flash.asm
+    utils_copy_sdram.asm
     utils_wait.asm
     utils_wait_fixed.asm
+    utils_wait_pin.asm
     watchdog.asm
   </extradist>
 

avr/devices/0BUILD

@@ -3,7 +3,6 @@
 <gwbuild>
 
   <subdirs>
-    n00
     n06
     n11
     n12
@@ -12,6 +11,10 @@
     n16
     n17
     n18
+    n19
+    n20
+    n21
+    n22
     r02
     x03
   </subdirs>

avr/devices/n00/0BUILD

@@ -2,7 +2,7 @@
 
 <gwbuild>
 
-  <target type="AvrHexFile" name="n00_main" >
+  <target type="AvrHexFile" name="n00_firmware" >
 
     <includes type="avrasm" >
       -I $(builddir)

avr/devices/n00/n00_boot.asm

@@ -12,7 +12,7 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
-.include "n00_defs.asm"
+.include "./n00_defs.asm"
 .include "defs_all.asm"
 
 

avr/devices/n00/n00_defs.asm

@@ -50,14 +50,10 @@
 .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_TXD_DDR        = DDRA
+.equ COM_DATA_DDR       = DDRA
-.equ COM_TXD_DATA       = PORTA
+.equ COM_DATA_INPUT     = PINA
-.equ COM_TXD_PIN        = PORTA1
+.equ COM_DATA_OUTPUT    = PORTA
-
+.equ COM_DATA_PIN       = PORTA1
-.equ COM_RXD_DDR        = DDRA
-.equ COM_RXD_INPUT      = PINA
-.equ COM_RXD_OUTPUT     = PORTA
-.equ COM_RXD_PIN        = PORTA1
 
 .equ COM_ATTN_DDR       = DDRA
 .equ COM_ATTN_INPUT     = PINA

avr/devices/n00/n00_main.asm

@@ -29,7 +29,7 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
-.include "n00_defs.asm"
+.include "./n00_defs.asm"
 .include "defs_all.asm"
 
 

avr/devices/n06/n06_boot.asm

@@ -12,7 +12,7 @@
 .include "include/tn84def.inc" ; Define device ATtiny84
 .list
 
-.include "n06_defs.asm"
+.include "./n06_defs.asm"
 .include "defs_all.asm"
 
 
@@ -79,8 +79,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 6, 4                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n06/n06_defs.asm

@@ -30,6 +30,10 @@
 .equ FIRMWARE_VARIANT_BOOT        = 0
 .equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
 
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 6
+.equ DEVICEINFO_REVISION = 4
+
 
 
 
@@ -50,14 +54,10 @@
 .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_TXD_DDR        = DDRA
+.equ COM_DATA_DDR       = DDRA
-.equ COM_TXD_DATA       = PORTA
+.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_TXD_PIN        = PORTA1
+.equ COM_DATA_INPUT     = PINA
-
+.equ COM_DATA_PIN       = PORTA1
-.equ COM_RXD_DDR        = DDRA
-.equ COM_RXD_INPUT      = PINA
-.equ COM_RXD_OUTPUT     = PORTA
-.equ COM_RXD_PIN        = PORTA1
 
 .equ COM_ATTN_DDR       = DDRA
 .equ COM_ATTN_INPUT     = PINA

avr/devices/n06/n06_main.asm

@@ -112,8 +112,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 6, 4                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n11/n11_boot.asm

@@ -79,8 +79,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 11, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n11/n11_defs.asm

@@ -30,6 +30,10 @@
 .equ FIRMWARE_VARIANT_BOOT        = 0
 .equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
 
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 11
+.equ DEVICEINFO_REVISION = 0
+
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n11/n11_main.asm

@@ -123,8 +123,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 11, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n12/n12_boot.asm

@@ -80,8 +80,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 12, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n12/n12_defs.asm

@@ -30,6 +30,10 @@
 .equ FIRMWARE_VARIANT_BOOT        = 0
 .equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
 
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 12
+.equ DEVICEINFO_REVISION = 0
+
 
 ; ---------------------------------------------------------------------------
 ; LED module
@@ -48,14 +52,10 @@
 .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_TXD_DDR        = DDRA
+.equ COM_DATA_DDR       = DDRA
-.equ COM_TXD_DATA       = PORTA
+.equ COM_DATA_OUTPUT    = PORTA
-.equ COM_TXD_PIN        = PORTA0
+.equ COM_DATA_INPUT     = PINA
-
+.equ COM_DATA_PIN       = PORTA0
-.equ COM_RXD_DDR        = DDRA
-.equ COM_RXD_INPUT      = PINA
-.equ COM_RXD_OUTPUT     = PORTA
-.equ COM_RXD_PIN        = PORTA0
 
 .equ COM_ATTN_DDR       = DDRA
 .equ COM_ATTN_INPUT     = PINA

avr/devices/n12/n12_main.asm

@@ -107,8 +107,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 12, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n14/n14_boot.asm

@@ -76,8 +76,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 14, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n14/n14_defs.asm

@@ -27,6 +27,10 @@
 .equ FIRMWARE_VARIANT_BOOT        = 0
 .equ FIRMWARE_VARIANT_LEDSTRIPS   = 1
 
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 14
+.equ DEVICEINFO_REVISION = 0
+
 
 ; ---------------------------------------------------------------------------
 ; LED module

avr/devices/n14/n14_main.asm

@@ -103,8 +103,8 @@
 	
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 14, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_LEDSTRIPS, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n15/n15_boot.asm

@@ -79,8 +79,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 15, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n15/n15_defs.asm

@@ -30,6 +30,10 @@
 .equ FIRMWARE_VARIANT_BOOT        = 0
 .equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
 
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 15
+.equ DEVICEINFO_REVISION = 0
+
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n15/n15_main.asm

@@ -118,8 +118,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 15, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n16/n16_boot.asm

@@ -79,8 +79,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 16, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n16/n16_defs.asm

@@ -30,6 +30,10 @@
 .equ FIRMWARE_VARIANT_BOOT        = 0
 .equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
 
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 16
+.equ DEVICEINFO_REVISION = 0
+
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n16/n16_main.asm

@@ -122,8 +122,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 16, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n17/n17_boot.asm

@@ -79,8 +79,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 17, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n17/n17_defs.asm

@@ -30,6 +30,10 @@
 .equ FIRMWARE_VARIANT_BOOT        = 0
 .equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
 
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 17
+.equ DEVICEINFO_REVISION = 0
+
 
 
 ; ---------------------------------------------------------------------------

avr/devices/n17/n17_main.asm

@@ -115,8 +115,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 17, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n18/boot.asm

@@ -76,8 +76,8 @@
 
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 18, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n18/defs.asm

@@ -28,6 +28,11 @@
 .equ FIRMWARE_VARIANT_MAIN        = 1
 
 
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 18
+.equ DEVICEINFO_REVISION = 0
+
+
 ; ---------------------------------------------------------------------------
 ; LED module
 

avr/devices/n18/main.asm

@@ -98,8 +98,8 @@
 	
 devInfoBlock:        ; 12 bytes
 devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
-devInfoId:           .db 'N', 0
+devInfoId:           .db DEVICEINFO_ID, 0
-devInfoVersion:      .db 18, 0                 ; version, revision
+devInfoVersion:      .db DEVICEINFO_VERSION, DEVICEINFO_REVISION             ; version, revision
 firmwareVersion:     .db FIRMWARE_VARIANT_MAIN, FIRMWARE_VERSION_MAJOR
                      .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
 

avr/devices/n19/.gitignore

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

avr/devices/n19/0BUILD

@@ -0,0 +1,52 @@
+<?xml?>
+
+<gwbuild>
+
+  <target type="AvrHexFile" name="firmware" >
+
+    <includes type="avrasm" >
+      -I $(builddir)
+      -I $(srcdir)
+      -I $(topsrcdir)/avr
+      -I $(topbuilddir)/avr
+    </includes>
+
+
+    <sources type="avrasm" >
+      main.asm
+    </sources>
+
+
+  </target>
+
+
+
+  <target type="AvrHexFile" name="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>
+    defs.asm
+  </extradist>
+  
+
+</gwbuild>
+
+

avr/devices/n19/boot.asm

@@ -0,0 +1,124 @@
+; ***************************************************************************
+; Source file for base system node on AtTiny 85
+;
+; 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/tn85def.inc" ; Define device ATtiny85
+.list
+
+.include "./defs.asm"
+.include "defs_all.asm"
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; generic
+
+.include "common/utils_wait.asm"
+.include "modules/com2/defs.asm"
+.include "modules/comproto/defs.asm"
+
+
+; ---------------------------------------------------------------------------
+; firmware settings
+
+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
+; ---------------------------------------------------------------------------
+; LED
+
+.equ LED_DDR             = DDRB
+.equ LED_PORT            = PORTB
+.equ LED_PIN             = PINB
+.equ LED_PINNUM          = PORTB3
+
+
+
+; ***************************************************************************
+; 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/flash/proto.asm
+
+
+
+
+; ***************************************************************************
+; includes
+
+.include "modules/uart_bitbang/bytelevel.asm"
+.include "modules/uart_bitbang/packetlevel.asm"
+.include "modules/com2/crc.asm"
+.include "common/crc8.asm"
+.include "common/utils_wait_fixed.asm"
+.include "common/utils_copy_from_flash.asm"
+.include "common/utils_copy_sdram.asm"
+.include "modules/flash/bootloader.asm"
+.include "modules/flash/flash.asm"
+.include "modules/flash/recv.asm"
+.include "modules/flash/send.asm"
+.include "modules/flash/wait.asm"
+.include "modules/flash/hdl_flash_start.asm"
+.include "modules/flash/hdl_flash_data.asm"
+.include "modules/flash/hdl_flash_end.asm"
+.include "modules/flash/flash_rsp.asm"
+.include "modules/flash/flash_ready.asm"
+
+
+
+

avr/devices/n19/defs.asm

@@ -0,0 +1,103 @@
+; ***************************************************************************
+; copyright   : (C) 2024 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.   *
+; ***************************************************************************
+
+; ***************************************************************************
+;
+;                                 AtTiny85
+;                                 --------
+;                     /RESET PB5  1      8  VCC
+;                        LED PB3  2      7  PB2  TWI-SDA
+;                   COM-DATA PB4  3      6  PB1  TWI-SCL
+;                            GND  4      5  PB0  COM-ATTN [PCINT0]
+;                                 --------
+;
+; ***************************************************************************
+
+
+
+.equ BOOTLOADER_ADDR = 0xd00
+
+
+.equ FIRMWARE_VARIANT_BOOT        = 0
+.equ FIRMWARE_VARIANT_MAIN        = 1
+
+
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 19
+.equ DEVICEINFO_REVISION = 0
+
+
+; ---------------------------------------------------------------------------
+; LED module
+
+.equ LED_SIMPLE_ONTIME  = 2
+.equ LED_SIMPLE_OFFTIME = 50
+.equ LED_SIMPLE_DDR     = DDRB
+.equ LED_SIMPLE_PORT    = PORTB
+.equ LED_SIMPLE_PINNUM  = PORTB3
+
+
+
+; ---------------------------------------------------------------------------
+; 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       = DDRB
+.equ COM_DATA_INPUT     = PINB
+.equ COM_DATA_OUTPUT    = PORTB
+.equ COM_DATA_PIN       = PORTB4
+
+.equ COM_ATTN_DDR       = DDRB
+.equ COM_ATTN_INPUT     = PINB
+.equ COM_ATTN_OUTPUT    = PORTB
+.equ COM_ATTN_PIN       = PORTB0
+
+.equ COM_IRQ_ADDR_ATTN   = PCMSK
+.equ COM_IRQ_BIT_ATTN    = PCINT0       ; bit 0 in PCMSK0 (PCINT0)
+.equ COM_IRQ_GIFR_ATTN   = PCIF
+.equ COM_IRQ_GIMSK_ATTN  = PCIE
+
+
+
+; ---------------------------------------------------------------------------
+; TWI master module
+
+;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
+.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
+
+.equ TWI_DDR_SCL          = DDRB
+.equ TWI_PORT_SCL         = PORTB
+.equ TWI_PIN_SCL          = PINB
+.equ TWI_PINNUM_SCL       = PORTB1
+
+.equ TWI_DDR_SDA          = DDRB
+.equ TWI_PORT_SDA         = PORTB
+.equ TWI_PIN_SDA          = PINB
+.equ TWI_PINNUM_SDA       = PORTB2
+
+
+
+; ---------------------------------------------------------------------------
+; SI 7021
+
+.equ SI7021_ADDR          = 0x40
+
+
+
+; ---------------------------------------------------------------------------
+; CCS 811
+;
+
+.equ CCS811_ADDR = 0x5a ; or 0x5b
+
+
+
+

avr/devices/n19/main.asm

@@ -0,0 +1,379 @@
+; ***************************************************************************
+; copyright   : (C) 2024 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 85
+;
+; This is for the full system (i.e. not the boot loader).
+; ***************************************************************************
+
+.equ clock=1000000 ; Define the clock frequency
+
+
+
+.nolist
+.include "include/tn85def.inc" ; Define device ATtiny85
+.list
+
+.include "./defs.asm"
+.include "defs_all.asm"
+.include "common/utils_wait.asm" ; wait macro
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; 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_COM
+#define MODULES_COM_WITH_ADDR_PROTO
+#define MODULES_LED_SIMPLE
+#define MODULES_TWI_MASTER
+#define MODULES_SI7021
+#define MODULES_STATS
+; #define MODULES_OWI_MASTER
+; #define MODULES_DS18B20
+; #define MODULES_SK6812
+; #define MODULES_MOTION_LIGHT
+
+; #define COM_ACCEPT_ALL_DEST
+#define MODULES_CCS811
+
+
+
+; ---------------------------------------------------------------------------
+; defines for modules
+
+.equ VALUE_ID_SI7021_TEMP  = 0x01
+.equ VALUE_ID_SI7021_HUM   = 0x02
+
+.equ VALUE_ID_CO2          = 0x07
+.equ VALUE_ID_TVOC         = 0x08
+
+.equ VALUE_ID_DEBUG        = 0x7f
+
+
+; ***************************************************************************
+; code segment
+
+.cseg
+.org 000000
+
+
+
+; ---------------------------------------------------------------------------
+; Reset and interrupt vectors
+
+        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
+	reti ; EXT_INT0
+	rjmp uartBitbangIsrPcint0 ; 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_MAIN, FIRMWARE_VERSION_MAJOR
+                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
+
+firmwareStart:   rjmp main
+
+
+; ***************************************************************************
+; includes
+
+.include "common/utils.asm"
+.include "common/utils_wait_fixed.asm"
+.include "common/utils_copy_from_flash.asm"
+.include "common/utils_copy_sdram.asm"
+.include "common/crc8.asm"
+
+.include "modules/basetimer/main.asm"
+
+#ifdef MODULES_TIMER
+  .include "modules/timer/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"
+  #ifdef MODULES_STATS
+    .include "modules/comproto/msg_recvstats.asm"
+    .include "modules/comproto/msg_sendstats.asm"
+    .include "modules/comproto/msg_sysstats.asm"
+    .include "modules/comproto/msg_memstats.asm"
+  #endif
+  .include "modules/comproto/msg_pong.asm"
+  .include "modules/comproto/msg_value.asm"
+  .include "modules/comproto/msg_device.asm"
+  .include "modules/comproto/msg_reboot.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"
+  #endif
+#endif
+#ifdef MODULES_STATS
+  .include "modules/stats/main.asm"
+#endif
+#ifdef MODULES_TWI_MASTER
+  .include "modules/twimaster/main.asm"
+#endif
+#ifdef MODULES_OWI_MASTER
+  .include "modules/owimaster/main.asm"
+#endif
+#ifdef MODULES_SI7021
+  .include "modules/si7021/main.asm"
+#endif
+#ifdef MODULES_DS18B20
+  .include "modules/ds18b20/main.asm"
+#endif
+#ifdef MODULES_SK6812
+  .include "modules/sk6812/main.asm"
+#endif
+#ifdef MODULES_MOTION_LIGHT
+  .include "modules/ma_light/main.asm"
+#endif
+
+#ifdef MODULES_CCS811
+  .include "modules/ccs811/main.asm"
+#endif
+
+
+; ***************************************************************************
+; data in SRAM
+
+.dseg
+
+
+#ifdef MODULES_SI7021
+  sramTimerSI7021Measure:      .byte 2
+  sramTimerSI7021SendTemp:     .byte 2
+  sramTimerSI7021SendHumidity: .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
+
+
+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_DS18B20
+  .dw sramDs18b20Timer,            Ds18b20_OnTimer,            0,                   300    ; every 30s
+  .dw sramSendDs18b20TempTimer,    sendDs18b20Temp,            TIMER_FLAGS_IF_ADDR, 600    ; every 60s
+#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_CCS811
+  .dw sramCcs811Timer,             CCS811_OnTimer,             0,                   10     ; every 1s
+#endif
+  .dw 0 ; end of list
+
+
+
+
+
+.include "main_all.asm"
+
+
+; ---------------------------------------------------------------------------
+; Called early on system startup. No arguments, no results.
+
+systemSetSpeed:
+.if clock == 1000000
+  ldi r16, (1<<CLKPCE)
+  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
+  out CLKPR, r16
+  out CLKPR, r17
+.endif
+
+.if clock == 8000000
+  ldi r16, (1<<CLKPCE)
+  ldi r17, 0
+  out CLKPR, r16
+  out CLKPR, r17
+.endif
+  ret
+
+
+
+; ---------------------------------------------------------------------------
+; Called just before rebooting to bootloader. No arguments, no results.
+
+systemSetBootSpeed:
+  ldi r16, (1<<CLKPCE)
+  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
+  out CLKPR, r16
+  out CLKPR, r17
+  ret
+
+
+
+; ---------------------------------------------------------------------------
+; Called on first time run, i.e. on system start. No arguments, no results.
+
+onSystemStart:
+  ret
+
+
+#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_LIGHT
+  rcall MotionLight_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:
+  ; get msg code
+  adiw xh:xl, COM2_MSG_OFFS_CMD
+  ld r16, x
+  sbiw xh:xl, COM2_MSG_OFFS_CMD
+
+#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
+
+
+
+#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
+

avr/devices/n20/.gitignore

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

avr/devices/n20/0BUILD

@@ -0,0 +1,53 @@
+<?xml?>
+
+<gwbuild>
+
+  <target type="AvrHexFile" name="n20_firmware" >
+
+    <includes type="avrasm" >
+      -I $(builddir)
+      -I $(srcdir)
+      -I $(topsrcdir)/avr
+      -I $(topbuilddir)/avr
+    </includes>
+
+
+    <sources type="avrasm" >
+      main.asm
+    </sources>
+
+
+  </target>
+
+
+
+  <target type="AvrHexFile" name="n20_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>
+    defs.asm
+    README
+  </extradist>
+  
+
+</gwbuild>
+
+

avr/devices/n20/README

@@ -0,0 +1,13 @@
+
+N20
+===
+
+- Role: Air quality and climate sensors
+- MCU: AtTiny84
+- Connection: RJ45
+- Periphery:
+  - PIR sensor (AMN31112)
+  - TWI interface
+    - SI7021 temperature and humidity sensor
+    - CCS811 air quality sensor
+  

avr/devices/n20/boot.asm

@@ -0,0 +1,162 @@
+; ***************************************************************************
+; 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 "./defs.asm"
+.include "defs_all.asm"
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; generic
+
+.include "common/utils_wait.asm"
+.include "modules/com2/defs.asm"
+.include "modules/comproto/defs.asm"
+
+
+
+; ---------------------------------------------------------------------------
+; firmware settings
+
+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
+
+; ---------------------------------------------------------------------------
+; 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 start ; Reset vector
+  rjmp main ; Reset vector
+  reti ; EXT_INT0
+  reti ; PCI0
+  reti ; PCI1
+  reti ; WATCHDOG
+  reti ; ICP1
+  reti ; OC1A
+  reti ; OC1B
+  reti ; OVF1
+  reti ; OC0A
+  reti ; OC0B
+  reti ; OVF0
+  reti ; ACI
+  reti ; ADCC
+  reti ; ERDY
+  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/flash/proto.asm
+
+
+
+
+; ***************************************************************************
+; includes
+
+.include "modules/uart_bitbang/bytelevel.asm"
+.include "modules/uart_bitbang/packetlevel.asm"
+.include "modules/com2/crc.asm"
+.include "common/crc8.asm"
+.include "common/utils_wait_fixed.asm"
+.include "common/utils_copy_from_flash.asm"
+.include "common/utils_copy_sdram.asm"
+.include "modules/flash/bootloader.asm"
+.include "modules/flash/flash.asm"
+.include "modules/flash/recv.asm"
+.include "modules/flash/send.asm"
+.include "modules/flash/wait.asm"
+.include "modules/flash/hdl_flash_start.asm"
+.include "modules/flash/hdl_flash_data.asm"
+.include "modules/flash/hdl_flash_end.asm"
+.include "modules/flash/flash_rsp.asm"
+.include "modules/flash/flash_ready.asm"
+
+
+#if 0
+debugStop:
+  cli
+  sbi LED_SIMPLE_DDR, LED_SIMPLE_PINNUM  ; out
+  cbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; on
+  
+  cbi COM_ATTN_DDR, COM_ATTN_PIN          ; set ATTN port as input
+  cbi COM_ATTN_OUTPUT, COM_ATTN_PIN       ; disable internal pullup for ATTN
+  
+  ldi r18, 0
+test_loop1:
+    ldi r16, 100
+test_loop2:
+      ldi r17, 100
+test_loop3:
+        Utils_WaitNanoSecs 10000, 0, r22
+        dec r17
+      brne test_loop3
+      dec r16
+    brne test_loop2
+    sbi LED_SIMPLE_PORTIN, LED_SIMPLE_PINNUM ; toggle
+    inc r18
+    mov r19, r18
+    andi r19, 1
+    brne test1
+    sbi COM_ATTN_DDR, COM_ATTN_PIN
+    cbi COM_ATTN_OUTPUT, COM_ATTN_PIN
+    rjmp test_loop1
+test1:
+    cbi COM_ATTN_DDR, COM_ATTN_PIN
+    cbi COM_ATTN_OUTPUT, COM_ATTN_PIN
+    
+  rjmp test_loop1
+#endif
+
+  
+

avr/devices/n20/defs.asm

@@ -0,0 +1,127 @@
+; ***************************************************************************
+; copyright   : (C) 2023 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
+;                            PB0  2     13  PA0  AUX-A0
+;                  PIR       PB1  3     12  PA1  COM-DATA
+;                  /RESET    PB3  4     11  PA2
+;                  AUX-B2    PB2  5     10  PA3  LED
+;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
+;                  TWI-SDA   PA6  7      8  PA5
+;                                 --------
+;
+; ***************************************************************************
+
+
+
+.equ BOOTLOADER_ADDR = 0xd00
+
+.equ FIRMWARE_VARIANT_BOOT        = 0
+.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
+
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 20
+.equ DEVICEINFO_REVISION = 0
+
+
+
+; ---------------------------------------------------------------------------
+; LED module
+
+.equ LED_SIMPLE_ONTIME  = 1     ; shorter
+.equ LED_SIMPLE_OFFTIME = 50    ; longer
+.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
+.equ COM_IRQ_GIFR_ATTN   = PCIF0
+.equ COM_IRQ_GIMSK_ATTN  = PCIE0
+
+
+
+; ---------------------------------------------------------------------------
+; TWI master module
+
+;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
+.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
+
+.equ TWI_DDR_SCL          = DDRA
+.equ TWI_PORT_SCL         = PORTA
+.equ TWI_PIN_SCL          = PINA
+.equ TWI_PINNUM_SCL       = PORTA4
+
+.equ TWI_DDR_SDA          = DDRA
+.equ TWI_PORT_SDA         = PORTA
+.equ TWI_PIN_SDA          = PINA
+.equ TWI_PINNUM_SDA       = PORTA6
+
+
+
+; ---------------------------------------------------------------------------
+; LCD module
+
+.equ LCD_TWI_ADDRESS      = 0x3c
+
+
+
+; ---------------------------------------------------------------------------
+; SI 7021
+
+.equ SI7021_ADDR          = 0x40
+
+
+
+; ---------------------------------------------------------------------------
+; 1-Wire Master
+;
+
+.equ OWI_DDR     = DDRB
+.equ OWI_PORTOUT = PORTB
+.equ OWI_PORTIN  = PINB
+.equ OWI_PINNUM  = PORTB2
+
+
+
+; ---------------------------------------------------------------------------
+; Motion Sensor
+;
+
+.equ MOTION_DDR       = DDRB
+.equ MOTION_INPUT     = PINB
+.equ MOTION_OUTPUT    = PORTB
+.equ MOTION_PIN       = PORTB1
+
+
+

avr/devices/n20/main.asm

@@ -0,0 +1,462 @@
+; ***************************************************************************
+; copyright   : (C) 2024 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 temperature sensor node on AtTiny 84
+;
+; This is for the full system (i.e. not the boot loader).
+;
+; All definitions and changes should go into this file.
+;
+;
+; ***************************************************************************
+
+
+.equ clock=1000000 ; Define the clock frequency
+;.equ clock=8000000 ; Define the clock frequency
+
+
+
+.nolist
+.include "include/tn84def.inc" ; Define device ATtiny84
+.list
+
+.include "./defs.asm"
+.include "defs_all.asm"
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; generic
+
+
+.include "common/utils_wait.asm"
+
+
+; ---------------------------------------------------------------------------
+; 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_COM
+#define MODULES_COM_WITH_ADDR_PROTO
+#define MODULES_LED_SIMPLE
+#define MODULES_TWI_MASTER
+;#define MODULES_LCD
+#define LCD_MINIMAL_FONT
+#define MODULES_SI7021
+#define MODULES_STATS
+;#define MODULES_OWI_MASTER
+;#define MODULES_DS18B20
+#define MODULES_MOTION
+
+; ---------------------------------------------------------------------------
+; defines for values
+
+.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_MOTION       = 0x07
+
+.equ VALUE_ID_CO2          = 0x08
+.equ VALUE_ID_TVOC         = 0x09
+
+;.equ VALUE_ID_REED_CONF    = 0x81
+
+
+
+; ***************************************************************************
+; code segment
+
+.cseg
+.org 000000
+
+
+
+; ---------------------------------------------------------------------------
+; Reset and interrupt vectors (will be removed as soon as we can flash data over COM)
+
+;	rjmp main ; Reset vector
+        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
+	reti ; EXT_INT0
+	rjmp uartBitbangIsrPcint0 ; PCI0
+	reti ; PCI1
+	reti ; WATCHDOG
+	reti ; ICP1
+	reti ; OC1A
+	reti ; OC1B
+	reti ; OVF1
+        rjmp baseTimerIrqOC0A ; OC0A
+	reti ; OC0B
+	reti ; OVF0
+	reti ; ACI
+        reti ; ADCC
+	reti ; ERDY
+	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_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
+                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
+
+firmwareStart:   rjmp main
+
+
+; ***************************************************************************
+; includes
+
+.include "common/utils.asm"
+.include "common/utils_wait_fixed.asm"
+.include "common/utils_copy_from_flash.asm"
+.include "common/utils_copy_sdram.asm"
+.include "common/crc8.asm"
+
+.include "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
+
+; 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
+
+
+; ***************************************************************************
+; data in FLASH
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; timer list
+
+
+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
+  .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/.gitignore

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

avr/devices/n21/0BUILD

@@ -0,0 +1,53 @@
+<?xml?>
+
+<gwbuild>
+
+  <target type="AvrHexFile" name="n21_firmware" >
+
+    <includes type="avrasm" >
+      -I $(builddir)
+      -I $(srcdir)
+      -I $(topsrcdir)/avr
+      -I $(topbuilddir)/avr
+    </includes>
+
+
+    <sources type="avrasm" >
+      main.asm
+    </sources>
+
+
+  </target>
+
+
+
+  <target type="AvrHexFile" name="n21_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>
+    defs.asm
+    README
+  </extradist>
+  
+
+</gwbuild>
+
+

avr/devices/n21/README

@@ -0,0 +1,13 @@
+
+N21
+===
+
+- Role: Door sensor with temp and motion detection
+- MCU: AtTiny84
+- Connection: RJ45
+- Periphery:
+  - PIR sensor (AMN31112)
+  - door sensor (TCRT1000)
+  - TWI interface
+    - SI7021 temperature and humidity sensor
+    

avr/devices/n21/boot.asm

@@ -0,0 +1,162 @@
+; ***************************************************************************
+; 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 "./defs.asm"
+.include "defs_all.asm"
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; generic
+
+.include "common/utils_wait.asm"
+.include "modules/com2/defs.asm"
+.include "modules/comproto/defs.asm"
+
+
+
+; ---------------------------------------------------------------------------
+; firmware settings
+
+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
+
+; ---------------------------------------------------------------------------
+; 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 start ; Reset vector
+  rjmp main ; Reset vector
+  reti ; EXT_INT0
+  reti ; PCI0
+  reti ; PCI1
+  reti ; WATCHDOG
+  reti ; ICP1
+  reti ; OC1A
+  reti ; OC1B
+  reti ; OVF1
+  reti ; OC0A
+  reti ; OC0B
+  reti ; OVF0
+  reti ; ACI
+  reti ; ADCC
+  reti ; ERDY
+  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/flash/proto.asm
+
+
+
+
+; ***************************************************************************
+; includes
+
+.include "modules/uart_bitbang/bytelevel.asm"
+.include "modules/uart_bitbang/packetlevel.asm"
+.include "modules/com2/crc.asm"
+.include "common/crc8.asm"
+.include "common/utils_wait_fixed.asm"
+.include "common/utils_copy_from_flash.asm"
+.include "common/utils_copy_sdram.asm"
+.include "modules/flash/bootloader.asm"
+.include "modules/flash/flash.asm"
+.include "modules/flash/recv.asm"
+.include "modules/flash/send.asm"
+.include "modules/flash/wait.asm"
+.include "modules/flash/hdl_flash_start.asm"
+.include "modules/flash/hdl_flash_data.asm"
+.include "modules/flash/hdl_flash_end.asm"
+.include "modules/flash/flash_rsp.asm"
+.include "modules/flash/flash_ready.asm"
+
+
+#if 0
+debugStop:
+  cli
+  sbi LED_SIMPLE_DDR, LED_SIMPLE_PINNUM  ; out
+  cbi LED_SIMPLE_PORT, LED_SIMPLE_PINNUM ; on
+  
+  cbi COM_ATTN_DDR, COM_ATTN_PIN          ; set ATTN port as input
+  cbi COM_ATTN_OUTPUT, COM_ATTN_PIN       ; disable internal pullup for ATTN
+  
+  ldi r18, 0
+test_loop1:
+    ldi r16, 100
+test_loop2:
+      ldi r17, 100
+test_loop3:
+        Utils_WaitNanoSecs 10000, 0, r22
+        dec r17
+      brne test_loop3
+      dec r16
+    brne test_loop2
+    sbi LED_SIMPLE_PORTIN, LED_SIMPLE_PINNUM ; toggle
+    inc r18
+    mov r19, r18
+    andi r19, 1
+    brne test1
+    sbi COM_ATTN_DDR, COM_ATTN_PIN
+    cbi COM_ATTN_OUTPUT, COM_ATTN_PIN
+    rjmp test_loop1
+test1:
+    cbi COM_ATTN_DDR, COM_ATTN_PIN
+    cbi COM_ATTN_OUTPUT, COM_ATTN_PIN
+    
+  rjmp test_loop1
+#endif
+
+  
+

avr/devices/n21/defs.asm

@@ -0,0 +1,127 @@
+; ***************************************************************************
+; copyright   : (C) 2023 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
+;                            PB0  2     13  PA0  AUX-A0
+;                  PIR       PB1  3     12  PA1  COM-DATA
+;                  /RESET    PB3  4     11  PA2
+;                  AUX-B2    PB2  5     10  PA3  LED
+;                  COM_ATTN  PA7  6      9  PA4  TWI-SCL
+;                  TWI-SDA   PA6  7      8  PA5
+;                                 --------
+;
+; ***************************************************************************
+
+
+
+.equ BOOTLOADER_ADDR = 0xd00
+
+.equ FIRMWARE_VARIANT_BOOT        = 0
+.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
+
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 21
+.equ DEVICEINFO_REVISION = 0
+
+
+
+; ---------------------------------------------------------------------------
+; LED module
+
+.equ LED_SIMPLE_ONTIME  = 1     ; shorter
+.equ LED_SIMPLE_OFFTIME = 50    ; longer
+.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
+.equ COM_IRQ_GIFR_ATTN   = PCIF0
+.equ COM_IRQ_GIMSK_ATTN  = PCIE0
+
+
+
+; ---------------------------------------------------------------------------
+; TWI master module
+
+;.equ TWI_BIT_LENGTH = 10000 ; 100000 and 200000 works for display: 10000, 100000, 200000
+.equ TWI_BIT_LENGTH = 1 ; 10, 100, 500, 100000 and 200000 works for display: 10000, 100000, 200000
+
+.equ TWI_DDR_SCL          = DDRA
+.equ TWI_PORT_SCL         = PORTA
+.equ TWI_PIN_SCL          = PINA
+.equ TWI_PINNUM_SCL       = PORTA4
+
+.equ TWI_DDR_SDA          = DDRA
+.equ TWI_PORT_SDA         = PORTA
+.equ TWI_PIN_SDA          = PINA
+.equ TWI_PINNUM_SDA       = PORTA6
+
+
+
+; ---------------------------------------------------------------------------
+; LCD module
+
+.equ LCD_TWI_ADDRESS      = 0x3c
+
+
+
+; ---------------------------------------------------------------------------
+; SI 7021
+
+.equ SI7021_ADDR          = 0x40
+
+
+
+; ---------------------------------------------------------------------------
+; 1-Wire Master
+;
+
+.equ OWI_DDR     = DDRB
+.equ OWI_PORTOUT = PORTB
+.equ OWI_PORTIN  = PINB
+.equ OWI_PINNUM  = PORTB2
+
+
+
+; ---------------------------------------------------------------------------
+; Motion Sensor
+;
+
+.equ MOTION_DDR       = DDRB
+.equ MOTION_INPUT     = PINB
+.equ MOTION_OUTPUT    = PORTB
+.equ MOTION_PIN       = PORTB1
+
+
+

avr/devices/n21/main.asm

@@ -0,0 +1,459 @@
+; ***************************************************************************
+; copyright   : (C) 2024 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 temperature sensor node on AtTiny 84
+;
+; This is for the full system (i.e. not the boot loader).
+;
+; All definitions and changes should go into this file.
+;
+;
+; ***************************************************************************
+
+
+.equ clock=1000000 ; Define the clock frequency
+;.equ clock=8000000 ; Define the clock frequency
+
+
+
+.nolist
+.include "include/tn84def.inc" ; Define device ATtiny84
+.list
+
+.include "./defs.asm"
+.include "defs_all.asm"
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; generic
+
+
+.include "common/utils_wait.asm"
+
+
+; ---------------------------------------------------------------------------
+; 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_COM
+#define MODULES_COM_WITH_ADDR_PROTO
+#define MODULES_LED_SIMPLE
+#define MODULES_TWI_MASTER
+;#define MODULES_LCD
+#define LCD_MINIMAL_FONT
+#define MODULES_SI7021
+#define MODULES_STATS
+;#define MODULES_OWI_MASTER
+;#define MODULES_DS18B20
+#define MODULES_MOTION
+
+; ---------------------------------------------------------------------------
+; defines for values
+
+.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_MOTION       = 0x07
+
+;.equ VALUE_ID_REED_CONF    = 0x81
+
+
+
+; ***************************************************************************
+; code segment
+
+.cseg
+.org 000000
+
+
+
+; ---------------------------------------------------------------------------
+; Reset and interrupt vectors (will be removed as soon as we can flash data over COM)
+
+;	rjmp main ; Reset vector
+        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
+	reti ; EXT_INT0
+	rjmp uartBitbangIsrPcint0 ; PCI0
+	reti ; PCI1
+	reti ; WATCHDOG
+	reti ; ICP1
+	reti ; OC1A
+	reti ; OC1B
+	reti ; OVF1
+        rjmp baseTimerIrqOC0A ; OC0A
+	reti ; OC0B
+	reti ; OVF0
+	reti ; ACI
+        reti ; ADCC
+	reti ; ERDY
+	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_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
+                     .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
+
+firmwareStart:   rjmp main
+
+
+; ***************************************************************************
+; includes
+
+.include "common/utils.asm"
+.include "common/utils_wait_fixed.asm"
+.include "common/utils_copy_from_flash.asm"
+.include "common/utils_copy_sdram.asm"
+.include "common/crc8.asm"
+
+.include "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
+
+; 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
+
+
+; ***************************************************************************
+; data in FLASH
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; timer list
+
+
+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
+  .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/n22/.gitignore

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

avr/devices/n22/0BUILD

@@ -0,0 +1,53 @@
+<?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>
+
+
+
+  <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>
+    defs.asm
+    README
+  </extradist>
+  
+
+</gwbuild>
+
+

avr/devices/n22/README

@@ -0,0 +1,13 @@
+
+N22
+===
+
+- Role: LED strip controller
+- MCU: AtTiny85
+- Connection: RJ45
+- Periphery:
+  - LED strip connection (SK6812)
+  - OWI interface
+    - DS18B20 temperature sensor
+- Modules:
+  - MA_LIGHT: motion activated light

avr/devices/n22/boot.asm

@@ -0,0 +1,124 @@
+; ***************************************************************************
+; Source file for base system node on AtTiny 85
+;
+; 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/tn85def.inc" ; Define device ATtiny85
+.list
+
+.include "./defs.asm"
+.include "defs_all.asm"
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; generic
+
+.include "common/utils_wait.asm"
+.include "modules/com2/defs.asm"
+.include "modules/comproto/defs.asm"
+
+
+; ---------------------------------------------------------------------------
+; firmware settings
+
+.equ FIRMWARE_VERSION_MAJOR       = 0
+.equ FIRMWARE_VERSION_MINOR       = 0
+.equ FIRMWARE_VERSION_PATCHLEVEL  = 1
+
+
+; ---------------------------------------------------------------------------
+; LED
+
+.equ LED_DDR             = DDRB
+.equ LED_PORT            = PORTB
+.equ LED_PIN             = PINB
+.equ LED_PINNUM          = PORTB4
+
+
+
+; ***************************************************************************
+; 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/flash/proto.asm
+
+
+
+
+; ***************************************************************************
+; includes
+
+.include "modules/uart_bitbang/bytelevel.asm"
+.include "modules/uart_bitbang/packetlevel.asm"
+.include "modules/com2/crc.asm"
+.include "common/crc8.asm"
+.include "common/utils_wait_fixed.asm"
+.include "common/utils_copy_from_flash.asm"
+.include "common/utils_copy_sdram.asm"
+.include "modules/flash/bootloader.asm"
+.include "modules/flash/flash.asm"
+.include "modules/flash/recv.asm"
+.include "modules/flash/send.asm"
+.include "modules/flash/wait.asm"
+.include "modules/flash/hdl_flash_start.asm"
+.include "modules/flash/hdl_flash_data.asm"
+.include "modules/flash/hdl_flash_end.asm"
+.include "modules/flash/flash_rsp.asm"
+.include "modules/flash/flash_ready.asm"
+
+
+
+

avr/devices/n22/defs.asm

@@ -0,0 +1,87 @@
+; ***************************************************************************
+; copyright   : (C) 2024 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.   *
+; ***************************************************************************
+
+; ***************************************************************************
+;
+;                                 AtTiny85
+;                                 --------
+;                     /RESET PB5  1      8  VCC
+;                        OWI PB3  2      7  PB2  COM-ATTN
+;                        LED PB4  3      6  PB1  COM-DATA
+;                            GND  4      5  PB0  LEDSTRIP
+;                                 --------
+;
+; ***************************************************************************
+
+
+
+.equ BOOTLOADER_ADDR = 0xd00
+
+
+.equ FIRMWARE_VARIANT_BOOT        = 0
+.equ FIRMWARE_VARIANT_LEDSTRIPS   = 1
+
+.equ DEVICEINFO_ID       = 'N'
+.equ DEVICEINFO_VERSION  = 22
+.equ DEVICEINFO_REVISION = 0
+
+
+; ---------------------------------------------------------------------------
+; LED module
+
+.equ LED_SIMPLE_ONTIME  = 1
+.equ LED_SIMPLE_OFFTIME = 50
+.equ LED_SIMPLE_DDR     = DDRB
+.equ LED_SIMPLE_PORT    = PORTB
+.equ LED_SIMPLE_PINNUM  = PORTB4
+
+
+
+; ---------------------------------------------------------------------------
+; 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       = DDRB
+.equ COM_DATA_INPUT     = PINB
+.equ COM_DATA_OUTPUT    = PORTB
+.equ COM_DATA_PIN       = PORTB1
+
+.equ COM_ATTN_DDR       = DDRB
+.equ COM_ATTN_INPUT     = PINB
+.equ COM_ATTN_OUTPUT    = PORTB
+.equ COM_ATTN_PIN       = PORTB2
+
+.equ COM_IRQ_ADDR_ATTN   = PCMSK
+.equ COM_IRQ_BIT_ATTN    = PCINT2       ; bit 2 in PCMSK0 (PCINT2)
+.equ COM_IRQ_GIFR_ATTN   = PCIF
+.equ COM_IRQ_GIMSK_ATTN  = PCIE
+
+
+
+; ---------------------------------------------------------------------------
+; 1-Wire Master
+;
+
+.equ OWI_DDR     = DDRB
+.equ OWI_PORTOUT = PORTB
+.equ OWI_PORTIN  = PINB
+.equ OWI_PINNUM  = PORTB3
+
+
+; ---------------------------------------------------------------------------
+; SK6812
+
+.equ SK6812_DDR    = DDRB
+.equ SK6812_PORT   = PORTB
+.equ SK6812_PINNUM = PORTB0
+
+
+

avr/devices/n22/main.asm

@@ -0,0 +1,333 @@
+; ***************************************************************************
+; copyright   : (C) 2024 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 85
+;
+; This is for the full system (i.e. not the boot loader).
+; ***************************************************************************
+
+.equ clock=8000000 ; Define the clock frequency
+
+
+
+.nolist
+.include "include/tn85def.inc" ; Define device ATtiny85
+.list
+
+.include "./defs.asm"
+.include "defs_all.asm"
+.include "common/utils_wait.asm" ; wait macro
+
+
+
+; ***************************************************************************
+; defines
+
+; ---------------------------------------------------------------------------
+; 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_COM
+#define MODULES_COM_WITH_ADDR_PROTO
+#define MODULES_LED_SIMPLE
+#define MODULES_STATS
+#define MODULES_OWI_MASTER
+#define MODULES_DS18B20
+#define MODULES_SK6812
+#define MODULES_MOTION_LIGHT
+
+; #define COM_ACCEPT_ALL_DEST
+
+
+
+; ---------------------------------------------------------------------------
+; 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
+
+
+; ***************************************************************************
+; code segment
+
+.cseg
+.org 000000
+
+
+
+; ---------------------------------------------------------------------------
+; Reset and interrupt vectors
+
+        rjmp BOOTLOADER_ADDR ; Reset vector  ; use this for flashed system
+	reti ; EXT_INT0
+	rjmp uartBitbangIsrPcint0 ; 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
+
+firmwareStart:   rjmp main
+
+
+; ***************************************************************************
+; includes
+
+.include "common/utils.asm"
+.include "common/utils_wait_fixed.asm"
+.include "common/utils_copy_from_flash.asm"
+.include "common/utils_copy_sdram.asm"
+.include "common/crc8.asm"
+
+.include "modules/basetimer/main.asm"
+
+#ifdef MODULES_TIMER
+  .include "modules/timer/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"
+  #ifdef MODULES_STATS
+    .include "modules/comproto/msg_recvstats.asm"
+    .include "modules/comproto/msg_sendstats.asm"
+    .include "modules/comproto/msg_sysstats.asm"
+    .include "modules/comproto/msg_memstats.asm"
+  #endif
+  .include "modules/comproto/msg_pong.asm"
+  .include "modules/comproto/msg_value.asm"
+  .include "modules/comproto/msg_device.asm"
+  .include "modules/comproto/msg_reboot.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"
+  #endif
+#endif
+#ifdef MODULES_STATS
+  .include "modules/stats/main.asm"
+#endif
+#ifdef MODULES_OWI_MASTER
+  .include "modules/owimaster/main.asm"
+#endif
+#ifdef MODULES_DS18B20
+  .include "modules/ds18b20/main.asm"
+#endif
+#ifdef MODULES_SK6812
+  .include "modules/sk6812/main.asm"
+#endif
+#ifdef MODULES_MOTION_LIGHT
+  .include "modules/ma_light/main.asm"
+#endif
+
+
+; ***************************************************************************
+; data in SRAM
+
+.dseg
+
+
+#ifdef MODULES_DS18B20
+  sramDs18b20Timer:            .byte 2
+  sramSendDs18b20TempTimer:    .byte 2
+#endif
+
+
+; ***************************************************************************
+; data in FLASH
+
+.cseg
+
+
+
+; ---------------------------------------------------------------------------
+; timer list
+
+
+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_DS18B20
+  .dw sramDs18b20Timer,            Ds18b20_OnTimer,            0,                   300    ; every 30s
+  .dw sramSendDs18b20TempTimer,    sendDs18b20Temp,            TIMER_FLAGS_IF_ADDR, 600    ; every 60s
+#endif
+  .dw 0 ; end of list
+
+
+
+
+
+.include "main_all.asm"
+
+
+; ---------------------------------------------------------------------------
+; Called early on system startup. No arguments, no results.
+
+systemSetSpeed:
+.if clock == 1000000
+  ldi r16, (1<<CLKPCE)
+  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
+  out CLKPR, r16
+  out CLKPR, r17
+.endif
+
+.if clock == 8000000
+  ldi r16, (1<<CLKPCE)
+  ldi r17, 0
+  out CLKPR, r16
+  out CLKPR, r17
+.endif
+  ret
+
+
+
+; ---------------------------------------------------------------------------
+; Called just before rebooting to bootloader. No arguments, no results.
+
+systemSetBootSpeed:
+  ldi r16, (1<<CLKPCE)
+  ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
+  out CLKPR, r16
+  out CLKPR, r17
+  ret
+
+
+
+; ---------------------------------------------------------------------------
+; Called on first time run, i.e. on system start. No arguments, no results.
+
+onSystemStart:
+  ret
+
+
+#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_LIGHT
+  rcall MotionLight_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:
+  ; get msg code
+  adiw xh:xl, COM2_MSG_OFFS_CMD
+  ld r16, x
+  sbiw xh:xl, COM2_MSG_OFFS_CMD
+
+#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/r02/0BUILD

@@ -2,7 +2,7 @@
 
 <gwbuild>
 
-  <target type="AvrHexFile" name="r02_main" >
+  <target type="AvrHexFile" name="r02_firmware" >
 
     <includes type="avrasm" >
       -I $(builddir)
@@ -13,7 +13,7 @@
 
 
     <sources type="avrasm" >
-      r02_main.asm
+      main.asm
     </sources>
 
 
@@ -32,7 +32,7 @@
 
 
     <sources type="avrasm" >
-      r02_boot.asm
+      boot.asm
     </sources>
 
 
@@ -43,7 +43,7 @@
   </subdirs>
 
   <extradist>
-    r02_defs.asm
+    defs.asm
   </extradist>
   
 

avr/devices/r02/boot.asm

@@ -12,8 +12,8 @@
 .include "include/tn841def.inc" ; Define device ATtiny841
 .list
 
-.include "r02_defs.asm"
+.include "./defs.asm"
-.include "defs.asm"
+.include "defs_all.asm"
 
 
 

avr/devices/r02/main.asm

@@ -27,10 +27,10 @@
 
 
 .nolist
-.include "include/tn841def.inc" ; Define device ATtiny84
+.include "include/tn841def.inc" ; Define device ATtiny841
 .list
 
-.include "r02_defs.asm"
+.include "./defs.asm"
 .include "defs_all.asm"
 
 

avr/devices/x03/ccs811/main.asm

@@ -58,6 +58,11 @@
 ; ---------------------------------------------------------------------------
 ; defines for modules
 
+.equ VALUE_ID_CO2          = 0x07
+.equ VALUE_ID_TVOC         = 0x08
+
+.equ VALUE_ID_DEBUG        = 0x7f
+
 ;.equ VALUE_ID_SI7021_TEMP    = 0x01
 ;.equ VALUE_ID_SI7021_HUM     = 0x02
 

avr/devices/x03/uart/main.asm

@@ -209,12 +209,12 @@ systemSetSpeed:
 
 
 systemSetBootSpeed:
-.if clock == 8000000
+;.if clock == 8000000
   ldi r16, (1<<CLKPCE)
   ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
   out CLKPR, r16
   out CLKPR, r17
-.endif
+;.endif
   ret
 
 

avr/include/0BUILD

@@ -182,6 +182,7 @@
     tn5def.inc
     tn84Adef.inc
     tn84def.inc
+    tn841def.inc
     tn85def.inc
     tn861Adef.inc
     tn861def.inc

avr/modules/0BUILD

@@ -25,6 +25,7 @@
     timer
     twimaster
     uart_bitbang
+    uart_irq
   </subdirs>
 
 </gwbuild>

avr/modules/com2/0BUILD

@@ -6,9 +6,7 @@
     buffer.asm
     crc.asm
     defs.asm
-    lowlevel.asm
     main.asm
-    packets.asm
     screen.asm
   </extradist>
 

avr/modules/flash/flash.asm

@@ -162,10 +162,10 @@ Flash_WritePage:
 ; REGS: R16
 
 flashDoSpm:
-wait:                ; wait for possibly previous SPM to complete
+flashDoSpm_wait:                ; wait for possibly previous SPM to complete
     in r16, SPMCSR
     sbrc r16, SPMEN
-  rjmp wait
+  rjmp flashDoSpm_wait
   ; SPM timed sequence
   out SPMCSR, r20
   spm

avr/modules/uart_bitbang/0BUILD

@@ -3,8 +3,10 @@
 <gwbuild>
 
   <extradist>
-    main.asm
     bytelevel.asm
+    defs.asm
+    main.asm
+    packetlevel.asm
   </extradist>
 
 </gwbuild>

avr/modules/uart_irq/0BUILD

@@ -0,0 +1,14 @@
+<?xml?>
+
+<gwbuild>
+
+  <extradist>
+    defs.asm
+    iface.asm
+    iface1.asm
+    iface2.asm
+  </extradist>
+
+</gwbuild>
+
+

avr/modules/uart_irq/iface.asm

@@ -229,20 +229,17 @@ uart_irq_JumpToStateFunction:
   push xh
 uart_irq_JumpToStateFunction_end:
   ret ; indirect jump to address we just pushed to the stack
-; @end
-
-
-
 uart_irq_state_jumptable:
-  rjmp uart_irq_handle_idle
+  rjmp uart_irq_handle_idle            ; (R16)
-  rjmp uart_irq_handle_waitforattnhigh
+  rjmp uart_irq_handle_waitforattnhigh ; (R16)
-  rjmp uart_irq_handle_waitforstartbit
+  rjmp uart_irq_handle_waitforstartbit ; (R16)
-  rjmp uart_irq_handle_waitfordatabit
+  rjmp uart_irq_handle_waitfordatabit  ; (R16)
-  rjmp uart_irq_handle_waitforstopbit
+  rjmp uart_irq_handle_waitforstopbit  ; (R16, R17, X)
-  rjmp uart_irq_handle_sendingattn
+  rjmp uart_irq_handle_sendingattn     ; (R16)
-  rjmp uart_irq_handle_sendingstartbit
+  rjmp uart_irq_handle_sendingstartbit ; (R16, R17, X)
-  rjmp uart_irq_handle_sendingdatabit
+  rjmp uart_irq_handle_sendingdatabit  ; (R16)
-  rjmp uart_irq_handle_sendingstopbit
+  rjmp uart_irq_handle_sendingstopbit  ; (R16)
+; @end
 
 
 ; ---------------------------------------------------------------------------
@@ -717,13 +714,31 @@ uart_irq_timer_init:                           ; setup timer for IRQ every 52/4
 ; Settings for clock 8Mhz
 ; use timer0 with prescaler 1, OCR0A=104-1 (irq every 13us)
 ;
+.if clock == 8000000
+
   ldi r16, (0<<CS02) | (0<<CS01) | (1<<CS00)  ; Prescaler 1
   out TCCR0B, r16
-
 ;  ldi r16, 52-1                    ; set timer for 8 times baudrate (fixed to 19200 for now)
   ldi r16, 104-1                    ; set timer for 4 times baudrate (fixed to 19200 for now)
 ;  ldi r16, 208-1                   ; set timer for 2 times baudrate (fixed to 19200 for now)
   out OCR0A, r16
+.endif
+
+
+;
+; Settings for clock 16Mhz
+; use timer0 with prescaler 1, OCR0A=208-1 (irq every 13us)
+; alternative:    prescaler 8, OCR0A=26-1  (irq every 13us)
+;
+.if clock == 16000000
+  ldi r16, (0<<CS02) | (0<<CS01) | (1<<CS00)  ; Prescaler 1
+  out TCCR0B, r16
+
+  ldi r16, 208-1                   ; set timer for 4 times baudrate (fixed to 19200 for now)
+  out OCR0A, r16
+.endif
+
+
 
   ldi r16, (1<<OCF0A)             ; clear pending interrupts
 .ifdef TIFR0

devices/nodes/0BUILD

@@ -10,6 +10,8 @@
     aqua_n16.xml
     aqua_n17.xml
     aqua_n18.xml
+    aqua_n19.xml
+    aqua_n20.xml
   </data>
 
 </gwbuild>

devices/nodes/aqua_n19.xml

@@ -0,0 +1,14 @@
+
+<device name="aqua_n19" driver="nodes">
+  <manufacturer>AQUA</manufacturer>
+  <devicetype>N</devicetype>
+  <deviceversion>19</deviceversion>
+  
+  <values>
+    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="CCS811_CO2"   id="0x07" type="sensor" dataType="rational" modality="co2"         units="ppm" denom="1" />
+    <value name="CCS811_TVOC"  id="0x08" type="sensor" dataType="rational" modality="tvoc"        units="ppb" denom="1" />
+  </values>
+
+</device>

devices/nodes/aqua_n20.xml

@@ -0,0 +1,15 @@
+
+<device name="aqua_n20" driver="nodes">
+  <manufacturer>AQUA</manufacturer>
+  <devicetype>N</devicetype>
+  <deviceversion>20</deviceversion>
+  
+  <values>
+    <value name="SI7021_TEMP"  id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
+    <value name="SI7021_HUM"   id="0x02" type="sensor" dataType="rational" modality="humidity"    units="%" denom="1" />
+    <value name="MOTION"       id="0x07" type="sensor" dataType="rational" modality="motion"                denom="1" />
+    <value name="CCS811_CO2"   id="0x08" type="sensor" dataType="rational" modality="co2"         units="ppm" denom="1" />
+    <value name="CCS811_TVOC"  id="0x09" type="sensor" dataType="rational" modality="tvoc"        units="ppb" denom="1" />
+  </values>
+
+</device>