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

added c03.

Browse Source
This commit is contained in:
Martin Preuss
2025-11-17 23:02:19 +01:00
parent fbcfd65e7f
commit 102f4e65e3
15 changed files with 1253 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
avr/devices/0BUILD
View File

@@ -26,6 +26,7 @@
all all
c01 c01
c02 c02
c03
n14 n14
n16 n16
n21 n21

2
avr/devices/c03/.gitignore vendored Normal file
View File

@@ -0,0 +1,2 @@
*.eep.hex
*.obj

18
avr/devices/c03/0BUILD Normal file
View File

@@ -0,0 +1,18 @@
<?xml?>
<gwbuild>
<subdirs>
boot
main
</subdirs>
<extradist>
defs.asm
README
</extradist>
</gwbuild>

10
avr/devices/c03/README Normal file
View File

@@ -0,0 +1,10 @@
C01
===
- Role: Controller with Display
- MCU: AtMega 644P
- Connection: RJ45
- Periphery:
- Display with SPI

32
avr/devices/c03/boot/0BUILD Normal file
View File

@@ -0,0 +1,32 @@
<?xml?>
<gwbuild>
<target type="AvrHexFile" name="c03_boot" >
<includes type="avrasm" >
-I $(builddir)
-I $(srcdir)
-I $(topsrcdir)/avr
-I $(topbuilddir)/avr
</includes>
<sources type="avrasm" >
boot.asm
</sources>
</target>
<subdirs>
</subdirs>
<extradist>
</extradist>
</gwbuild>

159
avr/devices/c03/boot/boot.asm Normal file
View File

@@ -0,0 +1,159 @@
; ***************************************************************************
; Source file for base system node on AtMega 644P
;
; This is for the maintenance system (i.e. the flash loader).
;
; All definitions and changes should go into this file.
; ***************************************************************************
.equ clock=8000000 ; Define the clock frequency
.nolist
.include "include/m644Pdef.inc" ; Define device ATmega8515
.list
.include "../defs.asm"
.include "devices/all/defs.asm"
.include "common/calls.asm"
.include "common/utils_wait.asm"
.include "common/utils_io.asm"
; ***************************************************************************
; defines
; ---------------------------------------------------------------------------
; generic
.equ NET_BUFFERS_NUM = 6
.equ NET_BUFFERS_SIZE = 32
; ---------------------------------------------------------------------------
; firmware settings
.equ FIRMWARE_VERSION_MAJOR = 0
.equ FIRMWARE_VERSION_MINOR = 0
.equ FIRMWARE_VERSION_PATCHLEVEL = 1
; ---------------------------------------------------------------------------
; LED
.equ LED_DDR = DDRB
.equ LED_PORT = PORTB
.equ LED_PIN = PINB
.equ LED_PINNUM = PORTB0
; ***************************************************************************
; code segment
.cseg
.org 0x0000
; ---------------------------------------------------------------------------
; Reset and interrupt vectors
jmp main ; 1: Reset vector RESET
jmp irqNotSet ; 2: INT0 External Interrupt Request 0
jmp irqNotSet ; 3: INT1 External Interrupt Request 1
jmp irqNotSet ; 4: INT2 External Interrupt Request 2
jmp irqNotSet ; 5: PCINT0 Pin Change Interrupt Request 0
jmp irqNotSet ; 6: PCINT1 Pin Change Interrupt Request 1
jmp irqNotSet ; 7: PCINT2 Pin Change Interrupt Request 2
jmp irqNotSet ; 8: PCINT3 Pin Change Interrupt Request 3
jmp irqNotSet ; 9: WDT Watchdog Time-out Interrupt
jmp irqNotSet ; 10: TIMER2_COMPA Timer/Counter2 Compare Match A
jmp irqNotSet ; 11: TIMER2_COMPB Timer/Counter2 Compare Match B
jmp irqNotSet ; 12: TIMER2_OVF Timer/Counter2 Overflow
jmp irqNotSet ; 13: TIMER1_CAPT Timer/Counter1 Capture Event
jmp irqNotSet ; 14: TIMER1_COMPA Timer/Counter1 Compare Match A
jmp irqNotSet ; 15: TIMER1_COMPB Timer/Counter1 Compare Match B
jmp irqNotSet ; 16: TIMER1_OVF Timer/Counter1 Overflow
jmp irqNotSet ; 17: TIMER0_COMPA Timer/Counter0 Compare Match A
jmp irqNotSet ; 18: TIMER0_COMPB Timer/Counter0 Compare Match B
jmp irqNotSet ; 19: TIMER0_OVF Timer/Counter0 Overflow
jmp irqNotSet ; 20: SPI_STC Serial Transfer Complete
jmp irqNotSet ; 21: USART0_RXC USART0 Rx Complete
jmp irqNotSet ; 22: USART0_UDRE USART0 Data Register Empty
jmp irqNotSet ; 23: USART0_TXC USART0 Tx Complete
jmp irqNotSet ; 24: ANA_COMP Analog Comparator
jmp irqNotSet ; 25: ADC ADC Conversion Complete
jmp irqNotSet ; 26: EE_RDY EEPROM Ready
jmp irqNotSet ; 27: TWI 2-Wire Interface
jmp irqNotSet ; 28: SPM_RDY Store Program Memory Ready
; ---------------------------------------------------------------------------
; Device Info Block
devInfoBlock: ; 12 bytes
devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
devInfoId: .db DEVICEINFO_ID, 0
devInfoVersion: .db DEVICEINFO_VERSION, DEVICEINFO_REVISION ; version, revision
firmwareVersion: .db FIRMWARE_VARIANT_BOOT, FIRMWARE_VERSION_MAJOR
.db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
firmwareStart:
jmp main ; will be overwritten when flashing
irqNotSet:
reti
; ***************************************************************************
; main code
.org BOOTLOADER_ADDR
main:
; ldi r16, 0xb0 ; orig: a0
; out OSCCAL, r16
jmp bootLoader ; this routine is in modules/bootloader/main.asm
; ***************************************************************************
; includes
.include "common/wait_10us.asm"
.include "common/utils_copy_from_flash.asm"
.include "common/utils_copy_sdram.asm"
.include "modules/flash/defs.asm"
.include "modules/flash/eeprom.asm"
.include "modules/flash/io.asm"
.include "modules/flash/io_com2w.asm"
.include "modules/flash/flash1pmega.asm"
.include "modules/flash/flashxp.asm"
.include "modules/flash/flashprocess.asm"
.include "modules/flash/wait.asm"
.include "modules/bootloader/main.asm"
.include "modules/network/msg/defs.asm"
.include "modules/network/msg/crc.asm"
;.include "common/debug.asm"
systemSetSpeed:
; speed not changeable at runtime on this device
ret

195
avr/devices/c03/defs.asm Normal file
View File

@@ -0,0 +1,195 @@
; ***************************************************************************
; copyright : (C) 2025 by Martin Preuss
; email : martin@libchipcard.de
;
; ***************************************************************************
; * This file is part of the project "AqHome". *
; * Please see toplevel file COPYING of that project for license details. *
; ***************************************************************************
; ***************************************************************************
;
; AtMega644
; --------
; LED PB0 1 40 PA0 DEV0
; DC PB1 2 39 PA1 DEV1
; INT2 PB2 3 38 PA2 DEV2
; DSPRES PB3 4 37 PA3 PA3
; SS PB4 5 36 PA4 PA4
; MOSI PB5 6 35 PA5
; MISO PB6 7 34 PA6
; SCK PB7 8 33 PA7
; /RESET 9 32 AREF
; VCC 10 31 GND
; GND 11 30 AVCC
; XTAL2 12 29 PC7
; XTAL1 13 28 PC6
; RXD PD0 14 27 PC5
; TXD PD1 15 26 PC4
; PD2 16 25 PC3
; INT1 PD3 17 24 PC2
; AUX_PD4 PD4 18 23 PC1
; DSPLED PD5 19 22 PC0
; PD6 20 21 PD7
; --------
;
; ***************************************************************************
.equ BOOTLOADER_ADDR = 0x7c00
.equ FIRMWARE_VARIANT_BOOT = 0
.equ FIRMWARE_VARIANT_TEMP_WINDOW = 1
.equ DEVICEINFO_ID = 'C'
.equ DEVICEINFO_VERSION = 3
.equ DEVICEINFO_REVISION = 0
; ---------------------------------------------------------------------------
; LED module
.equ LED_SIMPLE_ONTIME = 1 ; shorter
.equ LED_SIMPLE_OFFTIME = 50 ; longer
.equ LED_SIMPLE_DDR = DDRB
.equ LED_SIMPLE_PORT = PORTB
.equ LED_SIMPLE_PORTIN = PINB
.equ LED_SIMPLE_PINNUM = PORTB0
; ---------------------------------------------------------------------------
; COM module
.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_DATA_DDR = DDRA
.equ COM_DATA_INPUT = PINA
.equ COM_DATA_OUTPUT = PORTA
.equ COM_DATA_PIN = PORTA6
.equ COM_CLK_DDR = DDRA
.equ COM_CLK_INPUT = PINA
.equ COM_CLK_OUTPUT = PORTA
.equ COM_CLK_PIN = PORTA7
; pin change interrupt register and bit
.equ COM_IRQ_ADDR_CLK = PCMSK0
.equ COM_IRQ_BIT_CLK = PCINT7 ; PA7
; interrupt control register
.equ COM_IRQ_ICR_ADDR = PCICR ; PCICR on AtMega644P, GIMSK on AtTiny
.equ COM_IRQ_ICR_BIT = PCIE0
; interrupt flag/mask register
.equ COM_IRQ_IFR_ADDR = PCIFR ; PCIFR on AtMega644P, GIFR on AtTiny
.equ COM_IRQ_IFR_BIT = PCIF0
.equ COM_IRQ_GIFR_CLK = INTF0
;.equ COM_IRQ_GIMSK_CLK = PCIE0
; ---------------------------------------------------------------------------
; SPI hardware module
.equ SPIHW_SS_DDR = DDRB
.equ SPIHW_SS_INPUT = PINB
.equ SPIHW_SS_OUTPUT = PORTB
.equ SPIHW_SS_PIN = PORTB4
.equ SPIHW_MOSI_DDR = DDRB
.equ SPIHW_MOSI_INPUT = PINB
.equ SPIHW_MOSI_OUTPUT = PORTB
.equ SPIHW_MOSI_PIN = PORTB5
.equ SPIHW_MISO_DDR = DDRB
.equ SPIHW_MISO_INPUT = PINB
.equ SPIHW_MISO_OUTPUT = PORTB
.equ SPIHW_MISO_PIN = PORTB6
.equ SPIHW_SCK_DDR = DDRB
.equ SPIHW_SCK_INPUT = PINB
.equ SPIHW_SCK_OUTPUT = PORTB
.equ SPIHW_SCK_PIN = PORTB7
.equ SPIHW_SS0_DDR = DDRA
.equ SPIHW_SS0_OUTPUT = PORTA
.equ SPIHW_SS0_INPUT = PORTA
.equ SPIHW_SS0_PIN = PORTA0
.equ SPIHW_SS1_DDR = DDRA
.equ SPIHW_SS1_OUTPUT = PORTA
.equ SPIHW_SS1_INPUT = PORTA
.equ SPIHW_SS1_PIN = PORTA1
.equ SPIHW_SS2_DDR = DDRA
.equ SPIHW_SS2_OUTPUT = PORTA
.equ SPIHW_SS2_INPUT = PORTA
.equ SPIHW_SS2_PIN = PORTA2
; ---------------------------------------------------------------------------
; ILI9341 module
.equ DISPLAY_WIDTH = 320
.equ DISPLAY_HEIGHT = 240
.equ ILI9341_DEVICENUM = 0
.equ ILI9341_DSP_WIDTH = DISPLAY_WIDTH
.equ ILI9341_DSP_HEIGHT = DISPLAY_HEIGHT
.equ ILI9341_RESET_DDR = DDRB
.equ ILI9341_RESET_OUTPUT = PORTB
.equ ILI9341_RESET_INPUT = PORTB
.equ ILI9341_RESET_PIN = PORTB3
.equ ILI9341_DC_DDR = DDRB
.equ ILI9341_DC_OUTPUT = PORTB
.equ ILI9341_DC_INPUT = PORTB
.equ ILI9341_DC_PIN = PORTB1
.equ ILI9341_LED_DDR = DDRD
.equ ILI9341_LED_OUTPUT = PORTD
.equ ILI9341_LED_INPUT = PORTD
.equ ILI9341_LED_PIN = PORTD5
; ---------------------------------------------------------------------------
; XPT2046 module
.equ XPT2046_DEVICENUM = 1
; ---------------------------------------------------------------------------
; ComOnUart module
;.equ USART0_DATAREG = UDR
;.equ UCSR0A = UCSRA
;.equ UCSR0B = UCSRB
;.equ UCSR0C = UCSRC
;.equ UBRR0L = UBRRL
;.equ UBRR0H = UBRRH
;.equ UCSZ00 = UCSZ0
;.equ UCSZ01 = UCSZ1
;.equ UDRE0 = UDRE
;.equ RXC0 = RXC
;.equ TXC0 = TXC
;.equ FE0 = FE
;.equ DOR0 = DOR
;.equ UPE0 = UPE
;.equ RXEN0 = RXEN
;.equ TXEN0 = TXEN
;.equ USBS0 = USBS
;.equ RXCIE0 = RXCIE
;.equ UDRIE0 = UDRIE

34
avr/devices/c03/main/0BUILD Normal file
View File

@@ -0,0 +1,34 @@
<?xml?>
<gwbuild>
<target type="AvrHexFile" name="c03_firmware" >
<includes type="avrasm" >
-I $(builddir)
-I $(srcdir)
-I $(topsrcdir)/avr
-I $(topbuilddir)/avr
</includes>
<sources type="avrasm" >
main.asm
</sources>
</target>
<subdirs>
</subdirs>
<extradist>
data.asm
</extradist>
</gwbuild>

14
avr/devices/c03/main/data.asm Normal file
View File

@@ -0,0 +1,14 @@
; ***************************************************************************
; copyright : (C) 2025 by Martin Preuss
; email : martin@libchipcard.de
;
; ***************************************************************************
; * This file is part of the project "AqHome". *
; * Please see toplevel file COPYING of that project for license details. *
; ***************************************************************************
.dseg

287
avr/devices/c03/main/dlg_netstats.asm Normal file
View File

@@ -0,0 +1,287 @@
; ***************************************************************************
; copyright : (C) 2025 by Martin Preuss
; email : martin@libchipcard.de
;
; ***************************************************************************
; * This file is part of the project "AqHome". *
; * Please see toplevel file COPYING of that project for license details. *
; ***************************************************************************
#ifndef AQH_AVR_DEVICE_C03_DLG_NETSTATS_ASM
#define AQH_AVR_DEVICE_C03_DLG_NETSTATS_ASM
.equ DLG_NETSTATS_TIMER_100ms = 50
.equ DLG_NETSTATS_FLAGS_BUTTON_DOWN_BIT = 0
.cseg
DlgNetStats_Init:
ldi yl, LOW(dlgNetstats)
ldi yh, HIGH(dlgNetstats)
bigcall Dialog_Init
; set handler
ldi r16, LOW(DlgNetStats_Handler)
std Y+DIALOG_OFFS_HANDLER_LO, r16
ldi r16, HIGH(DlgNetStats_Handler)
std Y+DIALOG_OFFS_HANDLER_HI, r16
; clear vars
clr r16
sts dlgNetstatsUpdateNum, r16
sts dlgNetstatsUpdateNum+1, r16
sts dlgNetstatsTimer, r16
sts dlgNetstatsFlags, r16
ret
; @end
DlgNetStats_Handler:
cpi r23, (DIALOG_FN_TIMER+1)
brcc DlgNetStats_Handler_ret
ldi zl, LOW(DlgNetStats_Handler_Fns)
ldi zh, HIGH(DlgNetStats_Handler_Fns)
add zl, r23
adc zh, r23
sub zh, r23
ijmp
DlgNetStats_Handler_ret:
ret
; @end
DlgNetStats_Handler_Fns:
rjmp dlgNetStatsOnInit
rjmp dlgNetStatsOnFini
rjmp dlgNetStatsOnShow
rjmp dlgNetStatsOnHide
ret ; rjmp dlgNetStatsOnTouch
rjmp dlgNetStatsOnTimer
dlgNetStatsOnInit:
ret
dlgNetStatsOnFini:
ret
dlgNetStatsOnShow:
push yl
push yh
mov yl, xl
mov yh, xh
rcall DlgNetStats_Show
pop yh
pop yl
ret
dlgNetStatsOnHide:
ret
dlgNetStatsOnTouch:
mov r16, r18
mov r17, r18
mov yl, xl
mov yh, xh
; check for press change event
andi r17, (1<<DISPLAY_IFLAGS_CHGPRESS_BIT)
breq dlgNetStatsTouch_ret
; press changed
mov r17, r16
andi r17, (1<<DISPLAY_IFLAGS_PRESSED_BIT)
breq dlgNetStatsTouch_up
; touch came down
ldi zl, LOW(dlgNetstats_CloseBtn*2)
ldi zh, HIGH(dlgNetstats_CloseBtn*2)
bigcall Window_IsPointInRect
brcc dlgNetStatsTouch_ret
lds r16, dlgNetstatsFlags
mov r17, r16
andi r17, (1<<DLG_NETSTATS_FLAGS_BUTTON_DOWN_BIT)
brne dlgNetStatsTouch_ret ; already down, jmp
ori r16, (1<<DLG_NETSTATS_FLAGS_BUTTON_DOWN_BIT)
sts dlgNetstatsFlags, r16
ldi zl, LOW(dlgNetstats_CloseBtn*2)
ldi zh, HIGH(dlgNetstats_CloseBtn*2)
bigcall Button_Draw_Down
rjmp dlgNetStatsTouch_ret
dlgNetStatsTouch_up:
; touch came up
lds r16, dlgNetstatsFlags
mov r17, r16
andi r17, (1<<DLG_NETSTATS_FLAGS_BUTTON_DOWN_BIT)
breq dlgNetStatsTouch_ret ; already up, jmp
cbr r16, (1<<DLG_NETSTATS_FLAGS_BUTTON_DOWN_BIT)
sts dlgNetstatsFlags, r16
ldi zl, LOW(dlgNetstats_CloseBtn*2)
ldi zh, HIGH(dlgNetstats_CloseBtn*2)
bigcall Button_Draw_Up
ldi zl, LOW(dlgNetstats_CloseBtn*2)
ldi zh, HIGH(dlgNetstats_CloseBtn*2)
bigcall Window_IsPointInRect
brcc dlgNetStatsTouch_ret
; touch ended over button, TODO
dlgNetStatsTouch_ret:
ret
dlgNetStatsOnTimer:
ldd r16, Y+DIALOG_OFFS_OPTIONS
andi r16, (1<<DIALOG_OPT_ACTIVE_BIT)
breq dlgNetStatsTimer_ret ; not visible, hold timer
lds r16, dlgNetstatsTimer
inc r16
sts dlgNetstatsTimer, r16
cpi r16, DLG_NETSTATS_TIMER_100ms
brcs dlgNetStatsTimer_ret
push yl
push yh
mov yl, xl
mov yh, xh
rcall DlgNetStats_Update
pop yh
pop yl
clr r16
sts dlgNetstatsTimer, r16
dlgNetStatsTimer_ret:
ret
; @param @0 Y
; @param @1 label addr
.macro DLGNETSTATS_PRINTLABEL
; packets in
ldi zl, LOW(@1 * 2)
ldi zh, HIGH(@1 * 2)
ldi r16, 2 ; X
mov r4, r16
clr r5
ldi r16, LOW(STYLE_WIN_TITLE_HEIGHT+@0) ; Y
mov r6, r16
ldi r16, HIGH(STYLE_WIN_TITLE_HEIGHT+@0)
mov r7, r16
bigcall Window_DrawTextFlash
.endmacro
; @param @0 X
; @param @1 Y
; @param @2 data address
.macro DLGNETSTATS_PRINTDATA
ldi r16, @0 ; X
mov r4, r16
clr r5
ldi r16, LOW(STYLE_WIN_TITLE_HEIGHT+@1) ; Y
mov r6, r16
ldi r16, HIGH(@1)
mov r7, r16
lds r16, @2 ; data
lds r17, @2+1
bigcall Window_WriteHexWordAt
.endmacro
DlgNetStats_Show:
; draw title window basics (with title)
ldi zl, LOW(dlgNetstats_title*2)
ldi zh, HIGH(dlgNetstats_title*2)
bigcall TitleWindow_DrawTitle
bigcall TitleWindow_ClearContentArea
; packets in
DLGNETSTATS_PRINTLABEL 2, dlgNetstats_lPacketsIn
; packets out
DLGNETSTATS_PRINTLABEL 24, dlgNetstats_lPacketsOut
; eContent
DLGNETSTATS_PRINTLABEL 46, dlgNetstats_lContentErr
; eIO
DLGNETSTATS_PRINTLABEL 68, dlgNetstats_lIoErr
; eMsgSize
DLGNETSTATS_PRINTLABEL 90, dlgNetstats_lMsgSizeErr
; update num
DLGNETSTATS_PRINTLABEL 114, dlgNetstats_lUpdate
ldi zl, LOW(dlgNetstats_CloseBtn*2)
ldi zh, HIGH(dlgNetstats_CloseBtn*2)
bigcall Button_Draw_Up
rcall DlgNetStats_Update
ret
; @end
DlgNetStats_Update:
lds r16, dlgNetstatsUpdateNum
inc r16
sts dlgNetstatsUpdateNum, r16
; packets in
DLGNETSTATS_PRINTDATA 160, 2, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
; packets out
DLGNETSTATS_PRINTDATA 160, 24, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
; eContent
DLGNETSTATS_PRINTDATA 160, 46, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
; eIO
DLGNETSTATS_PRINTDATA 160, 68, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
; eMsgSize
DLGNETSTATS_PRINTDATA 160, 90, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
DLGNETSTATS_PRINTDATA 160, 114, dlgNetstatsUpdateNum
ret
; @end
dlgNetstats_title: .db "Network Statistics", 0, 0
dlgNetstats_lPacketsIn: .db "Pkgs In :", 0
dlgNetstats_lPacketsOut: .db "Pkgs Out:", 0
dlgNetstats_lContentErr: .db "eContent:", 0
dlgNetstats_lIoErr: .db "eIO :", 0
dlgNetstats_lMsgSizeErr: .db "eMsgSize:", 0
dlgNetstats_lUpdate: .db "Update :", 0
dlgNetstats_lClose: .db "Close", 0
dlgNetstats_CloseBtn: .dw 128, (140+STYLE_WIN_TITLE_HEIGHT), 64, 32, (dlgNetstats_lClose*2)
.dseg
dlgNetstats: .byte DIALOG_SIZE
dlgNetstatsUpdateNum: .byte 2
dlgNetstatsTimer: .byte 1
dlgNetstatsFlags: .byte 1
#endif ; AQH_AVR_DEVICE_C03_DLG_NETSTATS_ASM

294
avr/devices/c03/main/main.asm Normal file
View File

@@ -0,0 +1,294 @@
; ***************************************************************************
; copyright : (C) 2025 by Martin Preuss
; email : martin@libchipcard.de
;
; ***************************************************************************
; * This file is part of the project "AqHome". *
; * Please see toplevel file COPYING of that project for license details. *
; ***************************************************************************
;.equ clock=1000000 ; Define the clock frequency
.equ clock=8000000 ; Define the clock frequency
.nolist
.include "include/m644Pdef.inc" ; Define device ATmega644P
.list
.include "version.asm"
.include "../defs.asm"
.include "./data.asm"
.include "devices/all/defs.asm"
.include "common/calls.asm"
.include "common/utils_wait.asm"
.include "common/utils_io.asm"
; ***************************************************************************
; defines
; ---------------------------------------------------------------------------
; generic
.equ STACK_SIZE = 256
.equ NET_BUFFERS_NUM = 8
.equ NET_MSGNUMINBUF_SIZE = 8 ; max buffer nums in ringbuffer (global incoming)
.equ NET_IFACE_OUTMSGBUF_SIZE = 8 ; max buffer nums in ringbuffer (per interface outbound)
; ---------------------------------------------------------------------------
; firmware settings including list of modules used
; #define MODULES_TIMER
#define MODULES_CLOCK
;#define MODULES_XRAM
;#define MODULES_HEAP
#define MODULES_LED_SIMPLE
#define MODULES_NETWORK
;#define MODULES_COMONUART0
;#define MODULES_UART_HW
;#define MODULES_UART_BITBANG
#define MODULES_COM2W
#define MODULES_SPI_HW
#define MODULES_ILI9341
#define MODULES_XPT2046
#define MODULES_FONT
#define MODULES_GUI
;#define MODULES_TWI_MASTER
;#define MODULES_LCD
;#define LCD_MINIMAL_FONT
;#define MODULES_SI7021
;#define MODULES_SGP30
;#define MODULES_SGP40
;#define MODULES_STATS
;#define MODULES_OWI_MASTER
;#define MODULES_DS18B20
;#define MODULES_MOTION
;#define MODULES_CCS811
#define APPS_NETWORK
;#define APPS_MOTION
;#define APPS_REPORTSENSORS
#define APPS_STATS
; ---------------------------------------------------------------------------
; defines for values
.equ VALUE_ID_SI7021_TEMP = 0x01
.equ VALUE_ID_SI7021_HUM = 0x02
.equ VALUE_ID_ADC = 0x03
;.equ VALUE_ID_DS18B20_TEMP = 0x06
.equ VALUE_ID_MOTION = 0x07
.equ VALUE_ID_SGP40_TVOC = 0x08
.equ VALUE_ID_SGP30_TVOC = 0x09
.equ VALUE_ID_SGP30_CO2 = 0x0a
;.equ VALUE_ID_REED_CONF = 0x81
.equ VALUE_ID_DEBUG = 0x7f
.equ VALUE_ID_LEDSIMPLE_TIMING = 0x88
; ***************************************************************************
; code segment
.cseg
.org 000000
; ---------------------------------------------------------------------------
; Reset and interrupt vectors
jmp BOOTLOADER_ADDR ; 1: Reset vector RESET
jmp irqNotSet ; 2: INT0 External Interrupt Request 0
jmp irqNotSet ; 3: INT1 External Interrupt Request 1
jmp irqNotSet ; 4: INT2 External Interrupt Request 2
jmp com2wPcintIsr ; 5: PCINT0 Pin Change Interrupt Request 0
jmp irqNotSet ; 6: PCINT1 Pin Change Interrupt Request 1
jmp irqNotSet ; 7: PCINT2 Pin Change Interrupt Request 2
jmp irqNotSet ; 8: PCINT3 Pin Change Interrupt Request 3
jmp irqNotSet ; 9: WDT Watchdog Time-out Interrupt
jmp irqNotSet ; 10: TIMER2_COMPA Timer/Counter2 Compare Match A
jmp irqNotSet ; 11: TIMER2_COMPB Timer/Counter2 Compare Match B
jmp irqNotSet ; 12: TIMER2_OVF Timer/Counter2 Overflow
jmp irqNotSet ; 13: TIMER1_CAPT Timer/Counter1 Capture Event
jmp irqNotSet ; 14: TIMER1_COMPA Timer/Counter1 Compare Match A
jmp irqNotSet ; 15: TIMER1_COMPB Timer/Counter1 Compare Match B
jmp irqNotSet ; 16: TIMER1_OVF Timer/Counter1 Overflow
jmp baseTimerIrqOC0A ; 17: TIMER0_COMPA Timer/Counter0 Compare Match A
jmp irqNotSet ; 18: TIMER0_COMPB Timer/Counter0 Compare Match B
jmp irqNotSet ; 19: TIMER0_OVF Timer/Counter0 Overflow
jmp irqNotSet ; 20: SPI_STC Serial Transfer Complete
jmp irqNotSet ; 21: USART0_RXC USART0 Rx Complete
jmp irqNotSet ; 22: USART0_UDRE USART0 Data Register Empty
jmp irqNotSet ; 23: USART0_TXC USART0 Tx Complete
jmp irqNotSet ; 24: ANA_COMP Analog Comparator
jmp irqNotSet ; 25: ADC ADC Conversion Complete
jmp irqNotSet ; 26: EE_RDY EEPROM Ready
jmp irqNotSet ; 27: TWI 2-Wire Interface
jmp irqNotSet ; 28: SPM_RDY Store Program Memory Ready
devInfoBlock: ; 12 bytes
devInfoManufacturer: .db 'A', 'Q', 'U', 'A'
devInfoId: .db DEVICEINFO_ID, 0
devInfoVersion: .db DEVICEINFO_VERSION, DEVICEINFO_REVISION ; version, revision
firmwareVersion: .db FIRMWARE_VARIANT_TEMP_WINDOW, FIRMWARE_VERSION_MAJOR
.db FIRMWARE_VERSION_MINOR, FIRMWARE_VERSION_PATCHLEVEL
; ---------------------------------------------------------------------------
; @routine firmwareStart @global
firmwareStart:
rjmp main
; @end
irqNotSet:
reti
; ---------------------------------------------------------------------------
; @routine onSystemStart
onSystemStart:
clr r16
sts statsUpdateTimer, r16
bigcall test
ret
; @end
; ---------------------------------------------------------------------------
; @routine onMessageReceived
;
; Called on every message received
onMessageReceived:
clc
ret
; @end
; ---------------------------------------------------------------------------
; @routine onEvery100ms
;
; Called every 100ms. Add your routine calls here. No arguments, no results.
onEvery100ms:
bigcall DialogMgr_Every100ms
ret
onEveryMinute:
onEveryHour:
onEveryDay:
ret
; @end
onEverySecond:
#if 0
#ifdef MODULES_GUI
lds r16, statsUpdateTimer
inc r16
cpi r16, 5
brcc onEverySecond_updateStats
sts statsUpdateTimer, r16
ret
onEverySecond_updateStats:
bigcall WinNetStats_Update
clr r16
sts statsUpdateTimer, r16
#endif
#endif
ret
; ---------------------------------------------------------------------------
; @routine onEveryLoop
;
; Called on every loop (i.e. after awakening from sleep).
;
onEveryLoop:
ret
; @end
test:
bigcall DialogMgr_Init
bigcall DlgNetStats_Init
bigcall DialogMgr_PushDialog
ret
; ***************************************************************************
; includes
.include "devices/all/hw_m644p.asm"
.include "devices/all/includes.asm"
.include "common/debug.asm"
.include "modules/lcd2/gui/titlewindow2.asm"
.include "modules/lcd2/gui/dialog.asm"
.include "modules/lcd2/gui/button.asm"
;.include "modules/lcd2/font/font2.asm"
;.include "modules/lcd2/font/font3.asm"
;.include "modules/lcd2/font/font16x26.asm"
;.include "modules/lcd2/font/font4.asm"
;.include "modules/lcd2/font/font12x16.asm"
.include "modules/lcd2/ili9341/font12x20.asm"
.include "modules/lcd2/ili9341/font12x20_1.asm"
;.include "common/list_t.asm"
;.include "common/tree_t.asm"
.include "common/divide.asm"
.include "modules/lcd2/gui/style.asm"
.include "dlg_netstats.asm"
; ---------------------------------------------------------------------------
; defines for network interface
;.equ netInterfaceData = netUartIface
;.equ netInterfaceData = uart_bitbang_iface
.equ netInterfaceData = com2w_iface
.dseg
statsUpdateTimer: .byte 1
heapStart:
.equ HEAP_START = heapStart
.equ HEAP_SIZE = (SRAM_SIZE-STACK_SIZE)-HEAP_START

187
avr/devices/c03/main/win_netstats.asm Normal file
View File

@@ -0,0 +1,187 @@
; ***************************************************************************
; copyright : (C) 2025 by Martin Preuss
; email : martin@libchipcard.de
;
; ***************************************************************************
; * This file is part of the project "AqHome". *
; * Please see toplevel file COPYING of that project for license details. *
; ***************************************************************************
#ifndef AQH_AVR_DEVICE_C02_WIN_NETSTATS_ASM
#define AQH_AVR_DEVICE_C02_WIN_NETSTATS_ASM
.cseg
WinNetStats_Init:
clr r16
sts winNetstatsUpdateNum, r16
sts winNetstatsUpdateNum+1, r16
; setup
ldi yl, LOW(winNetstats)
ldi yh, HIGH(winNetstats)
bigcall TitleWindow_Init
ldi zl, LOW(STYLE_WIN_FONT*2)
ldi zh, HIGH(STYLE_WIN_FONT*2)
std Y+WIN_OFFS_FONT_LO, zl
std Y+WIN_OFFS_FONT_HI, zh
bigcall TitleWindow_SetFullSize
bigcall TitleWindow_SetStyleColors
ret
; @end
; @param @0 Y
; @param @1 label addr
.macro WINNETSTATS_PRINTLABEL
; packets in
ldi zl, LOW(@1 * 2)
ldi zh, HIGH(@1 * 2)
ldi r16, 2 ; X
mov r4, r16
clr r5
ldi r16, LOW(STYLE_WIN_TITLE_HEIGHT+@0) ; Y
mov r6, r16
ldi r16, HIGH(STYLE_WIN_TITLE_HEIGHT+@0)
mov r7, r16
bigcall Window_DrawTextFlash
.endmacro
; @param @0 X
; @param @1 Y
; @param @2 data address
.macro WINNETSTATS_PRINTDATA
ldi r16, @0 ; X
mov r4, r16
clr r5
ldi r16, LOW(STYLE_WIN_TITLE_HEIGHT+@1) ; Y
mov r6, r16
ldi r16, HIGH(@1)
mov r7, r16
lds r16, @2 ; data
lds r17, @2+1
bigcall Window_WriteHexWordAt
.endmacro
WinNetStats_Show:
; draw title window basics (with title)
ldi yl, LOW(winNetstats)
ldi yh, HIGH(winNetstats)
ldi zl, LOW(winNetstats_title*2)
ldi zh, HIGH(winNetstats_title*2)
bigcall TitleWindow_DrawTitle
bigcall TitleWindow_ClearContentArea
; packets in
WINNETSTATS_PRINTLABEL 2, winNetstats_lPacketsIn
; packets out
WINNETSTATS_PRINTLABEL 24, winNetstats_lPacketsOut
; eContent
WINNETSTATS_PRINTLABEL 46, winNetstats_lContentErr
; eIO
WINNETSTATS_PRINTLABEL 68, winNetstats_lIoErr
; eMsgSize
WINNETSTATS_PRINTLABEL 90, winNetstats_lMsgSizeErr
; draw horizontal line
ldi r16, STYLE_WIN_TITLE_HEIGHT+112
mov r6, r16
clr r7
clr r4
clr r5
ldi r16, LOW(DISPLAY_WIDTH)
mov r8, r16
ldi r16, HIGH(DISPLAY_WIDTH)
mov r9, r16
clr r2
clr r3
bigcall Display_DrawHLine
; X
WINNETSTATS_PRINTLABEL 114, winNetstats_lX
; Y
WINNETSTATS_PRINTLABEL 136, winNetstats_lY
; Z
WINNETSTATS_PRINTLABEL 158, winNetstats_lZ
; update num
WINNETSTATS_PRINTLABEL 180, winNetstats_lUpdate
rcall WinNetStats_Update
ret
; @end
WinNetStats_Update:
lds r16, winNetstatsUpdateNum
inc r16
sts winNetstatsUpdateNum, r16
ldi yl, LOW(winNetstats)
ldi yh, HIGH(winNetstats)
; packets in
WINNETSTATS_PRINTDATA 160, 2, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
; packets out
WINNETSTATS_PRINTDATA 160, 24, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
; eContent
WINNETSTATS_PRINTDATA 160, 46, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
; eIO
WINNETSTATS_PRINTDATA 160, 68, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
; eMsgSize
WINNETSTATS_PRINTDATA 160, 90, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
; X
WINNETSTATS_PRINTDATA 160, 114, xpt2046CurrentX
WINNETSTATS_PRINTDATA 240, 114, xpt2046RawX
; Y
WINNETSTATS_PRINTDATA 160, 136, xpt2046CurrentY
WINNETSTATS_PRINTDATA 240, 136, xpt2046RawY
; Z
WINNETSTATS_PRINTDATA 160, 158, xpt2046CurrentZ
; update num
WINNETSTATS_PRINTDATA 160, 180, winNetstatsUpdateNum
ret
; @end
winNetstats_title: .db "Network Statistics", 0, 0
winNetstats_lPacketsIn: .db "Pkgs In :", 0
winNetstats_lPacketsOut: .db "Pkgs Out:", 0
winNetstats_lContentErr: .db "eContent:", 0
winNetstats_lIoErr: .db "eIO :", 0
winNetstats_lMsgSizeErr: .db "eMsgSize:", 0
winNetstats_lX: .db "X :", 0
winNetstats_lY: .db "Y :", 0
winNetstats_lZ: .db "Z :", 0
winNetstats_lUpdate: .db "Update :", 0
.dseg
winNetstats:
.byte WIN_SIZE
.dseg
winNetstatsUpdateNum: .byte 2
#endif

1
devices/nodes/0BUILD
View File

@@ -4,6 +4,7 @@
<data dist="true" install="$(datadir)/aqhome/devices/nodes"> <data dist="true" install="$(datadir)/aqhome/devices/nodes">
aqua_c01.xml aqua_c01.xml
aqua_c02.xml aqua_c02.xml
aqua_c03.xml
aqua_n06.xml aqua_n06.xml
aqua_n11.xml aqua_n11.xml
aqua_n12.xml aqua_n12.xml

12
devices/nodes/aqua_c03.xml Normal file
View File

@@ -0,0 +1,12 @@
<device name="aqua_c03" driver="nodes">
<manufacturer>AQUA</manufacturer>
<devicetype>C</devicetype>
<deviceversion>3</deviceversion>
<values>
<value name="LEDTIMING" id="0x88" type="actor" dataType="uint16" />
</values>
</device>

7
flashnode.sh
View File

@@ -23,6 +23,13 @@ case $NODE in
EFUSE_ARG="-U efuse:w:0xFF:m" EFUSE_ARG="-U efuse:w:0xFF:m"
FILE_ARG="-U flash:w:./0-build/avr/devices/c02/boot/c02_boot.hex" FILE_ARG="-U flash:w:./0-build/avr/devices/c02/boot/c02_boot.hex"
;; ;;
c03)
DEVICE_ARG="-p m644p"
HFUSE_ARG="-U hfuse:w:0xD5:m"
LFUSE_ARG="-U lfuse:w:0xE2:m"
EFUSE_ARG="-U efuse:w:0xFF:m"
FILE_ARG="-U flash:w:./0-build/avr/devices/c03/boot/c03_boot.hex"
;;
n14) n14)
DEVICE_ARG="-p t85" DEVICE_ARG="-p t85"
HFUSE_ARG="-U hfuse:w:0xD7:m" HFUSE_ARG="-U hfuse:w:0xD7:m"