diff --git a/avr/devices/c01/defs.asm b/avr/devices/c01/defs.asm index ca34f21..5218d23 100644 --- a/avr/devices/c01/defs.asm +++ b/avr/devices/c01/defs.asm @@ -72,14 +72,14 @@ .equ COM_DATA_OUTPUT = PORTD .equ COM_DATA_PIN = PORTD0 -.equ COM_ATTN_DDR = DDRD -.equ COM_ATTN_INPUT = PIND -.equ COM_ATTN_OUTPUT = PORTD -.equ COM_ATTN_PIN = PORTD2 +.equ COM_CLK_DDR = DDRD +.equ COM_CLK_INPUT = PIND +.equ COM_CLK_OUTPUT = PORTD +.equ COM_CLK_PIN = PORTD2 -.equ COM_IRQ_ADDR_ATTN = GICR -.equ COM_IRQ_BIT_ATTN = INT0 -.equ COM_IRQ_GIFR_ATTN = INTF0 +.equ COM_IRQ_ADDR_CLK = GICR +.equ COM_IRQ_BIT_CLK = INT0 +.equ COM_IRQ_GIFR_CLK = INTF0 ;.equ COM_IRQ_GIMSK_ATTN = PCIE0 diff --git a/avr/devices/c01/main/main.asm b/avr/devices/c01/main/main.asm index f4fa9b6..4b9dff9 100644 --- a/avr/devices/c01/main/main.asm +++ b/avr/devices/c01/main/main.asm @@ -59,7 +59,8 @@ #define MODULES_NETWORK ;#define MODULES_COMONUART0 ;#define MODULES_UART_HW -#define MODULES_UART_BITBANG +;#define MODULES_UART_BITBANG +#define MODULES_COM2W #define MODULES_SPI_HW ;#define MODULES_ILI9341 ;#define MODULES_FONT_8X8 @@ -120,8 +121,7 @@ ; --------------------------------------------------------------------------- ; Reset and interrupt vectors rjmp BOOTLOADER_ADDR ; 1: Reset vector RESET -; rjmp NetUart_AttnChangeIsr ; 2: INT0 External Interrupt Request 0 - rjmp UART_BitBang_PcintIsr ; 2: INT0 External Interrupt Request 0 + rjmp com2wPcintIsr ; 2: INT0 External Interrupt Request 0 reti ; 3: INT1 External Interrupt Request 1 reti ; 4: TIMER1_CAPT Timer/Counter1 Capture Event reti ; 5: TIMER1_COMPA Timer/Counter1 Compare Match A @@ -221,7 +221,8 @@ onEveryLoop: ; defines for network interface ;.equ netInterfaceData = netUartIface -.equ netInterfaceData = uart_bitbang_iface +;.equ netInterfaceData = uart_bitbang_iface +.equ netInterfaceData = com2w_iface