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

n25: fixed interrupt table (was still for t85!).

Browse Source
This commit is contained in:
Martin Preuss
2025-06-01 22:38:48 +02:00
parent ff7d47e155
commit e6d0118ff3
4 changed files with 53 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
avr/devices/n25/boot/0BUILD
View File

@@ -2,7 +2,7 @@
<gwbuild> <gwbuild>
<target type="AvrHexFile" name="n22_boot" > <target type="AvrHexFile" name="n25_boot" >
<includes type="avrasm" > <includes type="avrasm" >
-I $(builddir) -I $(builddir)

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

@@ -18,24 +18,14 @@
.include "../defs.asm" .include "../defs.asm"
.include "devices/all/defs.asm" .include "devices/all/defs.asm"
.include "common/calls.asm"
.include "common/utils_wait.asm"
; *************************************************************************** ; ***************************************************************************
; defines ; defines
; ---------------------------------------------------------------------------
; generic
.include "common/utils_wait.asm"
.include "modules/com2/defs.asm"
.include "modules/comproto/defs.asm"
; ---------------------------------------------------------------------------
; firmware settings
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; LED ; LED
@@ -56,21 +46,24 @@
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; Reset and interrupt vectors ; Reset and interrupt vectors
rjmp main ; Reset vector
reti ; EXT_INT0 rjmp main ; 1: Reset vector
reti ; PCI0 reti ; 2: EXT_INT0
reti ; OC1A reti ; 3: PCI0
reti ; OVF1 reti ; 4: PCI1
reti ; OVF0 reti ; 5: WDT
reti ; ERDY reti ; 6: TIM1_CAPT
reti ; ACI reti ; 7: TIM1_COMPA
reti ; ADCC reti ; 8: TIM1_COMPB
reti ; OC1B reti ; 9: TIM1_OVF
reti ; OC0A reti ; 10: TIM0_COMPA
reti ; OC0B reti ; 11: TIM0_COMPB
reti ; WATCHDOG reti ; 12: TIM0_OVF
reti ; USI_STR reti ; 13: ANA_COMP
reti ; USI_OVF reti ; 14: ADC
reti ; 15: EE_RDY
reti ; 16: USI_STR
reti ; 17: USI_OVF
devInfoBlock: ; 12 bytes devInfoBlock: ; 12 bytes
devInfoManufacturer: .db 'A', 'Q', 'U', 'A' devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
@@ -79,7 +72,8 @@ devInfoVersion: .db DEVICEINFO_VERSION, DEVICEINFO_REVISION ; v
firmwareVersion: .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR firmwareVersion: .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
.db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL .db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
firmwareStart: rjmp main ; will be overwritten when flashing firmwareStart:
rjmp main ; will be overwritten when flashing

2
avr/devices/n25/main/0BUILD
View File

@@ -2,7 +2,7 @@
<gwbuild> <gwbuild>
<target type="AvrHexFile" name="n22_firmware" > <target type="AvrHexFile" name="n25_firmware" >
<includes type="avrasm" > <includes type="avrasm" >
-I $(builddir) -I $(builddir)

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

@@ -27,6 +27,8 @@
;.include "./data.asm" ;.include "./data.asm"
.include "devices/all/defs.asm" .include "devices/all/defs.asm"
.include "common/calls.asm"
.include "common/utils_wait.asm" .include "common/utils_wait.asm"
@@ -95,21 +97,27 @@
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; Reset and interrupt vectors ; Reset and interrupt vectors
rjmp BOOTLOADER_ADDR ; Reset vector ; use this for flashed system rjmp BOOTLOADER_ADDR ; 1: Reset vector ; use this for flashed system
reti ; EXT_INT0 reti ; 2: EXT_INT0
rjmp UART_BitBang_PcintIsr ; PCI0 #ifdef MODULES_UART_BITBANG
reti ; OC1A rjmp UART_BitBang_PcintIsr ; 3: PCI0
reti ; OVF1 #else
reti ; OVF0 reti ; 3: PCI0
reti ; ERDY #endif
reti ; ACI reti ; 4: PCI1
reti ; ADCC reti ; 5: WDT
reti ; OC1B reti ; 6: TIM1_CAPT
rjmp baseTimerIrqOC0A ; OC0A reti ; 7: TIM1_COMPA
reti ; OC0B reti ; 8: TIM1_COMPB
reti ; WATCHDOG reti ; 9: TIM1_OVF
reti ; USI_STR rjmp baseTimerIrqOC0A ; 10: TIM0_COMPA
reti ; USI_OVF reti ; 11: TIM0_COMPB
reti ; 12: TIM0_OVF
reti ; 13: ANA_COMP
reti ; 14: ADC
reti ; 15: EE_RDY
reti ; 16: USI_STR
reti ; 17: USI_OVF
devInfoBlock: ; 12 bytes devInfoBlock: ; 12 bytes
@@ -163,12 +171,14 @@ onEveryDay:
onEverySecond: onEverySecond:
ret ret
#if 0
; debug ; debug
ldi r19, 0x00 ; G ldi r19, 0x00 ; G
ldi r18, 0xff ; R ldi r18, 0xff ; R
ldi r20, 0x55 ; B ldi r20, 0x55 ; B
ldi r21, 0xaa ; W ldi r21, 0xaa ; W
rcall SK6812_SetAllColor ; r23 (r16, r17) rcall SK6812_SetAllColor ; r23 (r16, r17)
#endif
ret ret
@@ -191,14 +201,16 @@ onEveryLoop:
.include "devices/all/hw_tn84.asm" .include "devices/all/hw_tn84.asm"
.include "devices/all/includes.asm" .include "devices/all/includes.asm"
.include "common/debug.asm" ;.include "common/debug.asm"
; --------------------------------------------------------------------------- ; ---------------------------------------------------------------------------
; defines for network interface ; defines for network interface
#ifdef MODULES_UART_BITBANG
.equ netInterfaceData = uart_bitbang_iface .equ netInterfaceData = uart_bitbang_iface
#endif