h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2026-02-20 13:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

sync (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-30 17:10:43 +00:00
committed by github-actions[bot]
parent 442f050064
commit e71c3261c9
12 changed files with 96 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 17:10:40.314836175 +0000
@@ -11,6 +11,4 @@ @@ -11,6 +11,4 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
- lcd_dev fffb 0002 0000 0020 - lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 17:10:40.314836175 +0000
@@ -683,10 +683,7 @@ @@ -683,10 +683,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -24,8 +24,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/landscape/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 17:02:49.343806991 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 17:10:40.318836322 +0000
@@ -1924,10 +1924,6 @@ @@ -1924,10 +1924,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -38,8 +38,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/landscape/n2t-out/cardEntities.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 17:10:40.314836175 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -52,8 +52,8 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/landscape/n2t-out/cardGrid.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 17:10:40.314836175 +0000
@@ -635,10 +635,7 @@ @@ -635,10 +635,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -67,8 +67,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/landscape/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 17:10:40.314836175 +0000
@@ -581,10 +581,7 @@ @@ -581,10 +581,7 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -82,8 +82,8 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/landscape/n2t-out/cardQR.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 17:10:40.314836175 +0000
@@ -1169,10 +1169,6 @@ @@ -1169,10 +1169,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -96,8 +96,8 @@ diff -bur HMI/n2t-out/cardThermo.txt HMI/US/landscape/n2t-out/cardThermo.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 17:10:40.314836175 +0000
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
recmod=1 recmod=1
bauds=115200 bauds=115200
@@ -119,8 +119,8 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 17:10:40.314836175 +0000
@@ -560,10 +560,6 @@ @@ -560,10 +560,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -133,8 +133,8 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/landscape/n2t-out/popupLight.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/popupNotify.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 17:10:40.314836175 +0000
@@ -310,10 +310,6 @@ @@ -310,10 +310,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -147,8 +147,8 @@ diff -bur HMI/n2t-out/popupNotify.txt HMI/US/landscape/n2t-out/popupNotify.txt
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/popupShutter.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 17:02:49.331805698 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 17:10:40.314836175 +0000
@@ -405,10 +405,6 @@ @@ -405,10 +405,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -161,8 +161,8 @@ diff -bur HMI/n2t-out/popupShutter.txt HMI/US/landscape/n2t-out/popupShutter.txt
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {
diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/landscape/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 17:02:49.343806991 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 17:10:40.318836322 +0000
@@ -397,9 +397,6 @@ @@ -397,9 +397,6 @@
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0

80
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 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
--- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:02:48.739741932 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:10:39.902823788 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 int dimValue=40
@@ -10,24 +10,9 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
+ // fix touch offset (Removed for US version) + // fix touch offset (Removed for US version)
+ //lcd_dev fffb 0002 0000 0020 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.739741932 +0000
@@ -683,10 +683,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:02:48.743742363 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:10:39.902823788 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -483,8 +468,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:02:48.743742363 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:10:39.902823788 +0000
@@ -846,10 +846,6 @@ @@ -846,10 +846,6 @@
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
@@ -496,24 +481,9 @@ diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 17:02:48.743742363 +0000
@@ -635,10 +635,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
--- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:02:48.743742363 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:10:39.902823788 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -523,21 +493,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
Variable (string) entn Variable (string) entn
Attributes Attributes
@@ -581,10 +581,7 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
+ dim=dimValue
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:02:48.743742363 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:10:39.902823788 +0000
@@ -142,7 +142,7 @@ @@ -142,7 +142,7 @@
Disable release event after dragging: 0 Disable release event after dragging: 0
Send Component ID : disabled Send Component ID : disabled
@@ -556,23 +514,9 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
//send calc crc //send calc crc
btlen tSend.txt,sys0 btlen tSend.txt,sys0
crcrest 1,0xffff // reset CRC 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-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 17:02:48.743742363 +0000
@@ -560,10 +560,6 @@
// get value
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
- dim=dimValueNormal
}
if(tInstruction.txt=="timeout")
{
diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt
--- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-30 17:10:39.474892878 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:02:48.743742363 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:10:39.902823788 +0000
@@ -474,22 +474,6 @@ @@ -474,22 +474,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1

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

@@ -1,27 +1,12 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 17:02:48.759744086 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 17:10:39.918821674 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 17:10:39.474892878 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:02:48.739741932 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:10:39.902823788 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:10:39.474892878 +0000
+--- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:10:39.902823788 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.739741932 +0000
+@@ -683,10 +683,7 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
++ dim=dimValue
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:02:48.743742363 +0000
+@@ -1849,6 +2077,169 @@ +@@ -1849,6 +2077,169 @@
+diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt
+--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:10:39.474892878 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:02:48.743742363 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:10:39.902823788 +0000
+@@ -846,10 +846,6 @@ +@@ -846,10 +846,6 @@
+ // get value + // get value
+ spstr strCommand.txt,tTmp.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",1
@@ -33,51 +18,10 @@
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +--- HMI/n2t-out/cardQR.txt 2022-05-30 17:10:39.474892878 +0000
+--- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:10:39.902823788 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 17:02:48.743742363 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:10:39.474892878 +0000
+@@ -635,10 +635,7 @@ ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:10:39.902823788 +0000
+ // get value +--- HMI/n2t-out/screensaver.txt 2022-05-30 17:10:39.474892878 +0000
+ spstr strCommand.txt,tTmp.txt,"~",1 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:10:39.902823788 +0000
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
++ dim=dimValue
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:02:48.743742363 +0000
+@@ -581,10 +581,7 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
++ dim=dimValue
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:02:48.743742363 +0000
+diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 17:02:48.743742363 +0000
+@@ -560,10 +560,6 @@
+ // get value
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+- dim=dimValueNormal
+ }
+ if(tInstruction.txt=="timeout")
+ {
+--- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:02:48.743742363 +0000
+@@ -474,22 +474,6 @@ +@@ -474,22 +474,6 @@

5
HMI/US/portrait/n2t-out-visual/cardAlarm.txt
View File

@@ -1240,7 +1240,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out-visual/cardMedia.txt
View File

@@ -1084,7 +1084,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out-visual/cardQR.txt
View File

@@ -871,7 +871,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

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

@@ -2,10 +2,10 @@ Program.s
0 Component(s) 0 Component(s)
10 Line(s) of event code 10 Line(s) of event code
10 Unique line(s) of event code 10 Unique line(s) of event code
cardAlarm cardMedia
38 Component(s) 33 Component(s)
360 Line(s) of event code 348 Line(s) of event code
226 Unique line(s) of event code 182 Unique line(s) of event code
pageIcons pageIcons
6 Component(s) 6 Component(s)
0 Line(s) of event code 0 Line(s) of event code
@@ -18,18 +18,18 @@ cardGrid
42 Component(s) 42 Component(s)
435 Line(s) of event code 435 Line(s) of event code
256 Unique line(s) of event code 256 Unique line(s) of event code
popupLight
27 Component(s)
348 Line(s) of event code
188 Unique line(s) of event code
cardQR cardQR
30 Component(s) 30 Component(s)
359 Line(s) of event code 361 Line(s) of event code
209 Unique line(s) of event code 210 Unique line(s) of event code
cardMedia popupLight
33 Component(s) 27 Component(s)
346 Line(s) of event code 351 Line(s) of event code
181 Unique line(s) of event code 190 Unique line(s) of event code
cardAlarm
38 Component(s)
362 Line(s) of event code
227 Unique line(s) of event code
popupNotify popupNotify
17 Component(s) 17 Component(s)
203 Line(s) of event code 203 Line(s) of event code
@@ -58,5 +58,5 @@ cardEntities
Total Total
13 Page(s) 13 Page(s)
416 Component(s) 416 Component(s)
4678 Line(s) of event code 4687 Line(s) of event code
1236 Unique line(s) of event code 1236 Unique line(s) of event code

4
HMI/US/portrait/n2t-out-visual/popupLight.txt
View File

@@ -906,6 +906,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out/cardAlarm.txt
View File

@@ -683,7 +683,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out/cardMedia.txt
View File

@@ -635,7 +635,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

5
HMI/US/portrait/n2t-out/cardQR.txt
View File

@@ -581,7 +581,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
dim=dimValue // get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {

4
HMI/US/portrait/n2t-out/popupLight.txt
View File

@@ -560,6 +560,10 @@ Timer tmSerial
// get value // get value
spstr strCommand.txt,tTmp.txt,"~",1 spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0 covx tTmp.txt,dimValue,0,0
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
dim=dimValueNormal
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {