mirror of
https://github.com/joBr99/nspanel-lovelace-ui.git
synced 2025-12-19 22:24:15 +01:00
Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)
This commit is contained in:
joBr99
GitHub Actions
@@ -1,277 +0,0 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-03-31 10:46:02.736071584 +0000
|
||||
@@ -6,7 +6,7 @@
|
||||
int payloadLength=0
|
||||
int par0=0,par1=0
|
||||
// sleep timeout in s
|
||||
- int sleepTimeout=2
|
||||
+ int sleepTimeout=20
|
||||
int sleepValue=0
|
||||
// dim value
|
||||
int dimValue=40
|
||||
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
|
||||
--- HMI/n2t-out/cardAlarm.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-03-31 10:46:02.736071584 +0000
|
||||
@@ -615,48 +615,35 @@
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
- if(tId.txt=="pageStartup")
|
||||
- {
|
||||
- page pageStartup
|
||||
- }
|
||||
- if(tId.txt=="screensaver")
|
||||
+ if(tId.txt=="popupLight")
|
||||
{
|
||||
- page screensaver
|
||||
+ pageIcons.tTmp1.txt=tTmp.txt
|
||||
+ page popupLight
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
- if(tId.txt=="cardGrid")
|
||||
- {
|
||||
- page cardGrid
|
||||
- }
|
||||
- if(tId.txt=="popupLight")
|
||||
+ if(tId.txt=="cardThermo")
|
||||
{
|
||||
- pageIcons.tTmp1.txt=tTmp.txt
|
||||
- page popupLight
|
||||
+ page cardThermo
|
||||
}
|
||||
- if(tId.txt=="popupShutter")
|
||||
+ if(tId.txt=="pageStartup")
|
||||
{
|
||||
- pageIcons.tTmp1.txt=tTmp.txt
|
||||
- page popupShutter
|
||||
+ page pageStartup
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
- if(tId.txt=="cardThermo")
|
||||
+ if(tId.txt=="cardGrid")
|
||||
{
|
||||
- page cardThermo
|
||||
+ page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
- if(tId.txt=="cardAlarm")
|
||||
- {
|
||||
- page cardAlarm
|
||||
- }
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
@@ -678,7 +665,7 @@
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
- if(sleepTimeout!=0&&dimValue!=dim)
|
||||
+ if(sleepTimeout!=0)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-03-31 10:46:02.736071584 +0000
|
||||
@@ -1714,7 +1714,7 @@
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
- if(sleepTimeout!=0&&dimValue!=dim)
|
||||
+ if(sleepTimeout!=0)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
|
||||
--- HMI/n2t-out/cardGrid.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-03-31 10:46:02.736071584 +0000
|
||||
@@ -804,7 +804,7 @@
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
- if(sleepTimeout!=0&&dimValue!=dim)
|
||||
+ if(sleepTimeout!=0)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
|
||||
--- HMI/n2t-out/cardMedia.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-03-31 10:46:02.736071584 +0000
|
||||
@@ -583,43 +583,30 @@
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
- if(tId.txt=="pageStartup")
|
||||
- {
|
||||
- page pageStartup
|
||||
- }
|
||||
- if(tId.txt=="screensaver")
|
||||
+ if(tId.txt=="popupLight")
|
||||
{
|
||||
- page screensaver
|
||||
+ pageIcons.tTmp1.txt=tTmp.txt
|
||||
+ page popupLight
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
- if(tId.txt=="cardGrid")
|
||||
- {
|
||||
- page cardGrid
|
||||
- }
|
||||
- if(tId.txt=="popupLight")
|
||||
+ if(tId.txt=="cardThermo")
|
||||
{
|
||||
- pageIcons.tTmp1.txt=tTmp.txt
|
||||
- page popupLight
|
||||
+ page cardThermo
|
||||
}
|
||||
- if(tId.txt=="popupShutter")
|
||||
+ if(tId.txt=="pageStartup")
|
||||
{
|
||||
- pageIcons.tTmp1.txt=tTmp.txt
|
||||
- page popupShutter
|
||||
+ page pageStartup
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
- if(tId.txt=="cardThermo")
|
||||
- {
|
||||
- page cardThermo
|
||||
- }
|
||||
- if(tId.txt=="cardMedia")
|
||||
+ if(tId.txt=="cardGrid")
|
||||
{
|
||||
- page cardMedia
|
||||
+ page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
@@ -655,7 +642,7 @@
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
- if(sleepTimeout!=0&&dimValue!=dim)
|
||||
+ if(sleepTimeout!=0)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
|
||||
--- HMI/n2t-out/cardThermo.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-03-31 10:46:02.736071584 +0000
|
||||
@@ -866,43 +866,30 @@
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
- if(tId.txt=="pageStartup")
|
||||
- {
|
||||
- page pageStartup
|
||||
- }
|
||||
- if(tId.txt=="screensaver")
|
||||
+ if(tId.txt=="popupLight")
|
||||
{
|
||||
- page screensaver
|
||||
+ pageIcons.tTmp1.txt=tTmp.txt
|
||||
+ page popupLight
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
- if(tId.txt=="cardGrid")
|
||||
- {
|
||||
- page cardGrid
|
||||
- }
|
||||
- if(tId.txt=="popupLight")
|
||||
+ if(tId.txt=="cardMedia")
|
||||
{
|
||||
- pageIcons.tTmp1.txt=tTmp.txt
|
||||
- page popupLight
|
||||
+ page cardMedia
|
||||
}
|
||||
- if(tId.txt=="popupShutter")
|
||||
+ if(tId.txt=="pageStartup")
|
||||
{
|
||||
- pageIcons.tTmp1.txt=tTmp.txt
|
||||
- page popupShutter
|
||||
+ page pageStartup
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
- if(tId.txt=="cardThermo")
|
||||
- {
|
||||
- page cardThermo
|
||||
- }
|
||||
- if(tId.txt=="cardMedia")
|
||||
+ if(tId.txt=="cardGrid")
|
||||
{
|
||||
- page cardMedia
|
||||
+ page cardGrid
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
@@ -929,7 +916,7 @@
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
- if(sleepTimeout!=0&&dimValue!=dim)
|
||||
+ if(sleepTimeout!=0)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-03-31 10:46:02.736071584 +0000
|
||||
@@ -152,7 +152,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
- Text : 25
|
||||
+ Text : 24
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-03-31 10:46:02.736071584 +0000
|
||||
@@ -475,25 +475,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-Timer tmSleep
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Period (ms): 1000
|
||||
- Enabled : yes
|
||||
-
|
||||
- Events
|
||||
- Timer Event
|
||||
- if(sleepTimeout!=0&&dimValue!=dim)
|
||||
- {
|
||||
- sleepValue+=1
|
||||
- if(sleepTimeout<=sleepValue)
|
||||
- {
|
||||
- sleepValue=0
|
||||
- dim=dimValue
|
||||
- vaTap.val=0
|
||||
- }
|
||||
- }
|
||||
-
|
||||
TouchCap tc0
|
||||
Attributes
|
||||
Scope: local
|
||||
|
||||
@@ -1145,35 +1145,48 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="popupLight")
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardThermo
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardGrid
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
@@ -1196,7 +1209,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -2660,7 +2660,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -472,7 +472,7 @@ Picture p0
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 0
|
||||
x coordinate : 1
|
||||
y coordinate : 0
|
||||
Width : 479
|
||||
Height : 319
|
||||
@@ -1242,7 +1242,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -93,8 +93,8 @@ Text tTmp
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 22
|
||||
y coordinate : 155
|
||||
x coordinate : 29
|
||||
y coordinate : 151
|
||||
Width : 27
|
||||
Height : 30
|
||||
Effect : load
|
||||
@@ -153,8 +153,8 @@ Text tId
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Opacity : 127
|
||||
x coordinate : 73
|
||||
y coordinate : 158
|
||||
x coordinate : 60
|
||||
y coordinate : 153
|
||||
Width : 30
|
||||
Height : 30
|
||||
Effect : load
|
||||
@@ -1005,30 +1005,43 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="popupLight")
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardThermo
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardGrid
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
@@ -1065,7 +1078,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -1419,30 +1419,43 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="popupLight")
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardMedia
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardGrid
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
@@ -1470,7 +1483,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -22,41 +22,41 @@ pageStartup
|
||||
19 Component(s)
|
||||
150 Line(s) of event code
|
||||
113 Unique line(s) of event code
|
||||
screensaver
|
||||
28 Component(s)
|
||||
172 Line(s) of event code
|
||||
131 Unique line(s) of event code
|
||||
cardMedia
|
||||
30 Component(s)
|
||||
287 Line(s) of event code
|
||||
148 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
322 Line(s) of event code
|
||||
173 Unique line(s) of event code
|
||||
300 Line(s) of event code
|
||||
154 Unique line(s) of event code
|
||||
screensaver
|
||||
29 Component(s)
|
||||
182 Line(s) of event code
|
||||
137 Unique line(s) of event code
|
||||
popupShutter
|
||||
19 Component(s)
|
||||
178 Line(s) of event code
|
||||
101 Unique line(s) of event code
|
||||
cardAlarm
|
||||
35 Component(s)
|
||||
285 Line(s) of event code
|
||||
181 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
414 Line(s) of event code
|
||||
226 Unique line(s) of event code
|
||||
298 Line(s) of event code
|
||||
187 Unique line(s) of event code
|
||||
cardGrid
|
||||
39 Component(s)
|
||||
397 Line(s) of event code
|
||||
233 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
322 Line(s) of event code
|
||||
173 Unique line(s) of event code
|
||||
cardEntities
|
||||
62 Component(s)
|
||||
939 Line(s) of event code
|
||||
397 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
427 Line(s) of event code
|
||||
232 Unique line(s) of event code
|
||||
|
||||
Total
|
||||
13 Page(s)
|
||||
350 Component(s)
|
||||
3394 Line(s) of event code
|
||||
920 Unique line(s) of event code
|
||||
351 Component(s)
|
||||
3443 Line(s) of event code
|
||||
922 Unique line(s) of event code
|
||||
|
||||
@@ -402,7 +402,7 @@ Text tVersion
|
||||
Horizontal Alignment : center
|
||||
Vertical Alignment : center
|
||||
Input Type : character
|
||||
Text : 24
|
||||
Text : 25
|
||||
Max. Text Size : 10
|
||||
Word wrap : disabled
|
||||
Horizontal Spacing : 0
|
||||
|
||||
@@ -917,6 +917,26 @@ Timer tmSerial
|
||||
}
|
||||
}
|
||||
|
||||
Timer tmSleep
|
||||
Attributes
|
||||
ID : 28
|
||||
Scope : local
|
||||
Period (ms): 1000
|
||||
Enabled : yes
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
{
|
||||
sleepValue=0
|
||||
dim=dimValue
|
||||
vaTap.val=0
|
||||
}
|
||||
}
|
||||
|
||||
TouchCap tc0
|
||||
Attributes
|
||||
ID : 2
|
||||
|
||||
@@ -615,35 +615,48 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="popupLight")
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardThermo
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardGrid
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
page cardAlarm
|
||||
}
|
||||
}
|
||||
// end of user code
|
||||
udelete payloadLength-1
|
||||
@@ -665,7 +678,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -1714,7 +1714,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -804,7 +804,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -583,30 +583,43 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="popupLight")
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardThermo")
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardThermo
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardGrid
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
@@ -642,7 +655,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -866,30 +866,43 @@ Timer tmSerial
|
||||
//we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ...
|
||||
udelete payloadLength-1
|
||||
bufferPos=0
|
||||
if(tId.txt=="popupLight")
|
||||
if(tId.txt=="pageStartup")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
page pageStartup
|
||||
}
|
||||
if(tId.txt=="screensaver")
|
||||
{
|
||||
page screensaver
|
||||
}
|
||||
if(tId.txt=="cardEntities")
|
||||
{
|
||||
page cardEntities
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
if(tId.txt=="cardGrid")
|
||||
{
|
||||
page cardMedia
|
||||
page cardGrid
|
||||
}
|
||||
if(tId.txt=="pageStartup")
|
||||
if(tId.txt=="popupLight")
|
||||
{
|
||||
page pageStartup
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupLight
|
||||
}
|
||||
if(tId.txt=="popupShutter")
|
||||
{
|
||||
pageIcons.tTmp1.txt=tTmp.txt
|
||||
page popupShutter
|
||||
}
|
||||
if(tId.txt=="popupNotify")
|
||||
{
|
||||
page popupNotify
|
||||
}
|
||||
if(tId.txt=="cardGrid")
|
||||
if(tId.txt=="cardThermo")
|
||||
{
|
||||
page cardGrid
|
||||
page cardThermo
|
||||
}
|
||||
if(tId.txt=="cardMedia")
|
||||
{
|
||||
page cardMedia
|
||||
}
|
||||
if(tId.txt=="cardAlarm")
|
||||
{
|
||||
@@ -916,7 +929,7 @@ Timer tmSleep
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0)
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
|
||||
@@ -152,7 +152,7 @@ Text tVersion
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
Associated Keyboard : none
|
||||
Text : 24
|
||||
Text : 25
|
||||
Max. Text Size : 10
|
||||
|
||||
Picture p0
|
||||
|
||||
@@ -475,6 +475,25 @@ Timer tmSerial
|
||||
}
|
||||
}
|
||||
|
||||
Timer tmSleep
|
||||
Attributes
|
||||
Scope : local
|
||||
Period (ms): 1000
|
||||
Enabled : yes
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
{
|
||||
sleepValue=0
|
||||
dim=dimValue
|
||||
vaTap.val=0
|
||||
}
|
||||
}
|
||||
|
||||
TouchCap tc0
|
||||
Attributes
|
||||
Scope: local
|
||||
|
||||
@@ -1,13 +1,7 @@
|
||||
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
--- HMI/n2t-out/Program.s.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 10:46:02.260024923 +0000
|
||||
@@ -6,11 +6,11 @@
|
||||
int payloadLength=0
|
||||
int par0=0,par1=0
|
||||
// sleep timeout in s
|
||||
- int sleepTimeout=2
|
||||
+ int sleepTimeout=20
|
||||
int sleepValue=0
|
||||
--- HMI/n2t-out/Program.s.txt 2022-03-31 10:58:08.149531933 +0000
|
||||
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-31 10:58:08.637532153 +0000
|
||||
@@ -11,6 +11,6 @@
|
||||
// dim value
|
||||
int dimValue=40
|
||||
int dimValueNormal=100
|
||||
@@ -17,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
|
||||
+ //lcd_dev fffb 0002 0000 0020
|
||||
page pageStartup
|
||||
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 10:46:02.264025315 +0000
|
||||
--- HMI/n2t-out/cardEntities.txt 2022-03-31 10:58:08.149531933 +0000
|
||||
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-31 10:58:08.637532153 +0000
|
||||
@@ -62,6 +62,26 @@
|
||||
vis bText4,0
|
||||
vis hSlider4,0
|
||||
@@ -787,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
|
||||
if(tInstruction.txt=="pageType")
|
||||
{
|
||||
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 10:46:02.260024923 +0000
|
||||
--- HMI/n2t-out/pageStartup.txt 2022-03-31 10:58:08.149531933 +0000
|
||||
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-31 10:58:08.637532153 +0000
|
||||
@@ -142,7 +142,7 @@
|
||||
Disable release event after dragging: 0
|
||||
Send Component ID : disabled
|
||||
@@ -807,32 +801,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
|
||||
//send calc crc
|
||||
btlen tSend.txt,sys0
|
||||
crcrest 1,0xffff // reset CRC
|
||||
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
|
||||
--- HMI/n2t-out/screensaver.txt 2022-03-31 10:46:01.799979830 +0000
|
||||
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-31 10:46:02.264025315 +0000
|
||||
@@ -475,25 +475,6 @@
|
||||
}
|
||||
}
|
||||
|
||||
-Timer tmSleep
|
||||
- Attributes
|
||||
- Scope : local
|
||||
- Period (ms): 1000
|
||||
- Enabled : yes
|
||||
-
|
||||
- Events
|
||||
- Timer Event
|
||||
- if(sleepTimeout!=0&&dimValue!=dim)
|
||||
- {
|
||||
- sleepValue+=1
|
||||
- if(sleepTimeout<=sleepValue)
|
||||
- {
|
||||
- sleepValue=0
|
||||
- dim=dimValue
|
||||
- vaTap.val=0
|
||||
- }
|
||||
- }
|
||||
-
|
||||
TouchCap tc0
|
||||
Attributes
|
||||
Scope: local
|
||||
|
||||
@@ -38,14 +38,14 @@ cardGrid
|
||||
39 Component(s)
|
||||
397 Line(s) of event code
|
||||
233 Unique line(s) of event code
|
||||
screensaver
|
||||
29 Component(s)
|
||||
182 Line(s) of event code
|
||||
137 Unique line(s) of event code
|
||||
popupLight
|
||||
27 Component(s)
|
||||
322 Line(s) of event code
|
||||
173 Unique line(s) of event code
|
||||
screensaver
|
||||
28 Component(s)
|
||||
172 Line(s) of event code
|
||||
131 Unique line(s) of event code
|
||||
cardThermo
|
||||
41 Component(s)
|
||||
427 Line(s) of event code
|
||||
@@ -57,6 +57,6 @@ cardEntities
|
||||
|
||||
Total
|
||||
13 Page(s)
|
||||
374 Component(s)
|
||||
3822 Line(s) of event code
|
||||
1033 Unique line(s) of event code
|
||||
375 Component(s)
|
||||
3832 Line(s) of event code
|
||||
1034 Unique line(s) of event code
|
||||
|
||||
@@ -917,6 +917,26 @@ Timer tmSerial
|
||||
}
|
||||
}
|
||||
|
||||
Timer tmSleep
|
||||
Attributes
|
||||
ID : 28
|
||||
Scope : local
|
||||
Period (ms): 1000
|
||||
Enabled : yes
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
{
|
||||
sleepValue=0
|
||||
dim=dimValue
|
||||
vaTap.val=0
|
||||
}
|
||||
}
|
||||
|
||||
TouchCap tc0
|
||||
Attributes
|
||||
ID : 2
|
||||
|
||||
@@ -475,6 +475,25 @@ Timer tmSerial
|
||||
}
|
||||
}
|
||||
|
||||
Timer tmSleep
|
||||
Attributes
|
||||
Scope : local
|
||||
Period (ms): 1000
|
||||
Enabled : yes
|
||||
|
||||
Events
|
||||
Timer Event
|
||||
if(sleepTimeout!=0&&dimValue!=dim)
|
||||
{
|
||||
sleepValue+=1
|
||||
if(sleepTimeout<=sleepValue)
|
||||
{
|
||||
sleepValue=0
|
||||
dim=dimValue
|
||||
vaTap.val=0
|
||||
}
|
||||
}
|
||||
|
||||
TouchCap tc0
|
||||
Attributes
|
||||
Scope: local
|
||||
|
||||
@@ -6,7 +6,7 @@ Program.s
|
||||
int payloadLength=0
|
||||
int par0=0,par1=0
|
||||
// sleep timeout in s
|
||||
int sleepTimeout=2
|
||||
int sleepTimeout=20
|
||||
int sleepValue=0
|
||||
// dim value
|
||||
int dimValue=40
|
||||
|
||||
@@ -6,7 +6,7 @@ Program.s
|
||||
int payloadLength=0
|
||||
int par0=0,par1=0
|
||||
// sleep timeout in s
|
||||
int sleepTimeout=2
|
||||
int sleepTimeout=20
|
||||
int sleepValue=0
|
||||
// dim value
|
||||
int dimValue=40
|
||||
|
||||
Reference in New Issue
Block a user