From dbf7f76baad3bfb78d77fd79e8b157a436221a3a Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Thu, 29 May 2025 20:26:43 +0200 Subject: [PATCH] moved versions to a dedicated file shared by all nodes. --- avr/devices/c01/main/main.asm | 6 +----- avr/devices/n16/boot/boot.asm | 7 ++----- avr/devices/n16/main/main.asm | 6 +----- avr/devices/n21/boot/boot.asm | 5 +---- avr/devices/n21/main/main.asm | 6 +----- avr/devices/n22/boot/boot.asm | 6 ++---- avr/devices/n22/main/main.asm | 6 +----- avr/devices/n23/boot/boot.asm | 7 ++----- avr/devices/n23/main/main.asm | 6 +----- avr/devices/n24/boot/boot.asm | 7 ++----- avr/devices/n24/main/main.asm | 6 +----- avr/devices/n25/boot/boot.asm | 6 ++---- avr/devices/n25/main/main.asm | 5 +---- avr/devices/t03/main/main.asm | 8 +++----- avr/version.asm | 15 +++++++++++++++ 15 files changed, 36 insertions(+), 66 deletions(-) create mode 100644 avr/version.asm diff --git a/avr/devices/c01/main/main.asm b/avr/devices/c01/main/main.asm index ba8eb22..db18bae 100644 --- a/avr/devices/c01/main/main.asm +++ b/avr/devices/c01/main/main.asm @@ -16,6 +16,7 @@ .include "include/m8515def.inc" ; Define device ATmega8515 .list +.include "version.asm" .include "../defs.asm" .include "./data.asm" @@ -48,11 +49,6 @@ ; --------------------------------------------------------------------------- ; firmware settings including list of modules used -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - - ; #define MODULES_TIMER #define MODULES_CLOCK #define MODULES_XRAM diff --git a/avr/devices/n16/boot/boot.asm b/avr/devices/n16/boot/boot.asm index 8cb4e9f..f262502 100644 --- a/avr/devices/n16/boot/boot.asm +++ b/avr/devices/n16/boot/boot.asm @@ -12,8 +12,9 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" -.include "defs_all.asm" +.include "devices/all/defs.asm" @@ -32,10 +33,6 @@ ; --------------------------------------------------------------------------- ; firmware settings -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - ; --------------------------------------------------------------------------- diff --git a/avr/devices/n16/main/main.asm b/avr/devices/n16/main/main.asm index b0c1e34..8353e0c 100644 --- a/avr/devices/n16/main/main.asm +++ b/avr/devices/n16/main/main.asm @@ -30,6 +30,7 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" .include "devices/all/defs.asm" @@ -51,11 +52,6 @@ ; --------------------------------------------------------------------------- ; firmware settings including list of modules used -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - - #define MODULES_CLOCK #define MODULES_LED_SIMPLE #define MODULES_NETWORK diff --git a/avr/devices/n21/boot/boot.asm b/avr/devices/n21/boot/boot.asm index 589a736..791ecdf 100644 --- a/avr/devices/n21/boot/boot.asm +++ b/avr/devices/n21/boot/boot.asm @@ -12,6 +12,7 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" .include "devices/all/defs.asm" @@ -32,10 +33,6 @@ ; --------------------------------------------------------------------------- ; firmware settings -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - ; --------------------------------------------------------------------------- diff --git a/avr/devices/n21/main/main.asm b/avr/devices/n21/main/main.asm index a2e0325..7ffbd61 100644 --- a/avr/devices/n21/main/main.asm +++ b/avr/devices/n21/main/main.asm @@ -30,6 +30,7 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" .include "./data.asm" @@ -53,11 +54,6 @@ ; --------------------------------------------------------------------------- ; firmware settings including list of modules used -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - - ; #define MODULES_TIMER #define MODULES_CLOCK #define MODULES_LED_SIMPLE diff --git a/avr/devices/n22/boot/boot.asm b/avr/devices/n22/boot/boot.asm index f87b71d..646b42b 100644 --- a/avr/devices/n22/boot/boot.asm +++ b/avr/devices/n22/boot/boot.asm @@ -14,8 +14,9 @@ .include "include/tn85def.inc" ; Define device ATtiny85 .list +.include "version.asm" .include "../defs.asm" -.include "defs_all.asm" +.include "devices/all/defs.asm" @@ -33,9 +34,6 @@ ; --------------------------------------------------------------------------- ; firmware settings -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 ; --------------------------------------------------------------------------- diff --git a/avr/devices/n22/main/main.asm b/avr/devices/n22/main/main.asm index da7be3c..891587c 100644 --- a/avr/devices/n22/main/main.asm +++ b/avr/devices/n22/main/main.asm @@ -22,6 +22,7 @@ .include "include/tn85def.inc" ; Define device ATtiny85 .list +.include "version.asm" .include "../defs.asm" ;.include "./data.asm" @@ -44,11 +45,6 @@ ; --------------------------------------------------------------------------- ; firmware settings including list of modules used -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - - #define MODULES_CLOCK #define MODULES_LED_SIMPLE #define MODULES_NETWORK diff --git a/avr/devices/n23/boot/boot.asm b/avr/devices/n23/boot/boot.asm index 807f5c3..23c4f46 100644 --- a/avr/devices/n23/boot/boot.asm +++ b/avr/devices/n23/boot/boot.asm @@ -12,8 +12,9 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" -.include "defs_all.asm" +.include "devices/all/defs.asm" #define COM_ACCEPT_ALL_DEST @@ -33,10 +34,6 @@ ; --------------------------------------------------------------------------- ; firmware settings -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - ; --------------------------------------------------------------------------- diff --git a/avr/devices/n23/main/main.asm b/avr/devices/n23/main/main.asm index 297c883..66f10ca 100644 --- a/avr/devices/n23/main/main.asm +++ b/avr/devices/n23/main/main.asm @@ -30,6 +30,7 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" .include "./data.asm" @@ -55,11 +56,6 @@ ; --------------------------------------------------------------------------- ; firmware settings including list of modules used -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - - ; #define MODULES_TIMER #define MODULES_CLOCK #define MODULES_LED_SIMPLE diff --git a/avr/devices/n24/boot/boot.asm b/avr/devices/n24/boot/boot.asm index c9126f0..5777c4a 100644 --- a/avr/devices/n24/boot/boot.asm +++ b/avr/devices/n24/boot/boot.asm @@ -22,8 +22,9 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" -.include "defs_all.asm" +.include "devices/all/defs.asm" #define COM_ACCEPT_ALL_DEST @@ -45,10 +46,6 @@ ; --------------------------------------------------------------------------- ; firmware settings -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - ; --------------------------------------------------------------------------- diff --git a/avr/devices/n24/main/main.asm b/avr/devices/n24/main/main.asm index eb7cf59..ba2a829 100644 --- a/avr/devices/n24/main/main.asm +++ b/avr/devices/n24/main/main.asm @@ -33,6 +33,7 @@ .include "../defs.asm" .include "./data.asm" +.include "version.asm" .include "devices/all/defs.asm" .include "common/utils_wait.asm" @@ -55,11 +56,6 @@ ; --------------------------------------------------------------------------- ; firmware settings including list of modules used -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - - ; #define MODULES_TIMER #define MODULES_CLOCK #define MODULES_LED_SIMPLE diff --git a/avr/devices/n25/boot/boot.asm b/avr/devices/n25/boot/boot.asm index 6d8619f..4fb42c7 100644 --- a/avr/devices/n25/boot/boot.asm +++ b/avr/devices/n25/boot/boot.asm @@ -14,8 +14,9 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" -.include "defs_all.asm" +.include "devices/all/defs.asm" @@ -33,9 +34,6 @@ ; --------------------------------------------------------------------------- ; firmware settings -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 ; --------------------------------------------------------------------------- diff --git a/avr/devices/n25/main/main.asm b/avr/devices/n25/main/main.asm index 27011b0..fc98377 100644 --- a/avr/devices/n25/main/main.asm +++ b/avr/devices/n25/main/main.asm @@ -22,6 +22,7 @@ .include "include/tn84def.inc" ; Define device ATtiny84 .list +.include "version.asm" .include "../defs.asm" ;.include "./data.asm" @@ -44,10 +45,6 @@ ; --------------------------------------------------------------------------- ; firmware settings including list of modules used -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - #define MODULES_CLOCK #define MODULES_LED_SIMPLE diff --git a/avr/devices/t03/main/main.asm b/avr/devices/t03/main/main.asm index a37e92f..14b708e 100644 --- a/avr/devices/t03/main/main.asm +++ b/avr/devices/t03/main/main.asm @@ -30,8 +30,10 @@ .list .include "../defs.asm" -.include "defs_all.asm" +.include "version.asm" +;.include "defs_all.asm" +.include "devices/all/defs.asm" .include "common/utils_wait.asm" .include "common/utils_io.asm" @@ -47,10 +49,6 @@ ; --------------------------------------------------------------------------- ; firmware settings including list of modules used -.equ FIRMWARE_VERSION_MAJOR = 0 -.equ FIRMWARE_VERSION_MINOR = 0 -.equ FIRMWARE_VERSION_PATCHLEVEL = 1 - #define MAIN_WITHOUT_MSG_HANDLING ; we do message handling ourselfes diff --git a/avr/version.asm b/avr/version.asm new file mode 100644 index 0000000..bed3a46 --- /dev/null +++ b/avr/version.asm @@ -0,0 +1,15 @@ +; *************************************************************************** +; copyright : (C) 2025 by Martin Preuss +; email : martin@libchipcard.de +; +; *************************************************************************** +; * This file is part of the project "AqHome". * +; * Please see toplevel file COPYING of that project for license details. * +; *************************************************************************** + + + +.equ FIRMWARE_VERSION_MAJOR = 1 +.equ FIRMWARE_VERSION_MINOR = 0 +.equ FIRMWARE_VERSION_PATCHLEVEL = 0 +