From 5866a550674a98eb14b5da42fd2b8b4701cb6d5e Mon Sep 17 00:00:00 2001
From: Martin Preuss <martin@aquamaniac.de>
Date: Mon, 8 Sep 2025 22:05:52 +0200
Subject: [PATCH] use com2wi in S03

---
 avr/devices/s03/defs.asm      |  6 ++++++
 avr/devices/s03/main/main.asm | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/avr/devices/s03/defs.asm b/avr/devices/s03/defs.asm
index 2079869..b5712c6 100644
--- a/avr/devices/s03/defs.asm
+++ b/avr/devices/s03/defs.asm
@@ -97,6 +97,7 @@
 
 
 
+#if 0
 .equ COM_PORTS         = 8
 
 .equ COM_MASK_CLK0     = (1<<PINA0)
@@ -131,6 +132,11 @@
 .equ COM_MASK_DATA7    = (1<<PINC7)
 .equ COM_MASK_IRQ7     = (1<<PCINT7)
 
+#else
+.equ COM_MASK_CLK0     = (1<<PINA6)
+.equ COM_MASK_DATA0    = (1<<PINC6)
+.equ COM_MASK_IRQ0     = (1<<PCINT6)
+#endif
 
 
 
diff --git a/avr/devices/s03/main/main.asm b/avr/devices/s03/main/main.asm
index 2f82a98..bfc1046 100644
--- a/avr/devices/s03/main/main.asm
+++ b/avr/devices/s03/main/main.asm
@@ -36,15 +36,14 @@
 .equ NET_BUFFERS_NUM              =  96
 .equ NET_MSGNUMINBUF_SIZE         =  64 ; max buffer nums in ringbuffer (global incoming)
 .equ NET_IFACE_OUTMSGBUF_SIZE     =  16 ; max buffer nums in ringbuffer (per interface outbound)
-.equ COM2WN_IO_RINGBUFFER_SIZE    = 240
 
 
 
 ; ---------------------------------------------------------------------------
 ; firmware settings including list of modules used
 
-#define MAIN_WITHOUT_MSG_HANDLING ; message handling done here
-#define APP_STATS_NETDEV2
+;#define MAIN_WITHOUT_MSG_HANDLING ; message handling done here
+;#define APP_STATS_NETDEV2
 #define COM_ACCEPT_ALL_DEST       ; accept all messages!
 
 ; #define MODULES_TIMER
@@ -54,7 +53,7 @@
 #define MODULES_LED_SIMPLE
 #define MODULES_LED_ACTIVITY
 #define MODULES_NETWORK
-#define MODULES_COM2WN
+#define MODULES_COM2WI
 ;#define MODULES_COMONUART0
 ;#define MODULES_UART_HW
 ;#define MODULES_UART_BITBANG
@@ -74,11 +73,11 @@
 ;#define MODULES_MOTION
 ;#define MODULES_CCS811
 
-;#define APPS_NETWORK
+#define APPS_NETWORK
 ;#define APPS_MOTION
 ;#define APPS_REPORTSENSORS
 #define APPS_STATS
-#define APPS_HUB
+;#define APPS_HUB
 
 
 
@@ -116,7 +115,7 @@
   jmp irqNotSet                 ;  2: INT0           External Interrupt Request 0
   jmp irqNotSet                 ;  3: INT1           External Interrupt Request 1
   jmp irqNotSet                 ;  4: INT2           External Interrupt Request 2
-  jmp COM2WN_ClkChangeIsr       ;  5: PCINT0         Pin Change Interrupt Request 0
+  jmp irqNotSet                 ;  5: PCINT0         Pin Change Interrupt Request 0
   jmp irqNotSet                 ;  6: PCINT1         Pin Change Interrupt Request 1
   jmp irqNotSet                 ;  7: PCINT2         Pin Change Interrupt Request 2
   jmp irqNotSet                 ;  8: PCINT3         Pin Change Interrupt Request 3
@@ -125,7 +124,7 @@
   jmp irqNotSet                 ; 11: TIMER2_COMPB   Timer/Counter2 Compare Match B
   jmp irqNotSet                 ; 12: TIMER2_OVF     Timer/Counter2 Overflow
   jmp irqNotSet                 ; 13: TIMER1_CAPT    Timer/Counter1 Capture Event
-  jmp irqNotSet                 ; 14: TIMER1_COMPA   Timer/Counter1 Compare Match A
+  jmp COM2WI_Timer1Isr          ; 14: TIMER1_COMPA   Timer/Counter1 Compare Match A
   jmp irqNotSet                 ; 15: TIMER1_COMPB   Timer/Counter1 Compare Match B
   jmp irqNotSet                 ; 16: TIMER1_OVF     Timer/Counter1 Overflow
   jmp baseTimerIrqOC0A          ; 17: TIMER0_COMPA   Timer/Counter0 Compare Match A
@@ -169,6 +168,7 @@ irqNotSet:
 ; @routine onSystemStart
 
 onSystemStart:
+;  rcall LedActivity_Trigger
   ret
 ; @end
 
@@ -240,8 +240,8 @@ onEveryLoop:
 
 ;.equ netInterfaceData = netUartIface
 ;.equ netInterfaceData = uart_bitbang_iface
-.equ netInterfaceData = com2w6_iface
-.equ netInterfaceData2 = com2w5_iface
+.equ netInterfaceData = com2wi0_iface
+;.equ netInterfaceData2 = com2w5_iface