From 8a9f74b0a1c62406bd1455e256ec8a2d00619ab7 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Tue, 14 Apr 2026 23:47:21 +0200 Subject: [PATCH] avr: fixed includes. for unknown reasons avra doesn't check #if statements correctly which are meant to protect against double includes... --- avr/devices/all/apps_include.asm | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/avr/devices/all/apps_include.asm b/avr/devices/all/apps_include.asm index 22e9f3a..60b7bac 100644 --- a/avr/devices/all/apps_include.asm +++ b/avr/devices/all/apps_include.asm @@ -27,14 +27,15 @@ #endif #ifdef APPS_NETWORK +APP_BEGIN_NETWORK: .include "apps/network/main.asm" .include "modules/network/msg/reboot-d.asm" .include "modules/network/msg/reboot-r.asm" .include "modules/network/msg/pong-w.asm" .include "modules/network/msg/range-d.asm" .include "modules/network/msg/range-r.asm" -.include "common/eeprom-r.asm" -.include "common/eeprom-w.asm" +APP_END_NETWORK: +.equ APP_SIZE_NETWORK = APP_END_NETWORK-APP_BEGIN_NETWORK #endif #ifdef APPS_ROUTER @@ -45,8 +46,6 @@ .include "modules/network/msg/range-d.asm" .include "modules/network/msg/range-r.asm" .include "modules/network/msg/range-w.asm" -.include "common/eeprom-r.asm" -.include "common/eeprom-w.asm" #endif #ifdef APPS_HUB @@ -57,8 +56,6 @@ .include "modules/network/msg/range-d.asm" .include "modules/network/msg/range-r.asm" .include "modules/network/msg/range-w.asm" -.include "common/eeprom-r.asm" -.include "common/eeprom-w.asm" #endif #ifdef APPS_FORWARDER @@ -89,8 +86,6 @@ .include "apps/ma_light/data.asm" .include "apps/ma_light/main.asm" .include "apps/ma_light/recv.asm" -;.include "common/eeprom-r.asm" -;.include "common/eeprom-w.asm" #endif