gui2: renamed *layout2* to *layout*

This commit is contained in:
Martin Preuss
2026-04-12 17:10:15 +02:00
parent 98f1ab779d
commit 5fe4b4b705
8 changed files with 176 additions and 179 deletions

View File

@@ -14,7 +14,7 @@
; ***************************************************************************
; defines
.equ SENSORWATCH_OFFS_BEGIN = VLAYOUT2_SIZE
.equ SENSORWATCH_OFFS_BEGIN = VLAYOUT_SIZE
.equ SENSORWATCH_OFFS_BASEVALUEID = SENSORWATCH_OFFS_BEGIN+0
.equ SENSORWATCH_OFFS_EEPROMID = SENSORWATCH_OFFS_BEGIN+1
.equ SENSORWATCH_OFFS_NODEADDR = SENSORWATCH_OFFS_BEGIN+2
@@ -123,8 +123,8 @@ SensorWatch_Init:
push r21
push r22
; call base class
ldi r20, VLAYOUT2_MODE_EXPAND
bigcall VLayout2_Init
ldi r20, VLAYOUT_MODE_EXPAND
bigcall VLayout_Init
pop r22
pop r21
pop r20
@@ -641,7 +641,7 @@ sensorWatchReadFromEeprom_ret:
SensorWatch_DefaultSignalmap:
; header
.dw VLayout2_DefaultSignalmap*2 ; next table to use
.dw VLayout_DefaultSignalmap*2 ; next table to use
; entries
.db 0, WIDGET_SIGNAL_DRAW, LOW(Widget_OnDraw), HIGH(Widget_OnDraw)
.db NETMSG_CMD_VALUE_REPORT, OBJECT_SIGNAL_RECVMSG, LOW(SensorWatch_OnRecvReport), HIGH(SensorWatch_OnRecvReport)