diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 539138b8..45418d41 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1215,15 +1215,168 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -624,15 +600,14 @@ -│ tIcon1.font=3 -│ } -│ spstr strCommand.txt,tTmp.txt,"~",22 -│ if(tTmp.txt!="") +│ @@ -294,55 +270,65 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainIcon +│ +Text tMR +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainIconAlt +│ +Text tMRIcon +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainText +│ +Text tMainIcon +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainTextAlt +│ +Text tMainIconAlt +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 10 +│ + +│ +Text tMainText +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainTextAlt2 +│ +Text tMainTextAlt +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ @@ -456,15 +442,14 @@ +│ { +│ // crc is okay +│ // here is the location where acual code should be +│ // write command to variable strCommand +│ ucopy strCommand.txt,4,payloadLength-5,0 +│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) +│ spstr strCommand.txt,tInstruction.txt,"~",0 +│ - click m0,1 +│ if(tInstruction.txt=="wake") +│ { +│ //dim=100 +│ click tc0,1 +│ } +│ if(tInstruction.txt=="dimmode") +│ { +│ @@ -537,15 +522,16 @@ +│ } +│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") +│ { +│ vis tMainIcon,1 +│ vis tMainIconAlt,0 +│ vis tMainText,1 +│ vis tMainTextAlt,0 +│ - vis tMainTextAlt2,0 +│ + vis tMRIcon,0 +│ + vis tMR,0 +│ //tMainIcon +│ spstr strCommand.txt,tMainIcon.txt,"~",1 +│ tMainIconAlt.txt=tMainIcon.txt +│ //tMainText +│ spstr strCommand.txt,tMainText.txt,"~",2 +│ tMainTextAlt.txt=tMainText.txt +│ //tForecast1 +│ @@ -569,53 +555,76 @@ +│ //tForecast4 +│ spstr strCommand.txt,tForecast4.txt,"~",12 +│ //tF4Icon +│ spstr strCommand.txt,tF4Icon.txt,"~",13 +│ //tForecast4Val +│ spstr strCommand.txt,tForecast4Val.txt,"~",14 +│ //alternative layout +│ - //tMainTextAlt2 +│ - spstr strCommand.txt,tMainTextAlt2.txt,"~",15 +│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) +│ + //tMRIcon +│ + spstr strCommand.txt,tMRIcon.txt,"~",15 +│ + if(tMRIcon.txt!=""&&p0.w!=320) │ { -│ tIcon2.font=3 +│ //value for tMRIcon, activate alternative layout +│ vis tMainIcon,0 +│ vis tMainText,0 +│ vis tMainTextAlt,1 +│ vis tMainIconAlt,1 +│ - vis tMainTextAlt2,1 +│ + vis tMRIcon,1 +│ + vis tMR,1 +│ vis tForecast1,0 +│ vis tF1Icon,0 +│ vis tForecast1Val,0 +│ //move forecast values to the right +│ tForecast4.txt=tForecast3.txt +│ tForecast3.txt=tForecast2.txt +│ tForecast2.txt=tForecast1.txt +│ tForecast4Val.txt=tForecast3Val.txt +│ tForecast3Val.txt=tForecast2Val.txt +│ tForecast2Val.txt=tForecast1Val.txt +│ tF4Icon.txt=tF3Icon.txt +│ tF3Icon.txt=tF2Icon.txt +│ tF2Icon.txt=tF1Icon.txt │ } -│ - click m0,1 +│ + //tMR +│ + spstr strCommand.txt,tMR.txt,"~",16 +│ + //statusIcon1 +│ + spstr strCommand.txt,tIcon1.txt,"~",17 +│ + spstr strCommand.txt,tTmp.txt,"~",18 +│ + covx tTmp.txt,tIcon1.pco,0,0 +│ + //statusIcon2 +│ + spstr strCommand.txt,tIcon2.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",20 +│ + covx tTmp.txt,tIcon2.pco,0,0 +│ + spstr strCommand.txt,tTmp.txt,"~",21 +│ + if(tTmp.txt!="") +│ + { +│ + tIcon1.font=3 +│ + } +│ + spstr strCommand.txt,tTmp.txt,"~",22 +│ + if(tTmp.txt!="") +│ + { +│ + tIcon2.font=3 +│ + } │ } │ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") │ { @@ -1231,22 +1384,46 @@ │ covx tTmp.txt,tTime.bco,0,0 │ if(tTime.bco!=screensaver.bco) │ { -│ @@ -809,18 +784,14 @@ +│ screensaver.bco=tTime.bco +│ tAMPM.bco=tTime.bco +│ tDate.bco=tTime.bco +│ tMainIcon.bco=tTime.bco +│ tMainText.bco=tTime.bco +│ tMainIconAlt.bco=tTime.bco +│ tMainTextAlt.bco=tTime.bco +│ - tMainTextAlt2.bco=tTime.bco +│ + tMRIcon.bco=tTime.bco +│ + tMR.bco=tTime.bco +│ + tMRIcon.bco=tTime.bco +│ tIcon1.bco=tTime.bco +│ tIcon2.bco=tTime.bco +│ tForecast1.bco=tTime.bco +│ tForecast1Val.bco=tTime.bco +│ tF1Icon.bco=tTime.bco +│ tForecast2.bco=tTime.bco +│ tForecast2Val.bco=tTime.bco +│ @@ -663,20 +672,20 @@ +│ spstr strCommand.txt,tTmp.txt,"~",17 +│ covx tTmp.txt,tForecast3Val.pco,0,0 +│ spstr strCommand.txt,tTmp.txt,"~",18 +│ covx tTmp.txt,tForecast4Val.pco,0,0 +│ spstr strCommand.txt,tTmp.txt,"~",19 +│ covx tTmp.txt,t10.bco,0,0 +│ spstr strCommand.txt,tTmp.txt,"~",20 +│ - covx tTmp.txt,tMainTextAlt2.pco,0,0 +│ - //spstr strCommand.txt,tTmp.txt,"~",21 +│ - //covx tTmp.txt,tMR.pco,0,0 +│ + covx tTmp.txt,tMRIcon.pco,0,0 +│ + spstr strCommand.txt,tTmp.txt,"~",21 +│ + covx tTmp.txt,tMR.pco,0,0 +│ spstr strCommand.txt,tTmp.txt,"~",22 +│ covx tTmp.txt,tTimeAdd.pco,0,0 +│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) +│ + if(tMRIcon.txt!=""&&p0.w!=320) │ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } +│ tF4Icon.pco=tF3Icon.pco +│ tF3Icon.pco=tF2Icon.pco +│ tF2Icon.pco=tF1Icon.pco +│ tForecast4Val.pco=tForecast3Val.pco +│ tForecast3Val.pco=tForecast2Val.pco +│ tForecast2Val.pco=tForecast1Val.pco diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 1886ad6f..6bf0dda5 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -2259,15 +2259,168 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -624,15 +594,14 @@ -│ tIcon1.font=3 -│ } -│ spstr strCommand.txt,tTmp.txt,"~",22 -│ if(tTmp.txt!="") +│ @@ -294,55 +264,65 @@ +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainIcon +│ +Text tMR +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainIconAlt +│ +Text tMRIcon +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainText +│ +Text tMainIcon +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainTextAlt +│ +Text tMainIconAlt +│ + Attributes +│ + Scope : local +│ + Dragging : 0 +│ + Disable release event after dragging: 0 +│ + Send Component ID : disabled +│ + Associated Keyboard : none +│ + Text : +│ + Max. Text Size : 10 +│ + +│ +Text tMainText +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ Max. Text Size : 10 +│ +│ -Text tMainTextAlt2 +│ +Text tMainTextAlt +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : +│ @@ -456,15 +436,14 @@ +│ { +│ // crc is okay +│ // here is the location where acual code should be +│ // write command to variable strCommand +│ ucopy strCommand.txt,4,payloadLength-5,0 +│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) +│ spstr strCommand.txt,tInstruction.txt,"~",0 +│ - click m0,1 +│ if(tInstruction.txt=="wake") +│ { +│ //dim=100 +│ click tc0,1 +│ } +│ if(tInstruction.txt=="dimmode") +│ { +│ @@ -537,15 +516,16 @@ +│ } +│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") +│ { +│ vis tMainIcon,1 +│ vis tMainIconAlt,0 +│ vis tMainText,1 +│ vis tMainTextAlt,0 +│ - vis tMainTextAlt2,0 +│ + vis tMRIcon,0 +│ + vis tMR,0 +│ //tMainIcon +│ spstr strCommand.txt,tMainIcon.txt,"~",1 +│ tMainIconAlt.txt=tMainIcon.txt +│ //tMainText +│ spstr strCommand.txt,tMainText.txt,"~",2 +│ tMainTextAlt.txt=tMainText.txt +│ //tForecast1 +│ @@ -569,53 +549,76 @@ +│ //tForecast4 +│ spstr strCommand.txt,tForecast4.txt,"~",12 +│ //tF4Icon +│ spstr strCommand.txt,tF4Icon.txt,"~",13 +│ //tForecast4Val +│ spstr strCommand.txt,tForecast4Val.txt,"~",14 +│ //alternative layout +│ - //tMainTextAlt2 +│ - spstr strCommand.txt,tMainTextAlt2.txt,"~",15 +│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) +│ + //tMRIcon +│ + spstr strCommand.txt,tMRIcon.txt,"~",15 +│ + if(tMRIcon.txt!=""&&p0.w!=320) │ { -│ tIcon2.font=3 +│ //value for tMRIcon, activate alternative layout +│ vis tMainIcon,0 +│ vis tMainText,0 +│ vis tMainTextAlt,1 +│ vis tMainIconAlt,1 +│ - vis tMainTextAlt2,1 +│ + vis tMRIcon,1 +│ + vis tMR,1 +│ vis tForecast1,0 +│ vis tF1Icon,0 +│ vis tForecast1Val,0 +│ //move forecast values to the right +│ tForecast4.txt=tForecast3.txt +│ tForecast3.txt=tForecast2.txt +│ tForecast2.txt=tForecast1.txt +│ tForecast4Val.txt=tForecast3Val.txt +│ tForecast3Val.txt=tForecast2Val.txt +│ tForecast2Val.txt=tForecast1Val.txt +│ tF4Icon.txt=tF3Icon.txt +│ tF3Icon.txt=tF2Icon.txt +│ tF2Icon.txt=tF1Icon.txt │ } -│ - click m0,1 +│ + //tMR +│ + spstr strCommand.txt,tMR.txt,"~",16 +│ + //statusIcon1 +│ + spstr strCommand.txt,tIcon1.txt,"~",17 +│ + spstr strCommand.txt,tTmp.txt,"~",18 +│ + covx tTmp.txt,tIcon1.pco,0,0 +│ + //statusIcon2 +│ + spstr strCommand.txt,tIcon2.txt,"~",19 +│ + spstr strCommand.txt,tTmp.txt,"~",20 +│ + covx tTmp.txt,tIcon2.pco,0,0 +│ + spstr strCommand.txt,tTmp.txt,"~",21 +│ + if(tTmp.txt!="") +│ + { +│ + tIcon1.font=3 +│ + } +│ + spstr strCommand.txt,tTmp.txt,"~",22 +│ + if(tTmp.txt!="") +│ + { +│ + tIcon2.font=3 +│ + } │ } │ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") │ { @@ -2275,22 +2428,46 @@ │ covx tTmp.txt,tTime.bco,0,0 │ if(tTime.bco!=screensaver.bco) │ { -│ @@ -809,18 +778,14 @@ +│ screensaver.bco=tTime.bco +│ tAMPM.bco=tTime.bco +│ tDate.bco=tTime.bco +│ tMainIcon.bco=tTime.bco +│ tMainText.bco=tTime.bco +│ tMainIconAlt.bco=tTime.bco +│ tMainTextAlt.bco=tTime.bco +│ - tMainTextAlt2.bco=tTime.bco +│ + tMRIcon.bco=tTime.bco +│ + tMR.bco=tTime.bco +│ + tMRIcon.bco=tTime.bco +│ tIcon1.bco=tTime.bco +│ tIcon2.bco=tTime.bco +│ tForecast1.bco=tTime.bco +│ tForecast1Val.bco=tTime.bco +│ tF1Icon.bco=tTime.bco +│ tForecast2.bco=tTime.bco +│ tForecast2Val.bco=tTime.bco +│ @@ -663,20 +666,20 @@ +│ spstr strCommand.txt,tTmp.txt,"~",17 +│ covx tTmp.txt,tForecast3Val.pco,0,0 +│ spstr strCommand.txt,tTmp.txt,"~",18 +│ covx tTmp.txt,tForecast4Val.pco,0,0 +│ spstr strCommand.txt,tTmp.txt,"~",19 +│ covx tTmp.txt,t10.bco,0,0 +│ spstr strCommand.txt,tTmp.txt,"~",20 +│ - covx tTmp.txt,tMainTextAlt2.pco,0,0 +│ - //spstr strCommand.txt,tTmp.txt,"~",21 +│ - //covx tTmp.txt,tMR.pco,0,0 +│ + covx tTmp.txt,tMRIcon.pco,0,0 +│ + spstr strCommand.txt,tTmp.txt,"~",21 +│ + covx tTmp.txt,tMR.pco,0,0 +│ spstr strCommand.txt,tTmp.txt,"~",22 +│ covx tTmp.txt,tTimeAdd.pco,0,0 +│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) +│ + if(tMRIcon.txt!=""&&p0.w!=320) │ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } +│ tF4Icon.pco=tF3Icon.pco +│ tF3Icon.pco=tF2Icon.pco +│ tF2Icon.pco=tF1Icon.pco +│ tForecast4Val.pco=tForecast3Val.pco +│ tForecast3Val.pco=tForecast2Val.pco +│ tForecast2Val.pco=tForecast1Val.pco diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 3729f718..abed37f2 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-20 14:06:59.554663210 +0000 ++++ /dev/fd/62 2023-01-20 23:11:09.357823892 +0000 +le list + +1,12 @@ +.s.txt @@ -483,13 +483,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 +186,26 @@ +e (string) type6 @@ -1644,7 +1644,161 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+15 +594,14 @@ ++55 +264,65 @@ ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++ainIcon ++R ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++ainIconAlt ++RIcon ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++ainText ++ainIcon ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++ainTextAlt ++ainIconAlt ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++ainText ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++ Max. Text Size : 10 ++ ++ainTextAlt2 ++ainTextAlt ++ributes ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Text : ++15 +436,14 @@ ++ { ++ // crc is okay ++ // here is the location where acual code should be ++ // write command to variable strCommand ++ ucopy strCommand.txt,4,payloadLength-5,0 ++ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) ++ spstr strCommand.txt,tInstruction.txt,"~",0 ++ click m0,1 ++ if(tInstruction.txt=="wake") ++ { ++ //dim=100 ++ click tc0,1 ++ } ++ if(tInstruction.txt=="dimmode") ++ { ++15 +516,16 @@ ++ } ++ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") ++ { ++ vis tMainIcon,1 ++ vis tMainIconAlt,0 ++ vis tMainText,1 ++ vis tMainTextAlt,0 ++ vis tMainTextAlt2,0 ++ vis tMRIcon,0 ++ vis tMR,0 ++ //tMainIcon ++ spstr strCommand.txt,tMainIcon.txt,"~",1 ++ tMainIconAlt.txt=tMainIcon.txt ++ //tMainText ++ spstr strCommand.txt,tMainText.txt,"~",2 ++ tMainTextAlt.txt=tMainText.txt ++ //tForecast1 ++53 +549,76 @@ ++ //tForecast4 ++ spstr strCommand.txt,tForecast4.txt,"~",12 ++ //tF4Icon ++ spstr strCommand.txt,tF4Icon.txt,"~",13 ++ //tForecast4Val ++ spstr strCommand.txt,tForecast4Val.txt,"~",14 ++ //alternative layout ++ //tMainTextAlt2 ++ spstr strCommand.txt,tMainTextAlt2.txt,"~",15 ++ if(tMainTextAlt2.txt!=""&&p0.w!=320) ++ //tMRIcon ++ spstr strCommand.txt,tMRIcon.txt,"~",15 ++ if(tMRIcon.txt!=""&&p0.w!=320) ++ { ++ //value for tMRIcon, activate alternative layout ++ vis tMainIcon,0 ++ vis tMainText,0 ++ vis tMainTextAlt,1 ++ vis tMainIconAlt,1 ++ vis tMainTextAlt2,1 ++ vis tMRIcon,1 ++ vis tMR,1 ++ vis tForecast1,0 ++ vis tF1Icon,0 ++ vis tForecast1Val,0 ++ //move forecast values to the right ++ tForecast4.txt=tForecast3.txt ++ tForecast3.txt=tForecast2.txt ++ tForecast2.txt=tForecast1.txt ++ tForecast4Val.txt=tForecast3Val.txt ++ tForecast3Val.txt=tForecast2Val.txt ++ tForecast2Val.txt=tForecast1Val.txt ++ tF4Icon.txt=tF3Icon.txt ++ tF3Icon.txt=tF2Icon.txt ++ tF2Icon.txt=tF1Icon.txt ++ } ++ //tMR ++ spstr strCommand.txt,tMR.txt,"~",16 ++ //statusIcon1 ++ spstr strCommand.txt,tIcon1.txt,"~",17 ++ spstr strCommand.txt,tTmp.txt,"~",18 ++ covx tTmp.txt,tIcon1.pco,0,0 ++ //statusIcon2 ++ spstr strCommand.txt,tIcon2.txt,"~",19 ++ spstr strCommand.txt,tTmp.txt,"~",20 ++ covx tTmp.txt,tIcon2.pco,0,0 ++ spstr strCommand.txt,tTmp.txt,"~",21 ++ if(tTmp.txt!="") ++ { + tIcon1.font=3 + } + spstr strCommand.txt,tTmp.txt,"~",22 @@ -1652,7 +1806,6 @@ + { + tIcon2.font=3 + } -+ click m0,1 + } + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") + { @@ -1660,22 +1813,46 @@ + covx tTmp.txt,tTime.bco,0,0 + if(tTime.bco!=screensaver.bco) + { -+18 +778,14 @@ ++ screensaver.bco=tTime.bco ++ tAMPM.bco=tTime.bco ++ tDate.bco=tTime.bco ++ tMainIcon.bco=tTime.bco ++ tMainText.bco=tTime.bco ++ tMainIconAlt.bco=tTime.bco ++ tMainTextAlt.bco=tTime.bco ++ tMainTextAlt2.bco=tTime.bco ++ tMRIcon.bco=tTime.bco ++ tMR.bco=tTime.bco ++ tMRIcon.bco=tTime.bco ++ tIcon1.bco=tTime.bco ++ tIcon2.bco=tTime.bco ++ tForecast1.bco=tTime.bco ++ tForecast1Val.bco=tTime.bco ++ tF1Icon.bco=tTime.bco ++ tForecast2.bco=tTime.bco ++ tForecast2Val.bco=tTime.bco ++20 +666,20 @@ ++ spstr strCommand.txt,tTmp.txt,"~",17 ++ covx tTmp.txt,tForecast3Val.pco,0,0 ++ spstr strCommand.txt,tTmp.txt,"~",18 ++ covx tTmp.txt,tForecast4Val.pco,0,0 ++ spstr strCommand.txt,tTmp.txt,"~",19 ++ covx tTmp.txt,t10.bco,0,0 ++ spstr strCommand.txt,tTmp.txt,"~",20 ++ covx tTmp.txt,tMainTextAlt2.pco,0,0 ++ //spstr strCommand.txt,tTmp.txt,"~",21 ++ //covx tTmp.txt,tMR.pco,0,0 ++ covx tTmp.txt,tMRIcon.pco,0,0 ++ spstr strCommand.txt,tTmp.txt,"~",21 ++ covx tTmp.txt,tMR.pco,0,0 ++ spstr strCommand.txt,tTmp.txt,"~",22 ++ covx tTmp.txt,tTimeAdd.pco,0,0 ++ if(tMainTextAlt2.txt!=""&&p0.w!=320) ++ if(tMRIcon.txt!=""&&p0.w!=320) + { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } ++ tF4Icon.pco=tF3Icon.pco ++ tF3Icon.pco=tF2Icon.pco ++ tF2Icon.pco=tF1Icon.pco ++ tForecast4Val.pco=tForecast3Val.pco ++ tForecast3Val.pco=tForecast2Val.pco ++ tForecast2Val.pco=tForecast1Val.pco diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index c675f444..f305a6eb 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -43,9 +43,9 @@ pageStartup 185 Line(s) of event code 131 Unique line(s) of event code screensaver - 47 Component(s) - 443 Line(s) of event code - 311 Unique line(s) of event code + 46 Component(s) + 416 Line(s) of event code + 301 Unique line(s) of event code cardPower 48 Component(s) 483 Line(s) of event code @@ -85,6 +85,6 @@ cardEntities Total 20 Page(s) - 737 Component(s) - 8802 Line(s) of event code - 2271 Unique line(s) of event code + 736 Component(s) + 8775 Line(s) of event code + 2264 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 1aabed81..c690650e 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -53,7 +53,7 @@ Variable (string) strCommand Variable (string) strTmp Attributes - ID : 45 + ID : 41 Scope : local Text : Max. Text Size: 2 @@ -67,21 +67,21 @@ Variable (string) tId Variable (string) tInstruction Attributes - ID : 30 + ID : 28 Scope : local Text : Max. Text Size: 50 Variable (string) tSend Attributes - ID : 34 + ID : 30 Scope : local Text : Max. Text Size: 50 Variable (string) tTmp Attributes - ID : 31 + ID : 29 Scope : local Text : Max. Text Size: 50 @@ -94,43 +94,43 @@ Variable (int32) vaTap Variable (int32) xc1 Attributes - ID : 39 + ID : 35 Scope: local Value: 0 Variable (int32) xc2 Attributes - ID : 41 + ID : 37 Scope: local Value: 0 Variable (int32) xcR Attributes - ID : 44 + ID : 40 Scope: local Value: 0 Variable (int32) yc1 Attributes - ID : 40 + ID : 36 Scope: local Value: 0 Variable (int32) yc2 Attributes - ID : 42 + ID : 38 Scope: local Value: 0 Variable (int32) ycR Attributes - ID : 43 + ID : 39 Scope: local Value: 0 Text m0 Attributes - ID : 46 + ID : 42 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -621,7 +621,7 @@ Text tForecast4Val Text tIcon1 Attributes - ID : 35 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -651,7 +651,7 @@ Text tIcon1 Text tIcon2 Attributes - ID : 36 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -679,66 +679,6 @@ Text tIcon2 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tMR - Attributes - ID : 29 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 144 - y coordinate : 276 - Width : 62 - Height : 21 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : left - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMRIcon - Attributes - ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 101 - y coordinate : 272 - Width : 40 - Height : 35 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tMainIcon Attributes ID : 7 @@ -777,17 +717,17 @@ Text tMainIconAlt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 227 - Width : 100 - Height : 66 + x coordinate : 2 + y coordinate : 238 + Width : 54 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 4 + Font ID : 3 Back. Color : 0 Font Color : 65535 Horizontal Alignment : center @@ -837,10 +777,10 @@ Text tMainTextAlt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 104 + x coordinate : 58 y coordinate : 216 - Width : 106 - Height : 42 + Width : 152 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 @@ -850,7 +790,37 @@ Text tMainTextAlt Font ID : 3 Back. Color : 0 Font Color : 65535 - Horizontal Alignment : left + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMainTextAlt2 + Attributes + ID : 43 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 58 + y coordinate : 265 + Width : 152 + Height : 45 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center Vertical Alignment : center Input Type : character Text : @@ -861,7 +831,7 @@ Text tMainTextAlt Text tNotifyHead Attributes - ID : 32 + ID : 44 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -891,7 +861,7 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 33 + ID : 45 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -951,7 +921,7 @@ Text tTime Text tTimeAdd Attributes - ID : 37 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -998,7 +968,7 @@ Picture p0 Timer tm0 Attributes - ID : 38 + ID : 34 Scope : local Period (ms): 50 Enabled : yes @@ -1063,6 +1033,7 @@ Timer tmSerial ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) spstr strCommand.txt,tInstruction.txt,"~",0 + click m0,1 if(tInstruction.txt=="wake") { //dim=100 @@ -1143,8 +1114,7 @@ Timer tmSerial vis tMainIconAlt,0 vis tMainText,1 vis tMainTextAlt,0 - vis tMRIcon,0 - vis tMR,0 + vis tMainTextAlt2,0 //tMainIcon spstr strCommand.txt,tMainIcon.txt,"~",1 tMainIconAlt.txt=tMainIcon.txt @@ -1176,17 +1146,16 @@ Timer tmSerial //tForecast4Val spstr strCommand.txt,tForecast4Val.txt,"~",14 //alternative layout - //tMRIcon - spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!=""&&p0.w!=320) + //tMainTextAlt2 + spstr strCommand.txt,tMainTextAlt2.txt,"~",15 + if(tMainTextAlt2.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 vis tMainText,0 vis tMainTextAlt,1 vis tMainIconAlt,1 - vis tMRIcon,1 - vis tMR,1 + vis tMainTextAlt2,1 vis tForecast1,0 vis tF1Icon,0 vis tForecast1Val,0 @@ -1201,27 +1170,6 @@ Timer tmSerial tF3Icon.txt=tF2Icon.txt tF2Icon.txt=tF1Icon.txt } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 - //statusIcon1 - spstr strCommand.txt,tIcon1.txt,"~",17 - spstr strCommand.txt,tTmp.txt,"~",18 - covx tTmp.txt,tIcon1.pco,0,0 - //statusIcon2 - spstr strCommand.txt,tIcon2.txt,"~",19 - spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - if(tTmp.txt!="") - { - tIcon1.font=3 - } - spstr strCommand.txt,tTmp.txt,"~",22 - if(tTmp.txt!="") - { - tIcon2.font=3 - } - click m0,1 } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { @@ -1236,9 +1184,7 @@ Timer tmSerial tMainText.bco=tTime.bco tMainIconAlt.bco=tTime.bco tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco + tMainTextAlt2.bco=tTime.bco tIcon1.bco=tTime.bco tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco @@ -1294,12 +1240,12 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMR.pco,0,0 + covx tTmp.txt,tMainTextAlt2.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",21 + //covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tTimeAdd.pco,0,0 - if(tMRIcon.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!=""&&p0.w!=320) { tF4Icon.pco=tF3Icon.pco tF3Icon.pco=tF2Icon.pco @@ -1406,10 +1352,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 81211731..3a37fdcf 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -298,26 +298,6 @@ Text tIcon2 Text : Max. Text Size : 10 -Text tMR - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tMRIcon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - Text tMainIcon Attributes Scope : local @@ -358,6 +338,16 @@ Text tMainTextAlt Text : Max. Text Size : 10 +Text tMainTextAlt2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + Text tNotifyHead Attributes Scope : local @@ -470,6 +460,7 @@ Timer tmSerial ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) spstr strCommand.txt,tInstruction.txt,"~",0 + click m0,1 if(tInstruction.txt=="wake") { //dim=100 @@ -550,8 +541,7 @@ Timer tmSerial vis tMainIconAlt,0 vis tMainText,1 vis tMainTextAlt,0 - vis tMRIcon,0 - vis tMR,0 + vis tMainTextAlt2,0 //tMainIcon spstr strCommand.txt,tMainIcon.txt,"~",1 tMainIconAlt.txt=tMainIcon.txt @@ -583,17 +573,16 @@ Timer tmSerial //tForecast4Val spstr strCommand.txt,tForecast4Val.txt,"~",14 //alternative layout - //tMRIcon - spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!=""&&p0.w!=320) + //tMainTextAlt2 + spstr strCommand.txt,tMainTextAlt2.txt,"~",15 + if(tMainTextAlt2.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 vis tMainText,0 vis tMainTextAlt,1 vis tMainIconAlt,1 - vis tMRIcon,1 - vis tMR,1 + vis tMainTextAlt2,1 vis tForecast1,0 vis tF1Icon,0 vis tForecast1Val,0 @@ -608,27 +597,6 @@ Timer tmSerial tF3Icon.txt=tF2Icon.txt tF2Icon.txt=tF1Icon.txt } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 - //statusIcon1 - spstr strCommand.txt,tIcon1.txt,"~",17 - spstr strCommand.txt,tTmp.txt,"~",18 - covx tTmp.txt,tIcon1.pco,0,0 - //statusIcon2 - spstr strCommand.txt,tIcon2.txt,"~",19 - spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - if(tTmp.txt!="") - { - tIcon1.font=3 - } - spstr strCommand.txt,tTmp.txt,"~",22 - if(tTmp.txt!="") - { - tIcon2.font=3 - } - click m0,1 } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { @@ -643,9 +611,7 @@ Timer tmSerial tMainText.bco=tTime.bco tMainIconAlt.bco=tTime.bco tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco + tMainTextAlt2.bco=tTime.bco tIcon1.bco=tTime.bco tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco @@ -701,12 +667,12 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",19 covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMR.pco,0,0 + covx tTmp.txt,tMainTextAlt2.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",21 + //covx tTmp.txt,tMR.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,tTimeAdd.pco,0,0 - if(tMRIcon.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!=""&&p0.w!=320) { tF4Icon.pco=tF3Icon.pco tF3Icon.pco=tF2Icon.pco @@ -813,10 +779,6 @@ Timer tmSerial { page cardChart } - if(tId.txt=="cardLChart") - { - page cardLChart - } } // end of user code udelete payloadLength-1