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

avr: switched most devices to com2w interface now.

Browse Source
This commit is contained in:
Martin Preuss
2025-08-18 18:47:13 +02:00
parent f9d721ac02
commit 102996f69f
23 changed files with 113 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
avr/devices/n25/boot/boot.asm
View File

@@ -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"

18
avr/devices/n25/defs.asm
View File

@@ -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

16
avr/devices/n25/main/main.asm
View File

@@ -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