gui2: removed debug widgets and functions (buttons work now).
This commit is contained in:
Martin Preuss
@@ -114,7 +114,6 @@ testApp_signalmap:
|
|||||||
.db 0, WIDGET_SIGNAL_TOUCH, LOW(GuiApp_OnTouch), HIGH(GuiApp_OnTouch)
|
.db 0, WIDGET_SIGNAL_TOUCH, LOW(GuiApp_OnTouch), HIGH(GuiApp_OnTouch)
|
||||||
.db 0, OBJECT_SIGNAL_RECVMSG, LOW(GuiApp_OnMsgReceived), HIGH(GuiApp_OnMsgReceived)
|
.db 0, OBJECT_SIGNAL_RECVMSG, LOW(GuiApp_OnMsgReceived), HIGH(GuiApp_OnMsgReceived)
|
||||||
.db 0, OBJECT_SIGNAL_CREATE, LOW(GuiApp_OnCreate), HIGH(GuiApp_OnCreate)
|
.db 0, OBJECT_SIGNAL_CREATE, LOW(GuiApp_OnCreate), HIGH(GuiApp_OnCreate)
|
||||||
.db 0, GUIAPP_SIGNAL_DEBUG, LOW(onAppDebug), HIGH(onAppDebug)
|
|
||||||
.db 0, 0, 0, 0 ; end of table
|
.db 0, 0, 0, 0 ; end of table
|
||||||
|
|
||||||
|
|
||||||
@@ -604,7 +603,7 @@ testWin_signalmap:
|
|||||||
buttonNetwork:
|
buttonNetwork:
|
||||||
; OBJECT
|
; OBJECT
|
||||||
.db 0x55, 0xaa ; magic
|
.db 0x55, 0xaa ; magic
|
||||||
.dw debugValue1*2 ; next
|
.dw 0 ; next
|
||||||
.dw testWinBody_flashdata*2 ; parent
|
.dw testWinBody_flashdata*2 ; parent
|
||||||
.dw 0 ; first child
|
.dw 0 ; first child
|
||||||
.dw testWinBody_flashdata*2 ; target
|
.dw testWinBody_flashdata*2 ; target
|
||||||
@@ -614,8 +613,8 @@ testWin_signalmap:
|
|||||||
.db (1<<WIDGET_OPTSLO_INPUT_BIT) | (1<<WIDGET_OPTSLO_BORDER_BIT), 0 ; opts lo, hi
|
.db (1<<WIDGET_OPTSLO_INPUT_BIT) | (1<<WIDGET_OPTSLO_BORDER_BIT), 0 ; opts lo, hi
|
||||||
.dw DISPLAY_WIDTH-56 ; X
|
.dw DISPLAY_WIDTH-56 ; X
|
||||||
.dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-56 ; Y
|
.dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-56 ; Y
|
||||||
.dw 54 ; W
|
.dw 52 ; W
|
||||||
.dw 54 ; H
|
.dw 52 ; H
|
||||||
.dw STYLE_BUTTON_COL_FG_NORM ; front color
|
.dw STYLE_BUTTON_COL_FG_NORM ; front color
|
||||||
.dw STYLE_BUTTON_COL_BG_NORM ; back color
|
.dw STYLE_BUTTON_COL_BG_NORM ; back color
|
||||||
.dw STYLE_WIN_FONT*2 ; font
|
.dw STYLE_WIN_FONT*2 ; font
|
||||||
@@ -631,151 +630,5 @@ testWin_signalmap:
|
|||||||
.db 0, 0, 0, 0 ; end of table
|
.db 0, 0, 0, 0 ; end of table
|
||||||
|
|
||||||
|
|
||||||
debugValue1:
|
|
||||||
; OBJECT
|
|
||||||
.db 0x55, 0xaa ; magic
|
|
||||||
.dw debugValue2*2 ; next
|
|
||||||
.dw testWinBody_flashdata*2 ; parent
|
|
||||||
.dw 0 ; first child
|
|
||||||
.dw 0 ; target
|
|
||||||
.dw 0 ; selector (ony lower 8 bits used)
|
|
||||||
.dw debugValue1_signalmap*2 ; signal map
|
|
||||||
; WIDGET
|
|
||||||
.db (1<<WIDGET_OPTSLO_BORDER_BIT), (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
|
|
||||||
.dw 4 ; X
|
|
||||||
.dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-56 ; Y
|
|
||||||
.dw 100 ; W
|
|
||||||
.dw STYLE_WIN_FONT_HEIGHT+4 ; H
|
|
||||||
.dw STYLE_WIN_FOREGROUND ; front color
|
|
||||||
.dw STYLE_WIN_BACKGROUND ; back color
|
|
||||||
.dw STYLE_WIN_FONT*2 ; font
|
|
||||||
.dw debugValue1_ramdata ; ptr to SDRAM
|
|
||||||
; VALUELABEL
|
|
||||||
.db 0, 0 ; num of post-komma digits
|
|
||||||
|
|
||||||
debugValue1_signalmap:
|
|
||||||
.db 0, OBJECT_SIGNAL_CREATE, LOW(ValueLabel_OnCreate), HIGH(ValueLabel_OnCreate)
|
|
||||||
.db 0, WIDGET_SIGNAL_DRAW, LOW(ValueLabel_OnDraw), HIGH(ValueLabel_OnDraw)
|
|
||||||
.db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
|
|
||||||
.db 0, 0, 0, 0 ; end of table
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
debugValue2:
|
|
||||||
; OBJECT
|
|
||||||
.db 0x55, 0xaa ; magic
|
|
||||||
.dw debugValue3*2 ; next
|
|
||||||
.dw testWinBody_flashdata*2 ; parent
|
|
||||||
.dw 0 ; first child
|
|
||||||
.dw 0 ; target
|
|
||||||
.dw 0 ; selector (ony lower 8 bits used)
|
|
||||||
.dw debugValue2_signalmap*2 ; signal map
|
|
||||||
; WIDGET
|
|
||||||
.db (1<<WIDGET_OPTSLO_BORDER_BIT), (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
|
|
||||||
.dw 108 ; X
|
|
||||||
.dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-56 ; Y
|
|
||||||
.dw 100 ; W
|
|
||||||
.dw STYLE_WIN_FONT_HEIGHT+4 ; H
|
|
||||||
.dw STYLE_WIN_FOREGROUND ; front color
|
|
||||||
.dw STYLE_WIN_BACKGROUND ; back color
|
|
||||||
.dw STYLE_WIN_FONT*2 ; font
|
|
||||||
.dw debugValue2_ramdata ; ptr to SDRAM
|
|
||||||
; VALUELABEL
|
|
||||||
.db 0, 0 ; num of post-komma digits
|
|
||||||
|
|
||||||
debugValue2_signalmap:
|
|
||||||
.db 0, OBJECT_SIGNAL_CREATE, LOW(ValueLabel_OnCreate), HIGH(ValueLabel_OnCreate)
|
|
||||||
.db 0, WIDGET_SIGNAL_DRAW, LOW(ValueLabel_OnDraw), HIGH(ValueLabel_OnDraw)
|
|
||||||
.db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
|
|
||||||
.db 0, 0, 0, 0 ; end of table
|
|
||||||
|
|
||||||
|
|
||||||
debugValue3:
|
|
||||||
; OBJECT
|
|
||||||
.db 0x55, 0xaa ; magic
|
|
||||||
.dw 0 ; next
|
|
||||||
.dw testWinBody_flashdata*2 ; parent
|
|
||||||
.dw 0 ; first child
|
|
||||||
.dw 0 ; target
|
|
||||||
.dw 0 ; selector (ony lower 8 bits used)
|
|
||||||
.dw debugValue3_signalmap*2 ; signal map
|
|
||||||
; WIDGET
|
|
||||||
.db (1<<WIDGET_OPTSLO_BORDER_BIT), (1<<WIDGET_OPTSHI_HALIGNCENTER_BIT) ; opts lo, hi
|
|
||||||
.dw 4 ; X
|
|
||||||
.dw DISPLAY_HEIGHT-STYLE_WIN_TITLE_HEIGHT-30 ; Y
|
|
||||||
.dw 100 ; W
|
|
||||||
.dw STYLE_WIN_FONT_HEIGHT+4 ; H
|
|
||||||
.dw STYLE_WIN_FOREGROUND ; front color
|
|
||||||
.dw STYLE_WIN_BACKGROUND ; back color
|
|
||||||
.dw STYLE_WIN_FONT*2 ; font
|
|
||||||
.dw debugValue3_ramdata ; ptr to SDRAM
|
|
||||||
; VALUELABEL
|
|
||||||
.db 0, 0 ; num of post-komma digits
|
|
||||||
|
|
||||||
debugValue3_signalmap:
|
|
||||||
.db 0, OBJECT_SIGNAL_CREATE, LOW(ValueLabel_OnCreate), HIGH(ValueLabel_OnCreate)
|
|
||||||
.db 0, WIDGET_SIGNAL_DRAW, LOW(ValueLabel_OnDraw), HIGH(ValueLabel_OnDraw)
|
|
||||||
.db 0, VLABEL_SIGNAL_SETVALUE, LOW(ValueLabel_OnSetValue), HIGH(ValueLabel_OnSetValue)
|
|
||||||
.db 0, 0, 0, 0 ; end of table
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
onAppDebug:
|
|
||||||
push zl
|
|
||||||
push zh
|
|
||||||
push xl
|
|
||||||
push xh
|
|
||||||
; read X
|
|
||||||
ld r18, X+ ; WIDGET_DATA_TOUCH_OFFS_X_LO
|
|
||||||
ld r19, X+ ; WIDGET_DATA_TOUCH_OFFS_X_HI
|
|
||||||
push xl
|
|
||||||
push xh
|
|
||||||
mov xl, r18
|
|
||||||
mov xh, r19
|
|
||||||
ldi zl, LOW(debugValue1*2)
|
|
||||||
ldi zh, HIGH(debugValue1*2)
|
|
||||||
ldi r16, VLABEL_SIGNAL_SETVALUE
|
|
||||||
clr r17
|
|
||||||
bigcall OBJ_HandleSignal
|
|
||||||
pop xh
|
|
||||||
pop xl
|
|
||||||
; read Y
|
|
||||||
ld r18, X+ ; WIDGET_DATA_TOUCH_OFFS_Y_LO
|
|
||||||
ld r19, X+ ; WIDGET_DATA_TOUCH_OFFS_Y_HI
|
|
||||||
push xl
|
|
||||||
push xh
|
|
||||||
mov xl, r18
|
|
||||||
mov xh, r19
|
|
||||||
ldi zl, LOW(debugValue2*2)
|
|
||||||
ldi zh, HIGH(debugValue2*2)
|
|
||||||
ldi r16, VLABEL_SIGNAL_SETVALUE
|
|
||||||
clr r17
|
|
||||||
bigcall OBJ_HandleSignal
|
|
||||||
pop xh
|
|
||||||
pop xl
|
|
||||||
; read flags
|
|
||||||
ld r18, X+ ; WIDGET_DATA_TOUCH_OFFS_Y_LO
|
|
||||||
push xl
|
|
||||||
push xh
|
|
||||||
mov xl, r18
|
|
||||||
clr xh
|
|
||||||
ldi zl, LOW(debugValue3*2)
|
|
||||||
ldi zh, HIGH(debugValue3*2)
|
|
||||||
ldi r16, VLABEL_SIGNAL_SETVALUE
|
|
||||||
clr r17
|
|
||||||
bigcall OBJ_HandleSignal
|
|
||||||
pop xh
|
|
||||||
pop xl
|
|
||||||
|
|
||||||
pop xh
|
|
||||||
pop xl
|
|
||||||
pop zh
|
|
||||||
pop zl
|
|
||||||
ret
|
|
||||||
; @end
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@@ -26,19 +26,6 @@
|
|||||||
; @clobbers any, !Z
|
; @clobbers any, !Z
|
||||||
|
|
||||||
Button_OnTouch:
|
Button_OnTouch:
|
||||||
#if 0
|
|
||||||
push zl
|
|
||||||
push zh
|
|
||||||
bigcall Widget_GetApp
|
|
||||||
mov zl, r18
|
|
||||||
mov zh, r19
|
|
||||||
ldi r16, GUIAPP_SIGNAL_DEBUG
|
|
||||||
clr r17
|
|
||||||
bigcall OBJ_HandleSignal
|
|
||||||
pop zh
|
|
||||||
pop zl
|
|
||||||
#endif
|
|
||||||
|
|
||||||
rcall Widget_GetSdramPtr ; Y:=SDRAM data for widget
|
rcall Widget_GetSdramPtr ; Y:=SDRAM data for widget
|
||||||
|
|
||||||
; read touch signal data from X
|
; read touch signal data from X
|
||||||
|
|||||||
@@ -155,8 +155,6 @@ GuiApp_OnTimer_ret:
|
|||||||
; @param X pointer to touch event in SDRAM
|
; @param X pointer to touch event in SDRAM
|
||||||
|
|
||||||
GuiApp_OnTouch:
|
GuiApp_OnTouch:
|
||||||
bigcall onAppDebug
|
|
||||||
|
|
||||||
push zl
|
push zl
|
||||||
push zh
|
push zh
|
||||||
rcall GuiApp_GetSdramPtr
|
rcall GuiApp_GetSdramPtr
|
||||||
|
|||||||
Reference in New Issue
Block a user