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

Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

Browse Source
This commit is contained in:
joBr99
2022-05-30 17:02:53 +00:00
committed by github-actions[bot]
parent db1d8a285b
commit eeb05a1e96
16 changed files with 129 additions and 231 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 16:19:33.814519820 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.814519820 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/cardAlarm.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.818519895 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/cardEntities.txt 2022-05-30 17:02:49.343806991 +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 16:19:33.818519895 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/cardGrid.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.818519895 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/cardMedia.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.818519895 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/cardQR.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.818519895 +0000 --- HMI/n2t-out/cardThermo.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/cardThermo.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.818519895 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.818519895 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/popupLight.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.814519820 +0000 --- HMI/n2t-out/popupNotify.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/popupNotify.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.814519820 +0000 --- HMI/n2t-out/popupShutter.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/popupShutter.txt 2022-05-30 17:02:49.331805698 +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 16:19:33.818519895 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 16:19:34.706536541 +0000 +++ HMI/US/landscape/n2t-out/screensaver.txt 2022-05-30 17:02:49.343806991 +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

112
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 16:19:33.814519820 +0000 --- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:02:48.739741932 +0000
@@ -11,6 +11,6 @@ @@ -11,6 +11,6 @@
// dim value // dim value
int dimValue=40 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 + //lcd_dev fffb 0002 0000 0020
page pageStartup page pageStartup
diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
--- HMI/n2t-out/cardAlarm.txt 2022-05-30 16:19:33.814519820 +0000 --- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.739741932 +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
@@ -26,8 +26,8 @@ diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
if(tInstruction.txt=="timeout") 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 16:19:33.818519895 +0000 --- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:02:48.743742363 +0000
@@ -62,6 +62,16 @@ @@ -62,6 +62,16 @@
vis bText4,0 vis bText4,0
vis hSlider4,0 vis hSlider4,0
@@ -482,20 +482,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
} }
if(tInstruction.txt=="pageType") if(tInstruction.txt=="pageType")
{ {
@@ -1924,10 +2315,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/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 16:19:33.818519895 +0000 --- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:02:48.743742363 +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
@@ -508,8 +497,8 @@ 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 diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
--- HMI/n2t-out/cardMedia.txt 2022-05-30 16:19:33.818519895 +0000 --- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 17:02:48.743742363 +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
@@ -523,8 +512,8 @@ diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
if(tInstruction.txt=="timeout") 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 16:19:33.818519895 +0000 --- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:02:48.743742363 +0000
@@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
Attributes Attributes
Scope : local Scope : local
@@ -546,23 +535,9 @@ diff -bur HMI/n2t-out/cardQR.txt HMI/US/portrait/n2t-out/cardQR.txt
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt
--- HMI/n2t-out/cardThermo.txt 2022-05-30 16:19:33.818519895 +0000
+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-30 16:19:34.246527918 +0000
@@ -1169,10 +1169,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/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 16:19:33.818519895 +0000 --- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:02:48.743742363 +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
@@ -581,20 +556,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
@@ -273,10 +273,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
--- HMI/n2t-out/popupLight.txt 2022-05-30 16:19:33.818519895 +0000 --- HMI/n2t-out/popupLight.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 17:02:48.743742363 +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
@@ -606,48 +570,10 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
} }
if(tInstruction.txt=="timeout") if(tInstruction.txt=="timeout")
{ {
diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt
--- HMI/n2t-out/popupNotify.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-30 16:19:34.246527918 +0000
@@ -310,10 +310,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/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
--- HMI/n2t-out/popupShutter.txt 2022-05-30 16:19:33.814519820 +0000
+++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-30 16:19:34.246527918 +0000
@@ -405,10 +405,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=="time")
{
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 16:19:33.818519895 +0000 --- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000
+++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 16:19:34.246527918 +0000 +++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:02:48.743742363 +0000
@@ -397,9 +397,6 @@ @@ -474,22 +474,6 @@
spstr strCommand.txt,tTmp.txt,"~",1
covx tTmp.txt,dimValue,0,0
dim=dimValue
- // get value normal
- spstr strCommand.txt,tTmp.txt,"~",2
- covx tTmp.txt,dimValueNormal,0,0
}
if(tInstruction.txt=="time")
{
@@ -474,22 +471,6 @@
vis tMainIconAlt,1 vis tMainIconAlt,1
vis tMRIcon,1 vis tMRIcon,1
vis tMR,1 vis tMR,1

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

@@ -1,9 +1,9 @@
+++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 16:19:34.258528143 +0000 +++ HMI/US/portrait/diff-eu-version.txt 2022-05-30 17:02:48.759744086 +0000
+--- HMI/n2t-out/Program.s.txt 2022-05-30 16:19:33.814519820 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 16:19:34.246527918 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-30 17:02:48.739741932 +0000
+diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt
+--- HMI/n2t-out/cardAlarm.txt 2022-05-30 16:19:33.814519820 +0000 +--- HMI/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 16:19:34.246527918 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-05-30 17:02:48.739741932 +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
@@ -16,23 +16,12 @@
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+--- HMI/n2t-out/cardEntities.txt 2022-05-30 16:19:33.818519895 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 16:19:34.246527918 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-30 17:02:48.743742363 +0000
+@@ -1849,6 +2077,169 @@ +@@ -1849,6 +2077,169 @@
+@@ -1924,10 +2315,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/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 16:19:33.818519895 +0000 +--- HMI/n2t-out/cardGrid.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 16:19:34.246527918 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-05-30 17:02:48.743742363 +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
@@ -45,8 +34,8 @@
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt +diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt
+--- HMI/n2t-out/cardMedia.txt 2022-05-30 16:19:33.818519895 +0000 +--- HMI/n2t-out/cardMedia.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 16:19:34.246527918 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-05-30 17:02:48.743742363 +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
@@ -59,8 +48,8 @@
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+--- HMI/n2t-out/cardQR.txt 2022-05-30 16:19:33.818519895 +0000 +--- HMI/n2t-out/cardQR.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 16:19:34.246527918 +0000 ++++ HMI/US/portrait/n2t-out/cardQR.txt 2022-05-30 17:02:48.743742363 +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
@@ -73,36 +62,11 @@
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +--- HMI/n2t-out/pageStartup.txt 2022-05-30 17:02:48.227713141 +0000
+--- HMI/n2t-out/cardThermo.txt 2022-05-30 16:19:33.818519895 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 17:02:48.743742363 +0000
++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -1169,10 +1169,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/pageStartup.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -273,10 +273,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/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt +diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt
+--- HMI/n2t-out/popupLight.txt 2022-05-30 16:19:33.818519895 +0000 +--- HMI/n2t-out/popupLight.txt 2022-05-30 17:02:48.227713141 +0000
++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 16:19:34.246527918 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-05-30 17:02:48.743742363 +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
@@ -114,44 +78,6 @@
+ } + }
+ if(tInstruction.txt=="timeout") + if(tInstruction.txt=="timeout")
+ { + {
+diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +--- HMI/n2t-out/screensaver.txt 2022-05-30 17:02:48.227713141 +0000
+--- HMI/n2t-out/popupNotify.txt 2022-05-30 16:19:33.814519820 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 17:02:48.743742363 +0000
++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-05-30 16:19:34.246527918 +0000 +@@ -474,22 +474,6 @@
+@@ -310,10 +310,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/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt
+--- HMI/n2t-out/popupShutter.txt 2022-05-30 16:19:33.814519820 +0000
++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -405,10 +405,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=="time")
+ {
+--- HMI/n2t-out/screensaver.txt 2022-05-30 16:19:33.818519895 +0000
++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-05-30 16:19:34.246527918 +0000
+@@ -397,9 +397,6 @@
+ spstr strCommand.txt,tTmp.txt,"~",1
+ covx tTmp.txt,dimValue,0,0
+ dim=dimValue
+- // get value normal
+- spstr strCommand.txt,tTmp.txt,"~",2
+- covx tTmp.txt,dimValueNormal,0,0
+ }
+ if(tInstruction.txt=="time")
+ {
+@@ -474,22 +471,6 @@

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

@@ -3480,6 +3480,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")
{ {

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

@@ -1950,6 +1950,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")
{ {

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

@@ -14,10 +14,6 @@ pageTest
14 Component(s) 14 Component(s)
14 Line(s) of event code 14 Line(s) of event code
14 Unique line(s) of event code 14 Unique line(s) of event code
popupNotify
17 Component(s)
200 Line(s) of event code
125 Unique line(s) of event code
cardGrid cardGrid
42 Component(s) 42 Component(s)
435 Line(s) of event code 435 Line(s) of event code
@@ -34,29 +30,33 @@ cardMedia
33 Component(s) 33 Component(s)
346 Line(s) of event code 346 Line(s) of event code
181 Unique line(s) of event code 181 Unique line(s) of event code
cardThermo popupNotify
56 Component(s) 17 Component(s)
542 Line(s) of event code 203 Line(s) of event code
292 Unique line(s) of event code 127 Unique line(s) of event code
pageStartup
19 Component(s)
154 Line(s) of event code
115 Unique line(s) of event code
popupShutter popupShutter
20 Component(s) 20 Component(s)
244 Line(s) of event code 247 Line(s) of event code
138 Unique line(s) of event code 140 Unique line(s) of event code
cardThermo
56 Component(s)
545 Line(s) of event code
294 Unique line(s) of event code
pageStartup
19 Component(s)
157 Line(s) of event code
117 Unique line(s) of event code
screensaver screensaver
37 Component(s) 37 Component(s)
290 Line(s) of event code 292 Line(s) of event code
229 Unique line(s) of event code 230 Unique line(s) of event code
cardEntities cardEntities
77 Component(s) 77 Component(s)
1359 Line(s) of event code 1362 Line(s) of event code
578 Unique line(s) of event code 580 Unique line(s) of event code
Total Total
13 Page(s) 13 Page(s)
416 Component(s) 416 Component(s)
4661 Line(s) of event code 4678 Line(s) of event code
1234 Unique line(s) of event code 1236 Unique line(s) of event code

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

@@ -568,6 +568,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")
{ {

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

@@ -519,6 +519,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")
{ {

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

@@ -690,6 +690,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=="time") if(tInstruction.txt=="time")
{ {

3
HMI/US/portrait/n2t-out-visual/screensaver.txt
View File

@@ -942,6 +942,9 @@ Timer tmSerial
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 dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {

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

@@ -2315,6 +2315,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")
{ {

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

@@ -1169,6 +1169,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")
{ {

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

@@ -273,6 +273,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")
{ {

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

@@ -310,6 +310,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")
{ {

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

@@ -405,6 +405,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=="time") if(tInstruction.txt=="time")
{ {

3
HMI/US/portrait/n2t-out/screensaver.txt
View File

@@ -397,6 +397,9 @@ Timer tmSerial
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 dim=dimValue
// get value normal
spstr strCommand.txt,tTmp.txt,"~",2
covx tTmp.txt,dimValueNormal,0,0
} }
if(tInstruction.txt=="time") if(tInstruction.txt=="time")
{ {