diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index c98ec4f4..0e0a73d1 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -2902,3 +2902,39 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled +│ @@ -508,35 +489,14 @@ +│ } +│ if(tInstruction.txt=="timeout") +│ { +│ //set timeout to global var +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,sleepTimeout,0,0 +│ } +│ - if(tInstruction.txt=="statusUpdate") +│ - { +│ - //statusIcon1 +│ - spstr strCommand.txt,tIcon1.txt,"~",1 +│ - spstr strCommand.txt,tTmp.txt,"~",2 +│ - covx tTmp.txt,tIcon1.pco,0,0 +│ - //statusIcon2 +│ - spstr strCommand.txt,tIcon2.txt,"~",3 +│ - spstr strCommand.txt,tTmp.txt,"~",4 +│ - covx tTmp.txt,tIcon2.pco,0,0 +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - if(tTmp.txt!="") +│ - { +│ - tIcon1.font=3 +│ - } +│ - spstr strCommand.txt,tTmp.txt,"~",6 +│ - if(tTmp.txt!="") +│ - { +│ - tIcon2.font=3 +│ - } +│ - } +│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") +│ { +│ vis tMainIcon,1 +│ vis tMainIconAlt,0 +│ vis tMainText,1 +│ vis tMainTextAlt,0 +│ vis tMRIcon,0 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index e28391b9..b3001390 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2065,3 +2065,39 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled +│ @@ -508,35 +489,14 @@ +│ } +│ if(tInstruction.txt=="timeout") +│ { +│ //set timeout to global var +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,sleepTimeout,0,0 +│ } +│ - if(tInstruction.txt=="statusUpdate") +│ - { +│ - //statusIcon1 +│ - spstr strCommand.txt,tIcon1.txt,"~",1 +│ - spstr strCommand.txt,tTmp.txt,"~",2 +│ - covx tTmp.txt,tIcon1.pco,0,0 +│ - //statusIcon2 +│ - spstr strCommand.txt,tIcon2.txt,"~",3 +│ - spstr strCommand.txt,tTmp.txt,"~",4 +│ - covx tTmp.txt,tIcon2.pco,0,0 +│ - spstr strCommand.txt,tTmp.txt,"~",5 +│ - if(tTmp.txt!="") +│ - { +│ - tIcon1.font=3 +│ - } +│ - spstr strCommand.txt,tTmp.txt,"~",6 +│ - if(tTmp.txt!="") +│ - { +│ - tIcon2.font=3 +│ - } +│ - } +│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") +│ { +│ vis tMainIcon,1 +│ vis tMainIconAlt,0 +│ vis tMainText,1 +│ vis tMainTextAlt,0 +│ vis tMRIcon,0 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index d81d6c33..0ab11eb7 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-31 00:54:59.785437486 +0000 ++++ /dev/fd/62 2022-12-31 14:00:50.738431612 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardAlarm.txt @@ -366,13 +366,13 @@ +ributes + Scope : local + Text : -+ Max. Text Size: 80 + Max. Text Size: 40 + +e (string) nent2 +ributes + Scope : local + Text : ++ Max. Text Size: 80 + Max. Text Size: 40 +14 +176,26 @@ +e (string) type6 @@ -1449,3 +1449,39 @@ + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled ++35 +489,14 @@ ++ } ++ if(tInstruction.txt=="timeout") ++ { ++ //set timeout to global var ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,sleepTimeout,0,0 ++ } ++ if(tInstruction.txt=="statusUpdate") ++ { ++ //statusIcon1 ++ spstr strCommand.txt,tIcon1.txt,"~",1 ++ spstr strCommand.txt,tTmp.txt,"~",2 ++ covx tTmp.txt,tIcon1.pco,0,0 ++ //statusIcon2 ++ spstr strCommand.txt,tIcon2.txt,"~",3 ++ spstr strCommand.txt,tTmp.txt,"~",4 ++ covx tTmp.txt,tIcon2.pco,0,0 ++ spstr strCommand.txt,tTmp.txt,"~",5 ++ if(tTmp.txt!="") ++ { ++ tIcon1.font=3 ++ } ++ spstr strCommand.txt,tTmp.txt,"~",6 ++ if(tTmp.txt!="") ++ { ++ tIcon2.font=3 ++ } ++ } ++ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") ++ { ++ vis tMainIcon,1 ++ vis tMainIconAlt,0 ++ vis tMainText,1 ++ vis tMainTextAlt,0 ++ vis tMRIcon,0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 432565f0..446d50ae 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -76,11 +76,11 @@ cardThermo 313 Unique line(s) of event code screensaver 47 Component(s) - 411 Line(s) of event code - 299 Unique line(s) of event code + 430 Line(s) of event code + 302 Unique line(s) of event code Total 19 Page(s) 694 Component(s) - 8217 Line(s) of event code - 2124 Unique line(s) of event code + 8236 Line(s) of event code + 2127 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index d52a608b..e36c0472 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1105,6 +1105,27 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } + if(tInstruction.txt=="statusUpdate") + { + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",4 + covx tTmp.txt,tIcon2.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + tIcon1.font=3 + } + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt!="") + { + tIcon2.font=3 + } + } if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { vis tMainIcon,1 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 784cb1b9..a3650257 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -512,6 +512,27 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",1 covx tTmp.txt,sleepTimeout,0,0 } + if(tInstruction.txt=="statusUpdate") + { + //statusIcon1 + spstr strCommand.txt,tIcon1.txt,"~",1 + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,tIcon1.pco,0,0 + //statusIcon2 + spstr strCommand.txt,tIcon2.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",4 + covx tTmp.txt,tIcon2.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt!="") + { + tIcon1.font=3 + } + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt!="") + { + tIcon2.font=3 + } + } if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { vis tMainIcon,1