diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 1894637b..311c83eb 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -462,7 +462,7 @@ │ } │ } ├── screensaver.txt -│ @@ -683,18 +683,14 @@ +│ @@ -691,18 +691,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 b25f39a7..adb8879d 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,10 +38,6 @@ cardGrid 42 Component(s) 469 Line(s) of event code 278 Unique line(s) of event code -screensaver - 38 Component(s) - 341 Line(s) of event code - 263 Unique line(s) of event code cardThermo 52 Component(s) 580 Line(s) of event code @@ -50,6 +46,10 @@ 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) - 5272 Line(s) of event code + 5280 Line(s) of event code 1415 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 0b5c97bf..d10a2c30 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1183,6 +1183,14 @@ 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 dcbd0f98..05bcb898 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -618,6 +618,14 @@ 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 3255e050..ae8d848d 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 -│ @@ -683,18 +683,14 @@ +│ @@ -691,18 +691,14 @@ │ { │ page cardAlarm │ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 39f030e4..1ce0d255 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-09-21 15:55:38.406625045 +0000 ++++ /dev/fd/62 2022-09-22 16:21:40.160676588 +0000 +rdAlarm.txt +18 +833,14 @@ + { @@ -381,7 +381,7 @@ + Scope : local + Dragging : 0 + Disable release event after dragging: 0 -+18 +683,14 @@ ++18 +691,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 a283aa9f..9d76c132 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,7 +52,7 @@ cardThermo 303 Unique line(s) of event code screensaver 38 Component(s) - 341 Line(s) of event code + 349 Line(s) of event code 263 Unique line(s) of event code cardEntities 77 Component(s) @@ -62,5 +62,5 @@ cardEntities Total 14 Page(s) 451 Component(s) - 5495 Line(s) of event code + 5503 Line(s) of event code 1489 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 c04c42da..9bad7594 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1183,6 +1183,14 @@ 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 445ced6e..3a2d3c1f 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -618,6 +618,14 @@ 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 e48fb390..f44ff49c 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -24,7 +24,7 @@ popupLight 213 Unique line(s) of event code screensaver 38 Component(s) - 345 Line(s) of event code + 353 Line(s) of event code 265 Unique line(s) of event code popupFan 27 Component(s) @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 488 Component(s) - 5733 Line(s) of event code + 5741 Line(s) of event code 1534 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index c2d5e2be..60cc5d28 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1183,6 +1183,14 @@ 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 eda880c9..3b62c693 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -618,6 +618,14 @@ Timer tmSerial tForecast3.pco=tForecast2.pco tForecast2.pco=tForecast1.pco } + if(tNotifyHead.txt!="") + { + ref tNotifyHead + } + if(tNotifyText.txt!="") + { + ref tNotifyText + } } if(tInstruction.txt=="notify") {