diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 8be1b00a..cf4649ae 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -30,3 +30,31 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd +├── screensaver.txt +│ @@ -620,26 +620,14 @@ +│ vis tNotifyHead,1 +│ vis tNotifyText,1 +│ }else +│ { +│ vis tNotifyHead,0 +│ vis tNotifyText,0 +│ } +│ - tNotifyHead.bco=tTime.bco +│ - tNotifyText.bco=tTime.bco +│ - spstr strCommand.txt,tTmp.txt,"~",3 +│ - if(tTmp.txt!="") +│ - { +│ - covx tTmp.txt,tNotifyHead.pco,0,0 +│ - } +│ - spstr strCommand.txt,tTmp.txt,"~",4 +│ - if(tTmp.txt!="") +│ - { +│ - covx tTmp.txt,tNotifyText.pco,0,0 +│ - } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ dim=100 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 441585e3..3ce17716 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -735,3 +735,30 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 +│ @@ -620,26 +620,14 @@ +│ vis tNotifyHead,1 +│ vis tNotifyText,1 +│ }else +│ { +│ vis tNotifyHead,0 +│ vis tNotifyText,0 +│ } +│ - tNotifyHead.bco=tTime.bco +│ - tNotifyText.bco=tTime.bco +│ - spstr strCommand.txt,tTmp.txt,"~",3 +│ - if(tTmp.txt!="") +│ - { +│ - covx tTmp.txt,tNotifyHead.pco,0,0 +│ - } +│ - spstr strCommand.txt,tTmp.txt,"~",4 +│ - if(tTmp.txt!="") +│ - { +│ - covx tTmp.txt,tNotifyText.pco,0,0 +│ - } +│ } +│ if(tInstruction.txt=="pageType") +│ { +│ dim=100 +│ //command format pageType,specialPageName +│ //write name of speical page to tId +│ spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 992922b7..4c1cd6b8 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-10-16 07:36:55.021416954 +0000 ++++ /dev/fd/62 2022-10-16 07:58:08.397597578 +0000 +geIcons.txt +5 +15,15 @@ + Scope : global @@ -61,3 +61,30 @@ + Scope : local + Dragging : 0 + Disable release event after dragging: 0 ++26 +620,14 @@ ++ vis tNotifyHead,1 ++ vis tNotifyText,1 ++ }else ++ { ++ vis tNotifyHead,0 ++ vis tNotifyText,0 ++ } ++ tNotifyHead.bco=tTime.bco ++ tNotifyText.bco=tTime.bco ++ spstr strCommand.txt,tTmp.txt,"~",3 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,tNotifyHead.pco,0,0 ++ } ++ spstr strCommand.txt,tTmp.txt,"~",4 ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,tNotifyText.pco,0,0 ++ } ++ } ++ if(tInstruction.txt=="pageType") ++ { ++ dim=100 ++ //command format pageType,specialPageName ++ //write name of speical page to tId ++ spstr strCommand.txt,tId.txt,"~",1 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index c1b8c25a..9fbf0093 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -42,14 +42,14 @@ cardMedia 34 Component(s) 394 Line(s) of event code 213 Unique line(s) of event code +screensaver + 38 Component(s) + 350 Line(s) of event code + 266 Unique line(s) of event code cardPower 43 Component(s) 420 Line(s) of event code 292 Unique line(s) of event code -screensaver - 38 Component(s) - 338 Line(s) of event code - 262 Unique line(s) of event code cardThermo 52 Component(s) 585 Line(s) of event code @@ -66,5 +66,5 @@ cardEntities Total 15 Page(s) 490 Component(s) - 5819 Line(s) of event code - 1576 Unique line(s) of event code + 5831 Line(s) of event code + 1580 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 113b8afd..86b494c5 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1189,6 +1189,18 @@ Timer tmSerial vis tNotifyHead,0 vis tNotifyText,0 } + tNotifyHead.bco=tTime.bco + tNotifyText.bco=tTime.bco + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,tNotifyHead.pco,0,0 + } + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,tNotifyText.pco,0,0 + } } if(tInstruction.txt=="pageType") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 01a8cc52..625daaf4 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -624,6 +624,18 @@ Timer tmSerial vis tNotifyHead,0 vis tNotifyText,0 } + tNotifyHead.bco=tTime.bco + tNotifyText.bco=tTime.bco + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,tNotifyHead.pco,0,0 + } + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,tNotifyText.pco,0,0 + } } if(tInstruction.txt=="pageType") {