avr: more work on gui2
- decreased complexitiy by removing guicntl - changed fonts to allow for storing bitmaps in ressource segment - add fonts to ressources for display node c03 - added some safety features (check pointers, add magic field to objects etc) - moved style.asm to device folder
This commit is contained in:
@@ -182,9 +182,9 @@ onSystemStart:
|
||||
; Called on every message received
|
||||
|
||||
onMessageReceived:
|
||||
ldi zl, LOW(testCntrl*2)
|
||||
ldi zh, HIGH(testCntrl*2)
|
||||
bigcall GuiCntrl_MsgReceived
|
||||
ldi zl, LOW(testApp_flashdata*2)
|
||||
ldi zh, HIGH(testApp_flashdata*2)
|
||||
bigcall GuiApp_MsgReceived
|
||||
clc
|
||||
ret
|
||||
; @end
|
||||
@@ -197,9 +197,9 @@ onMessageReceived:
|
||||
; Called every 100ms. Add your routine calls here. No arguments, no results.
|
||||
|
||||
onEvery100ms:
|
||||
ldi zl, LOW(testCntrl*2)
|
||||
ldi zh, HIGH(testCntrl*2)
|
||||
bigcall GuiCntrl_Every100ms
|
||||
ldi zl, LOW(testApp_flashdata*2)
|
||||
ldi zh, HIGH(testApp_flashdata*2)
|
||||
bigcall GuiApp_Every100ms
|
||||
ret
|
||||
|
||||
onEveryMinute:
|
||||
@@ -226,17 +226,10 @@ onEveryLoop:
|
||||
|
||||
|
||||
test:
|
||||
ldi zl, LOW(testCntrl*2)
|
||||
ldi zh, HIGH(testCntrl*2)
|
||||
ldi zl, LOW(testApp_flashdata*2)
|
||||
ldi zh, HIGH(testApp_flashdata*2)
|
||||
bigcall GuiApp_Init
|
||||
|
||||
; init GuiAppCntrl
|
||||
ldi r16, OBJECT_SIGNAL_CREATE
|
||||
clr r17
|
||||
bigcall OBJ_TreeAllHandleSignal
|
||||
|
||||
; show first app
|
||||
bigcall GuiCntrl_ShowFirstApp
|
||||
|
||||
ret
|
||||
|
||||
|
||||
@@ -267,13 +260,13 @@ test:
|
||||
.include "common/divide.asm"
|
||||
.include "common/ressource.asm"
|
||||
|
||||
.include "modules/lcd2/gui2/style.asm"
|
||||
.include "style.asm"
|
||||
|
||||
.include "modules/lcd2/gui2/object.asm"
|
||||
.include "modules/lcd2/gui2/widget.asm"
|
||||
.include "modules/lcd2/gui2/label.asm"
|
||||
.include "modules/lcd2/gui2/imageview.asm"
|
||||
.include "modules/lcd2/gui2/guiapp.asm"
|
||||
.include "modules/lcd2/gui2/guicntrl.asm"
|
||||
|
||||
.include "testwin.asm"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user