diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 311c83eb..ce3341b8 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -462,7 +462,7 @@ │ } │ } ├── screensaver.txt -│ @@ -691,18 +691,14 @@ +│ @@ -675,18 +675,14 @@ │ { │ page cardAlarm │ } 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 adb8879d..7495260b 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 @@ -38,6 +38,10 @@ cardGrid 42 Component(s) 469 Line(s) of event code 278 Unique line(s) of event code +screensaver + 38 Component(s) + 333 Line(s) of event code + 259 Unique line(s) of event code cardThermo 52 Component(s) 580 Line(s) of event code @@ -46,10 +50,6 @@ popupShutter 25 Component(s) 389 Line(s) of event code 212 Unique line(s) of event code -screensaver - 38 Component(s) - 349 Line(s) of event code - 263 Unique line(s) of event code cardAlarm 40 Component(s) 422 Line(s) of event code @@ -62,5 +62,5 @@ cardEntities Total 14 Page(s) 439 Component(s) - 5280 Line(s) of event code - 1415 Unique line(s) of event code + 5264 Line(s) of event code + 1411 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index d10a2c30..c95315c3 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1012,7 +1012,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } - if(tInstruction.txt=="weatherUpdate") + if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { vis tMainIcon,1 vis tMainIconAlt,0 @@ -1086,16 +1086,8 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } - if(tInstruction.txt=="color") + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 @@ -1183,14 +1175,6 @@ Timer tmSerial tForecast3.pco=tForecast2.pco tForecast2.pco=tForecast1.pco } - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } if(tInstruction.txt=="notify") { diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 05bcb898..c49db507 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -447,7 +447,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } - if(tInstruction.txt=="weatherUpdate") + if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { vis tMainIcon,1 vis tMainIconAlt,0 @@ -521,16 +521,8 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } - if(tInstruction.txt=="color") + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 @@ -618,14 +610,6 @@ Timer tmSerial tForecast3.pco=tForecast2.pco tForecast2.pco=tForecast1.pco } - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } if(tInstruction.txt=="notify") { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index ae8d848d..5880c0ef 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1069,7 +1069,7 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -691,18 +691,14 @@ +│ @@ -675,18 +675,14 @@ │ { │ page cardAlarm │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 1ce0d255..40e70606 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-09-22 16:21:40.160676588 +0000 ++++ /dev/fd/62 2022-09-26 13:45:52.701819549 +0000 +rdAlarm.txt +18 +833,14 @@ + { @@ -381,7 +381,7 @@ + Scope : local + Dragging : 0 + Disable release event after dragging: 0 -+18 +691,14 @@ ++18 +675,14 @@ + { + page cardAlarm + } diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 9d76c132..a67f5371 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -52,8 +52,8 @@ cardThermo 303 Unique line(s) of event code screensaver 38 Component(s) - 349 Line(s) of event code - 263 Unique line(s) of event code + 333 Line(s) of event code + 259 Unique line(s) of event code cardEntities 77 Component(s) 1354 Line(s) of event code @@ -62,5 +62,5 @@ cardEntities Total 14 Page(s) 451 Component(s) - 5503 Line(s) of event code - 1489 Unique line(s) of event code + 5487 Line(s) of event code + 1485 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 9bad7594..3bb9a27d 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1012,7 +1012,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } - if(tInstruction.txt=="weatherUpdate") + if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { vis tMainIcon,1 vis tMainIconAlt,0 @@ -1086,16 +1086,8 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } - if(tInstruction.txt=="color") + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 @@ -1183,14 +1175,6 @@ Timer tmSerial tForecast3.pco=tForecast2.pco tForecast2.pco=tForecast1.pco } - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } if(tInstruction.txt=="notify") { diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 3a2d3c1f..08135f25 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -447,7 +447,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } - if(tInstruction.txt=="weatherUpdate") + if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { vis tMainIcon,1 vis tMainIconAlt,0 @@ -521,16 +521,8 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } - if(tInstruction.txt=="color") + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 @@ -618,14 +610,6 @@ Timer tmSerial tForecast3.pco=tForecast2.pco tForecast2.pco=tForecast1.pco } - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } if(tInstruction.txt=="notify") { diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index f44ff49c..2d14119e 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -24,8 +24,8 @@ popupLight 213 Unique line(s) of event code screensaver 38 Component(s) - 353 Line(s) of event code - 265 Unique line(s) of event code + 337 Line(s) of event code + 261 Unique line(s) of event code popupFan 27 Component(s) 346 Line(s) of event code @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 488 Component(s) - 5741 Line(s) of event code - 1534 Unique line(s) of event code + 5725 Line(s) of event code + 1530 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 60cc5d28..f07d0f7f 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1012,7 +1012,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } - if(tInstruction.txt=="weatherUpdate") + if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { vis tMainIcon,1 vis tMainIconAlt,0 @@ -1086,16 +1086,8 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } - if(tInstruction.txt=="color") + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 @@ -1183,14 +1175,6 @@ Timer tmSerial tForecast3.pco=tForecast2.pco tForecast2.pco=tForecast1.pco } - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } if(tInstruction.txt=="notify") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 3b62c693..bc110c0a 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -447,7 +447,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } - if(tInstruction.txt=="weatherUpdate") + if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { vis tMainIcon,1 vis tMainIconAlt,0 @@ -521,16 +521,8 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } - if(tInstruction.txt=="color") + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,tTime.bco,0,0 @@ -618,14 +610,6 @@ Timer tmSerial tForecast3.pco=tForecast2.pco tForecast2.pco=tForecast1.pco } - if(tNotifyHead.txt!="") - { - ref tNotifyHead - } - if(tNotifyText.txt!="") - { - ref tNotifyText - } } if(tInstruction.txt=="notify") {