From 102996f69f7e727422548e91ac88c1af1d7177e4 Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Mon, 18 Aug 2025 18:47:13 +0200 Subject: [PATCH] avr: switched most devices to com2w interface now. --- avr/devices/n14/boot/boot.asm | 4 ++-- avr/devices/n14/defs.asm | 16 ++++++++-------- avr/devices/n14/main/main.asm | 10 ++++++---- avr/devices/n16/boot/boot.asm | 4 ++-- avr/devices/n16/defs.asm | 18 +++++++++--------- avr/devices/n16/main/main.asm | 4 +++- avr/devices/n21/boot/boot.asm | 4 ++-- avr/devices/n21/defs.asm | 18 +++++++++--------- avr/devices/n21/main/main.asm | 10 ++++++---- avr/devices/n24/boot/boot.asm | 4 ++-- avr/devices/n24/defs.asm | 18 +++++++++--------- avr/devices/n24/main/main.asm | 10 ++++++---- avr/devices/n25/boot/boot.asm | 4 ++-- avr/devices/n25/defs.asm | 18 +++++++++--------- avr/devices/n25/main/main.asm | 16 ++++++---------- avr/devices/n26/boot/boot.asm | 4 ++-- avr/devices/n26/defs.asm | 18 +++++++++--------- avr/devices/n26/main/main.asm | 9 ++++++--- avr/devices/n27/defs.asm | 13 +------------ avr/devices/n27/main/main.asm | 8 ++++---- avr/devices/r06/defs.asm | 5 +++++ avr/devices/r06/main/main.asm | 4 +++- avr/version.asm | 4 ++-- 23 files changed, 113 insertions(+), 110 deletions(-) diff --git a/avr/devices/n14/boot/boot.asm b/avr/devices/n14/boot/boot.asm index 2acc025..175be30 100644 --- a/avr/devices/n14/boot/boot.asm +++ b/avr/devices/n14/boot/boot.asm @@ -19,6 +19,7 @@ .include "devices/all/defs.asm" .include "common/calls.asm" +.include "common/utils_io.asm" .include "common/utils_wait.asm" .include "modules/com2/defs.asm" .include "modules/comproto/defs.asm" @@ -98,8 +99,7 @@ main: .include "modules/flash/defs.asm" .include "modules/flash/eeprom.asm" .include "modules/flash/io.asm" -.include "modules/flash/io_attn.asm" -.include "modules/flash/io_bitbang.asm" +.include "modules/flash/io_com2w.asm" .include "modules/flash/flashxp.asm" .include "modules/flash/flash1p.asm" .include "modules/flash/flashprocess.asm" diff --git a/avr/devices/n14/defs.asm b/avr/devices/n14/defs.asm index 13d0245..b450626 100644 --- a/avr/devices/n14/defs.asm +++ b/avr/devices/n14/defs.asm @@ -55,15 +55,15 @@ .equ COM_DATA_OUTPUT = PORTB .equ COM_DATA_PIN = PORTB1 -.equ COM_ATTN_DDR = DDRB -.equ COM_ATTN_INPUT = PINB -.equ COM_ATTN_OUTPUT = PORTB -.equ COM_ATTN_PIN = PORTB2 +.equ COM_CLK_DDR = DDRB +.equ COM_CLK_INPUT = PINB +.equ COM_CLK_OUTPUT = PORTB +.equ COM_CLK_PIN = PORTB2 -.equ COM_IRQ_ADDR_ATTN = PCMSK -.equ COM_IRQ_BIT_ATTN = PCINT2 ; bit 2 in PCMSK0 (PCINT2) -.equ COM_IRQ_GIFR_ATTN = PCIF -.equ COM_IRQ_GIMSK_ATTN = PCIE +.equ COM_IRQ_ADDR_CLK = PCMSK +.equ COM_IRQ_BIT_CLK = PCINT2 ; bit 2 in PCMSK0 (PCINT2) +.equ COM_IRQ_GIFR_CLK = PCIF +.equ COM_IRQ_GIMSK_CLK = PCIE diff --git a/avr/devices/n14/main/main.asm b/avr/devices/n14/main/main.asm index 425a941..b05ccfe 100644 --- a/avr/devices/n14/main/main.asm +++ b/avr/devices/n14/main/main.asm @@ -40,7 +40,9 @@ ; --------------------------------------------------------------------------- ; generic -.equ NET_BUFFERS_NUM = 6 +.equ NET_BUFFERS_NUM = 6 +.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) @@ -50,7 +52,7 @@ #define MODULES_CLOCK #define MODULES_LED_SIMPLE #define MODULES_NETWORK -#define MODULES_UART_BITBANG +#define MODULES_COM2W #define MODULES_OWI_MASTER #define MODULES_DS18B20 #define MODULES_SK6812 @@ -98,7 +100,7 @@ rjmp BOOTLOADER_ADDR ; Reset vector ; use this for flashed system reti ; EXT_INT0 - rjmp UART_BitBang_PcintIsr ; PCI0 + rjmp com2wPcintIsr ; PCI0 reti ; OC1A reti ; OVF1 reti ; OVF0 @@ -199,7 +201,7 @@ onEveryLoop: ; --------------------------------------------------------------------------- ; defines for network interface -.equ netInterfaceData = uart_bitbang_iface +.equ netInterfaceData = com2w_iface diff --git a/avr/devices/n16/boot/boot.asm b/avr/devices/n16/boot/boot.asm index 74bd935..8096bff 100644 --- a/avr/devices/n16/boot/boot.asm +++ b/avr/devices/n16/boot/boot.asm @@ -17,6 +17,7 @@ .include "devices/all/defs.asm" .include "common/calls.asm" +.include "common/utils_io.asm" .include "common/utils_wait.asm" ;.include "modules/com2/defs.asm" ;.include "modules/comproto/defs.asm" @@ -99,8 +100,7 @@ main: .include "modules/flash/defs.asm" .include "modules/flash/eeprom.asm" .include "modules/flash/io.asm" -.include "modules/flash/io_attn.asm" -.include "modules/flash/io_bitbang.asm" +.include "modules/flash/io_com2w.asm" .include "modules/flash/flash1p.asm" .include "modules/flash/flashxp.asm" .include "modules/flash/flashprocess.asm" diff --git a/avr/devices/n16/defs.asm b/avr/devices/n16/defs.asm index f5e1371..12d4e10 100644 --- a/avr/devices/n16/defs.asm +++ b/avr/devices/n16/defs.asm @@ -17,7 +17,7 @@ ; PIR PB1 3 12 PA1 COM-DATA ; /RESET PB3 4 11 PA2 TCRT1000_Input ; PB2 5 10 PA3 LED -; COM_ATTN PA7 6 9 PA4 TWI-SCL +; COM_CLK PA7 6 9 PA4 TWI-SCL ; TWI-SDA PA6 7 8 PA5 ; -------- ; @@ -59,15 +59,15 @@ .equ COM_DATA_OUTPUT = PORTA .equ COM_DATA_PIN = PORTA1 -.equ COM_ATTN_DDR = DDRA -.equ COM_ATTN_INPUT = PINA -.equ COM_ATTN_OUTPUT = PORTA -.equ COM_ATTN_PIN = PORTA7 +.equ COM_CLK_DDR = DDRA +.equ COM_CLK_INPUT = PINA +.equ COM_CLK_OUTPUT = PORTA +.equ COM_CLK_PIN = PORTA7 -.equ COM_IRQ_ADDR_ATTN = PCMSK0 -.equ COM_IRQ_BIT_ATTN = PCINT7 ; bit 7 in PCMSK0 -.equ COM_IRQ_GIFR_ATTN = PCIF0 -.equ COM_IRQ_GIMSK_ATTN = PCIE0 +.equ COM_IRQ_ADDR_CLK = PCMSK0 +.equ COM_IRQ_BIT_CLK = PCINT7 ; bit 7 in PCMSK0 +.equ COM_IRQ_GIFR_CLK = PCIF0 +.equ COM_IRQ_GIMSK_CLK = PCIE0 diff --git a/avr/devices/n16/main/main.asm b/avr/devices/n16/main/main.asm index 461aeb2..4354219 100644 --- a/avr/devices/n16/main/main.asm +++ b/avr/devices/n16/main/main.asm @@ -47,7 +47,9 @@ ; --------------------------------------------------------------------------- ; generic -.equ NET_BUFFERS_NUM = 6 +.equ NET_BUFFERS_NUM = 6 +.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) diff --git a/avr/devices/n21/boot/boot.asm b/avr/devices/n21/boot/boot.asm index c05a918..cd8ec3e 100644 --- a/avr/devices/n21/boot/boot.asm +++ b/avr/devices/n21/boot/boot.asm @@ -17,6 +17,7 @@ .include "devices/all/defs.asm" .include "common/calls.asm" +.include "common/utils_io.asm" .include "common/utils_wait.asm" @@ -98,8 +99,7 @@ main: .include "modules/flash/defs.asm" .include "modules/flash/eeprom.asm" .include "modules/flash/io.asm" -.include "modules/flash/io_attn.asm" -.include "modules/flash/io_bitbang.asm" +.include "modules/flash/io_com2w.asm" .include "modules/flash/flash1p.asm" .include "modules/flash/flashxp.asm" .include "modules/flash/flashprocess.asm" diff --git a/avr/devices/n21/defs.asm b/avr/devices/n21/defs.asm index 2b5eb92..2f5b3ae 100644 --- a/avr/devices/n21/defs.asm +++ b/avr/devices/n21/defs.asm @@ -17,7 +17,7 @@ ; PIR PB1 3 12 PA1 COM-DATA ; /RESET PB3 4 11 PA2 TCRT1000_Input ; AUX-B2 PB2 5 10 PA3 LED -; COM_ATTN PA7 6 9 PA4 TWI-SCL +; COM_CLK PA7 6 9 PA4 TWI-SCL ; TWI-SDA PA6 7 8 PA5 ; -------- ; @@ -59,15 +59,15 @@ .equ COM_DATA_OUTPUT = PORTA .equ COM_DATA_PIN = PORTA1 -.equ COM_ATTN_DDR = DDRA -.equ COM_ATTN_INPUT = PINA -.equ COM_ATTN_OUTPUT = PORTA -.equ COM_ATTN_PIN = PORTA7 +.equ COM_CLK_DDR = DDRA +.equ COM_CLK_INPUT = PINA +.equ COM_CLK_OUTPUT = PORTA +.equ COM_CLK_PIN = PORTA7 -.equ COM_IRQ_ADDR_ATTN = PCMSK0 -.equ COM_IRQ_BIT_ATTN = PCINT7 ; bit 7 in PCMSK0 -.equ COM_IRQ_GIFR_ATTN = PCIF0 -.equ COM_IRQ_GIMSK_ATTN = PCIE0 +.equ COM_IRQ_ADDR_CLK = PCMSK0 +.equ COM_IRQ_BIT_CLK = PCINT7 ; bit 7 in PCMSK0 +.equ COM_IRQ_GIFR_CLK = PCIF0 +.equ COM_IRQ_GIMSK_CLK = PCIE0 diff --git a/avr/devices/n21/main/main.asm b/avr/devices/n21/main/main.asm index 6fa58e2..dcb1f8c 100644 --- a/avr/devices/n21/main/main.asm +++ b/avr/devices/n21/main/main.asm @@ -47,7 +47,9 @@ ; --------------------------------------------------------------------------- ; generic -.equ NET_BUFFERS_NUM = 6 +.equ NET_BUFFERS_NUM = 6 +.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) @@ -59,7 +61,7 @@ #define MODULES_CLOCK #define MODULES_LED_SIMPLE #define MODULES_NETWORK -#define MODULES_UART_BITBANG +#define MODULES_COM2W #define MODULES_TWI_MASTER ;#define MODULES_LCD ;#define LCD_MINIMAL_FONT @@ -112,7 +114,7 @@ ; rjmp main ; Reset vector rjmp BOOTLOADER_ADDR ; Reset vector ; use this for flashed system reti ; EXT_INT0 - rjmp UART_BitBang_PcintIsr ; PCI0 + rjmp com2wPcintIsr ; PCI0 reti ; PCI1 reti ; WATCHDOG reti ; ICP1 @@ -212,6 +214,6 @@ onEveryLoop: ; --------------------------------------------------------------------------- ; defines for network interface -.equ netInterfaceData = uart_bitbang_iface +.equ netInterfaceData = com2w_iface diff --git a/avr/devices/n24/boot/boot.asm b/avr/devices/n24/boot/boot.asm index 767f207..f867d2b 100644 --- a/avr/devices/n24/boot/boot.asm +++ b/avr/devices/n24/boot/boot.asm @@ -26,6 +26,7 @@ .include "../defs.asm" .include "common/calls.asm" +.include "common/utils_io.asm" .include "devices/all/defs.asm" @@ -122,8 +123,7 @@ main: .include "modules/flash/defs.asm" .include "modules/flash/eeprom.asm" .include "modules/flash/io.asm" -.include "modules/flash/io_attn.asm" -.include "modules/flash/io_bitbang.asm" +.include "modules/flash/io_com2w.asm" .include "modules/flash/flash1p.asm" .include "modules/flash/flashxp.asm" .include "modules/flash/flashprocess.asm" diff --git a/avr/devices/n24/defs.asm b/avr/devices/n24/defs.asm index d1b401f..0bdeb74 100644 --- a/avr/devices/n24/defs.asm +++ b/avr/devices/n24/defs.asm @@ -17,7 +17,7 @@ ; PIR PB1 3 12 PA1 COM-DATA ; /RESET PB3 4 11 PA2 AUX-PA2 ; PB2 5 10 PA3 LED -; COM_ATTN PA7 6 9 PA4 TWI-SCL +; COM_CLK PA7 6 9 PA4 TWI-SCL ; TWI-SDA PA6 7 8 PA5 ; -------- ; @@ -59,15 +59,15 @@ .equ COM_DATA_OUTPUT = PORTA .equ COM_DATA_PIN = PORTA1 -.equ COM_ATTN_DDR = DDRA -.equ COM_ATTN_INPUT = PINA -.equ COM_ATTN_OUTPUT = PORTA -.equ COM_ATTN_PIN = PORTA7 +.equ COM_CLK_DDR = DDRA +.equ COM_CLK_INPUT = PINA +.equ COM_CLK_OUTPUT = PORTA +.equ COM_CLK_PIN = PORTA7 -.equ COM_IRQ_ADDR_ATTN = PCMSK0 -.equ COM_IRQ_BIT_ATTN = PCINT7 ; bit 7 in PCMSK0 -.equ COM_IRQ_GIFR_ATTN = PCIF0 -.equ COM_IRQ_GIMSK_ATTN = PCIE0 +.equ COM_IRQ_ADDR_CLK = PCMSK0 +.equ COM_IRQ_BIT_CLK = PCINT7 ; bit 7 in PCMSK0 +.equ COM_IRQ_GIFR_CLK = PCIF0 +.equ COM_IRQ_GIMSK_CLK = PCIE0 diff --git a/avr/devices/n24/main/main.asm b/avr/devices/n24/main/main.asm index b11d874..242d8c7 100644 --- a/avr/devices/n24/main/main.asm +++ b/avr/devices/n24/main/main.asm @@ -47,7 +47,9 @@ ; --------------------------------------------------------------------------- ; generic -.equ NET_BUFFERS_NUM = 6 +.equ NET_BUFFERS_NUM = 6 +.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) .equ PROGRAM_SENSOR_INTERVAL_SECS = 60 .equ PROGRAM_STATS_INTERVAL_MINS = 10 @@ -61,7 +63,7 @@ #define MODULES_CLOCK #define MODULES_LED_SIMPLE #define MODULES_NETWORK -#define MODULES_UART_BITBANG +#define MODULES_COM2W #define MODULES_TWI_MASTER ;#define MODULES_LCD ;#define LCD_MINIMAL_FONT @@ -123,7 +125,7 @@ ; rjmp main ; Reset vector rjmp BOOTLOADER_ADDR ; Reset vector ; use this for flashed system reti ; EXT_INT0 - rjmp UART_BitBang_PcintIsr ; PCI0 + rjmp com2wPcintIsr ; PCI0 reti ; PCI1 reti ; WATCHDOG reti ; ICP1 @@ -218,7 +220,7 @@ onEveryLoop: ; --------------------------------------------------------------------------- ; defines for network interface -.equ netInterfaceData = uart_bitbang_iface +.equ netInterfaceData = com2w_iface diff --git a/avr/devices/n25/boot/boot.asm b/avr/devices/n25/boot/boot.asm index d0987a0..df06de6 100644 --- a/avr/devices/n25/boot/boot.asm +++ b/avr/devices/n25/boot/boot.asm @@ -19,6 +19,7 @@ .include "devices/all/defs.asm" .include "common/calls.asm" +.include "common/utils_io.asm" .include "common/utils_wait.asm" @@ -99,8 +100,7 @@ main: .include "modules/flash/defs.asm" .include "modules/flash/eeprom.asm" .include "modules/flash/io.asm" -.include "modules/flash/io_attn.asm" -.include "modules/flash/io_bitbang.asm" +.include "modules/flash/io_com2w.asm" .include "modules/flash/flashxp.asm" .include "modules/flash/flash1p.asm" .include "modules/flash/flashprocess.asm" diff --git a/avr/devices/n25/defs.asm b/avr/devices/n25/defs.asm index 1ad3575..2a9b1e3 100644 --- a/avr/devices/n25/defs.asm +++ b/avr/devices/n25/defs.asm @@ -16,7 +16,7 @@ ; PB1 3 12 PA1 COM-DATA ; PB3 4 11 PA2 ; PB2 5 10 PA3 LED -; COM_ATTN PA7 6 9 PA4 LED_CLK +; COM_CLK PA7 6 9 PA4 LED_CLK ; LED_DATA PA6 7 8 PA5 LED_Mode (0 for SPI) ; -------- ; @@ -58,15 +58,15 @@ .equ COM_DATA_OUTPUT = PORTA .equ COM_DATA_PIN = PORTA1 -.equ COM_ATTN_DDR = DDRA -.equ COM_ATTN_INPUT = PINA -.equ COM_ATTN_OUTPUT = PORTA -.equ COM_ATTN_PIN = PORTA7 +.equ COM_CLK_DDR = DDRA +.equ COM_CLK_INPUT = PINA +.equ COM_CLK_OUTPUT = PORTA +.equ COM_CLK_PIN = PORTA7 -.equ COM_IRQ_ADDR_ATTN = PCMSK0 -.equ COM_IRQ_BIT_ATTN = PCINT7 ; bit 7 in PCMSK0 (PCINT7) -.equ COM_IRQ_GIFR_ATTN = PCIF0 -.equ COM_IRQ_GIMSK_ATTN = PCIE0 +.equ COM_IRQ_ADDR_CLK = PCMSK0 +.equ COM_IRQ_BIT_CLK = PCINT7 ; bit 7 in PCMSK0 (PCINT7) +.equ COM_IRQ_GIFR_CLK = PCIF0 +.equ COM_IRQ_GIMSK_CLK = PCIE0 diff --git a/avr/devices/n25/main/main.asm b/avr/devices/n25/main/main.asm index 3f52ad5..139400a 100644 --- a/avr/devices/n25/main/main.asm +++ b/avr/devices/n25/main/main.asm @@ -40,7 +40,9 @@ ; --------------------------------------------------------------------------- ; generic -.equ NET_BUFFERS_NUM = 6 +.equ NET_BUFFERS_NUM = 6 +.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) @@ -51,7 +53,7 @@ #define MODULES_CLOCK #define MODULES_LED_SIMPLE #define MODULES_NETWORK -#define MODULES_UART_BITBANG +#define MODULES_COM2W #define MODULES_OWI_MASTER #define MODULES_DS18B20 #define MODULES_SK6812 @@ -99,11 +101,7 @@ rjmp BOOTLOADER_ADDR ; 1: Reset vector ; use this for flashed system reti ; 2: EXT_INT0 -#ifdef MODULES_UART_BITBANG - rjmp UART_BitBang_PcintIsr ; 3: PCI0 -#else - reti ; 3: PCI0 -#endif + rjmp com2wPcintIsr ; 3: PCI0 reti ; 4: PCI1 reti ; 5: WDT reti ; 6: TIM1_CAPT @@ -208,9 +206,7 @@ onEveryLoop: ; --------------------------------------------------------------------------- ; defines for network interface -#ifdef MODULES_UART_BITBANG -.equ netInterfaceData = uart_bitbang_iface -#endif +.equ netInterfaceData = com2w_iface diff --git a/avr/devices/n26/boot/boot.asm b/avr/devices/n26/boot/boot.asm index 767f207..f867d2b 100644 --- a/avr/devices/n26/boot/boot.asm +++ b/avr/devices/n26/boot/boot.asm @@ -26,6 +26,7 @@ .include "../defs.asm" .include "common/calls.asm" +.include "common/utils_io.asm" .include "devices/all/defs.asm" @@ -122,8 +123,7 @@ main: .include "modules/flash/defs.asm" .include "modules/flash/eeprom.asm" .include "modules/flash/io.asm" -.include "modules/flash/io_attn.asm" -.include "modules/flash/io_bitbang.asm" +.include "modules/flash/io_com2w.asm" .include "modules/flash/flash1p.asm" .include "modules/flash/flashxp.asm" .include "modules/flash/flashprocess.asm" diff --git a/avr/devices/n26/defs.asm b/avr/devices/n26/defs.asm index 8f27140..904a131 100644 --- a/avr/devices/n26/defs.asm +++ b/avr/devices/n26/defs.asm @@ -17,7 +17,7 @@ ; PB1 3 12 PA1 COM-DATA ; /RESET PB3 4 11 PA2 ; PB2 5 10 PA3 LED -; COM_ATTN PA7 6 9 PA4 TWI-SCL +; COM_CLK PA7 6 9 PA4 TWI-SCL ; TWI-SDA PA6 7 8 PA5 ; -------- ; @@ -59,15 +59,15 @@ .equ COM_DATA_OUTPUT = PORTA .equ COM_DATA_PIN = PORTA1 -.equ COM_ATTN_DDR = DDRA -.equ COM_ATTN_INPUT = PINA -.equ COM_ATTN_OUTPUT = PORTA -.equ COM_ATTN_PIN = PORTA7 +.equ COM_CLK_DDR = DDRA +.equ COM_CLK_INPUT = PINA +.equ COM_CLK_OUTPUT = PORTA +.equ COM_CLK_PIN = PORTA7 -.equ COM_IRQ_ADDR_ATTN = PCMSK0 -.equ COM_IRQ_BIT_ATTN = PCINT7 ; bit 7 in PCMSK0 -.equ COM_IRQ_GIFR_ATTN = PCIF0 -.equ COM_IRQ_GIMSK_ATTN = PCIE0 +.equ COM_IRQ_ADDR_CLK = PCMSK0 +.equ COM_IRQ_BIT_CLK = PCINT7 ; bit 7 in PCMSK0 +.equ COM_IRQ_GIFR_CLK = PCIF0 +.equ COM_IRQ_GIMSK_CLK = PCIE0 diff --git a/avr/devices/n26/main/main.asm b/avr/devices/n26/main/main.asm index bec6550..63abdc6 100644 --- a/avr/devices/n26/main/main.asm +++ b/avr/devices/n26/main/main.asm @@ -48,6 +48,8 @@ ; generic .equ NET_BUFFERS_NUM = 6 +.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) .equ PROGRAM_SENSOR_INTERVAL_SECS = 60 .equ PROGRAM_STATS_INTERVAL_MINS = 10 @@ -61,7 +63,8 @@ #define MODULES_CLOCK #define MODULES_LED_SIMPLE #define MODULES_NETWORK -#define MODULES_UART_BITBANG +;#define MODULES_UART_BITBANG +#define MODULES_COM2W #define MODULES_TWI_MASTER ;#define MODULES_LCD ;#define LCD_MINIMAL_FONT @@ -109,7 +112,7 @@ ; rjmp main ; Reset vector rjmp BOOTLOADER_ADDR ; Reset vector ; use this for flashed system reti ; EXT_INT0 - rjmp UART_BitBang_PcintIsr ; PCI0 + rjmp com2wPcintIsr ; PCI0 reti ; PCI1 reti ; WATCHDOG reti ; ICP1 @@ -204,7 +207,7 @@ onEveryLoop: ; --------------------------------------------------------------------------- ; defines for network interface -.equ netInterfaceData = uart_bitbang_iface +.equ netInterfaceData = com2w_iface diff --git a/avr/devices/n27/defs.asm b/avr/devices/n27/defs.asm index 21f980e..7fc3e86 100644 --- a/avr/devices/n27/defs.asm +++ b/avr/devices/n27/defs.asm @@ -17,7 +17,7 @@ ; PIR PB1 3 12 PA1 COM-DATA ; /RESET PB3 4 11 PA2 AUX-PA2 ; PB2 5 10 PA3 LED -; COM_ATTN PA7 6 9 PA4 TWI-SCL +; COM_CLK PA7 6 9 PA4 TWI-SCL ; TWI-SDA PA6 7 8 PA5 ; -------- ; @@ -59,17 +59,6 @@ .equ COM_DATA_OUTPUT = PORTA .equ COM_DATA_PIN = PORTA1 -.equ COM_ATTN_DDR = DDRA -.equ COM_ATTN_INPUT = PINA -.equ COM_ATTN_OUTPUT = PORTA -.equ COM_ATTN_PIN = PORTA7 - -.equ COM_IRQ_ADDR_ATTN = PCMSK0 -.equ COM_IRQ_BIT_ATTN = PCINT7 ; bit 7 in PCMSK0 -.equ COM_IRQ_GIFR_ATTN = PCIF0 -.equ COM_IRQ_GIMSK_ATTN = PCIE0 - - .equ COM_CLK_DDR = DDRA .equ COM_CLK_INPUT = PINA .equ COM_CLK_OUTPUT = PORTA diff --git a/avr/devices/n27/main/main.asm b/avr/devices/n27/main/main.asm index f1695b2..9f9b7aa 100644 --- a/avr/devices/n27/main/main.asm +++ b/avr/devices/n27/main/main.asm @@ -47,10 +47,12 @@ ; --------------------------------------------------------------------------- ; generic -.equ NET_BUFFERS_NUM = 6 +.equ NET_BUFFERS_NUM = 6 +.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) .equ PROGRAM_SENSOR_INTERVAL_SECS = 60 -.equ PROGRAM_STATS_INTERVAL_MINS = 10 +.equ PROGRAM_STATS_INTERVAL_MINS = 10 @@ -124,7 +126,6 @@ ; rjmp main ; Reset vector rjmp BOOTLOADER_ADDR ; Reset vector ; use this for flashed system reti ; EXT_INT0 -; rjmp UART_BitBang_PcintIsr ; PCI0 rjmp com2wPcintIsr ; PCI0 reti ; PCI1 reti ; WATCHDOG @@ -220,7 +221,6 @@ onEveryLoop: ; --------------------------------------------------------------------------- ; defines for network interface -;.equ netInterfaceData = uart_bitbang_iface .equ netInterfaceData = com2w_iface diff --git a/avr/devices/r06/defs.asm b/avr/devices/r06/defs.asm index 7c0728e..e952453 100644 --- a/avr/devices/r06/defs.asm +++ b/avr/devices/r06/defs.asm @@ -74,6 +74,11 @@ .equ COM_LED_PIN = PORTB0 +.equ COM_IRQ_ADDR_M_CLK = GIMSK +.equ COM_IRQ_BIT_M_CLK = PCIE0 +.equ COM_IRQ_ADDR_F_CLK = GIFR +.equ COM_IRQ_BIT_F_CLK = PCIE0 + .equ COM_PORTS = 2 .equ COM_MASK_CLK0 = (1<