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

minor changes to unify modules.

Browse Source
This commit is contained in:
Martin Preuss
2025-07-06 14:38:21 +02:00
parent c540135705
commit caf149fe8b
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
avr/modules/uart_hw/comonuart0.asm
View File

@@ -8,7 +8,6 @@
; *************************************************************************** ; ***************************************************************************
.equ COMONUART0_IFACENUM = 1
.equ COMONUART0_READ_TIMEOUT = 3 .equ COMONUART0_READ_TIMEOUT = 3
.equ COMONUART0_MSG_INTERVAL = 0 .equ COMONUART0_MSG_INTERVAL = 0

11
avr/modules/uart_hw/comonuart1.asm
View File

@@ -8,7 +8,6 @@
; *************************************************************************** ; ***************************************************************************
.equ COMONUART1_IFACENUM = 2
.equ COMONUART1_READ_TIMEOUT = 3 .equ COMONUART1_READ_TIMEOUT = 3
.equ COMONUART1_MSG_INTERVAL = 0 .equ COMONUART1_MSG_INTERVAL = 0
@@ -358,13 +357,13 @@ comOnUart1RunWriteModes:
comOnUart1RunWriteIdle: comOnUart1RunWriteIdle:
ldd r16, Y+NET_IFACE_OFFS_WRITETIMER ldd r16, Y+NET_IFACE_OFFS_WRITETIMER
cpi r16, COMONUART0_MSG_INTERVAL ; wait a bit between messages cpi r16, COMONUART1_MSG_INTERVAL ; wait a bit between messages
brcs comOnUart1RunWriteIdle_end brcs comOnUart1RunWriteIdle_end
rcall NET_Interface_PeekNextOutgoingMsgNum ; r16=msgNum rcall NET_Interface_PeekNextOutgoingMsgNum ; r16=msgNum
brcc comOnUart1RunWriteIdle_end ; no outmsg in queue brcc comOnUart1RunWriteIdle_end ; no outmsg in queue
sbis COM_ATTN_INPUT, COM_ATTN_PIN ; ATTN low? sbis COM_ATTN1_INPUT, COM_ATTN1_PIN ; ATTN low?
rjmp comOnUart1RunWriteIdle_end ; yes, line busy, jmp rjmp comOnUart1RunWriteIdle_end ; yes, line busy, jmp
rcall comOnUart1SetAttnLow ; reserve bus as soon as possible rcall comOnUart1SetAttnLow ; reserve bus as soon as possible
@@ -468,7 +467,7 @@ comOnUart1RunReading:
ret ret
ldd r16, Y+NET_IFACE_OFFS_READTIMER ldd r16, Y+NET_IFACE_OFFS_READTIMER
cpi r16, COMONUART0_READ_TIMEOUT cpi r16, COMONUART1_READ_TIMEOUT
brcs comOnUart1RunReading_end brcs comOnUart1RunReading_end
rcall comOnUart1StopRx ; (R16) rcall comOnUart1StopRx ; (R16)
ldd r16, Y+UART_HW_IFACE_OFFS_READBUFNUM ldd r16, Y+UART_HW_IFACE_OFFS_READBUFNUM
@@ -499,7 +498,7 @@ comOnUart1RunSkipping:
breq comOnUart1RunSkipping_checkAttn breq comOnUart1RunSkipping_checkAttn
rcall NET_Buffer_ReleaseByNum ; (R16, X) rcall NET_Buffer_ReleaseByNum ; (R16, X)
comOnUart1RunSkipping_checkAttn: comOnUart1RunSkipping_checkAttn:
sbis COM_ATTN_INPUT, COM_ATTN_PIN ; ATTN low? sbis COM_ATTN1_INPUT, COM_ATTN1_PIN ; ATTN low?
rjmp comOnUart1RunSkipping_end ; yes, jmp rjmp comOnUart1RunSkipping_end ; yes, jmp
; ATTN ishigh, skipped message finished ; ATTN ishigh, skipped message finished
ldi r16, UART_HW_READMODE_IDLE ldi r16, UART_HW_READMODE_IDLE
@@ -528,7 +527,7 @@ comOnUart1RunMsgReceived:
; @clobbers R16, R17, X ; @clobbers R16, R17, X
comOnUart1Init: comOnUart1Init:
.ifdef COM_ATTN_PUE .ifdef COM_ATTN1_PUE
lds r16, COM_ATTN1_PUE lds r16, COM_ATTN1_PUE
cbr r16, 1<<COM_ATTN1_PIN ; disable pullup on ATTN cbr r16, 1<<COM_ATTN1_PIN ; disable pullup on ATTN
sts COM_ATTN1_PUE, r16 sts COM_ATTN1_PUE, r16

1
avr/modules/uart_hw/ttyonuart1.asm
View File

@@ -10,7 +10,6 @@
.equ TTYONUART1_SKIPTIME = 2 .equ TTYONUART1_SKIPTIME = 2
.equ TTYONUART1_MSG_INTERVAL = 0 .equ TTYONUART1_MSG_INTERVAL = 0
.equ TTYONUART1_IFACENUM = 2
.dseg .dseg