xpt2046 now basically works.
This commit is contained in:
@@ -260,7 +260,7 @@ test:
|
||||
.include "modules/lcd2/ili9341/font12x20_1.asm"
|
||||
;.include "common/list_t.asm"
|
||||
;.include "common/tree_t.asm"
|
||||
;.include "common/divide.asm"
|
||||
.include "common/divide.asm"
|
||||
|
||||
.include "modules/lcd2/gui/style.asm"
|
||||
.include "win_netstats.asm"
|
||||
|
||||
@@ -56,19 +56,20 @@ WinNetStats_Init:
|
||||
|
||||
|
||||
|
||||
; @param @0 Y
|
||||
; @param @1 data address
|
||||
; @param @0 X
|
||||
; @param @1 Y
|
||||
; @param @2 data address
|
||||
|
||||
.macro WINNETSTATS_PRINTDATA
|
||||
ldi r16, 160 ; X
|
||||
ldi r16, @0 ; X
|
||||
mov r4, r16
|
||||
clr r5
|
||||
ldi r16, LOW(STYLE_WIN_TITLE_HEIGHT+@0) ; Y
|
||||
ldi r16, LOW(STYLE_WIN_TITLE_HEIGHT+@1) ; Y
|
||||
mov r6, r16
|
||||
ldi r16, HIGH(@0)
|
||||
ldi r16, HIGH(@1)
|
||||
mov r7, r16
|
||||
lds r16, @1 ; data
|
||||
lds r17, @1+1
|
||||
lds r16, @2 ; data
|
||||
lds r17, @2+1
|
||||
bigcall Window_WriteHexWordAt
|
||||
.endmacro
|
||||
|
||||
@@ -120,24 +121,26 @@ WinNetStats_Update:
|
||||
ldi yh, HIGH(winNetstats)
|
||||
|
||||
; packets in
|
||||
WINNETSTATS_PRINTDATA 2, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
|
||||
WINNETSTATS_PRINTDATA 160, 2, netInterfaceData+NET_IFACE_OFFS_PACKETSIN_LOW
|
||||
; packets out
|
||||
WINNETSTATS_PRINTDATA 24, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
|
||||
WINNETSTATS_PRINTDATA 160, 24, netInterfaceData+NET_IFACE_OFFS_PACKETSOUT_LOW
|
||||
; eContent
|
||||
WINNETSTATS_PRINTDATA 46, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
|
||||
WINNETSTATS_PRINTDATA 160, 46, netInterfaceData+NET_IFACE_OFFS_ERR_CONTENT_LOW
|
||||
; eIO
|
||||
WINNETSTATS_PRINTDATA 68, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
|
||||
WINNETSTATS_PRINTDATA 160, 68, netInterfaceData+NET_IFACE_OFFS_ERR_IO_LOW
|
||||
; eMsgSize
|
||||
WINNETSTATS_PRINTDATA 90, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
|
||||
WINNETSTATS_PRINTDATA 160, 90, netInterfaceData+NET_IFACE_OFFS_ERR_MSGSIZE_LOW
|
||||
|
||||
; X
|
||||
WINNETSTATS_PRINTDATA 112, xpt2046CurrentX
|
||||
WINNETSTATS_PRINTDATA 160, 112, xpt2046CurrentX
|
||||
WINNETSTATS_PRINTDATA 240, 112, xpt2046RawX
|
||||
; Y
|
||||
WINNETSTATS_PRINTDATA 134, xpt2046CurrentY
|
||||
WINNETSTATS_PRINTDATA 160, 134, xpt2046CurrentY
|
||||
WINNETSTATS_PRINTDATA 240, 134, xpt2046RawY
|
||||
; Z
|
||||
WINNETSTATS_PRINTDATA 156, xpt2046CurrentZ
|
||||
WINNETSTATS_PRINTDATA 160, 156, xpt2046CurrentZ
|
||||
; update num
|
||||
WINNETSTATS_PRINTDATA 178, winNetstatsUpdateNum
|
||||
WINNETSTATS_PRINTDATA 160, 178, winNetstatsUpdateNum
|
||||
|
||||
ret
|
||||
; @end
|
||||
|
||||
Reference in New Issue
Block a user