h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 07:54:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

syned serial fix to us versions (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-04-12 19:23:44 +00:00
committed by github-actions[bot]
parent e86e1f6fb4
commit 533db201a8
13 changed files with 244 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

123
HMI/US/landscape/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 19:02:33.614166242 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-04-12 19:23:43.769693891 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
+ //lcd_dev fffb 0002 0000 0020
page pageStartup
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:02:32.754160910 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 19:02:33.618166267 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-04-12 19:23:43.769693891 +0000
@@ -177,7 +177,7 @@
recmod=1
bauds=115200
@@ -23,8 +23,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-12 19:02:33.618166267 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-04-12 19:23:43.769693891 +0000
@@ -570,43 +570,25 @@
//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
@@ -75,114 +75,3 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-04-12 19:02:33.618166267 +0000
@@ -339,43 +339,25 @@
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
- {
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
- }
- if(tId.txt=="popupShutter")
- {
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
- }
- if(tId.txt=="popupNotify")
+ if(tId.txt=="cardMedia")
{
- page popupNotify
+ page cardMedia
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
- if(tId.txt=="cardMedia")
+ if(tId.txt=="pageStartup")
{
- page cardMedia
+ page pageStartup
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-04-12 19:02:33.618166267 +0000
@@ -366,43 +366,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")
{

22
HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt
View File

@@ -20,24 +20,20 @@ cardMedia
169 Unique line(s) of event code
popupNotify
17 Component(s)
178 Line(s) of event code
117 Unique line(s) of event code
popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
196 Line(s) of event code
123 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupLight
27 Component(s)
320 Line(s) of event code
173 Unique line(s) of event code
cardAlarm
35 Component(s)
343 Line(s) of event code
214 Unique line(s) of event code
popupShutter
19 Component(s)
191 Line(s) of event code
107 Unique line(s) of event code
cardGrid
39 Component(s)
418 Line(s) of event code
@@ -50,9 +46,13 @@ cardEntities
62 Component(s)
964 Line(s) of event code
410 Unique line(s) of event code
popupLight
27 Component(s)
320 Line(s) of event code
173 Unique line(s) of event code
Total
12 Page(s)
341 Component(s)
3540 Line(s) of event code
3571 Line(s) of event code
947 Unique line(s) of event code

34
HMI/US/landscape/n2t-out-visual/popupNotify.txt
View File

@@ -548,25 +548,43 @@ Timer tmSerial
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="pageStartup")
{
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=="popupLight")
{
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=="cardThermo")
{
page cardThermo
}
if(tId.txt=="pageStartup")
if(tId.txt=="cardMedia")
{
page pageStartup
}
if(tId.txt=="cardGrid")
{
page cardGrid
page cardMedia
}
if(tId.txt=="cardAlarm")
{

31
HMI/US/landscape/n2t-out-visual/popupShutter.txt
View File

@@ -631,30 +631,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")
{

34
HMI/US/landscape/n2t-out/popupNotify.txt
View File

@@ -339,25 +339,43 @@ Timer tmSerial
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="pageStartup")
{
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=="popupLight")
{
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=="cardThermo")
{
page cardThermo
}
if(tId.txt=="pageStartup")
if(tId.txt=="cardMedia")
{
page pageStartup
}
if(tId.txt=="cardGrid")
{
page cardGrid
page cardMedia
}
if(tId.txt=="cardAlarm")
{

31
HMI/US/landscape/n2t-out/popupShutter.txt
View File

@@ -366,30 +366,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")
{

131
HMI/US/portrait/diff-eu-version.txt
View File

@@ -1,6 +1,6 @@
diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:02:33.138163241 +0000
--- HMI/n2t-out/Program.s.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:23:43.361690306 +0000
@@ -11,6 +11,6 @@
// dim value
int dimValue=40
@@ -11,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-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:02:33.142163267 +0000
--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:23:43.361690306 +0000
@@ -62,6 +62,16 @@
vis bText4,0
vis hSlider4,0
@@ -463,8 +463,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-04-12 19:02:32.754160910 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:02:33.138163241 +0000
--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:23:43.361690306 +0000
@@ -142,7 +142,7 @@
Disable release event after dragging: 0
Send Component ID : disabled
@@ -484,8 +484,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC
diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:02:33.142163267 +0000
--- HMI/n2t-out/popupLight.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:23:43.361690306 +0000
@@ -570,43 +570,25 @@
//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
@@ -532,124 +532,13 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+ if(tId.txt=="cardGrid")
{
- page cardMedia
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-12 19:02:33.138163241 +0000
@@ -339,43 +339,25 @@
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
- if(tId.txt=="pageStartup")
- {
- page pageStartup
- }
- if(tId.txt=="screensaver")
- {
- page screensaver
- }
if(tId.txt=="cardEntities")
{
page cardEntities
}
- if(tId.txt=="cardGrid")
- {
- page cardGrid
- }
- if(tId.txt=="popupLight")
- {
- pageIcons.tTmp1.txt=tTmp.txt
- page popupLight
- }
- if(tId.txt=="popupShutter")
- {
- pageIcons.tTmp1.txt=tTmp.txt
- page popupShutter
- }
- if(tId.txt=="popupNotify")
+ if(tId.txt=="cardMedia")
{
- page popupNotify
+ page cardMedia
}
if(tId.txt=="cardThermo")
{
page cardThermo
}
- if(tId.txt=="cardMedia")
+ if(tId.txt=="pageStartup")
{
- page cardMedia
+ page pageStartup
+ }
+ if(tId.txt=="cardGrid")
+ {
+ page cardGrid
}
if(tId.txt=="cardAlarm")
{
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-12 19:02:33.142163267 +0000
@@ -366,43 +366,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")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-04-12 19:02:32.758160910 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:02:33.138163241 +0000
--- HMI/n2t-out/screensaver.txt 2022-04-12 19:23:42.977686931 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:23:43.361690306 +0000
@@ -48,6 +48,26 @@
Scope: local
Value: 0

136
HMI/US/portrait/diff-filtered.txt
View File

@@ -1,8 +1,8 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 19:02:33.222163771 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-12 19:02:32.754160910 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:02:33.138163241 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:02:33.142163267 +0000
+++ HMI/US/portrait/diff-eu-version.txt 2022-04-12 19:23:43.373690411 +0000
+--- HMI/n2t-out/Program.s.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-04-12 19:23:43.361690306 +0000
+--- HMI/n2t-out/cardEntities.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-04-12 19:23:43.361690306 +0000
+@@ -62,6 +62,16 @@
+@@ -117,6 +127,18 @@
+@@ -153,6 +175,15 @@
@@ -49,11 +49,14 @@
+@@ -967,6 +1146,33 @@
+@@ -1072,6 +1278,28 @@
+@@ -1642,6 +1870,128 @@
+--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:02:32.754160910 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:02:33.138163241 +0000
+ }
+ if(tInstruction.txt=="pageType")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-04-12 19:23:43.361690306 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:02:33.142163267 +0000
+--- HMI/n2t-out/popupLight.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-04-12 19:23:43.361690306 +0000
+@@ -570,43 +570,25 @@
+ //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
@@ -104,120 +107,9 @@
+ }
+ if(tId.txt=="cardAlarm")
+ {
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
+--- HMI/n2t-out/popupNotify.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-04-12 19:02:33.138163241 +0000
+@@ -339,43 +339,25 @@
+ pageIcons.tTmp1.txt=tTmp.txt
+ page popupLight
+ }
+- if(tId.txt=="pageStartup")
+- {
+- page pageStartup
+- }
+- if(tId.txt=="screensaver")
+- {
+- page screensaver
+- }
+ if(tId.txt=="cardEntities")
+ {
+ page cardEntities
+ }
+- if(tId.txt=="cardGrid")
+- {
+- page cardGrid
+- }
+- if(tId.txt=="popupLight")
+- {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupLight
+- }
+- if(tId.txt=="popupShutter")
+- {
+- pageIcons.tTmp1.txt=tTmp.txt
+- page popupShutter
+- }
+- if(tId.txt=="popupNotify")
++ if(tId.txt=="cardMedia")
+ {
+- page popupNotify
++ page cardMedia
+ }
+ if(tId.txt=="cardThermo")
+ {
+ page cardThermo
+ }
+- if(tId.txt=="cardMedia")
++ if(tId.txt=="pageStartup")
+ {
+- page cardMedia
++ page pageStartup
++ }
++ if(tId.txt=="cardGrid")
++ {
++ page cardGrid
+ }
+ if(tId.txt=="cardAlarm")
+ {
+diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-04-12 19:02:33.142163267 +0000
+@@ -366,43 +366,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")
+ {
+diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
+--- HMI/n2t-out/screensaver.txt 2022-04-12 19:02:32.758160910 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:02:33.138163241 +0000
+--- HMI/n2t-out/screensaver.txt 2022-04-12 19:23:42.977686931 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-04-12 19:23:43.361690306 +0000
+@@ -48,6 +48,26 @@
+ Scope: local
+ Value: 0

22
HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt
View File

@@ -12,12 +12,20 @@ pageIcons
0 Unique line(s) of event code
popupNotify
17 Component(s)
178 Line(s) of event code
117 Unique line(s) of event code
196 Line(s) of event code
123 Unique line(s) of event code
popupShutter
19 Component(s)
191 Line(s) of event code
107 Unique line(s) of event code
pageStartup
19 Component(s)
150 Line(s) of event code
113 Unique line(s) of event code
popupLight
27 Component(s)
320 Line(s) of event code
173 Unique line(s) of event code
screensaver
33 Component(s)
195 Line(s) of event code
@@ -42,17 +50,9 @@ cardThermo
41 Component(s)
442 Line(s) of event code
247 Unique line(s) of event code
popupShutter
19 Component(s)
178 Line(s) of event code
101 Unique line(s) of event code
popupLight
27 Component(s)
320 Line(s) of event code
173 Unique line(s) of event code
Total
12 Page(s)
353 Component(s)
3733 Line(s) of event code
3764 Line(s) of event code
1003 Unique line(s) of event code

34
HMI/US/portrait/n2t-out-visual/popupNotify.txt
View File

@@ -548,25 +548,43 @@ Timer tmSerial
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="pageStartup")
{
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=="popupLight")
{
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=="cardThermo")
{
page cardThermo
}
if(tId.txt=="pageStartup")
if(tId.txt=="cardMedia")
{
page pageStartup
}
if(tId.txt=="cardGrid")
{
page cardGrid
page cardMedia
}
if(tId.txt=="cardAlarm")
{

31
HMI/US/portrait/n2t-out-visual/popupShutter.txt
View File

@@ -631,30 +631,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")
{

34
HMI/US/portrait/n2t-out/popupNotify.txt
View File

@@ -339,25 +339,43 @@ Timer tmSerial
pageIcons.tTmp1.txt=tTmp.txt
page popupLight
}
if(tId.txt=="pageStartup")
{
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=="popupLight")
{
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=="cardThermo")
{
page cardThermo
}
if(tId.txt=="pageStartup")
if(tId.txt=="cardMedia")
{
page pageStartup
}
if(tId.txt=="cardGrid")
{
page cardGrid
page cardMedia
}
if(tId.txt=="cardAlarm")
{

31
HMI/US/portrait/n2t-out/popupShutter.txt
View File

@@ -366,30 +366,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")
{