From 3b916facf468e87a56f707188a62a59e7d387711 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Sat, 6 Sep 2025 00:38:43 +0200 Subject: [PATCH] avr: added device n28. --- avr/devices/0BUILD | 2 + avr/devices/n28/.gitignore | 2 + avr/devices/n28/0BUILD | 21 ++++ avr/devices/n28/README | 13 ++ avr/devices/n28/aqua_n28.xml | 17 +++ avr/devices/n28/boot/0BUILD | 32 +++++ avr/devices/n28/boot/boot.asm | 129 ++++++++++++++++++++ avr/devices/n28/defs.asm | 131 ++++++++++++++++++++ avr/devices/n28/main/0BUILD | 34 ++++++ avr/devices/n28/main/data.asm | 14 +++ avr/devices/n28/main/main.asm | 221 ++++++++++++++++++++++++++++++++++ 11 files changed, 616 insertions(+) create mode 100644 avr/devices/n28/.gitignore create mode 100644 avr/devices/n28/0BUILD create mode 100644 avr/devices/n28/README create mode 100644 avr/devices/n28/aqua_n28.xml create mode 100644 avr/devices/n28/boot/0BUILD create mode 100644 avr/devices/n28/boot/boot.asm create mode 100644 avr/devices/n28/defs.asm create mode 100644 avr/devices/n28/main/0BUILD create mode 100644 avr/devices/n28/main/data.asm create mode 100644 avr/devices/n28/main/main.asm diff --git a/avr/devices/0BUILD b/avr/devices/0BUILD index be0570c..81d626e 100644 --- a/avr/devices/0BUILD +++ b/avr/devices/0BUILD @@ -33,10 +33,12 @@ n25 n26 n27 + n28 r05 r06 s03 t03 + t04 diff --git a/avr/devices/n28/.gitignore b/avr/devices/n28/.gitignore new file mode 100644 index 0000000..8e0618c --- /dev/null +++ b/avr/devices/n28/.gitignore @@ -0,0 +1,2 @@ +*.eep.hex +*.obj diff --git a/avr/devices/n28/0BUILD b/avr/devices/n28/0BUILD new file mode 100644 index 0000000..a2d9bae --- /dev/null +++ b/avr/devices/n28/0BUILD @@ -0,0 +1,21 @@ + + + + + + boot + main + + + + defs.asm + README + + + + aqua_n28.xml + + + + + diff --git a/avr/devices/n28/README b/avr/devices/n28/README new file mode 100644 index 0000000..c6733c4 --- /dev/null +++ b/avr/devices/n28/README @@ -0,0 +1,13 @@ + +N28 +=== + +- Role: Door sensor with temp sensor +- MCU: AtTiny84 +- Connection: RJ45 +- Predecessor: N21, N16 +- Periphery: + - door sensor (TCRT1000) + - TWI interface + - SI7021 temperature and humidity sensor + \ No newline at end of file diff --git a/avr/devices/n28/aqua_n28.xml b/avr/devices/n28/aqua_n28.xml new file mode 100644 index 0000000..700fa28 --- /dev/null +++ b/avr/devices/n28/aqua_n28.xml @@ -0,0 +1,17 @@ + + + AQUA + N + 28 + + + + + + + + + + + + diff --git a/avr/devices/n28/boot/0BUILD b/avr/devices/n28/boot/0BUILD new file mode 100644 index 0000000..95d031c --- /dev/null +++ b/avr/devices/n28/boot/0BUILD @@ -0,0 +1,32 @@ + + + + + + + + -I $(builddir) + -I $(srcdir) + -I $(topsrcdir)/avr + -I $(topbuilddir)/avr + + + + + boot.asm + + + + + + + + + + + + + + + + diff --git a/avr/devices/n28/boot/boot.asm b/avr/devices/n28/boot/boot.asm new file mode 100644 index 0000000..cd8ec3e --- /dev/null +++ b/avr/devices/n28/boot/boot.asm @@ -0,0 +1,129 @@ +; *************************************************************************** +; Source file for base system node on AtTiny 84 +; +; This is for the maintenance system (i.e. the flash loader). +; +; All definitions and changes should go into this file. +; *************************************************************************** + +.equ clock=1000000 ; Define the clock frequency + +.nolist +.include "include/tn84def.inc" ; Define device ATtiny84 +.list + +.include "version.asm" +.include "../defs.asm" +.include "devices/all/defs.asm" + +.include "common/calls.asm" +.include "common/utils_io.asm" +.include "common/utils_wait.asm" + + + +; *************************************************************************** +; defines + + +; --------------------------------------------------------------------------- +; 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_com2w.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" + + +systemSetSpeed: +.if clock == 8000000 + ldi r16, (1< + + + + + + + -I $(builddir) + -I $(srcdir) + -I $(topsrcdir)/avr + -I $(topbuilddir)/avr + + + + + main.asm + + + + + + + + + + + + data.asm + + + + + + diff --git a/avr/devices/n28/main/data.asm b/avr/devices/n28/main/data.asm new file mode 100644 index 0000000..31ccc2f --- /dev/null +++ b/avr/devices/n28/main/data.asm @@ -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 + + diff --git a/avr/devices/n28/main/main.asm b/avr/devices/n28/main/main.asm new file mode 100644 index 0000000..39a6848 --- /dev/null +++ b/avr/devices/n28/main/main.asm @@ -0,0 +1,221 @@ +; *************************************************************************** +; 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 "version.asm" +.include "../defs.asm" +.include "./data.asm" + +.include "devices/all/defs.asm" +.include "common/calls.asm" +.include "common/utils_io.asm" +.include "common/utils_wait.asm" + + + +; *************************************************************************** +; defines + +; --------------------------------------------------------------------------- +; generic + +.equ NET_BUFFERS_NUM = 10 +.equ NET_MSGNUMINBUF_SIZE = 8 ; max buffer nums in ringbuffer (global incoming) +.equ NET_IFACE_OUTMSGBUF_SIZE = 8 ; max buffer nums in ringbuffer (per interface outbound) + + + + +; --------------------------------------------------------------------------- +; firmware settings including list of modules used + +; #define MODULES_TIMER +#define MODULES_CLOCK +;#define MODULES_LED_SIMPLE +#define MODULES_LED_ACTIVITY +#define MODULES_NETWORK +#define MODULES_COM2W +#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 +#define MODULES_TCRT1000 +;#define MODULES_CCS811 + +#define APPS_NETWORK +;#define APPS_MOTION +#define APPS_DOOR +#define APPS_REPORTSENSORS +#define APPS_STATS + + + +; --------------------------------------------------------------------------- +; 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_TCRT1K = 0x08 + +;.equ VALUE_ID_REED_CONF = 0x81 + +.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 com2wPcintIsr ; 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: +onEveryHour: +onEveryDay: + ret +; @end + + + +onEveryMinute: +; lds r16, tcrt1kLastValue +; ldi r17, VALUE_ID_ADC +; ldi r22, AQHOME_VALUETYPE_UNKNOWN ; VALUE TYPE +; rcall Main_Send8BitValueReport + ret + + + +; --------------------------------------------------------------------------- +; @routine onEveryLoop +; +; Called on every loop (i.e. after awakening from sleep). +; +onEveryLoop: + ret +; @end + + + + + +; *************************************************************************** +; includes + +.include "devices/all/hw_tn84.asm" +.include "devices/all/includes.asm" + + + +; --------------------------------------------------------------------------- +; defines for network interface + +.equ netInterfaceData = com2w_iface + +