martin/aqhomecontrol
Public Access
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avr: adapted to latest changes.

Browse Source
This commit is contained in:
Martin Preuss
2024-09-05 03:28:05 +02:00
parent b56947dcba
commit c73fede935
4 changed files with 4 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
avr/defs.asm
View File

@@ -15,26 +15,10 @@
.equ AQHOME_VALUETYPE_DOOR = 3 .equ AQHOME_VALUETYPE_DOOR = 3
; module type ids for firmware header
.equ AQHOME_FW_MODULE_TIMER = 1
.equ AQHOME_FW_MODULE_COM = 2
.equ AQHOME_FW_MODULE_LED = 3
.equ AQHOME_FW_MODULE_TWIMASTER = 4
.equ AQHOME_FW_MODULE_LCD = 5
.equ AQHOME_FW_MODULE_SI7021 = 6
.equ AQHOME_FW_MODULE_STATS = 7
.equ AQHOME_FW_MODULE_CNY70 = 8
.equ AQHOME_FW_MODULE_REED = 9
.equ AQHOME_FW_TYPE_ATT84_BASE = 0 .equ AQHOME_FW_TYPE_ATT84_BASE = 0
.equ AQHOME_FW_TYPE_ATT84_TEMP1 = 1 .equ AQHOME_FW_TYPE_ATT84_TEMP1 = 1
;.equ AQHOME_FW_START_ADDRESS_MAIN = 0x0500
.equ AQHOME_BOOTLOADER_ADDR = 0xd00
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; EEPROM positions ; EEPROM positions

3
avr/devices/n11/n11_boot.asm
View File

@@ -144,7 +144,8 @@ main:
.include "modules/com2/packets.asm" .include "modules/com2/packets.asm"
.include "common/crc8.asm" .include "common/crc8.asm"
.include "common/utils_wait_fixed.asm" .include "common/utils_wait_fixed.asm"
.include "common/utils_copy.asm" .include "common/utils_copy_from_flash.asm"
.include "common/utils_copy_sdram.asm"
.include "modules/flash/bootloader.asm" .include "modules/flash/bootloader.asm"
.include "modules/flash/flash.asm" .include "modules/flash/flash.asm"
.include "modules/flash/recv.asm" .include "modules/flash/recv.asm"

37
avr/devices/n11/n11_main.asm
View File

@@ -56,10 +56,6 @@
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; firmware settings including list of modules used ; firmware settings including list of modules used
#define FW_TYPE AQHOME_FW_TYPE_ATT84_TEMP1
#define FW_VERSION 0x0001
#define MODULES_TIMER #define MODULES_TIMER
#define MODULES_COM #define MODULES_COM
#define MODULES_COM_WITH_ADDR_PROTO #define MODULES_COM_WITH_ADDR_PROTO
@@ -72,36 +68,6 @@
#define MODULES_REED #define MODULES_REED
.set MODULES_MASK = 0
#ifdef MODULES_TIMER
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_TIMER)
#endif
#ifdef MODULES_COM
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_COM)
#endif
#ifdef MODULES_LED
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_LED)
#endif
#ifdef MODULES_TWI_MASTER
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_TWIMASTER)
#endif
#ifdef MODULES_LCD
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_LCD)
#endif
#ifdef MODULES_SI7021
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_SI7021)
#endif
#ifdef MODULES_STATS
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_STATS)
#endif
#ifdef MODULES_CNY70
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_CNY70)
#endif
#ifdef MODULES_REED
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_REED)
#endif
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; defines for modules ; defines for modules
@@ -262,7 +228,8 @@ firmwareStart: rjmp main
.include "common/utils.asm" .include "common/utils.asm"
.include "common/utils_wait_fixed.asm" .include "common/utils_wait_fixed.asm"
.include "common/utils_copy.asm" .include "common/utils_copy_from_flash.asm"
.include "common/utils_copy_sdram.asm"
.include "common/crc8.asm" .include "common/crc8.asm"
#ifdef MODULES_TIMER #ifdef MODULES_TIMER

35
avr/devices/n12/n12_main.asm
View File

@@ -56,10 +56,6 @@
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; firmware settings including list of modules used ; firmware settings including list of modules used
#define FW_TYPE AQHOME_FW_TYPE_ATT84_TEMP1
#define FW_VERSION 0x0001
#define MODULES_TIMER #define MODULES_TIMER
#define MODULES_COM #define MODULES_COM
#define MODULES_COM_WITH_ADDR_PROTO #define MODULES_COM_WITH_ADDR_PROTO
@@ -72,37 +68,6 @@
#define MODULES_REED #define MODULES_REED
.set MODULES_MASK = 0
#ifdef MODULES_TIMER
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_TIMER)
#endif
#ifdef MODULES_COM
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_COM)
#endif
#ifdef MODULES_LED
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_LED)
#endif
#ifdef MODULES_TWI_MASTER
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_TWIMASTER)
#endif
#ifdef MODULES_LCD
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_LCD)
#endif
#ifdef MODULES_SI7021
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_SI7021)
#endif
#ifdef MODULES_STATS
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_STATS)
#endif
#ifdef MODULES_CNY70
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_CNY70)
#endif
#ifdef MODULES_REED
.set MODULES_MASK = MODULES_MASK | (1<<AQHOME_FW_MODULE_REED)
#endif
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; defines for modules ; defines for modules