diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 96a37df9..e1d65fe4 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -12,153 +12,6 @@ │ - // fix touch offset │ - lcd_dev fffb 0002 0000 0020 │ - page pageStartup -├── cardAlarm.txt -│ @@ -671,19 +671,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ //text arm1 -│ spstr strCommand.txt,arm1.txt,"~",3 -│ if(arm1.txt!="") -│ { -│ vis arm1,1 -│ } -│ //id arm1 -├── cardEntities.txt -│ @@ -1253,19 +1253,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",3 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",4 -│ if(type1.txt=="delete"||type1.txt=="") -│ { -│ vis bUp1,0 -├── cardGrid.txt -│ @@ -680,19 +680,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",3 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",4 -│ if(type1.txt=="delete"||type1.txt=="") -│ { -│ vis tEntity1,0 -├── cardMedia.txt -│ @@ -628,19 +628,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ //entity name -│ spstr strCommand.txt,entn.txt,"~",3 -│ //icon -│ spstr strCommand.txt,tIcon.txt,"~",4 -│ //title -│ spstr strCommand.txt,tTitle.txt,"~",5 -│ //author -├── cardPower.txt -│ @@ -586,19 +586,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ // icon color home -│ spstr strCommand.txt,tTmp.txt,"~",3 -│ covx tTmp.txt,t1.pco,0,0 -│ // icon home -│ spstr strCommand.txt,t1.txt,"~",4 -│ // text home -│ spstr strCommand.txt,tHome.txt,"~",5 -├── cardQR.txt -│ @@ -477,19 +477,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ //text qrcode -│ spstr strCommand.txt,vaQR.txt,"~",3 -│ // get Type -│ spstr strCommand.txt,type1.txt,"~",4 -│ // get internal name -│ spstr strCommand.txt,entn1.txt,"~",5 -│ if(type1.txt=="delete"||type1.txt=="") -├── cardThermo.txt -│ @@ -925,19 +925,14 @@ -│ } -│ if(tTmp.txt=="1") -│ { -│ vis bNext,1 -│ tsw mSwipeNext,1 -│ bNext.txt="" -│ } -│ - if(tTmp.txt=="2") -│ - { -│ - vis bNext,1 -│ - bNext.txt="" -│ - } -│ //entity name -│ spstr strCommand.txt,entn.txt,"~",3 -│ //currentTemp -│ spstr strCommand.txt,tCurTemp.txt,"~",4 -│ //dstTemp -│ spstr strCommand.txt,tTmp.txt,"~",5 -│ covx tTmp.txt,xTempDest1.val,0,0 ├── pageStartup.txt │ @@ -173,15 +173,15 @@ │ Max. Text Size : 10 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index 19861f9a..3eb07475 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -1258,6 +1258,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //text arm1 spstr strCommand.txt,arm1.txt,"~",3 if(arm1.txt!="") diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 45125c1a..f8ad8bad 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2210,6 +2210,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,"~",3 // get internal name diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index f4822cf1..6e87d739 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -1130,6 +1130,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,"~",3 // get internal name diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 92c78a67..72d3bb1f 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -1064,6 +1064,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //entity name spstr strCommand.txt,entn.txt,"~",3 //icon diff --git a/HMI/US/landscape/n2t-out-visual/cardPower.txt b/HMI/US/landscape/n2t-out-visual/cardPower.txt index f16b58c8..1faf3a85 100644 --- a/HMI/US/landscape/n2t-out-visual/cardPower.txt +++ b/HMI/US/landscape/n2t-out-visual/cardPower.txt @@ -1096,6 +1096,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // icon color home spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,t1.pco,0,0 diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index 19e4bf44..f02da680 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -780,6 +780,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //text qrcode spstr strCommand.txt,vaQR.txt,"~",3 // get Type diff --git a/HMI/US/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 1ad2f70c..f1c44ff8 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -1649,6 +1649,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index d0e4ff4a..096dbf1d 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -14,14 +14,14 @@ popupNotify 19 Component(s) 253 Line(s) of event code 164 Unique line(s) of event code -cardAlarm - 40 Component(s) - 434 Line(s) of event code - 260 Unique line(s) of event code -cardQR - 32 Component(s) - 416 Line(s) of event code - 241 Unique line(s) of event code +cardMedia + 34 Component(s) + 406 Line(s) of event code + 216 Unique line(s) of event code +cardPower + 43 Component(s) + 435 Line(s) of event code + 297 Unique line(s) of event code popupLight 27 Component(s) 391 Line(s) of event code @@ -38,41 +38,41 @@ pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -cardGrid - 42 Component(s) - 485 Line(s) of event code - 285 Unique line(s) of event code -cardMedia - 34 Component(s) - 401 Line(s) of event code - 215 Unique line(s) of event code -cardPower - 43 Component(s) - 430 Line(s) of event code - 296 Unique line(s) of event code +cardQR + 32 Component(s) + 421 Line(s) of event code + 242 Unique line(s) of event code +cardThermo + 53 Component(s) + 608 Line(s) of event code + 316 Unique line(s) of event code popupInSel 34 Component(s) 529 Line(s) of event code 257 Unique line(s) of event code +cardAlarm + 40 Component(s) + 439 Line(s) of event code + 261 Unique line(s) of event code +cardEntities + 65 Component(s) + 1165 Line(s) of event code + 530 Unique line(s) of event code popupThermo 44 Component(s) 515 Line(s) of event code 272 Unique line(s) of event code +cardGrid + 42 Component(s) + 490 Line(s) of event code + 286 Unique line(s) of event code screensaver 45 Component(s) 389 Line(s) of event code 288 Unique line(s) of event code -cardThermo - 53 Component(s) - 603 Line(s) of event code - 315 Unique line(s) of event code -cardEntities - 65 Component(s) - 1160 Line(s) of event code - 529 Unique line(s) of event code Total 17 Page(s) 570 Component(s) - 6944 Line(s) of event code - 1795 Unique line(s) of event code + 6979 Line(s) of event code + 1796 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 31de7a2c..2ecbfcd8 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -675,6 +675,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //text arm1 spstr strCommand.txt,arm1.txt,"~",3 if(arm1.txt!="") diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index ebb2cd0e..126a32ad 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1257,6 +1257,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,"~",3 // get internal name diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index f9e19531..ed39cfd5 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -684,6 +684,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // get Type spstr strCommand.txt,type1.txt,"~",3 // get internal name diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index b7ab6567..01368924 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -632,6 +632,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //entity name spstr strCommand.txt,entn.txt,"~",3 //icon diff --git a/HMI/US/landscape/n2t-out/cardPower.txt b/HMI/US/landscape/n2t-out/cardPower.txt index 528f57d6..e01a63c2 100644 --- a/HMI/US/landscape/n2t-out/cardPower.txt +++ b/HMI/US/landscape/n2t-out/cardPower.txt @@ -590,6 +590,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } // icon color home spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,t1.pco,0,0 diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 6016a818..674d6422 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -481,6 +481,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //text qrcode spstr strCommand.txt,vaQR.txt,"~",3 // get Type diff --git a/HMI/US/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index bec1d0dd..40da416f 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/n2t-out/cardThermo.txt @@ -929,6 +929,11 @@ Timer tmSerial tsw mSwipeNext,1 bNext.txt="" } + if(tTmp.txt=="2") + { + vis bNext,1 + bNext.txt="" + } //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 60a264ad..de0d4bbc 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-11-03 18:55:21.474851026 +0000 ++++ /dev/fd/62 2022-11-03 19:06:12.228899058 +0000 +14 +116,20 @@ +e (string) strCommand + Max. Text Size: 500