gui2: new layout modules basically work now.
This commit is contained in:
@@ -358,6 +358,15 @@ DEBUG_DUMPWDG:
|
||||
clr r5
|
||||
clr r6
|
||||
clr r7
|
||||
|
||||
ldi r16, 3
|
||||
add r4, r16
|
||||
adc r5, r17
|
||||
rcall DEBUG_DUMPCWDG
|
||||
ldi r16, 20
|
||||
clr r17
|
||||
add r6, r16
|
||||
adc r7, r17
|
||||
|
||||
push yl
|
||||
push yh
|
||||
@@ -520,22 +529,23 @@ Debug_Style:
|
||||
GUI2_MODULE_BEGIN:
|
||||
.include "modules/lcd2/gui2/base/object.asm"
|
||||
.include "modules/lcd2/gui2/base/widget.asm"
|
||||
.include "modules/lcd2/gui2/base/layout.asm"
|
||||
.include "modules/lcd2/gui2/base/hlayout.asm"
|
||||
.include "modules/lcd2/gui2/base/vlayout.asm"
|
||||
.include "modules/lcd2/gui2/base/mlayout.asm"
|
||||
.include "modules/lcd2/gui2/base/mlayout_column.asm"
|
||||
;.include "modules/lcd2/gui2/base/layout.asm"
|
||||
;.include "modules/lcd2/gui2/base/hlayout.asm"
|
||||
;.include "modules/lcd2/gui2/base/vlayout.asm"
|
||||
;.include "modules/lcd2/gui2/base/mlayout.asm"
|
||||
;.include "modules/lcd2/gui2/base/mlayout_column.asm"
|
||||
.include "modules/lcd2/gui2/base/guiapp.asm"
|
||||
.include "modules/lcd2/gui2/base/mainwindow.asm"
|
||||
.include "modules/lcd2/gui2/base/rootwindow.asm"
|
||||
.include "modules/lcd2/gui2/base/label.asm"
|
||||
.include "modules/lcd2/gui2/base/button.asm"
|
||||
.include "modules/lcd2/gui2/base/imageview.asm"
|
||||
.include "modules/lcd2/gui2/base/valuelabel.asm"
|
||||
.include "modules/lcd2/gui2/aqhome/sensorwatch.asm"
|
||||
.include "modules/lcd2/gui2/base/layout2.asm"
|
||||
.include "modules/lcd2/gui2/base/hlayout2.asm"
|
||||
.include "modules/lcd2/gui2/base/vlayout2.asm"
|
||||
.include "modules/lcd2/gui2/base/mclayout.asm"
|
||||
.include "modules/lcd2/gui2/base/mainwindow.asm"
|
||||
.include "modules/lcd2/gui2/aqhome/sensorwatch.asm"
|
||||
GUI2_MODULE_END:
|
||||
.equ MODULE_SIZE_GUI2 = GUI2_MODULE_END-GUI2_MODULE_BEGIN
|
||||
|
||||
|
||||
Reference in New Issue
Block a user