added missing files, n26, increased firmware version.
This commit is contained in:
3
0BUILD
3
0BUILD
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
<gwbuild>
|
<gwbuild>
|
||||||
|
|
||||||
<project name="aqhome" version="0.0.10" so_current="0" so_age="0" so_revision="10" write_config_h="TRUE">
|
<project name="aqhome" version="0.0.11" so_current="0" so_age="0" so_revision="11" write_config_h="TRUE">
|
||||||
<setVar name="package">$(project_name)</setVar>
|
<setVar name="package">$(project_name)</setVar>
|
||||||
<setVar name="version">
|
<setVar name="version">
|
||||||
$(project_vmajor).$(project_vminor).$(project_vpatchlevel)
|
$(project_vmajor).$(project_vminor).$(project_vpatchlevel)
|
||||||
@@ -128,6 +128,7 @@
|
|||||||
</option>
|
</option>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
<checkheaders>
|
<checkheaders>
|
||||||
signal.h
|
signal.h
|
||||||
sys/stat.h
|
sys/stat.h
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
.include "./data.asm"
|
.include "./data.asm"
|
||||||
|
|
||||||
.include "devices/all/defs.asm"
|
.include "devices/all/defs.asm"
|
||||||
|
.include "common/calls.asm"
|
||||||
.include "common/utils_wait.asm"
|
.include "common/utils_wait.asm"
|
||||||
.include "common/utils_io.asm"
|
.include "common/utils_io.asm"
|
||||||
|
|
||||||
|
|||||||
13
avr/devices/n19/README
Normal file
13
avr/devices/n19/README
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
|
||||||
|
N19
|
||||||
|
===
|
||||||
|
|
||||||
|
- 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
|
||||||
|
|
||||||
@@ -12,6 +12,10 @@
|
|||||||
README
|
README
|
||||||
</extradist>
|
</extradist>
|
||||||
|
|
||||||
|
<data dist="true" install="$(datadir)/aqhome/devices/nodes">
|
||||||
|
aqua_n21.xml
|
||||||
|
</data>
|
||||||
|
|
||||||
|
|
||||||
</gwbuild>
|
</gwbuild>
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
<values>
|
<values>
|
||||||
<value name="SI7021_TEMP" id="0x01" type="sensor" dataType="rational" modality="temperature" units="C" denom="100" />
|
<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="SI7021_HUM" id="0x02" type="sensor" dataType="rational" modality="humidity" units="%" denom="1" />
|
||||||
|
<value name="ADC" id="0x03" type="sensor" dataType="uint16" denom="1" />
|
||||||
<value name="MOTION" id="0x07" type="sensor" dataType="rational" modality="motion" denom="1" />
|
<value name="MOTION" id="0x07" type="sensor" dataType="rational" modality="motion" denom="1" />
|
||||||
<value name="DOOR" id="0x08" type="sensor" dataType="rational" modality="door" denom="1" />
|
<value name="DOOR" id="0x08" type="sensor" dataType="rational" modality="door" denom="1" />
|
||||||
|
|
||||||
@@ -18,10 +19,6 @@
|
|||||||
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
||||||
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
|
||||||
<value name="stats_heap_used" id="0xe7" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
<value name="stats_heap_free" id="0xe8" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
<value name="stats_noram_errors" id="0xe9" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
|
|
||||||
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
||||||
</values>
|
</values>
|
||||||
|
|
||||||
@@ -5,6 +5,8 @@ N22
|
|||||||
- Role: LED strip controller
|
- Role: LED strip controller
|
||||||
- MCU: AtTiny85
|
- MCU: AtTiny85
|
||||||
- Connection: RJ45
|
- Connection: RJ45
|
||||||
|
- Predecessor: N16
|
||||||
|
- UART: uart_bitbang2
|
||||||
- Periphery:
|
- Periphery:
|
||||||
- LED strip connection (SK6812)
|
- LED strip connection (SK6812)
|
||||||
- OWI interface
|
- OWI interface
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ N23
|
|||||||
- Role: Air quality and climate sensors
|
- Role: Air quality and climate sensors
|
||||||
- MCU: AtTiny84
|
- MCU: AtTiny84
|
||||||
- Connection: RJ45
|
- Connection: RJ45
|
||||||
|
- Predecessor: N19
|
||||||
- Periphery:
|
- Periphery:
|
||||||
- PIR sensor (AMN31112)
|
- PIR sensor (AMN31112)
|
||||||
- TWI interface
|
- TWI interface
|
||||||
|
|||||||
@@ -20,10 +20,6 @@
|
|||||||
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
||||||
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
|
||||||
<value name="stats_heap_used" id="0xe7" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
<value name="stats_heap_free" id="0xe8" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
<value name="stats_noram_errors" id="0xe9" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
|
|
||||||
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
||||||
</values>
|
</values>
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ N24
|
|||||||
- Role: Air quality and climate sensors
|
- Role: Air quality and climate sensors
|
||||||
- MCU: AtTiny84
|
- MCU: AtTiny84
|
||||||
- Connection: RJ45
|
- Connection: RJ45
|
||||||
|
- Predecessor: N23, N19
|
||||||
- Periphery:
|
- Periphery:
|
||||||
- PIR sensor (AMN31112)
|
- PIR sensor (AMN31112)
|
||||||
- TWI interface
|
- TWI interface
|
||||||
|
|||||||
@@ -11,6 +11,7 @@
|
|||||||
<value name="SGP40_VALUE" id="0x08" type="sensor" dataType="rational" modality="tvoc" denom="1" />
|
<value name="SGP40_VALUE" id="0x08" type="sensor" dataType="rational" modality="tvoc" denom="1" />
|
||||||
<value name="SGP30_TVOC" id="0x09" type="sensor" dataType="rational" modality="tvoc" denom="1" />
|
<value name="SGP30_TVOC" id="0x09" type="sensor" dataType="rational" modality="tvoc" denom="1" />
|
||||||
<value name="SGP30_CO2" id="0x0a" type="sensor" dataType="rational" modality="co2" denom="1" />
|
<value name="SGP30_CO2" id="0x0a" type="sensor" dataType="rational" modality="co2" denom="1" />
|
||||||
|
<value name="LIGHT" id="0x0b" type="sensor" dataType="rational" modality="light" denom="1" />
|
||||||
|
|
||||||
<value name="stats_packets_in" id="0xe0" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_packets_in" id="0xe0" type="sensor" dataType="uint16" denom="1" />
|
||||||
<value name="stats_packets_out" id="0xe1" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_packets_out" id="0xe1" type="sensor" dataType="uint16" denom="1" />
|
||||||
@@ -20,10 +21,6 @@
|
|||||||
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
||||||
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
|
||||||
<value name="stats_heap_used" id="0xe7" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
<value name="stats_heap_free" id="0xe8" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
<value name="stats_noram_errors" id="0xe9" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
|
|
||||||
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
||||||
</values>
|
</values>
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@
|
|||||||
; AtTiny84
|
; AtTiny84
|
||||||
; --------
|
; --------
|
||||||
; VCC 1 14 GND
|
; VCC 1 14 GND
|
||||||
; AUX-PB0 PB0 2 13 PA0 AUX-PA0
|
; AUX-PB0 PB0 2 13 PA0 LUM
|
||||||
; PIR PB1 3 12 PA1 COM-DATA
|
; PIR PB1 3 12 PA1 COM-DATA
|
||||||
; /RESET PB3 4 11 PA2 AUX-PA2
|
; /RESET PB3 4 11 PA2 AUX-PA2
|
||||||
; PB2 5 10 PA3 LED
|
; PB2 5 10 PA3 LED
|
||||||
|
|||||||
@@ -23,10 +23,6 @@
|
|||||||
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
||||||
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
|
||||||
<value name="stats_heap_used" id="0xe7" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
<value name="stats_heap_free" id="0xe8" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
<value name="stats_noram_errors" id="0xe9" type="sensor" dataType="uint16" denom="1" />
|
|
||||||
|
|
||||||
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
||||||
</values>
|
</values>
|
||||||
|
|
||||||
|
|||||||
2
avr/devices/n26/.gitignore
vendored
Normal file
2
avr/devices/n26/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
*.eep.hex
|
||||||
|
*.obj
|
||||||
22
avr/devices/n26/0BUILD
Normal file
22
avr/devices/n26/0BUILD
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
<?xml?>
|
||||||
|
|
||||||
|
<gwbuild>
|
||||||
|
|
||||||
|
<subdirs>
|
||||||
|
boot
|
||||||
|
main
|
||||||
|
</subdirs>
|
||||||
|
|
||||||
|
<data dist="true" install="$(datadir)/aqhome/devices/nodes">
|
||||||
|
aqua_n26.xml
|
||||||
|
</data>
|
||||||
|
|
||||||
|
<extradist>
|
||||||
|
defs.asm
|
||||||
|
README
|
||||||
|
</extradist>
|
||||||
|
|
||||||
|
|
||||||
|
</gwbuild>
|
||||||
|
|
||||||
|
|
||||||
11
avr/devices/n26/README
Normal file
11
avr/devices/n26/README
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
|
||||||
|
N26
|
||||||
|
===
|
||||||
|
|
||||||
|
- Role: Air quality sensors
|
||||||
|
- MCU: AtTiny84
|
||||||
|
- Connection: RJ45
|
||||||
|
- Periphery:
|
||||||
|
- TWI interface
|
||||||
|
- SGP-30/40 air quality sensor
|
||||||
|
|
||||||
22
avr/devices/n26/aqua_n26.xml
Normal file
22
avr/devices/n26/aqua_n26.xml
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
|
||||||
|
<device name="aqua_n26" driver="nodes">
|
||||||
|
<manufacturer>AQUA</manufacturer>
|
||||||
|
<devicetype>N</devicetype>
|
||||||
|
<deviceversion>26</deviceversion>
|
||||||
|
|
||||||
|
<values>
|
||||||
|
<value name="SGP30_TVOC" id="0x09" type="sensor" dataType="rational" modality="tvoc" denom="1" />
|
||||||
|
<value name="SGP30_CO2" id="0x0a" type="sensor" dataType="rational" modality="co2" denom="1" />
|
||||||
|
|
||||||
|
<value name="stats_packets_in" id="0xe0" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
<value name="stats_packets_out" id="0xe1" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
<value name="stats_content_errors" id="0xe2" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
<value name="stats_io_errors" id="0xe3" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
<value name="stats_nobuf_errors" id="0xe4" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
<value name="stats_collision_errors" id="0xe5" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
<value name="stats_busy_errors" id="0xe6" type="sensor" dataType="uint16" denom="1" />
|
||||||
|
|
||||||
|
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
|
||||||
|
</values>
|
||||||
|
|
||||||
|
</device>
|
||||||
32
avr/devices/n26/boot/0BUILD
Normal file
32
avr/devices/n26/boot/0BUILD
Normal file
@@ -0,0 +1,32 @@
|
|||||||
|
<?xml?>
|
||||||
|
|
||||||
|
<gwbuild>
|
||||||
|
|
||||||
|
<target type="AvrHexFile" name="n26_boot" >
|
||||||
|
|
||||||
|
<includes type="avrasm" >
|
||||||
|
-I $(builddir)
|
||||||
|
-I $(srcdir)
|
||||||
|
-I $(topsrcdir)/avr
|
||||||
|
-I $(topbuilddir)/avr
|
||||||
|
</includes>
|
||||||
|
|
||||||
|
|
||||||
|
<sources type="avrasm" >
|
||||||
|
boot.asm
|
||||||
|
</sources>
|
||||||
|
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
<subdirs>
|
||||||
|
</subdirs>
|
||||||
|
|
||||||
|
<extradist>
|
||||||
|
</extradist>
|
||||||
|
|
||||||
|
|
||||||
|
</gwbuild>
|
||||||
|
|
||||||
|
|
||||||
157
avr/devices/n26/boot/boot.asm
Normal file
157
avr/devices/n26/boot/boot.asm
Normal file
@@ -0,0 +1,157 @@
|
|||||||
|
; ***************************************************************************
|
||||||
|
; copyright : (C) 2025 by Martin Preuss
|
||||||
|
; email : martin@libchipcard.de
|
||||||
|
;
|
||||||
|
; ***************************************************************************
|
||||||
|
; * This file is part of the project "AqHome". *
|
||||||
|
; * Please see toplevel file COPYING of that project for license details. *
|
||||||
|
; ***************************************************************************
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
; Source file for base system node on AtTiny 84
|
||||||
|
;
|
||||||
|
; This is for the maintenance system (i.e. the flash loader).
|
||||||
|
;
|
||||||
|
; All definitions and changes should go into this file.
|
||||||
|
; ***************************************************************************
|
||||||
|
|
||||||
|
.equ clock=1000000 ; Define the clock frequency
|
||||||
|
|
||||||
|
.nolist
|
||||||
|
.include "include/tn84def.inc" ; Define device ATtiny84
|
||||||
|
.list
|
||||||
|
|
||||||
|
.include "version.asm"
|
||||||
|
.include "../defs.asm"
|
||||||
|
|
||||||
|
.include "common/calls.asm"
|
||||||
|
.include "devices/all/defs.asm"
|
||||||
|
|
||||||
|
|
||||||
|
#define COM_ACCEPT_ALL_DEST
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
; defines
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; generic
|
||||||
|
|
||||||
|
.include "common/utils_wait.asm"
|
||||||
|
.include "modules/com2/defs.asm"
|
||||||
|
.include "modules/comproto/defs.asm"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; firmware settings
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; LED
|
||||||
|
|
||||||
|
.equ LED_DDR = DDRA
|
||||||
|
.equ LED_PORT = PORTA
|
||||||
|
.equ LED_PIN = PINA
|
||||||
|
.equ LED_PINNUM = PORTA3
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
; code segment
|
||||||
|
|
||||||
|
.cseg
|
||||||
|
.org 0x0000
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; Reset and interrupt vectors
|
||||||
|
; rjmp 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/bootloader/main.asm
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
; includes
|
||||||
|
|
||||||
|
.include "common/utils_wait_fixed.asm"
|
||||||
|
.include "common/utils_copy_from_flash.asm"
|
||||||
|
.include "common/utils_copy_sdram.asm"
|
||||||
|
|
||||||
|
.include "modules/flash/defs.asm"
|
||||||
|
.include "modules/flash/eeprom.asm"
|
||||||
|
.include "modules/flash/io.asm"
|
||||||
|
.include "modules/flash/io_attn.asm"
|
||||||
|
.include "modules/flash/io_bitbang.asm"
|
||||||
|
.include "modules/flash/flash1p.asm"
|
||||||
|
.include "modules/flash/flashxp.asm"
|
||||||
|
.include "modules/flash/flashprocess.asm"
|
||||||
|
.include "modules/flash/wait.asm"
|
||||||
|
.include "modules/bootloader/main.asm"
|
||||||
|
.include "modules/network/msg/defs.asm"
|
||||||
|
.include "modules/network/msg/crc.asm"
|
||||||
|
|
||||||
|
;.include "common/debug.asm"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
systemSetSpeed:
|
||||||
|
.if clock == 8000000
|
||||||
|
ldi r16, (1<<CLKPCE)
|
||||||
|
ldi r17, 0
|
||||||
|
out CLKPR, r16
|
||||||
|
out CLKPR, r17
|
||||||
|
.endif
|
||||||
|
|
||||||
|
.if clock == 1000000
|
||||||
|
ldi r16, (1<<CLKPCE)
|
||||||
|
ldi r17, (1<<CLKPS1) | (1<<CLKPS0)
|
||||||
|
out CLKPR, r16
|
||||||
|
out CLKPR, r17
|
||||||
|
.endif
|
||||||
|
ret
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
98
avr/devices/n26/defs.asm
Normal file
98
avr/devices/n26/defs.asm
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
; ***************************************************************************
|
||||||
|
; copyright : (C) 2025 by Martin Preuss
|
||||||
|
; email : martin@libchipcard.de
|
||||||
|
;
|
||||||
|
; ***************************************************************************
|
||||||
|
; * This file is part of the project "AqHome". *
|
||||||
|
; * Please see toplevel file COPYING of that project for license details. *
|
||||||
|
; ***************************************************************************
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
;
|
||||||
|
; AtTiny84
|
||||||
|
; --------
|
||||||
|
; VCC 1 14 GND
|
||||||
|
; PB0 2 13 PA0
|
||||||
|
; PB1 3 12 PA1 COM-DATA
|
||||||
|
; /RESET PB3 4 11 PA2
|
||||||
|
; 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 = 26
|
||||||
|
.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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; SGB 30
|
||||||
|
|
||||||
|
.equ SGP30_ADDR = 0x58
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
34
avr/devices/n26/main/0BUILD
Normal file
34
avr/devices/n26/main/0BUILD
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
<?xml?>
|
||||||
|
|
||||||
|
<gwbuild>
|
||||||
|
|
||||||
|
<target type="AvrHexFile" name="n26_firmware" >
|
||||||
|
|
||||||
|
<includes type="avrasm" >
|
||||||
|
-I $(builddir)
|
||||||
|
-I $(srcdir)
|
||||||
|
-I $(topsrcdir)/avr
|
||||||
|
-I $(topbuilddir)/avr
|
||||||
|
</includes>
|
||||||
|
|
||||||
|
|
||||||
|
<sources type="avrasm" >
|
||||||
|
main.asm
|
||||||
|
</sources>
|
||||||
|
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
<subdirs>
|
||||||
|
</subdirs>
|
||||||
|
|
||||||
|
<extradist>
|
||||||
|
data.asm
|
||||||
|
</extradist>
|
||||||
|
|
||||||
|
|
||||||
|
</gwbuild>
|
||||||
|
|
||||||
|
|
||||||
14
avr/devices/n26/main/data.asm
Normal file
14
avr/devices/n26/main/data.asm
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
; ***************************************************************************
|
||||||
|
; copyright : (C) 2025 by Martin Preuss
|
||||||
|
; email : martin@libchipcard.de
|
||||||
|
;
|
||||||
|
; ***************************************************************************
|
||||||
|
; * This file is part of the project "AqHome". *
|
||||||
|
; * Please see toplevel file COPYING of that project for license details. *
|
||||||
|
; ***************************************************************************
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
.dseg
|
||||||
|
|
||||||
|
|
||||||
210
avr/devices/n26/main/main.asm
Normal file
210
avr/devices/n26/main/main.asm
Normal file
@@ -0,0 +1,210 @@
|
|||||||
|
; ***************************************************************************
|
||||||
|
; copyright : (C) 2025 by Martin Preuss
|
||||||
|
; email : martin@libchipcard.de
|
||||||
|
;
|
||||||
|
; ***************************************************************************
|
||||||
|
; * This file is part of the project "AqHome". *
|
||||||
|
; * Please see toplevel file COPYING of that project for license details. *
|
||||||
|
; ***************************************************************************
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
; Source file for 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 "./data.asm"
|
||||||
|
|
||||||
|
.include "version.asm"
|
||||||
|
.include "devices/all/defs.asm"
|
||||||
|
.include "common/calls.asm"
|
||||||
|
.include "common/utils_wait.asm"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
; defines
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; generic
|
||||||
|
|
||||||
|
.equ NET_BUFFERS_NUM = 6
|
||||||
|
.equ NET_BUFFERS_SIZE = 32
|
||||||
|
|
||||||
|
.equ PROGRAM_SENSOR_INTERVAL_SECS = 60
|
||||||
|
.equ PROGRAM_STATS_INTERVAL_MINS = 10
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; firmware settings including list of modules used
|
||||||
|
|
||||||
|
; #define MODULES_TIMER
|
||||||
|
#define MODULES_CLOCK
|
||||||
|
#define MODULES_LED_SIMPLE
|
||||||
|
#define MODULES_NETWORK
|
||||||
|
#define MODULES_UART_BITBANG
|
||||||
|
#define MODULES_TWI_MASTER
|
||||||
|
;#define MODULES_LCD
|
||||||
|
;#define LCD_MINIMAL_FONT
|
||||||
|
;#define MODULES_SI7021
|
||||||
|
#define MODULES_SGP30
|
||||||
|
;#define MODULES_SGP40
|
||||||
|
;#define MODULES_STATS
|
||||||
|
;#define MODULES_OWI_MASTER
|
||||||
|
;#define MODULES_DS18B20
|
||||||
|
;#define MODULES_MOTION
|
||||||
|
;#define MODULES_CCS811
|
||||||
|
|
||||||
|
#define APPS_NETWORK
|
||||||
|
;#define APPS_MOTION
|
||||||
|
#define APPS_REPORTSENSORS
|
||||||
|
#define APPS_STATS
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; defines for values
|
||||||
|
|
||||||
|
.equ VALUE_ID_SGP30_TVOC = 0x09
|
||||||
|
.equ VALUE_ID_SGP30_CO2 = 0x0a
|
||||||
|
|
||||||
|
.equ VALUE_ID_DEBUG = 0x7f
|
||||||
|
|
||||||
|
.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
; 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 UART_BitBang_PcintIsr ; 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
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; @routine firmwareStart @global
|
||||||
|
|
||||||
|
firmwareStart:
|
||||||
|
rjmp main
|
||||||
|
; @end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; @routine onSystemStart
|
||||||
|
|
||||||
|
onSystemStart:
|
||||||
|
ret
|
||||||
|
; @end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; @routine onMessageReceived
|
||||||
|
;
|
||||||
|
; Called on every message received
|
||||||
|
|
||||||
|
onMessageReceived:
|
||||||
|
clc
|
||||||
|
ret
|
||||||
|
; @end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; @routine onEvery100ms
|
||||||
|
;
|
||||||
|
; Called every 100ms. Add your routine calls here. No arguments, no results.
|
||||||
|
|
||||||
|
onEvery100ms:
|
||||||
|
onEverySecond:
|
||||||
|
onEveryMinute:
|
||||||
|
onEveryHour:
|
||||||
|
onEveryDay:
|
||||||
|
ret
|
||||||
|
; @end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; @routine onEveryLoop
|
||||||
|
;
|
||||||
|
; Called on every loop (i.e. after awakening from sleep).
|
||||||
|
;
|
||||||
|
onEveryLoop:
|
||||||
|
ret
|
||||||
|
; @end
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ***************************************************************************
|
||||||
|
; includes
|
||||||
|
|
||||||
|
.include "devices/all/hw_tn84.asm"
|
||||||
|
.include "devices/all/includes.asm"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
; ---------------------------------------------------------------------------
|
||||||
|
; defines for network interface
|
||||||
|
|
||||||
|
.equ netInterfaceData = uart_bitbang_iface
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -11,5 +11,5 @@
|
|||||||
|
|
||||||
.equ FIRMWARE_VERSION_MAJOR = 1
|
.equ FIRMWARE_VERSION_MAJOR = 1
|
||||||
.equ FIRMWARE_VERSION_MINOR = 0
|
.equ FIRMWARE_VERSION_MINOR = 0
|
||||||
.equ FIRMWARE_VERSION_PATCHLEVEL = 3
|
.equ FIRMWARE_VERSION_PATCHLEVEL = 4
|
||||||
|
|
||||||
|
|||||||
@@ -5,14 +5,12 @@
|
|||||||
aqua_n06.xml
|
aqua_n06.xml
|
||||||
aqua_n11.xml
|
aqua_n11.xml
|
||||||
aqua_n12.xml
|
aqua_n12.xml
|
||||||
aqua_n14.xml
|
|
||||||
aqua_n15.xml
|
aqua_n15.xml
|
||||||
aqua_n16.xml
|
aqua_n16.xml
|
||||||
aqua_n17.xml
|
aqua_n17.xml
|
||||||
aqua_n18.xml
|
aqua_n18.xml
|
||||||
aqua_n19.xml
|
aqua_n19.xml
|
||||||
aqua_n20.xml
|
aqua_n20.xml
|
||||||
aqua_n21.xml
|
|
||||||
aqua_n22.xml
|
aqua_n22.xml
|
||||||
aqua_t03.xml
|
aqua_t03.xml
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
|
|
||||||
<device name="aqua_n14" driver="nodes">
|
|
||||||
<manufacturer>AQUA</manufacturer>
|
|
||||||
<devicetype>N</devicetype>
|
|
||||||
<deviceversion>14</deviceversion>
|
|
||||||
|
|
||||||
<values>
|
|
||||||
<value name="DS18B20_TEMP" id="0x06" type="sensor" dataType="rational" modality="temperature" units="C" denom="16" />
|
|
||||||
|
|
||||||
<value name="NUMLEDS" id="0x82" type="actor" dataType="int" />
|
|
||||||
<value name="RGBWVALUE" id="0x83" type="actor" dataType="dword" />
|
|
||||||
|
|
||||||
<value name="MALRGBWVALUE" id="0x84" type="actor" dataType="dword" />
|
|
||||||
<value name="MALONTIME" id="0x85" type="actor" dataType="uint16" />
|
|
||||||
<value name="MALSOURCE1" id="0x86" type="actor" dataType="uint16" />
|
|
||||||
<value name="MALSOURCE2" id="0x87" type="actor" dataType="uint16" />
|
|
||||||
</values>
|
|
||||||
|
|
||||||
</device>
|
|
||||||
@@ -23,6 +23,13 @@ case $NODE in
|
|||||||
EFUSE_ARG="-U efuse:w:0xFF:m"
|
EFUSE_ARG="-U efuse:w:0xFF:m"
|
||||||
FILE_ARG="-U flash:w:./0-build/avr/devices/c02/boot/c02_boot.hex"
|
FILE_ARG="-U flash:w:./0-build/avr/devices/c02/boot/c02_boot.hex"
|
||||||
;;
|
;;
|
||||||
|
n14)
|
||||||
|
DEVICE_ARG="-p t85"
|
||||||
|
HFUSE_ARG="-U hfuse:w:0xD7:m"
|
||||||
|
LFUSE_ARG=""
|
||||||
|
EFUSE_ARG="-U efuse:w:0xFE:m"
|
||||||
|
FILE_ARG="-U flash:w:./0-build/avr/devices/n14/boot/n14_boot.hex"
|
||||||
|
;;
|
||||||
n16)
|
n16)
|
||||||
DEVICE_ARG="-p t84"
|
DEVICE_ARG="-p t84"
|
||||||
HFUSE_ARG="-U hfuse:w:0xD7:m"
|
HFUSE_ARG="-U hfuse:w:0xD7:m"
|
||||||
|
|||||||
Reference in New Issue
Block a user