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

r05, comOnUart0 and comOnUart1 work!

Browse Source
This commit is contained in:
Martin Preuss
2025-07-06 17:19:59 +02:00
parent 439e787d37
commit 81b008af0c
5 changed files with 302 additions and 566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
avr/devices/r05/main/main.asm
View File

@@ -129,12 +129,12 @@
reti ; 21: SPI SPI Serial Transfer Complete
reti ; 22: USART0_RXS USART0 Rx Start
rjmp ComOnUart0_RxCharIsr ; 23: USART0_RXC USART0 Rx Complete
rjmp ComOnUart0_TxUdreIsr ; 24: USART0_DRE USART0 Data Register Empty
rjmp ComOnUart0_TxCharIsr ; 25: USART0_TXC USART0 Tx Complete
reti ; 24: USART0_DRE USART0 Data Register Empty
reti ; 25: USART0_TXC USART0 Tx Complete
reti ; 26: USART1_RXS USART1 Rx Start
rjmp ComOnUart1_RxCharIsr ; 27: USART1_RXC USART1 Rx Complete
rjmp ComOnUart1_TxUdreIsr ; 28: USART1_DRE USART1 Data Register Empty
rjmp ComOnUart1_TxCharIsr ; 29: USART1_TXC USART1 Tx Complete
reti ; 28: USART1_DRE USART1 Data Register Empty
reti ; 29: USART1_TXC USART1 Tx Complete
reti ; 30: TWI Two-Wire-Interface
reti ; 31: RESERVED reserved
@@ -162,6 +162,13 @@ firmwareStart:
; @routine onSystemStart
onSystemStart:
; set interface number for UART0
ldi r16, COMONUART0_IFACENUM
sts comOnUart0_iface+NET_IFACE_OFFS_IFACENUM, r16
; set interface number for UART1
ldi r16, COMONUART1_IFACENUM
sts comOnUart1_iface+NET_IFACE_OFFS_IFACENUM, r16
ret
; @end
@@ -230,7 +237,7 @@ checkRecvdMsg:
; forward to other interface
ld r17, X
andi r17, (NET_IFACE_BUFFER_IFACENUM1_BIT | NET_IFACE_BUFFER_IFACENUM0_BIT)
andi r17, (1<<NET_IFACE_BUFFER_IFACENUM1_BIT) | (1<<NET_IFACE_BUFFER_IFACENUM0_BIT)
rcall reverseInterfaceNum ; (R16, R17)
; ldi r17, COMONUART0_IFACENUM ; DEBUG: send everything to uart0 to test that code first
rcall addMsgToInterface
@@ -288,6 +295,7 @@ letSysHandleMsg_end:
reverseInterfaceNum:
ldi r16, (1<<NET_IFACE_BUFFER_IFACENUM1_BIT) | (1<<NET_IFACE_BUFFER_IFACENUM0_BIT)
eor r17, r16
and r17, r16
ret
; @end
@@ -319,6 +327,9 @@ addMsgToInterface_end:
sendPacketsIface2In:
ldi yl, LOW(netInterfaceData)
ldi yh, HIGH(netInterfaceData)
; ldi yl, LOW(comOnUart1_iface)
; ldi yh, HIGH(comOnUart1_iface)
ldi r17, AQHOME_VALUEID_STATS_PACKETS_IN2
lds r18, comOnUart1_iface+NET_IFACE_OFFS_PACKETSIN_LOW
lds r19, comOnUart1_iface+NET_IFACE_OFFS_PACKETSIN_HIGH

35
avr/devices/r05/test/main.asm
View File

@@ -75,8 +75,8 @@
;#define MODULES_MOTION
#define MODULES_NETWORK
;#define MODULES_TTYONUART1
;#define MODULES_COMONUART0
#define MODULES_COMONUART1
#define MODULES_COMONUART0
;#define MODULES_COMONUART1
#define APPS_STATS
#define APPS_NETWORK
@@ -113,9 +113,10 @@
rjmp BOOTLOADER_ADDR ; 1: RESET Reset vector use this for flashed system
reti ; 2: INT0 External Interrupt Request 0
; rjmp ComOnUart0_AttnChangeIsr ; 3: PCINT0 Pin Change Interrupt 0
reti ; 3: PCINT0 Pin Change Interrupt 0
rjmp ComOnUart1_AttnChangeIsr ; 4: PCINT1 Pin Change Interrupt 1
rjmp ComOnUart0_AttnChangeIsr ; 3: PCINT0 Pin Change Interrupt 0
; reti ; 3: PCINT0 Pin Change Interrupt 0
; rjmp ComOnUart1_AttnChangeIsr ; 4: PCINT1 Pin Change Interrupt 1
reti ; 4: PCINT1 Pin Change Interrupt 1
reti ; 5: WDT Watchdog Time-out
reti ; 6: TIM1_CAPT Timer/Counter1 Capture Event
reti ; 7: TIM1_COMPA (OC1A) Timer/Counter1 Compare Match A
@@ -134,19 +135,17 @@
reti ; 20: TIM2_OVF (OVF2) Timer/Counter2 Overflow
reti ; 21: SPI SPI Serial Transfer Complete
reti ; 22: USART0_RXS USART0 Rx Start
; rjmp ComOnUart0_RxCharIsr ; 23: USART0_RXC USART0 Rx Complete
reti ; 23: USART0_RXC USART0 Rx Complete
rjmp ComOnUart0_RxCharIsr ; 23: USART0_RXC USART0 Rx Complete
; reti ; 23: USART0_RXC USART0 Rx Complete
; rjmp ComOnUart0_TxUdreIsr ; 24: USART0_DRE USART0 Data Register Empty
reti ; 24: USART0_DRE USART0 Data Register Empty
; rjmp ComOnUart0_TxCharIsr ; 25: USART0_TXC USART0 Tx Complete
reti ; 25: USART0_TXC USART0 Tx Complete
reti ; 26: USART1_RXS USART1 Rx Start
rjmp ComOnUart1_RxCharIsr ; 27: USART1_RXC USART1 Rx Complete
; reti ; 27: USART1_RXC USART1 Rx Complete
rjmp ComOnUart1_TxUdreIsr ; 28: USART1_DRE USART1 Data Register Empty
; reti ; 28: USART1_DRE USART1 Data Register Empty
rjmp ComOnUart1_TxCharIsr ; 29: USART1_TXC USART1 Tx Complete
; reti ; 29: USART1_TXC USART1 Tx Complete
; rjmp ComOnUart1_RxCharIsr ; 27: USART1_RXC USART1 Rx Complete
reti ; 27: USART1_RXC USART1 Rx Complete
reti ; 28: USART1_DRE USART1 Data Register Empty
reti ; 29: USART1_TXC USART1 Tx Complete
reti ; 30: TWI Two-Wire-Interface
reti ; 31: RESERVED reserved
@@ -175,11 +174,11 @@ firmwareStart:
onSystemStart:
; set interface number for UART0
; ldi r16, COMONUART0_IFACENUM
; sts comOnUart0_iface+NET_IFACE_OFFS_IFACENUM, r16
ldi r16, COMONUART0_IFACENUM
sts comOnUart0_iface+NET_IFACE_OFFS_IFACENUM, r16
; set interface number for UART1
ldi r16, COMONUART1_IFACENUM
sts comOnUart1_iface+NET_IFACE_OFFS_IFACENUM, r16
; ldi r16, COMONUART1_IFACENUM
; sts comOnUart1_iface+NET_IFACE_OFFS_IFACENUM, r16
ret
; @end
@@ -236,7 +235,7 @@ onMessageReceived:
; ---------------------------------------------------------------------------
; defines for network interface
.equ netInterfaceData = comOnUart1_iface
.equ netInterfaceData = comOnUart0_iface
;.equ netInterfaceData2 = comOnUart1_iface