diff --git a/avr/devices/c03/main/g_app.asm b/avr/devices/c03/main/g_app.asm index d4a10e5..c5cdaba 100644 --- a/avr/devices/c03/main/g_app.asm +++ b/avr/devices/c03/main/g_app.asm @@ -15,6 +15,9 @@ ; defines +.equ APPC03_SEL_BUTTON_NETWORK = 1 + + ; *************************************************************************** ; data @@ -51,10 +54,11 @@ appC03: .dw winRoot*2 ; root widget appC03_signalmap: - .db 0, OBJECT_SIGNAL_TIMER, LOW(GuiApp_OnTimer), HIGH(GuiApp_OnTimer) - .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_CREATE, LOW(GuiApp_OnCreate), HIGH(GuiApp_OnCreate) + .db 0, OBJECT_SIGNAL_TIMER, LOW(GuiApp_OnTimer), HIGH(GuiApp_OnTimer) + .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_CREATE, LOW(GuiApp_OnCreate), HIGH(GuiApp_OnCreate) + .db APPC03_SEL_BUTTON_NETWORK, WIDGET_SIGNAL_CLICKED, LOW(AppC03_OnClickedNetwork), HIGH(AppC03_OnClickedNetwork) .db 0, 0, 0, 0 ; end of table @@ -88,6 +92,14 @@ testRootWin_signalmap: + + +AppC03_OnClickedNetwork: +; TODO: select network window + ret + + + #endif diff --git a/avr/devices/c03/main/g_win_climate.asm b/avr/devices/c03/main/g_win_climate.asm index c263d9e..0363a89 100644 --- a/avr/devices/c03/main/g_win_climate.asm +++ b/avr/devices/c03/main/g_win_climate.asm @@ -450,10 +450,10 @@ winClimate_signalmap: ; OBJECT .db 0x55, 0xaa ; magic .dw 0 ; next - .dw winClimateBody*2 ; parent + .dw winClimateBody*2 ; parent .dw 0 ; first child - .dw winClimateBody*2 ; target - .dw 0 ; selector (ony lower 8 bits used) + .dw appC03*2 ; target + .dw APPC03_SEL_BUTTON_NETWORK ; selector (ony lower 8 bits used) .dw buttonNetwork_signalmap*2 ; signal map ; WIDGET .db (1< font - gui + gui2 ili9341 xpt2046 diff --git a/avr/modules/lcd2/gui2/0BUILD b/avr/modules/lcd2/gui2/0BUILD index 9135924..0823627 100644 --- a/avr/modules/lcd2/gui2/0BUILD +++ b/avr/modules/lcd2/gui2/0BUILD @@ -3,6 +3,7 @@ + sensorwatch.asm diff --git a/avr/modules/lcd2/gui2/generic/0BUILD b/avr/modules/lcd2/gui2/generic/0BUILD new file mode 100644 index 0000000..fb7ee44 --- /dev/null +++ b/avr/modules/lcd2/gui2/generic/0BUILD @@ -0,0 +1,18 @@ + + + + + + button.asm + guiapp.asm + imageview.asm + label.asm + object.asm + rootwidget.asm + valuelabel.asm + widget.asm + + + + + diff --git a/avr/modules/lcd2/gui2/button.asm b/avr/modules/lcd2/gui2/generic/button.asm similarity index 100% rename from avr/modules/lcd2/gui2/button.asm rename to avr/modules/lcd2/gui2/generic/button.asm diff --git a/avr/modules/lcd2/gui2/guiapp.asm b/avr/modules/lcd2/gui2/generic/guiapp.asm similarity index 100% rename from avr/modules/lcd2/gui2/guiapp.asm rename to avr/modules/lcd2/gui2/generic/guiapp.asm diff --git a/avr/modules/lcd2/gui2/imageview.asm b/avr/modules/lcd2/gui2/generic/imageview.asm similarity index 100% rename from avr/modules/lcd2/gui2/imageview.asm rename to avr/modules/lcd2/gui2/generic/imageview.asm diff --git a/avr/modules/lcd2/gui2/label.asm b/avr/modules/lcd2/gui2/generic/label.asm similarity index 100% rename from avr/modules/lcd2/gui2/label.asm rename to avr/modules/lcd2/gui2/generic/label.asm diff --git a/avr/modules/lcd2/gui2/object.asm b/avr/modules/lcd2/gui2/generic/object.asm similarity index 100% rename from avr/modules/lcd2/gui2/object.asm rename to avr/modules/lcd2/gui2/generic/object.asm diff --git a/avr/modules/lcd2/gui2/rootwidget.asm b/avr/modules/lcd2/gui2/generic/rootwidget.asm similarity index 100% rename from avr/modules/lcd2/gui2/rootwidget.asm rename to avr/modules/lcd2/gui2/generic/rootwidget.asm diff --git a/avr/modules/lcd2/gui2/valuelabel.asm b/avr/modules/lcd2/gui2/generic/valuelabel.asm similarity index 100% rename from avr/modules/lcd2/gui2/valuelabel.asm rename to avr/modules/lcd2/gui2/generic/valuelabel.asm diff --git a/avr/modules/lcd2/gui2/widget.asm b/avr/modules/lcd2/gui2/generic/widget.asm similarity index 100% rename from avr/modules/lcd2/gui2/widget.asm rename to avr/modules/lcd2/gui2/generic/widget.asm