diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index d6b85acb..33c4d0d6 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -108,7 +108,28 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -748,18 +724,14 @@ +│ @@ -626,20 +602,14 @@ +│ { +│ vis tMainIcon,1 +│ vis tMainIconAlt,0 +│ vis tMainText,1 +│ vis tMainTextAlt,0 +│ vis tMainTextAlt2,0 +│ vis tMainIconAlt2,0 +│ - if(p0.w!=320) +│ - { +│ - vis tForecast1,1 +│ - vis tF1Icon,1 +│ - vis tForecast1Val,1 +│ - } +│ } +│ } +│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") +│ { +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,tTime.bco,0,0 +│ if(tTime.bco!=screensaver.bco) +│ @@ -754,18 +724,14 @@ │ { │ page pageStartup │ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 3c296b9b..51409132 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1513,6 +1513,27 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none +│ @@ -626,20 +602,14 @@ +│ { +│ vis tMainIcon,1 +│ vis tMainIconAlt,0 +│ vis tMainText,1 +│ vis tMainTextAlt,0 +│ vis tMainTextAlt2,0 +│ vis tMainIconAlt2,0 +│ - if(p0.w!=320) +│ - { +│ - vis tForecast1,1 +│ - vis tF1Icon,1 +│ - vis tForecast1Val,1 +│ - } +│ } +│ } +│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") +│ { +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,tTime.bco,0,0 +│ if(tTime.bco!=screensaver.bco) │ --- HMI/n2t-out/screensaver2.txt ├── +++ HMI/US/portrait/n2t-out/screensaver2.txt │ @@ -29,17 +29,14 @@ diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 160e78da..bfcafb2a 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-03-27 16:17:58.208991272 +0000 ++++ /dev/fd/62 2023-04-08 15:35:50.059610175 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +1 +10,10 @@ @@ -900,6 +900,27 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none ++20 +602,14 @@ ++ { ++ vis tMainIcon,1 ++ vis tMainIconAlt,0 ++ vis tMainText,1 ++ vis tMainTextAlt,0 ++ vis tMainTextAlt2,0 ++ vis tMainIconAlt2,0 ++ if(p0.w!=320) ++ { ++ vis tForecast1,1 ++ vis tF1Icon,1 ++ vis tForecast1Val,1 ++ } ++ } ++ } ++ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") ++ { ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,tTime.bco,0,0 ++ if(tTime.bco!=screensaver.bco) +I/n2t-out/screensaver2.txt ++ HMI/US/portrait/n2t-out/screensaver2.txt +7 +29,14 @@ diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 68fe49f3..81775b6f 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -70,6 +70,10 @@ cardMedia 59 Component(s) 645 Line(s) of event code 320 Unique line(s) of event code +screensaver + 47 Component(s) + 440 Line(s) of event code + 314 Unique line(s) of event code cardPower 54 Component(s) 523 Line(s) of event code @@ -78,10 +82,6 @@ popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code -screensaver - 47 Component(s) - 434 Line(s) of event code - 311 Unique line(s) of event code cardEntities 67 Component(s) 1166 Line(s) of event code @@ -90,5 +90,5 @@ cardEntities Total 21 Page(s) 802 Component(s) - 9249 Line(s) of event code - 2342 Unique line(s) of event code + 9255 Line(s) of event code + 2345 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index a04109b9..f8d5ddb5 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1223,6 +1223,12 @@ Timer tmSerial vis tMainTextAlt,0 vis tMainTextAlt2,0 vis tMainIconAlt2,0 + if(p0.w!=320) + { + vis tForecast1,1 + vis tF1Icon,1 + vis tForecast1Val,1 + } } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index fcafb4a4..b33179c7 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -630,6 +630,12 @@ Timer tmSerial vis tMainTextAlt,0 vis tMainTextAlt2,0 vis tMainIconAlt2,0 + if(p0.w!=320) + { + vis tForecast1,1 + vis tF1Icon,1 + vis tForecast1Val,1 + } } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="")