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

avr: started working on xpt2046 module.

Browse Source
This commit is contained in:
Martin Preuss
2025-11-10 14:49:23 +01:00
parent e82c1cbe5c
commit 29f74c0eae
15 changed files with 1020 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
avr/devices/c02/main/win_netstats.asm
View File

@@ -15,20 +15,20 @@
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(ili9341Font12x20_1*2)
ldi zh, HIGH(ili9341Font12x20_1*2)
bigcall TitleWindow_SetFont
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
ldi r16, LOW(winNetstats_title*2)
std Y+TITLEWINDOW_OFFS_TITLEPTR_LO, r16
ldi r16, HIGH(winNetstats_title*2)
std Y+TITLEWINDOW_OFFS_TITLEPTR_HI, r16
bigcall TitleWindow_SetFullSize
bigcall TitleWindow_SetStyleColors
@@ -37,64 +37,108 @@ WinNetStats_Init:
WinNetStats_Draw:
ldi yl, LOW(winNetstats)
ldi yh, HIGH(winNetstats)
bigcall TitleWindow_Draw
rcall WinNetStats_Update
ret
; @param @0 Y
; @param @1 label addr
; @param @2 data address
.macro WINNETSTATS_PRINTDATA
.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(@0) ; Y
ldi r16, LOW(STYLE_WIN_TITLE_HEIGHT+@0) ; Y
mov r6, r16
ldi r16, HIGH(@0)
ldi r16, HIGH(STYLE_WIN_TITLE_HEIGHT+@0)
mov r7, r16
bigcall Window_DrawTextFlash
.endmacro
; @param @0 Y
; @param @1 data address
.macro WINNETSTATS_PRINTDATA
ldi r16, 160 ; X
mov r4, r16
clr r5
ldi r16, LOW(@0) ; Y
ldi r16, LOW(STYLE_WIN_TITLE_HEIGHT+@0) ; Y
mov r6, r16
ldi r16, HIGH(@0)
mov r7, r16
lds r16, @2 ; data
lds r17, @2+1
lds r16, @1 ; data
lds r17, @1+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
; X
WINNETSTATS_PRINTLABEL 112, winNetstats_lX
; Y
WINNETSTATS_PRINTLABEL 134, winNetstats_lY
; Z
WINNETSTATS_PRINTLABEL 156, winNetstats_lZ
; update num
WINNETSTATS_PRINTLABEL 178, 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)
adiw yh:yl, TITLEWINDOW_OFFS_CONTENTWIN
bigcall Window_Clear
; packets in
WINNETSTATS_PRINTDATA 2, winNetstats_lPacketsIn, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
WINNETSTATS_PRINTDATA 2, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
; packets out
WINNETSTATS_PRINTDATA 24, winNetstats_lPacketsOut, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
WINNETSTATS_PRINTDATA 24, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
; eContent
WINNETSTATS_PRINTDATA 46, winNetstats_lContentErr, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
WINNETSTATS_PRINTDATA 46, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
; eIO
WINNETSTATS_PRINTDATA 68, winNetstats_lIoErr, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
WINNETSTATS_PRINTDATA 68, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
; eMsgSize
WINNETSTATS_PRINTDATA 90, winNetstats_lMsgSizeErr, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
WINNETSTATS_PRINTDATA 90, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
; X
WINNETSTATS_PRINTDATA 112, xpt2046CurrentX
; Y
WINNETSTATS_PRINTDATA 134, xpt2046CurrentY
; Z
WINNETSTATS_PRINTDATA 156, xpt2046CurrentZ
; update num
WINNETSTATS_PRINTDATA 178, winNetstatsUpdateNum
sbiw yh:yl, TITLEWINDOW_OFFS_CONTENTWIN
ret
; @end
@@ -107,13 +151,20 @@ 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
winNetstats:
.byte TITLEWINDOW_SIZE
winNetstatsUpdateNum: .byte 2
#endif