From eb68e6674679d7b615022502e5e258a3cf4dcb6c Mon Sep 17 00:00:00 2001 From: Martin Preuss Date: Thu, 31 Oct 2024 22:24:18 +0100 Subject: [PATCH] avr: adapted pin defs. --- avr/devices/n14/n14_defs.asm | 24 ++++++++++-------------- avr/modules/uart_irq/iface1.asm | 2 +- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/avr/devices/n14/n14_defs.asm b/avr/devices/n14/n14_defs.asm index 893cbff..baf055a 100644 --- a/avr/devices/n14/n14_defs.asm +++ b/avr/devices/n14/n14_defs.asm @@ -45,26 +45,22 @@ .equ COM_BIT_LENGTH = 52000 ; 104000ns=9600, 52000ns=19200, 26000ns=38400 .equ COM_HALFBIT_LENGTH = 26000 ; see https://de.wikipedia.org/wiki/Universal_Asynchronous_Receiver_Transmitter -.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_TXD_DDR = DDRB -.equ COM_TXD_DATA = PORTB -.equ COM_TXD_PIN = PORTB1 - -.equ COM_RXD_DDR = DDRB -.equ COM_RXD_INPUT = PINB -.equ COM_RXD_OUTPUT = PORTB -.equ COM_RXD_PIN = PORTB1 +.equ COM_DATA_DDR = DDRB +.equ COM_DATA_INPUT = PINB +.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_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 + + ; --------------------------------------------------------------------------- ; 1-Wire Master diff --git a/avr/modules/uart_irq/iface1.asm b/avr/modules/uart_irq/iface1.asm index d56cde1..904d142 100644 --- a/avr/modules/uart_irq/iface1.asm +++ b/avr/modules/uart_irq/iface1.asm @@ -20,7 +20,7 @@ uartIrqDataIface1: .byte UART_IRQ_IFACE_SIZE UART_Irq_Iface1_HandleTick: m_uart_irq_handle_tick \ - COM_RXD_DDR, COM_RXD_INPUT, COM_RXD_OUTPUT, COM_RXD_PIN, \ + COM_DATA_DDR, COM_DATA_INPUT, COM_DATA_OUTPUT, COM_DATA_PIN, \ COM_ATTN_DDR, COM_ATTN_INPUT, COM_ATTN_OUTPUT, COM_ATTN_PIN, \ uartIrqDataIface1