diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 04af313c..e03ade02 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -72,7 +72,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -313,176 +303,154 @@ +│ @@ -313,209 +303,154 @@ │ State : unpressed │ Text : 1 │ Max. Text Size : 10 @@ -81,7 +81,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"1" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b1 │ Attributes @@ -97,7 +100,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"2" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b10 │ Attributes @@ -113,7 +119,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"0" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b11 │ Attributes @@ -129,7 +138,10 @@ │ Touch Press Event │ tCode.txt="" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b2 │ Attributes @@ -145,7 +157,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"3" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b3 │ Attributes @@ -161,7 +176,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"4" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b4 │ Attributes @@ -177,7 +195,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"5" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b5 │ Attributes @@ -193,7 +214,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"6" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b6 │ Attributes @@ -209,7 +233,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"7" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b7 │ Attributes @@ -225,7 +252,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"8" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b8 │ Attributes @@ -241,7 +271,10 @@ │ Touch Press Event │ tCode.txt=tCode.txt+"9" │ - vis tCode,1 -│ - vis tHeading,0 +│ - if(p0.w!=320) +│ - { +│ - vis tHeading,0 +│ - } │ │ Button b9 │ Attributes @@ -249,7 +282,7 @@ │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled -│ @@ -665,26 +633,15 @@ +│ @@ -698,26 +633,15 @@ │ // 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) @@ -277,7 +310,7 @@ │ vis bPrev,0 │ }else │ { -│ @@ -711,77 +668,69 @@ +│ @@ -744,77 +668,69 @@ │ spstr strCommand.txt,bNext.txt,"~",10 │ // change icon color │ spstr strCommand.txt,tTmp.txt,"~",11 @@ -367,7 +400,7 @@ │ vis b2,0 │ vis b3,0 │ vis b4,0 -│ @@ -791,30 +740,30 @@ +│ @@ -824,30 +740,30 @@ │ vis b8,0 │ vis b9,0 │ vis b10,0 @@ -402,7 +435,7 @@ │ // get set time to global variable │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } -│ @@ -915,18 +864,14 @@ +│ @@ -948,18 +864,14 @@ │ { │ page cardPower │ } diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 9456fb29..7fe0b277 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,20 +1,5 @@ --- HMI/n2t-out +++ HMI/US/portrait/n2t-out -├── file list -│ @@ -1,13 +1,12 @@ -│ Program.s.txt -│ cardAlarm.txt -│ cardChart.txt -│ cardEntities.txt -│ cardGrid.txt -│ -cardLChart.txt -│ cardMedia.txt -│ cardPower.txt -│ cardQR.txt -│ cardThermo.txt -│ pageIcons.txt -│ pageStartup.txt -│ pageTest.txt │ --- HMI/n2t-out/Program.s.txt ├── +++ HMI/US/portrait/n2t-out/Program.s.txt │ @@ -10,10 +10,10 @@ @@ -49,401 +34,6 @@ │ //b[sys0].pco=defaultFontColor │ } │ } -│ @@ -123,24 +123,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 10 -│ -│ -Text tHeading -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 40 -│ - -│ Text tIcon -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -313,176 +303,154 @@ -│ State : unpressed -│ Text : 1 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"1" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b1 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 2 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"2" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b10 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 0 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"0" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b11 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : CLR -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt="" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b2 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 3 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"3" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b3 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 4 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"4" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b4 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 5 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"5" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b5 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 6 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"6" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b6 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 7 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"7" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b7 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 8 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"8" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b8 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ Text : 9 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"9" -│ - vis tCode,1 -│ - vis tHeading,0 -│ -│ Button b9 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ @@ -665,26 +633,15 @@ -│ // 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 -│ if(tInstruction.txt=="entityUpd") -│ { -│ //entn -│ - spstr strCommand.txt,tHeading.txt,"~",1 -│ - if(tHeading.txt=="unknown") -│ - { -│ - tHeading.txt="" -│ - } -│ - if(tHeading.txt!="") -│ - { -│ - vis tHeading,1 -│ - }else -│ - { -│ - vis tHeading,0 -│ - } -│ + spstr strCommand.txt,entn.txt,"~",1 -│ // navigation icon left -│ spstr strCommand.txt,tTmp.txt,"~",2 //type -│ if(tTmp.txt=="delete"||tTmp.txt=="") -│ { -│ vis bPrev,0 -│ }else -│ { -│ @@ -711,77 +668,69 @@ -│ spstr strCommand.txt,bNext.txt,"~",10 -│ // change icon color -│ spstr strCommand.txt,tTmp.txt,"~",11 -│ covx tTmp.txt,sys0,0,0 -│ bNext.pco=sys0 -│ vis bNext,1 -│ } -│ - //entn -│ - spstr strCommand.txt,entn.txt,"~",14 -│ //text arm1 -│ - spstr strCommand.txt,arm1.txt,"~",15 -│ + spstr strCommand.txt,arm1.txt,"~",14 -│ if(arm1.txt!="") -│ { -│ vis arm1,1 -│ } -│ //id arm1 -│ - spstr strCommand.txt,va1.txt,"~",16 -│ + spstr strCommand.txt,va1.txt,"~",15 -│ //text arm2 -│ - spstr strCommand.txt,arm2.txt,"~",17 -│ + spstr strCommand.txt,arm2.txt,"~",16 -│ if(arm2.txt!="") -│ { -│ vis arm2,1 -│ } -│ //id arm2 -│ - spstr strCommand.txt,va2.txt,"~",18 -│ + spstr strCommand.txt,va2.txt,"~",17 -│ //text arm3 -│ - spstr strCommand.txt,arm3.txt,"~",19 -│ + spstr strCommand.txt,arm3.txt,"~",18 -│ if(arm3.txt!="") -│ { -│ vis arm3,1 -│ } -│ //id arm3 -│ - spstr strCommand.txt,va3.txt,"~",20 -│ + spstr strCommand.txt,va3.txt,"~",19 -│ //text arm4 -│ - spstr strCommand.txt,arm4.txt,"~",21 -│ + spstr strCommand.txt,arm4.txt,"~",20 -│ if(arm4.txt!="") -│ { -│ vis arm4,1 -│ } -│ //id arm4 -│ - spstr strCommand.txt,va4.txt,"~",22 -│ + spstr strCommand.txt,va4.txt,"~",21 -│ //icon -│ - spstr strCommand.txt,tIcon.txt,"~",23 -│ + spstr strCommand.txt,tIcon.txt,"~",22 -│ //icon color -│ - spstr strCommand.txt,tTmp.txt,"~",24 -│ + spstr strCommand.txt,tTmp.txt,"~",23 -│ covx tTmp.txt,sys0,0,0 -│ tIcon.pco=sys0 -│ //numpad status -│ - spstr strCommand.txt,tTmp.txt,"~",25 -│ + spstr strCommand.txt,tTmp.txt,"~",24 -│ if(tTmp.txt!="disable") -│ { -│ vis b0,1 -│ vis b1,1 -│ vis b2,1 -│ vis b3,1 -│ vis b4,1 -│ vis b5,1 -│ vis b6,1 -│ vis b7,1 -│ vis b8,1 -│ vis b9,1 -│ vis b10,1 -│ vis b11,1 -│ - if(tHeading.txt!="") -│ - { -│ - vis tCode,0 -│ - }else -│ - { -│ - vis tCode,1 -│ - } -│ + vis tCode,1 -│ }else -│ { -│ vis b0,0 -│ vis b1,0 -│ vis b2,0 -│ vis b3,0 -│ vis b4,0 -│ @@ -791,30 +740,30 @@ -│ vis b8,0 -│ vis b9,0 -│ vis b10,0 -│ vis b11,0 -│ vis tCode,0 -│ } -│ //flashing status -│ - spstr strCommand.txt,tTmp.txt,"~",26 -│ + spstr strCommand.txt,tTmp.txt,"~",25 -│ if(tTmp.txt=="enable") -│ { -│ tmFlash.en=1 -│ }else -│ { -│ tmFlash.en=0 -│ } -│ // extra button -│ - spstr strCommand.txt,b9.txt,"~",27 -│ + spstr strCommand.txt,b9.txt,"~",26 -│ if(b9.txt!="") -│ { -│ vis b9,1 -│ - spstr strCommand.txt,tTmp.txt,"~",28 -│ + spstr strCommand.txt,tTmp.txt,"~",27 -│ covx tTmp.txt,b9.pco,0,0 -│ - spstr strCommand.txt,vaAddBtn.txt,"~",29 -│ + spstr strCommand.txt,vaAddBtn.txt,"~",28 -│ } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ @@ -915,18 +864,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } -│ --- HMI/n2t-out/cardChart.txt -├── +++ HMI/US/portrait/n2t-out/cardChart.txt -│ @@ -681,18 +681,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } │ --- HMI/n2t-out/cardEntities.txt ├── +++ HMI/US/portrait/n2t-out/cardEntities.txt │ @@ -61,16 +61,36 @@ @@ -1476,67 +1066,6 @@ │ //command format pageType,specialPageName │ //write name of speical page to tId │ spstr strCommand.txt,tId.txt,"~",1 -│ @@ -1931,18 +2711,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/portrait/n2t-out/cardGrid.txt -│ @@ -916,18 +916,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/portrait/n2t-out/cardMedia.txt -│ @@ -1200,18 +1200,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") │ --- HMI/n2t-out/cardPower.txt ├── +++ HMI/US/portrait/n2t-out/cardPower.txt │ @@ -35,15 +35,15 @@ @@ -1556,44 +1085,34 @@ │ b[sys0].pco=defaultFontColor │ } │ if(defaultBcoColor==0) -│ @@ -275,109 +275,79 @@ +│ @@ -283,15 +283,15 @@ +│ Attributes +│ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none │ Text : -│ Max. Text Size : 20 +│ - Max. Text Size : 10 +│ + Max. Text Size : 20 │ -│ -Text tHome2 -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : +│ Text tHomeO +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ @@ -303,81 +303,81 @@ +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ Send Component ID : disabled +│ Associated Keyboard : none +│ Text : │ - Max. Text Size : 10 -│ - -│ -Text tHomeO -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ -Text tHomeO2 -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 10 -│ - +│ + Max. Text Size : 20 +│ │ Picture p0 │ Attributes │ Scope : local @@ -1678,7 +1197,7 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -463,92 +433,74 @@ +│ @@ -463,92 +463,74 @@ │ Attributes │ Scope : local │ Period (ms): 100 @@ -1790,7 +1309,7 @@ │ + if(sys0h4.maxval) @@ -1810,7 +1329,7 @@ │ + if(sys0120) -│ - { -│ - t0Speed.val=120 -│ - } -│ - if(t0Speed.val<-120) -│ - { -│ - t0Speed.val=-120 -│ - } -│ // lower text -│ - spstr strCommand.txt,t0u.txt,"~",25 -│ + spstr strCommand.txt,t0u.txt,"~",20 -│ if(t0Icon.txt!="") -│ { -│ vis t0Icon,1 -│ vis t0u,1 -│ vis h0,1 -│ }else -│ { -│ vis t0Icon,0 -│ vis t0u,0 -│ vis h0,0 -│ } -│ // iconColor -│ - spstr strCommand.txt,tTmp.txt,"~",26 -│ + spstr strCommand.txt,tTmp.txt,"~",21 -│ covx tTmp.txt,t1Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t1Icon.txt,"~",27 -│ + spstr strCommand.txt,t1Icon.txt,"~",22 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",28 -│ + spstr strCommand.txt,tTmp.txt,"~",23 -│ covx tTmp.txt,t1Speed.val,0,0 -│ - if(t1Speed.val>120) -│ - { -│ - t1Speed.val=120 -│ - } -│ - if(t1Speed.val<-120) -│ - { -│ - t1Speed.val=-120 -│ - } -│ // lower text -│ - spstr strCommand.txt,t1u.txt,"~",29 -│ + spstr strCommand.txt,t1u.txt,"~",24 -│ if(t1Icon.txt!="") -│ { -│ vis t1Icon,1 -│ vis t1u,1 -│ vis h1,1 -│ }else -│ { -│ vis t1Icon,0 -│ vis t1u,0 -│ vis h1,0 -│ } -│ // iconColor -│ - spstr strCommand.txt,tTmp.txt,"~",30 -│ + spstr strCommand.txt,tTmp.txt,"~",25 -│ covx tTmp.txt,t2Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t2Icon.txt,"~",31 -│ + spstr strCommand.txt,t2Icon.txt,"~",26 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",32 -│ + spstr strCommand.txt,tTmp.txt,"~",27 -│ covx tTmp.txt,t2Speed.val,0,0 -│ - if(t2Speed.val>120) -│ - { -│ - t2Speed.val=120 -│ - } -│ - if(t2Speed.val<-120) -│ - { -│ - t2Speed.val=-120 -│ - } -│ // lower text -│ - spstr strCommand.txt,t2u.txt,"~",33 -│ + spstr strCommand.txt,t2u.txt,"~",28 -│ if(t2Icon.txt!="") -│ { -│ vis t2Icon,1 -│ vis t2u,1 -│ vis h2,1 -│ }else -│ { -│ vis t2Icon,0 -│ vis t2u,0 -│ vis h2,0 -│ } -│ // iconColor -│ - spstr strCommand.txt,tTmp.txt,"~",34 -│ + spstr strCommand.txt,tTmp.txt,"~",29 -│ covx tTmp.txt,t3Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t3Icon.txt,"~",35 -│ + spstr strCommand.txt,t3Icon.txt,"~",30 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",36 -│ + spstr strCommand.txt,tTmp.txt,"~",31 -│ covx tTmp.txt,t3Speed.val,0,0 -│ - if(t3Speed.val>120) -│ - { -│ - t3Speed.val=120 -│ - } -│ - if(t3Speed.val<-120) -│ - { -│ - t3Speed.val=-120 -│ - } -│ // lower text -│ - spstr strCommand.txt,t3u.txt,"~",37 -│ + spstr strCommand.txt,t3u.txt,"~",32 -│ if(t3Icon.txt!="") -│ { -│ vis t3Icon,1 -│ vis t3u,1 -│ vis h3,1 -│ }else -│ { -│ vis t3Icon,0 -│ vis t3u,0 -│ vis h3,0 -│ } -│ // iconColor -│ - spstr strCommand.txt,tTmp.txt,"~",38 -│ + spstr strCommand.txt,tTmp.txt,"~",33 -│ covx tTmp.txt,t4Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t4Icon.txt,"~",39 -│ + spstr strCommand.txt,t4Icon.txt,"~",34 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",40 -│ + spstr strCommand.txt,tTmp.txt,"~",35 -│ covx tTmp.txt,t4Speed.val,0,0 -│ - if(t4Speed.val>120) -│ - { -│ - t4Speed.val=120 -│ - } -│ - if(t4Speed.val<-120) -│ - { -│ - t4Speed.val=-120 -│ - } -│ // lower text -│ - spstr strCommand.txt,t4u.txt,"~",41 -│ + spstr strCommand.txt,t4u.txt,"~",36 -│ if(t4Icon.txt!="") -│ { -│ vis t4Icon,1 -│ vis t4u,1 -│ vis h4,1 -│ }else -│ { -│ vis t4Icon,0 -│ vis t4u,0 -│ vis h4,0 -│ } -│ // iconColor -│ - spstr strCommand.txt,tTmp.txt,"~",42 -│ + spstr strCommand.txt,tTmp.txt,"~",37 -│ covx tTmp.txt,t5Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t5Icon.txt,"~",43 -│ + spstr strCommand.txt,t5Icon.txt,"~",38 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",44 -│ + spstr strCommand.txt,tTmp.txt,"~",39 -│ covx tTmp.txt,t5Speed.val,0,0 -│ - if(t5Speed.val>120) -│ - { -│ - t5Speed.val=120 -│ - } -│ - if(t5Speed.val<-120) -│ - { -│ - t5Speed.val=-120 -│ - } -│ // lower text -│ - spstr strCommand.txt,t5u.txt,"~",45 -│ + spstr strCommand.txt,t5u.txt,"~",40 -│ if(t5Icon.txt!="") -│ { -│ vis t5Icon,1 -│ vis t5u,1 -│ vis h5,1 -│ }else -│ { │ --- HMI/n2t-out/cardQR.txt ├── +++ HMI/US/portrait/n2t-out/cardQR.txt │ @@ -602,19 +602,19 @@ @@ -2058,46 +1361,6 @@ │ // get set time to global variable │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ } -│ @@ -715,18 +715,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } -│ --- HMI/n2t-out/cardThermo.txt -├── +++ HMI/US/portrait/n2t-out/cardThermo.txt -│ @@ -1117,18 +1117,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // get set time to global variable -│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -│ } -│ if(tInstruction.txt=="date") │ --- HMI/n2t-out/pageStartup.txt ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt │ @@ -35,20 +35,14 @@ @@ -2172,25 +1435,6 @@ │ crcputs sys0,2 │ crcputs tSend.txt,0 │ //send cmd -│ @@ -366,18 +360,14 @@ -│ { -│ page cardPower -│ } -│ if(tId.txt=="cardChart") -│ { -│ page cardChart -│ } -│ - if(tId.txt=="cardLChart") -│ - { -│ - page cardLChart -│ - } -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } │ --- HMI/n2t-out/screensaver.txt ├── +++ HMI/US/portrait/n2t-out/screensaver.txt │ @@ -29,28 +29,19 @@ @@ -2259,25 +1503,38 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -401,14 +371,21 @@ -│ Picture p0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ -│ +Hotspot m0 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + -│ Timer tm0 -│ Attributes -│ Scope : local -│ Period (ms): 50 -│ Enabled : yes -│ -│ Events +│ @@ -494,15 +464,14 @@ +│ if(tTmp.txt!="") +│ { +│ covx tTmp.txt,defaultFontColor,0,0 +│ } +│ } +│ if(tInstruction.txt=="time") +│ { +│ - click m0,1 +│ //get set time to global variable +│ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 +│ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 +│ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 +│ if(tAMPM.txt=="") +│ { +│ vis tAMPM,0 +│ @@ -788,14 +757,18 @@ +│ { +│ page cardPower +│ } +│ if(tId.txt=="cardChart") +│ { +│ page cardChart +│ } +│ + if(tId.txt=="cardLChart") +│ + { +│ + page cardLChart +│ + } +│ } +│ if(tInstruction.txt=="timeout") +│ { +│ //set timeout to global var +│ spstr strCommand.txt,tTmp.txt,"~",1 +│ covx tTmp.txt,sleepTimeout,0,0 +│ } diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 05da1fea..584e3002 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,19 +1,4 @@ -+++ /dev/fd/62 2023-01-21 21:19:16.415580783 +0000 -+le list -+ +1,12 @@ -+.s.txt -+rm.txt -+rt.txt -+ities.txt -+d.txt -+art.txt -+ia.txt -+er.txt -+txt -+rmo.txt -+ns.txt -+rtup.txt -+t.txt ++++ /dev/fd/62 2023-01-22 12:29:59.836182943 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardAlarm.txt @@ -35,401 +20,6 @@ + //b[sys0].pco=defaultFontColor + } + } -+24 +123,14 @@ -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 10 -+ -+eading -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 40 -+ -+con -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+176 +303,154 @@ -+ State : unpressed -+ Text : 1 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"1" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b1 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 2 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"2" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b10 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 0 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"0" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b11 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : CLR -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt="" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b2 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 3 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"3" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b3 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 4 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"4" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b4 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 5 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"5" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b5 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 6 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"6" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b6 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 7 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"7" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b7 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 8 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"8" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b8 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+ Text : 9 -+ Max. Text Size : 10 -+ -+nts -+ Touch Press Event -+ tCode.txt=tCode.txt+"9" -+ vis tCode,1 -+ vis tHeading,0 -+ -+b9 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+26 +633,15 @@ -+ // 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 -+ if(tInstruction.txt=="entityUpd") -+ { -+ //entn -+ spstr strCommand.txt,tHeading.txt,"~",1 -+ if(tHeading.txt=="unknown") -+ { -+ tHeading.txt="" -+ } -+ if(tHeading.txt!="") -+ { -+ vis tHeading,1 -+ }else -+ { -+ vis tHeading,0 -+ } -+ spstr strCommand.txt,entn.txt,"~",1 -+ // navigation icon left -+ spstr strCommand.txt,tTmp.txt,"~",2 //type -+ if(tTmp.txt=="delete"||tTmp.txt=="") -+ { -+ vis bPrev,0 -+ }else -+ { -+77 +668,69 @@ -+ spstr strCommand.txt,bNext.txt,"~",10 -+ // change icon color -+ spstr strCommand.txt,tTmp.txt,"~",11 -+ covx tTmp.txt,sys0,0,0 -+ bNext.pco=sys0 -+ vis bNext,1 -+ } -+ //entn -+ spstr strCommand.txt,entn.txt,"~",14 -+ //text arm1 -+ spstr strCommand.txt,arm1.txt,"~",15 -+ spstr strCommand.txt,arm1.txt,"~",14 -+ if(arm1.txt!="") -+ { -+ vis arm1,1 -+ } -+ //id arm1 -+ spstr strCommand.txt,va1.txt,"~",16 -+ spstr strCommand.txt,va1.txt,"~",15 -+ //text arm2 -+ spstr strCommand.txt,arm2.txt,"~",17 -+ spstr strCommand.txt,arm2.txt,"~",16 -+ if(arm2.txt!="") -+ { -+ vis arm2,1 -+ } -+ //id arm2 -+ spstr strCommand.txt,va2.txt,"~",18 -+ spstr strCommand.txt,va2.txt,"~",17 -+ //text arm3 -+ spstr strCommand.txt,arm3.txt,"~",19 -+ spstr strCommand.txt,arm3.txt,"~",18 -+ if(arm3.txt!="") -+ { -+ vis arm3,1 -+ } -+ //id arm3 -+ spstr strCommand.txt,va3.txt,"~",20 -+ spstr strCommand.txt,va3.txt,"~",19 -+ //text arm4 -+ spstr strCommand.txt,arm4.txt,"~",21 -+ spstr strCommand.txt,arm4.txt,"~",20 -+ if(arm4.txt!="") -+ { -+ vis arm4,1 -+ } -+ //id arm4 -+ spstr strCommand.txt,va4.txt,"~",22 -+ spstr strCommand.txt,va4.txt,"~",21 -+ //icon -+ spstr strCommand.txt,tIcon.txt,"~",23 -+ spstr strCommand.txt,tIcon.txt,"~",22 -+ //icon color -+ spstr strCommand.txt,tTmp.txt,"~",24 -+ spstr strCommand.txt,tTmp.txt,"~",23 -+ covx tTmp.txt,sys0,0,0 -+ tIcon.pco=sys0 -+ //numpad status -+ spstr strCommand.txt,tTmp.txt,"~",25 -+ spstr strCommand.txt,tTmp.txt,"~",24 -+ if(tTmp.txt!="disable") -+ { -+ vis b0,1 -+ vis b1,1 -+ vis b2,1 -+ vis b3,1 -+ vis b4,1 -+ vis b5,1 -+ vis b6,1 -+ vis b7,1 -+ vis b8,1 -+ vis b9,1 -+ vis b10,1 -+ vis b11,1 -+ if(tHeading.txt!="") -+ { -+ vis tCode,0 -+ }else -+ { -+ vis tCode,1 -+ } -+ vis tCode,1 -+ }else -+ { -+ vis b0,0 -+ vis b1,0 -+ vis b2,0 -+ vis b3,0 -+ vis b4,0 -+30 +740,30 @@ -+ vis b8,0 -+ vis b9,0 -+ vis b10,0 -+ vis b11,0 -+ vis tCode,0 -+ } -+ //flashing status -+ spstr strCommand.txt,tTmp.txt,"~",26 -+ spstr strCommand.txt,tTmp.txt,"~",25 -+ if(tTmp.txt=="enable") -+ { -+ tmFlash.en=1 -+ }else -+ { -+ tmFlash.en=0 -+ } -+ // extra button -+ spstr strCommand.txt,b9.txt,"~",27 -+ spstr strCommand.txt,b9.txt,"~",26 -+ if(b9.txt!="") -+ { -+ vis b9,1 -+ spstr strCommand.txt,tTmp.txt,"~",28 -+ spstr strCommand.txt,tTmp.txt,"~",27 -+ covx tTmp.txt,b9.pco,0,0 -+ spstr strCommand.txt,vaAddBtn.txt,"~",29 -+ spstr strCommand.txt,vaAddBtn.txt,"~",28 -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+18 +864,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } -+I/n2t-out/cardChart.txt -++ HMI/US/portrait/n2t-out/cardChart.txt -+18 +681,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } +I/n2t-out/cardEntities.txt ++ HMI/US/portrait/n2t-out/cardEntities.txt +6 +61,36 @@ @@ -483,13 +73,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 @@ -895,67 +485,6 @@ + covx tTmp.txt,sys0,0,0 + hSlider6.maxval=sys0 + } -+,18 +2711,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") -+I/n2t-out/cardGrid.txt -++ HMI/US/portrait/n2t-out/cardGrid.txt -+18 +916,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") -+I/n2t-out/cardMedia.txt -++ HMI/US/portrait/n2t-out/cardMedia.txt -+,18 +1200,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") +I/n2t-out/cardPower.txt ++ HMI/US/portrait/n2t-out/cardPower.txt +5 +35,15 @@ @@ -975,15 +504,7 @@ + b[sys0].pco=defaultFontColor + } + if(defaultBcoColor==0) -+109 +275,79 @@ -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 20 -+ -+ome2 ++15 +283,15 @@ +ributes + Scope : local + Dragging : 0 @@ -992,6 +513,7 @@ + Associated Keyboard : none + Text : + Max. Text Size : 10 ++ Max. Text Size : 20 + +omeO +ributes @@ -999,11 +521,7 @@ + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled -+ Associated Keyboard : none -+ Text : -+ Max. Text Size : 20 -+ -+omeO2 ++81 +303,81 @@ +ributes + Scope : local + Dragging : 0 @@ -1012,6 +530,7 @@ + Associated Keyboard : none + Text : + Max. Text Size : 10 ++ Max. Text Size : 20 + + p0 +ributes @@ -1097,7 +616,7 @@ + Scope : local + Dragging : 0 + Disable release event after dragging: 0 -+92 +433,74 @@ ++92 +463,74 @@ +ributes + Scope : local + Period (ms): 100 @@ -1237,222 +756,6 @@ + Scope : local + Period (ms): 50 + Enabled : yes -+ -+189 +588,131 @@ -+ vis bNext,1 -+ } -+ // icon color home -+ spstr strCommand.txt,tTmp.txt,"~",14 -+ covx tTmp.txt,t1.pco,0,0 -+ // icon home -+ spstr strCommand.txt,t1.txt,"~",15 -+ // speed 16 ignored -+ // text home -+ spstr strCommand.txt,tHome.txt,"~",17 -+ spstr tHome.txt,tHome2.txt," ",1 -+ spstr tHome.txt,tHome.txt," ",0 -+ // icon color 18 ignored -+ // icon 19 ignored -+ // speed 20 ignored -+ // text home -+ spstr strCommand.txt,tHomeO.txt,"~",21 -+ spstr tHomeO.txt,tHomeO2.txt," ",1 -+ spstr tHomeO.txt,tHomeO.txt," ",0 -+ spstr strCommand.txt,tHome.txt,"~",16 -+ // iconColor -+ spstr strCommand.txt,tTmp.txt,"~",22 -+ spstr strCommand.txt,tTmp.txt,"~",17 -+ covx tTmp.txt,t0Icon.pco,0,0 -+ // icon -+ spstr strCommand.txt,t0Icon.txt,"~",23 -+ spstr strCommand.txt,t0Icon.txt,"~",18 -+ // speed -+ spstr strCommand.txt,tTmp.txt,"~",24 -+ spstr strCommand.txt,tTmp.txt,"~",19 -+ covx tTmp.txt,t0Speed.val,0,0 -+ if(t0Speed.val>120) -+ { -+ t0Speed.val=120 -+ } -+ if(t0Speed.val<-120) -+ { -+ t0Speed.val=-120 -+ } -+ // lower text -+ spstr strCommand.txt,t0u.txt,"~",25 -+ spstr strCommand.txt,t0u.txt,"~",20 -+ if(t0Icon.txt!="") -+ { -+ vis t0Icon,1 -+ vis t0u,1 -+ vis h0,1 -+ }else -+ { -+ vis t0Icon,0 -+ vis t0u,0 -+ vis h0,0 -+ } -+ // iconColor -+ spstr strCommand.txt,tTmp.txt,"~",26 -+ spstr strCommand.txt,tTmp.txt,"~",21 -+ covx tTmp.txt,t1Icon.pco,0,0 -+ // icon -+ spstr strCommand.txt,t1Icon.txt,"~",27 -+ spstr strCommand.txt,t1Icon.txt,"~",22 -+ // speed -+ spstr strCommand.txt,tTmp.txt,"~",28 -+ spstr strCommand.txt,tTmp.txt,"~",23 -+ covx tTmp.txt,t1Speed.val,0,0 -+ if(t1Speed.val>120) -+ { -+ t1Speed.val=120 -+ } -+ if(t1Speed.val<-120) -+ { -+ t1Speed.val=-120 -+ } -+ // lower text -+ spstr strCommand.txt,t1u.txt,"~",29 -+ spstr strCommand.txt,t1u.txt,"~",24 -+ if(t1Icon.txt!="") -+ { -+ vis t1Icon,1 -+ vis t1u,1 -+ vis h1,1 -+ }else -+ { -+ vis t1Icon,0 -+ vis t1u,0 -+ vis h1,0 -+ } -+ // iconColor -+ spstr strCommand.txt,tTmp.txt,"~",30 -+ spstr strCommand.txt,tTmp.txt,"~",25 -+ covx tTmp.txt,t2Icon.pco,0,0 -+ // icon -+ spstr strCommand.txt,t2Icon.txt,"~",31 -+ spstr strCommand.txt,t2Icon.txt,"~",26 -+ // speed -+ spstr strCommand.txt,tTmp.txt,"~",32 -+ spstr strCommand.txt,tTmp.txt,"~",27 -+ covx tTmp.txt,t2Speed.val,0,0 -+ if(t2Speed.val>120) -+ { -+ t2Speed.val=120 -+ } -+ if(t2Speed.val<-120) -+ { -+ t2Speed.val=-120 -+ } -+ // lower text -+ spstr strCommand.txt,t2u.txt,"~",33 -+ spstr strCommand.txt,t2u.txt,"~",28 -+ if(t2Icon.txt!="") -+ { -+ vis t2Icon,1 -+ vis t2u,1 -+ vis h2,1 -+ }else -+ { -+ vis t2Icon,0 -+ vis t2u,0 -+ vis h2,0 -+ } -+ // iconColor -+ spstr strCommand.txt,tTmp.txt,"~",34 -+ spstr strCommand.txt,tTmp.txt,"~",29 -+ covx tTmp.txt,t3Icon.pco,0,0 -+ // icon -+ spstr strCommand.txt,t3Icon.txt,"~",35 -+ spstr strCommand.txt,t3Icon.txt,"~",30 -+ // speed -+ spstr strCommand.txt,tTmp.txt,"~",36 -+ spstr strCommand.txt,tTmp.txt,"~",31 -+ covx tTmp.txt,t3Speed.val,0,0 -+ if(t3Speed.val>120) -+ { -+ t3Speed.val=120 -+ } -+ if(t3Speed.val<-120) -+ { -+ t3Speed.val=-120 -+ } -+ // lower text -+ spstr strCommand.txt,t3u.txt,"~",37 -+ spstr strCommand.txt,t3u.txt,"~",32 -+ if(t3Icon.txt!="") -+ { -+ vis t3Icon,1 -+ vis t3u,1 -+ vis h3,1 -+ }else -+ { -+ vis t3Icon,0 -+ vis t3u,0 -+ vis h3,0 -+ } -+ // iconColor -+ spstr strCommand.txt,tTmp.txt,"~",38 -+ spstr strCommand.txt,tTmp.txt,"~",33 -+ covx tTmp.txt,t4Icon.pco,0,0 -+ // icon -+ spstr strCommand.txt,t4Icon.txt,"~",39 -+ spstr strCommand.txt,t4Icon.txt,"~",34 -+ // speed -+ spstr strCommand.txt,tTmp.txt,"~",40 -+ spstr strCommand.txt,tTmp.txt,"~",35 -+ covx tTmp.txt,t4Speed.val,0,0 -+ if(t4Speed.val>120) -+ { -+ t4Speed.val=120 -+ } -+ if(t4Speed.val<-120) -+ { -+ t4Speed.val=-120 -+ } -+ // lower text -+ spstr strCommand.txt,t4u.txt,"~",41 -+ spstr strCommand.txt,t4u.txt,"~",36 -+ if(t4Icon.txt!="") -+ { -+ vis t4Icon,1 -+ vis t4u,1 -+ vis h4,1 -+ }else -+ { -+ vis t4Icon,0 -+ vis t4u,0 -+ vis h4,0 -+ } -+ // iconColor -+ spstr strCommand.txt,tTmp.txt,"~",42 -+ spstr strCommand.txt,tTmp.txt,"~",37 -+ covx tTmp.txt,t5Icon.pco,0,0 -+ // icon -+ spstr strCommand.txt,t5Icon.txt,"~",43 -+ spstr strCommand.txt,t5Icon.txt,"~",38 -+ // speed -+ spstr strCommand.txt,tTmp.txt,"~",44 -+ spstr strCommand.txt,tTmp.txt,"~",39 -+ covx tTmp.txt,t5Speed.val,0,0 -+ if(t5Speed.val>120) -+ { -+ t5Speed.val=120 -+ } -+ if(t5Speed.val<-120) -+ { -+ t5Speed.val=-120 -+ } -+ // lower text -+ spstr strCommand.txt,t5u.txt,"~",45 -+ spstr strCommand.txt,t5u.txt,"~",40 -+ if(t5Icon.txt!="") -+ { -+ vis t5Icon,1 -+ vis t5u,1 -+ vis h5,1 -+ }else -+ { +I/n2t-out/cardQR.txt ++ HMI/US/portrait/n2t-out/cardQR.txt +19 +602,19 @@ @@ -1477,46 +780,6 @@ + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } -+18 +715,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } -+I/n2t-out/cardThermo.txt -++ HMI/US/portrait/n2t-out/cardThermo.txt -+,18 +1117,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ if(tInstruction.txt=="time") -+ { -+ // get set time to global variable -+ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 -+ } -+ if(tInstruction.txt=="date") +I/n2t-out/pageStartup.txt ++ HMI/US/portrait/n2t-out/pageStartup.txt +0 +35,14 @@ @@ -1557,25 +820,6 @@ + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled -+18 +360,14 @@ -+ { -+ page cardPower -+ } -+ if(tId.txt=="cardChart") -+ { -+ page cardChart -+ } -+ if(tId.txt=="cardLChart") -+ { -+ page cardLChart -+ } -+ } -+ // end of user code -+ udelete payloadLength-1 -+ bufferPos=0 -+ } -+ } -+ } +I/n2t-out/screensaver.txt ++ HMI/US/portrait/n2t-out/screensaver.txt +8 +29,19 @@ @@ -1644,25 +888,38 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+14 +371,21 @@ -+ p0 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ -+ m0 -+ributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ -+m0 -+ributes -+ Scope : local -+ Period (ms): 50 -+ Enabled : yes -+ -+nts ++15 +464,14 @@ ++ if(tTmp.txt!="") ++ { ++ covx tTmp.txt,defaultFontColor,0,0 ++ } ++ } ++ if(tInstruction.txt=="time") ++ { ++ click m0,1 ++ //get set time to global variable ++ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 ++ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 ++ spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 ++ if(tAMPM.txt=="") ++ { ++ vis tAMPM,0 ++14 +757,18 @@ ++ { ++ page cardPower ++ } ++ if(tId.txt=="cardChart") ++ { ++ page cardChart ++ } ++ if(tId.txt=="cardLChart") ++ { ++ page cardLChart ++ } ++ } ++ if(tInstruction.txt=="timeout") ++ { ++ //set timeout to global var ++ spstr strCommand.txt,tTmp.txt,"~",1 ++ covx tTmp.txt,sleepTimeout,0,0 ++ } diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index 0dc5a466..0c087a18 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -143,8 +143,8 @@ Text tCode Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 68 - y coordinate : 17 + x coordinate : 23 + y coordinate : 73 Width : 192 Height : 49 Effect : load @@ -165,6 +165,36 @@ Text tCode Horizontal Spacing : 0 Vertical Spacing : 0 +Text tHeading + Attributes + ID : 42 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 68 + y coordinate : 26 + Width : 184 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Text tIcon Attributes ID : 26 @@ -173,7 +203,7 @@ Text tIcon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 129 + x coordinate : 236 y coordinate : 73 Width : 64 Height : 49 @@ -295,8 +325,8 @@ Picture p0 Opacity : 127 x coordinate : 0 y coordinate : 0 - Width : 319 - Height : 479 + Width : 320 + Height : 480 Effect : load Effect Priority : 0 Effect Time : 300 @@ -527,7 +557,7 @@ Button b0 Send Component ID : disabled Opacity : 127 x coordinate : 25 - y coordinate : 252 + y coordinate : 251 Width : 75 Height : 50 Effect : load @@ -555,6 +585,11 @@ Button b0 Events Touch Press Event tCode.txt=tCode.txt+"1" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b1 Attributes @@ -593,6 +628,11 @@ Button b1 Events Touch Press Event tCode.txt=tCode.txt+"2" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b10 Attributes @@ -631,6 +671,11 @@ Button b10 Events Touch Press Event tCode.txt=tCode.txt+"0" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b11 Attributes @@ -669,6 +714,11 @@ Button b11 Events Touch Press Event tCode.txt="" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b2 Attributes @@ -707,6 +757,11 @@ Button b2 Events Touch Press Event tCode.txt=tCode.txt+"3" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b3 Attributes @@ -745,6 +800,11 @@ Button b3 Events Touch Press Event tCode.txt=tCode.txt+"4" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b4 Attributes @@ -783,6 +843,11 @@ Button b4 Events Touch Press Event tCode.txt=tCode.txt+"5" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b5 Attributes @@ -821,6 +886,11 @@ Button b5 Events Touch Press Event tCode.txt=tCode.txt+"6" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b6 Attributes @@ -859,6 +929,11 @@ Button b6 Events Touch Press Event tCode.txt=tCode.txt+"7" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b7 Attributes @@ -897,6 +972,11 @@ Button b7 Events Touch Press Event tCode.txt=tCode.txt+"8" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b8 Attributes @@ -935,6 +1015,11 @@ Button b8 Events Touch Press Event tCode.txt=tCode.txt+"9" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b9 Attributes @@ -1139,7 +1224,7 @@ Hotspot mSwipeUp x coordinate : 10 y coordinate : 0 Width : 300 - Height : 9 + Height : 8 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1222,7 +1307,18 @@ Timer tmSerial if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,"~",1 + spstr strCommand.txt,tHeading.txt,"~",1 + if(tHeading.txt=="unknown") + { + tHeading.txt="" + } + if(tHeading.txt!="") + { + vis tHeading,1 + }else + { + vis tHeading,0 + } // navigation icon left spstr strCommand.txt,tTmp.txt,"~",2 //type if(tTmp.txt=="delete"||tTmp.txt=="") @@ -1257,46 +1353,48 @@ Timer tmSerial bNext.pco=sys0 vis bNext,1 } + //entn + spstr strCommand.txt,entn.txt,"~",14 //text arm1 - spstr strCommand.txt,arm1.txt,"~",14 + spstr strCommand.txt,arm1.txt,"~",15 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,"~",15 + spstr strCommand.txt,va1.txt,"~",16 //text arm2 - spstr strCommand.txt,arm2.txt,"~",16 + spstr strCommand.txt,arm2.txt,"~",17 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,"~",17 + spstr strCommand.txt,va2.txt,"~",18 //text arm3 - spstr strCommand.txt,arm3.txt,"~",18 + spstr strCommand.txt,arm3.txt,"~",19 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,"~",19 + spstr strCommand.txt,va3.txt,"~",20 //text arm4 - spstr strCommand.txt,arm4.txt,"~",20 + spstr strCommand.txt,arm4.txt,"~",21 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,"~",21 + spstr strCommand.txt,va4.txt,"~",22 //icon - spstr strCommand.txt,tIcon.txt,"~",22 + spstr strCommand.txt,tIcon.txt,"~",23 //icon color - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",25 if(tTmp.txt!="disable") { vis b0,1 @@ -1311,7 +1409,13 @@ Timer tmSerial vis b9,1 vis b10,1 vis b11,1 - vis tCode,1 + if(tHeading.txt!="") + { + vis tCode,0 + }else + { + vis tCode,1 + } }else { vis b0,0 @@ -1329,7 +1433,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",26 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -1338,13 +1442,13 @@ Timer tmSerial tmFlash.en=0 } // extra button - spstr strCommand.txt,b9.txt,"~",26 + spstr strCommand.txt,b9.txt,"~",27 if(b9.txt!="") { vis b9,1 - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,b9.pco,0,0 - spstr strCommand.txt,vaAddBtn.txt,"~",28 + spstr strCommand.txt,vaAddBtn.txt,"~",29 } } if(tInstruction.txt=="time") @@ -1453,6 +1557,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardChart.txt b/HMI/US/portrait/n2t-out-visual/cardChart.txt index b92b4b6a..c3cfa2c6 100644 --- a/HMI/US/portrait/n2t-out-visual/cardChart.txt +++ b/HMI/US/portrait/n2t-out-visual/cardChart.txt @@ -847,6 +847,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 02e2f8cd..40726a49 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -4056,6 +4056,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index 6db849a9..230950fe 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -1368,6 +1368,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardLChart.txt b/HMI/US/portrait/n2t-out-visual/cardLChart.txt new file mode 100644 index 00000000..05d6d273 --- /dev/null +++ b/HMI/US/portrait/n2t-out-visual/cardLChart.txt @@ -0,0 +1,880 @@ +Page cardLChart + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 6371 + + Events + Preinitialize Event + dim=dimValueNormal + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + cardLChart.bco=defaultBcoColor + //vis x0,0 + //x0.bco=defaultBcoColor + //x0.borderc=defaultBcoColor + for(sys0=0;sys0<32;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==6371) + { + b[sys0].pic=1 + b[sys0].pic2=2 + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + +Variable (string) entn + Attributes + ID : 6 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent1 + Attributes + ID : 32 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + ID : 31 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) strCommand + Attributes + ID : 5 + Scope : local + Text : + Max. Text Size: 512 + +Variable (string) strTmp + Attributes + ID : 18 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tId + Attributes + ID : 14 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 15 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tSend + Attributes + ID : 9 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 400 + +Variable (int32) vNValues + Attributes + ID : 17 + Scope: local + Value: 0 + +Variable (int32) vaBottom + Attributes + ID : 22 + Scope: local + Value: 0 + +Variable (int32) vaColorD + Attributes + ID : 25 + Scope: local + Value: 0 + +Variable (int32) vaColorL + Attributes + ID : 24 + Scope: local + Value: 0 + +Variable (int32) vaLeft + Attributes + ID : 23 + Scope: local + Value: 0 + +Variable (int32) vaMaxX + Attributes + ID : 27 + Scope: local + Value: 2147483648 + +Variable (int32) vaMaxY + Attributes + ID : 26 + Scope: local + Value: 0 + +Variable (int32) vaMinX + Attributes + ID : 29 + Scope: local + Value: 2147483647 + +Variable (int32) vaMinY + Attributes + ID : 30 + Scope: local + Value: 2147483647 + +Variable (int32) vaValue + Attributes + ID : 21 + Scope: local + Value: 0 + +Variable (int32) vaXUnit + Attributes + ID : 20 + Scope: local + Value: 0 + +Variable (int32) vaYUnit + Attributes + ID : 28 + Scope: local + Value: 0 + +Text tHeading + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 66 + y coordinate : 26 + Width : 184 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 319 + Height : 479 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +Button bNext + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bPrev + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot m0 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 20 + y coordinate : 90 + Width : 280 + Height : 370 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //fill m0.x,m0.y,m0.w,m0.h,RED + +Hotspot mSwipeNext + Attributes + ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 313 + y coordinate : 5 + Width : 7 + Height : 475 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipePrev + Attributes + ID : 12 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Hotspot mSwipeUp + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + click bPrev,1 + +Timer tmSerial + Attributes + ID : 4 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos>11 // red + vaColorD.val=sys0*8/10<<11 // store and shift + sys0=vaColorL.val>>5%64 // green + vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift + sys0=vaColorL.val%32 + vaColorD.val=sys0*8/10+vaColorD.val // store and add + // + // detect nValues and maxX/Y + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+18 + strlen tTmp.txt,sya0 + while(sya0>0) + { + //tHeading.txt="last value="+tTmp.txt + spstr tTmp.txt,strTmp.txt,":",0 + covx strTmp.txt,sya1,0,0 + if(sya1>vaMaxX.val) + { + vaMaxX.val=sya1 + } + if(sya1vaMaxY.val) + { + vaMaxY.val=sya1 + } + if(sya10) + { + covx strTmp.txt,sya1,0,0 + if(sya1>vaMinY.val) + { + sys0-- + if(sys0>=0) + { + // found a y-tick => take is at min... + spstr tTmp.txt,strTmp.txt,":",sys0 + covx strTmp.txt,vaMinY.val,0,0 + } + sya0=0 + }else + { + // next + sys0++ + spstr tTmp.txt,strTmp.txt,":",sys0 + strlen strTmp.txt,sya0 + } + } + sys1=sys0+1 // last label + spstr tTmp.txt,strTmp.txt,":",sys1 + strlen strTmp.txt,sya0 + while(sya0>0) + { + covx strTmp.txt,sya1,0,0 + if(sya1>=vaMaxY.val) + { + vaMaxY.val=sya1 + sya0=0 + }else + { + // next + sys1++ + spstr tTmp.txt,strTmp.txt,":",sys1 + strlen strTmp.txt,sya0 + } + } + // get first given x axis tick + spstr strCommand.txt,strTmp.txt,"~",17 // X-Axis ticks & labels in strTmp.txt + covx strTmp.txt,vaMinX.val,0,0 + // covx vaMinX.val,strTmp.txt,0,0 + // tHeading.txt+=strTmp.txt+":" + // covx vaMaxX.val,strTmp.txt,0,0 + // tHeading.txt+=strTmp.txt + // calculate unit width + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + sya1=vaMaxX.val-vaMinX.val + vaXUnit.val=m0.w-25-40*100/sya1 + sya1=vaMaxY.val-vaMinY.val + vaYUnit.val=m0.h-24*100/sya1 + // draw labels + // labels still in tTmp.txt + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+5,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + if(sys0>0) + { + sys0-- + } + for(sya0=sys0;sya0<=sys1;sya0++) + { + spstr tTmp.txt,strTmp.txt,":",sya0 + covx strTmp.txt,sya1,0,0 + sys2=sya1%10 + sya1/=10 + if(sya1>0) + { + covx sya1,strTmp.txt,0,0 + }else + { + strTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + strTmp.txt=strTmp.txt+"."+tId.txt + } + sya1*=10+sys2 + sya1-=vaMinY.val + xstr m0.x+28,-1*vaYUnit.val*sya1/100+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,strTmp.txt + line m0.x+25+40-5,-1*vaYUnit.val*sya1/100+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sya1/100+vaBottom.val,14823 + } + // y achis label + spstr strCommand.txt,tTmp.txt,"~",15 + strlen tTmp.txt,sys1 + sya1=sys1*11+m0.h-48/2 + for(sys0=0;sys0 sya1 contains fist ticks value + spstr tTmp.txt,strTmp.txt,"+",sys1 + strlen strTmp.txt,sya0 + covx strTmp.txt,sya1,0,0 + // loop until current ticks label is smaller than the maximum value observed + while(sya0>0&&sya10) + { + // label found ~> draw + xstr -6*sya0+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + } + // next ~> sya1 contains next ticks label + sys1++ + spstr tTmp.txt,strTmp.txt,"+",sys1 + strlen strTmp.txt,sya0 + covx strTmp.txt,sya1,0,0 + } + // + // draw line segments... + sys1=-2147483648 + sys2=-2147483648 + for(sys0=0;sys00&&sys2>0) + { + // this is not the first point as the last one has been stored in (sys1,sys2) + // ~> connect with a line... + //line sys1,sys2,sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40,sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val,vaColorD.val + line sys1,sys2,sya0,sya1,vaColorD.val + //line sys1-1,sys2-1,sya0-1,sya1-1,vaColorL.val + //line sys1+1,sys2+1,sya0+1,sya1+1,vaColorL.val + } + // store current point to (sys1,sys2) + //sys1=sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40 + //sys2=sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val + sys1=sya0 + sys2=sya1 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + sleepValue=0 + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + if(tId.txt=="cardLChart") + { + page cardLChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + ID : 7 + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0&&dimValue!=dim) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + dim=dimValue + tSend.txt="event,sleepReached,cardAlarm" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + } + } + +TouchCap tc0 + Attributes + ID : 8 + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 480d1d37..c90d64f3 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -1692,6 +1692,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardPower.txt b/HMI/US/portrait/n2t-out-visual/cardPower.txt index 6a2943df..73b18b3f 100644 --- a/HMI/US/portrait/n2t-out-visual/cardPower.txt +++ b/HMI/US/portrait/n2t-out-visual/cardPower.txt @@ -592,10 +592,100 @@ Text tHome Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 277 - y coordinate : 237 - Width : 40 - Height : 60 + x coordinate : 179 + y coordinate : 239 + Width : 61 + Height : 55 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHome2 + Attributes + ID : 45 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 239 + y coordinate : 239 + Width : 35 + Height : 55 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHomeO + Attributes + ID : 46 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 48 + y coordinate : 240 + Width : 61 + Height : 55 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 20 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHomeO2 + Attributes + ID : 47 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 108 + y coordinate : 240 + Width : 35 + Height : 55 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1100,18 +1190,36 @@ Timer tmSerial covx tTmp.txt,t1.pco,0,0 // icon home spstr strCommand.txt,t1.txt,"~",15 + // speed 16 ignored // text home - spstr strCommand.txt,tHome.txt,"~",16 + spstr strCommand.txt,tHome.txt,"~",17 + spstr tHome.txt,tHome2.txt," ",1 + spstr tHome.txt,tHome.txt," ",0 + // icon color 18 ignored + // icon 19 ignored + // speed 20 ignored + // text home + spstr strCommand.txt,tHomeO.txt,"~",21 + spstr tHomeO.txt,tHomeO2.txt," ",1 + spstr tHomeO.txt,tHomeO.txt," ",0 // iconColor - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,t0Icon.pco,0,0 // icon - spstr strCommand.txt,t0Icon.txt,"~",18 + spstr strCommand.txt,t0Icon.txt,"~",23 // speed - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,t0Speed.val,0,0 + if(t0Speed.val>120) + { + t0Speed.val=120 + } + if(t0Speed.val<-120) + { + t0Speed.val=-120 + } // lower text - spstr strCommand.txt,t0u.txt,"~",20 + spstr strCommand.txt,t0u.txt,"~",25 if(t0Icon.txt!="") { vis t0Icon,1 @@ -1124,15 +1232,23 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",22 + spstr strCommand.txt,t1Icon.txt,"~",27 // speed - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,t1Speed.val,0,0 + if(t1Speed.val>120) + { + t1Speed.val=120 + } + if(t1Speed.val<-120) + { + t1Speed.val=-120 + } // lower text - spstr strCommand.txt,t1u.txt,"~",24 + spstr strCommand.txt,t1u.txt,"~",29 if(t1Icon.txt!="") { vis t1Icon,1 @@ -1145,15 +1261,23 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",30 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",26 + spstr strCommand.txt,t2Icon.txt,"~",31 // speed - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,t2Speed.val,0,0 + if(t2Speed.val>120) + { + t2Speed.val=120 + } + if(t2Speed.val<-120) + { + t2Speed.val=-120 + } // lower text - spstr strCommand.txt,t2u.txt,"~",28 + spstr strCommand.txt,t2u.txt,"~",33 if(t2Icon.txt!="") { vis t2Icon,1 @@ -1166,15 +1290,23 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",29 + spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",30 + spstr strCommand.txt,t3Icon.txt,"~",35 // speed - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",36 covx tTmp.txt,t3Speed.val,0,0 + if(t3Speed.val>120) + { + t3Speed.val=120 + } + if(t3Speed.val<-120) + { + t3Speed.val=-120 + } // lower text - spstr strCommand.txt,t3u.txt,"~",32 + spstr strCommand.txt,t3u.txt,"~",37 if(t3Icon.txt!="") { vis t3Icon,1 @@ -1187,15 +1319,23 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",33 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",34 + spstr strCommand.txt,t4Icon.txt,"~",39 // speed - spstr strCommand.txt,tTmp.txt,"~",35 + spstr strCommand.txt,tTmp.txt,"~",40 covx tTmp.txt,t4Speed.val,0,0 + if(t4Speed.val>120) + { + t4Speed.val=120 + } + if(t4Speed.val<-120) + { + t4Speed.val=-120 + } // lower text - spstr strCommand.txt,t4u.txt,"~",36 + spstr strCommand.txt,t4u.txt,"~",41 if(t4Icon.txt!="") { vis t4Icon,1 @@ -1208,15 +1348,23 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",37 + spstr strCommand.txt,tTmp.txt,"~",42 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",38 + spstr strCommand.txt,t5Icon.txt,"~",43 // speed - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,t5Speed.val,0,0 + if(t5Speed.val>120) + { + t5Speed.val=120 + } + if(t5Speed.val<-120) + { + t5Speed.val=-120 + } // lower text - spstr strCommand.txt,t5u.txt,"~",40 + spstr strCommand.txt,t5u.txt,"~",45 if(t5Icon.txt!="") { vis t5Icon,1 diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt index cb87133d..7ff9eaca 100644 --- a/HMI/US/portrait/n2t-out-visual/cardQR.txt +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -1020,6 +1020,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardThermo.txt b/HMI/US/portrait/n2t-out-visual/cardThermo.txt index 5b78c223..8a324837 100644 --- a/HMI/US/portrait/n2t-out-visual/cardThermo.txt +++ b/HMI/US/portrait/n2t-out-visual/cardThermo.txt @@ -1845,6 +1845,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { 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 a684d414..c5114240 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 @@ -22,22 +22,18 @@ popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code -pageStartup - 19 Component(s) - 181 Line(s) of event code - 129 Unique line(s) of event code cardQR 34 Component(s) - 398 Line(s) of event code - 232 Unique line(s) of event code -cardPower - 45 Component(s) - 412 Line(s) of event code - 289 Unique line(s) of event code -screensaver - 46 Component(s) - 410 Line(s) of event code - 295 Unique line(s) of event code + 402 Line(s) of event code + 234 Unique line(s) of event code +pageStartup + 19 Component(s) + 185 Line(s) of event code + 131 Unique line(s) of event code +cardGrid + 44 Component(s) + 515 Line(s) of event code + 291 Unique line(s) of event code popupShutter 25 Component(s) 398 Line(s) of event code @@ -46,41 +42,49 @@ popupThermo 44 Component(s) 519 Line(s) of event code 274 Unique line(s) of event code -cardGrid - 44 Component(s) - 511 Line(s) of event code - 289 Unique line(s) of event code -cardChart - 33 Component(s) - 425 Line(s) of event code - 290 Unique line(s) of event code -cardMedia - 59 Component(s) - 637 Line(s) of event code - 316 Unique line(s) of event code -cardAlarm - 42 Component(s) - 415 Line(s) of event code - 253 Unique line(s) of event code cardThermo 57 Component(s) - 528 Line(s) of event code - 313 Unique line(s) of event code + 532 Line(s) of event code + 315 Unique line(s) of event code +cardPower + 48 Component(s) + 465 Line(s) of event code + 318 Unique line(s) of event code +cardChart + 33 Component(s) + 429 Line(s) of event code + 292 Unique line(s) of event code +cardLChart + 33 Component(s) + 408 Line(s) of event code + 268 Unique line(s) of event code +cardMedia + 59 Component(s) + 641 Line(s) of event code + 318 Unique line(s) of event code popupTimer 42 Component(s) 512 Line(s) of event code 255 Unique line(s) of event code +cardAlarm + 43 Component(s) + 492 Line(s) of event code + 269 Unique line(s) of event code +screensaver + 45 Component(s) + 413 Line(s) of event code + 296 Unique line(s) of event code popupInSel 34 Component(s) 617 Line(s) of event code 295 Unique line(s) of event code cardEntities 91 Component(s) - 1618 Line(s) of event code - 699 Unique line(s) of event code + 1622 Line(s) of event code + 701 Unique line(s) of event code Total - 19 Page(s) - 710 Component(s) - 8623 Line(s) of event code - 2253 Unique line(s) of event code + 20 Page(s) + 746 Component(s) + 9192 Line(s) of event code + 2379 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index 04293d4c..8ffd1272 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -659,6 +659,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index dba05455..513234c5 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -810,7 +810,7 @@ Text tMainTextAlt2 Text tNotifyHead Attributes - ID : 45 + ID : 44 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -840,7 +840,7 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 44 + ID : 43 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -945,22 +945,6 @@ Picture p0 Effect Time : 300 Picture ID : 0 -Hotspot m0 - Attributes - ID : 43 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 289 - y coordinate : 282 - Width : 24 - Height : 23 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Timer tm0 Attributes ID : 40 @@ -1056,7 +1040,6 @@ Timer tmSerial } if(tInstruction.txt=="time") { - click m0,1 //get set time to global variable spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -1350,6 +1333,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index 8e63de4b..0167c252 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -127,6 +127,16 @@ Text tCode Text : Max. Text Size : 10 +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + Text tIcon Attributes Scope : local @@ -307,6 +317,11 @@ Button b0 Events Touch Press Event tCode.txt=tCode.txt+"1" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b1 Attributes @@ -321,6 +336,11 @@ Button b1 Events Touch Press Event tCode.txt=tCode.txt+"2" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b10 Attributes @@ -335,6 +355,11 @@ Button b10 Events Touch Press Event tCode.txt=tCode.txt+"0" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b11 Attributes @@ -349,6 +374,11 @@ Button b11 Events Touch Press Event tCode.txt="" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b2 Attributes @@ -363,6 +393,11 @@ Button b2 Events Touch Press Event tCode.txt=tCode.txt+"3" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b3 Attributes @@ -377,6 +412,11 @@ Button b3 Events Touch Press Event tCode.txt=tCode.txt+"4" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b4 Attributes @@ -391,6 +431,11 @@ Button b4 Events Touch Press Event tCode.txt=tCode.txt+"5" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b5 Attributes @@ -405,6 +450,11 @@ Button b5 Events Touch Press Event tCode.txt=tCode.txt+"6" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b6 Attributes @@ -419,6 +469,11 @@ Button b6 Events Touch Press Event tCode.txt=tCode.txt+"7" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b7 Attributes @@ -433,6 +488,11 @@ Button b7 Events Touch Press Event tCode.txt=tCode.txt+"8" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b8 Attributes @@ -447,6 +507,11 @@ Button b8 Events Touch Press Event tCode.txt=tCode.txt+"9" + vis tCode,1 + if(p0.w!=320) + { + vis tHeading,0 + } Button b9 Attributes @@ -637,7 +702,18 @@ Timer tmSerial if(tInstruction.txt=="entityUpd") { //entn - spstr strCommand.txt,entn.txt,"~",1 + spstr strCommand.txt,tHeading.txt,"~",1 + if(tHeading.txt=="unknown") + { + tHeading.txt="" + } + if(tHeading.txt!="") + { + vis tHeading,1 + }else + { + vis tHeading,0 + } // navigation icon left spstr strCommand.txt,tTmp.txt,"~",2 //type if(tTmp.txt=="delete"||tTmp.txt=="") @@ -672,46 +748,48 @@ Timer tmSerial bNext.pco=sys0 vis bNext,1 } + //entn + spstr strCommand.txt,entn.txt,"~",14 //text arm1 - spstr strCommand.txt,arm1.txt,"~",14 + spstr strCommand.txt,arm1.txt,"~",15 if(arm1.txt!="") { vis arm1,1 } //id arm1 - spstr strCommand.txt,va1.txt,"~",15 + spstr strCommand.txt,va1.txt,"~",16 //text arm2 - spstr strCommand.txt,arm2.txt,"~",16 + spstr strCommand.txt,arm2.txt,"~",17 if(arm2.txt!="") { vis arm2,1 } //id arm2 - spstr strCommand.txt,va2.txt,"~",17 + spstr strCommand.txt,va2.txt,"~",18 //text arm3 - spstr strCommand.txt,arm3.txt,"~",18 + spstr strCommand.txt,arm3.txt,"~",19 if(arm3.txt!="") { vis arm3,1 } //id arm3 - spstr strCommand.txt,va3.txt,"~",19 + spstr strCommand.txt,va3.txt,"~",20 //text arm4 - spstr strCommand.txt,arm4.txt,"~",20 + spstr strCommand.txt,arm4.txt,"~",21 if(arm4.txt!="") { vis arm4,1 } //id arm4 - spstr strCommand.txt,va4.txt,"~",21 + spstr strCommand.txt,va4.txt,"~",22 //icon - spstr strCommand.txt,tIcon.txt,"~",22 + spstr strCommand.txt,tIcon.txt,"~",23 //icon color - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,sys0,0,0 tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,"~",24 + spstr strCommand.txt,tTmp.txt,"~",25 if(tTmp.txt!="disable") { vis b0,1 @@ -726,7 +804,13 @@ Timer tmSerial vis b9,1 vis b10,1 vis b11,1 - vis tCode,1 + if(tHeading.txt!="") + { + vis tCode,0 + }else + { + vis tCode,1 + } }else { vis b0,0 @@ -744,7 +828,7 @@ Timer tmSerial vis tCode,0 } //flashing status - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",26 if(tTmp.txt=="enable") { tmFlash.en=1 @@ -753,13 +837,13 @@ Timer tmSerial tmFlash.en=0 } // extra button - spstr strCommand.txt,b9.txt,"~",26 + spstr strCommand.txt,b9.txt,"~",27 if(b9.txt!="") { vis b9,1 - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,b9.pco,0,0 - spstr strCommand.txt,vaAddBtn.txt,"~",28 + spstr strCommand.txt,vaAddBtn.txt,"~",29 } } if(tInstruction.txt=="time") @@ -868,6 +952,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardChart.txt b/HMI/US/portrait/n2t-out/cardChart.txt index b45f5530..7fd94478 100644 --- a/HMI/US/portrait/n2t-out/cardChart.txt +++ b/HMI/US/portrait/n2t-out/cardChart.txt @@ -685,6 +685,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 622b0379..5bd5df67 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -2715,6 +2715,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 1ad6c8f4..f9b70050 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -920,6 +920,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardLChart.txt b/HMI/US/portrait/n2t-out/cardLChart.txt new file mode 100644 index 00000000..951d7614 --- /dev/null +++ b/HMI/US/portrait/n2t-out/cardLChart.txt @@ -0,0 +1,738 @@ +Page cardLChart + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + + Events + Preinitialize Event + dim=dimValueNormal + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + cardLChart.bco=defaultBcoColor + //vis x0,0 + //x0.bco=defaultBcoColor + //x0.borderc=defaultBcoColor + for(sys0=0;sys0<32;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116) + { + b[sys0].bco=defaultBcoColor + b[sys0].pco=defaultFontColor + } + if(b[sys0].type==53&&defaultBcoColor==6371) + { + b[sys0].pic=1 + b[sys0].pic2=2 + } + if(b[sys0].type==53&&defaultBcoColor==0) + { + b[sys0].pic=10 + b[sys0].pic2=11 + } + } + +Variable (string) entn + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) nent2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 512 + +Variable (string) strTmp + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 400 + +Variable (int32) vNValues + Attributes + Scope: local + Value: 0 + +Variable (int32) vaBottom + Attributes + Scope: local + Value: 0 + +Variable (int32) vaColorD + Attributes + Scope: local + Value: 0 + +Variable (int32) vaColorL + Attributes + Scope: local + Value: 0 + +Variable (int32) vaLeft + Attributes + Scope: local + Value: 0 + +Variable (int32) vaMaxX + Attributes + Scope: local + Value: 2147483648 + +Variable (int32) vaMaxY + Attributes + Scope: local + Value: 0 + +Variable (int32) vaMinX + Attributes + Scope: local + Value: 2147483647 + +Variable (int32) vaMinY + Attributes + Scope: local + Value: 2147483647 + +Variable (int32) vaValue + Attributes + Scope: local + Value: 0 + +Variable (int32) vaXUnit + Attributes + Scope: local + Value: 0 + +Variable (int32) vaYUnit + Attributes + Scope: local + Value: 0 + +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Button bNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," + if(bPrev.txt=="") + { + tSend.txt+="bHome" + }else + { + tSend.txt+="bNext" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bPrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardChart," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot m0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //fill m0.x,m0.y,m0.w,m0.h,RED + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bNext,1 + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bPrev,1 + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + click bPrev,1 + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos>11 // red + vaColorD.val=sys0*8/10<<11 // store and shift + sys0=vaColorL.val>>5%64 // green + vaColorD.val=sys0*8/10<<5+vaColorD.val // store and shift + sys0=vaColorL.val%32 + vaColorD.val=sys0*8/10+vaColorD.val // store and add + // + // detect nValues and maxX/Y + vNValues.val=0 + spstr strCommand.txt,tTmp.txt,"~",vNValues.val+18 + strlen tTmp.txt,sya0 + while(sya0>0) + { + //tHeading.txt="last value="+tTmp.txt + spstr tTmp.txt,strTmp.txt,":",0 + covx strTmp.txt,sya1,0,0 + if(sya1>vaMaxX.val) + { + vaMaxX.val=sya1 + } + if(sya1vaMaxY.val) + { + vaMaxY.val=sya1 + } + if(sya10) + { + covx strTmp.txt,sya1,0,0 + if(sya1>vaMinY.val) + { + sys0-- + if(sys0>=0) + { + // found a y-tick => take is at min... + spstr tTmp.txt,strTmp.txt,":",sys0 + covx strTmp.txt,vaMinY.val,0,0 + } + sya0=0 + }else + { + // next + sys0++ + spstr tTmp.txt,strTmp.txt,":",sys0 + strlen strTmp.txt,sya0 + } + } + sys1=sys0+1 // last label + spstr tTmp.txt,strTmp.txt,":",sys1 + strlen strTmp.txt,sya0 + while(sya0>0) + { + covx strTmp.txt,sya1,0,0 + if(sya1>=vaMaxY.val) + { + vaMaxY.val=sya1 + sya0=0 + }else + { + // next + sys1++ + spstr tTmp.txt,strTmp.txt,":",sys1 + strlen strTmp.txt,sya0 + } + } + // get first given x axis tick + spstr strCommand.txt,strTmp.txt,"~",17 // X-Axis ticks & labels in strTmp.txt + covx strTmp.txt,vaMinX.val,0,0 + // covx vaMinX.val,strTmp.txt,0,0 + // tHeading.txt+=strTmp.txt+":" + // covx vaMaxX.val,strTmp.txt,0,0 + // tHeading.txt+=strTmp.txt + // calculate unit width + vaBottom.val=m0.y+m0.h-24 + vaLeft.val=m0.x+25+40*100 + sya1=vaMaxX.val-vaMinX.val + vaXUnit.val=m0.w-25-40*100/sya1 + sya1=vaMaxY.val-vaMinY.val + vaYUnit.val=m0.h-24*100/sya1 + // draw labels + // labels still in tTmp.txt + line m0.x+25+40-10,m0.y,m0.x+25+40-10,vaBottom.val+5,14823 + line m0.x+25+40-5,vaBottom.val,m0.x+25+40-15,vaBottom.val,14823 + if(sys0>0) + { + sys0-- + } + for(sya0=sys0;sya0<=sys1;sya0++) + { + spstr tTmp.txt,strTmp.txt,":",sya0 + covx strTmp.txt,sya1,0,0 + sys2=sya1%10 + sya1/=10 + if(sya1>0) + { + covx sya1,strTmp.txt,0,0 + }else + { + strTmp.txt="" + } + if(sys2!=0) + { + covx sys2,tId.txt,0,0 + strTmp.txt=strTmp.txt+"."+tId.txt + } + sya1*=10+sys2 + sya1-=vaMinY.val + xstr m0.x+28,-1*vaYUnit.val*sya1/100+vaBottom.val-10,20,20,0,defaultFontColor,RED,2,1,3,strTmp.txt + line m0.x+25+40-5,-1*vaYUnit.val*sya1/100+vaBottom.val,m0.x+25+40-15,-1*vaYUnit.val*sya1/100+vaBottom.val,14823 + } + // y achis label + spstr strCommand.txt,tTmp.txt,"~",15 + strlen tTmp.txt,sys1 + sya1=sys1*11+m0.h-48/2 + for(sys0=0;sys0 sya1 contains fist ticks value + spstr tTmp.txt,strTmp.txt,"+",sys1 + strlen strTmp.txt,sya0 + covx strTmp.txt,sya1,0,0 + // loop until current ticks label is smaller than the maximum value observed + while(sya0>0&&sya10) + { + // label found ~> draw + xstr -6*sya0+sys2,vaBottom.val+2,sya0*12,22,0,defaultFontColor,defaultBcoColor,1,1,3,strTmp.txt + } + // next ~> sya1 contains next ticks label + sys1++ + spstr tTmp.txt,strTmp.txt,"+",sys1 + strlen strTmp.txt,sya0 + covx strTmp.txt,sya1,0,0 + } + // + // draw line segments... + sys1=-2147483648 + sys2=-2147483648 + for(sys0=0;sys00&&sys2>0) + { + // this is not the first point as the last one has been stored in (sys1,sys2) + // ~> connect with a line... + //line sys1,sys2,sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40,sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val,vaColorD.val + line sys1,sys2,sya0,sya1,vaColorD.val + //line sys1-1,sys2-1,sya0-1,sya1-1,vaColorL.val + //line sys1+1,sys2+1,sya0+1,sya1+1,vaColorL.val + } + // store current point to (sys1,sys2) + //sys1=sya0-vaMinX.val*vaXUnit.val/100+m0.x+25+40 + //sys2=sya1-vaMinY.val*vaYUnit.val/-100+vaBottom.val + sys1=sya0 + sys2=sya1 + } + } + if(tInstruction.txt=="time") + { + // get set time to global variable + spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 + } + if(tInstruction.txt=="date") + { + // get set date to global variable + spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 + } + if(tInstruction.txt=="dimmode") + { + // get value + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,dimValue,0,0 + // get value normal + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,dimValueNormal,0,0 + dim=dimValueNormal + // get background color + spstr strCommand.txt,tTmp.txt,"~",3 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultBcoColor,0,0 + } + // get font color + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + covx tTmp.txt,defaultFontColor,0,0 + } + } + if(tInstruction.txt=="timeout") + { + //set timeout to global var + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,sleepTimeout,0,0 + } + if(tInstruction.txt=="pageType") + { + sleepValue=0 + //command format pageType,specialPageName + //write name of speical page to tId + spstr strCommand.txt,tId.txt,"~",1 + //save second arg if there's one + spstr strCommand.txt,tTmp.txt,"~",2 + //save third arg if there's one + spstr strCommand.txt,pageIcons.tTmp2.txt,"~",3 + spstr strCommand.txt,pageIcons.tTmp3.txt,"~",4 + //we are going to exit this page with this command, so we have to clear the buffer, so we are not getting into a stupid loop ... + udelete payloadLength-1 + bufferPos=0 + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="screensaver") + { + page screensaver + } + if(tId.txt=="cardEntities") + { + page cardEntities + } + if(tId.txt=="cardGrid") + { + page cardGrid + } + if(tId.txt=="popupLight") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupLight + } + if(tId.txt=="popupShutter") + { + pageIcons.tTmp1.txt=tTmp.txt + page popupShutter + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardThermo") + { + page cardThermo + } + if(tId.txt=="cardMedia") + { + page cardMedia + } + if(tId.txt=="cardAlarm") + { + page cardAlarm + } + if(tId.txt=="cardQR") + { + page cardQR + } + if(tId.txt=="cardPower") + { + page cardPower + } + if(tId.txt=="cardChart") + { + page cardChart + } + if(tId.txt=="cardLChart") + { + page cardLChart + } + } + // end of user code + udelete payloadLength-1 + bufferPos=0 + } + } + } + } + // next character + bufferPos++ + } + } + +Timer tmSleep + Attributes + Scope : local + Period (ms): 1000 + Enabled : yes + + Events + Timer Event + if(sleepTimeout!=0&&dimValue!=dim) + { + sleepValue+=1 + if(sleepTimeout<=sleepValue) + { + sleepValue=0 + dim=dimValue + tSend.txt="event,sleepReached,cardAlarm" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + } + } + +TouchCap tc0 + Attributes + Scope: local + Value: 0 + + Events + Touch Press Event + sleepValue=0 + diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index b7909860..6e9c51c4 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -1204,6 +1204,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardPower.txt b/HMI/US/portrait/n2t-out/cardPower.txt index a29d2d83..06490055 100644 --- a/HMI/US/portrait/n2t-out/cardPower.txt +++ b/HMI/US/portrait/n2t-out/cardPower.txt @@ -279,6 +279,36 @@ Text tHome Text : Max. Text Size : 20 +Text tHome2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text tHomeO + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text tHomeO2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + Picture p0 Attributes Scope : local @@ -592,18 +622,36 @@ Timer tmSerial covx tTmp.txt,t1.pco,0,0 // icon home spstr strCommand.txt,t1.txt,"~",15 + // speed 16 ignored // text home - spstr strCommand.txt,tHome.txt,"~",16 + spstr strCommand.txt,tHome.txt,"~",17 + spstr tHome.txt,tHome2.txt," ",1 + spstr tHome.txt,tHome.txt," ",0 + // icon color 18 ignored + // icon 19 ignored + // speed 20 ignored + // text home + spstr strCommand.txt,tHomeO.txt,"~",21 + spstr tHomeO.txt,tHomeO2.txt," ",1 + spstr tHomeO.txt,tHomeO.txt," ",0 // iconColor - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",22 covx tTmp.txt,t0Icon.pco,0,0 // icon - spstr strCommand.txt,t0Icon.txt,"~",18 + spstr strCommand.txt,t0Icon.txt,"~",23 // speed - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",24 covx tTmp.txt,t0Speed.val,0,0 + if(t0Speed.val>120) + { + t0Speed.val=120 + } + if(t0Speed.val<-120) + { + t0Speed.val=-120 + } // lower text - spstr strCommand.txt,t0u.txt,"~",20 + spstr strCommand.txt,t0u.txt,"~",25 if(t0Icon.txt!="") { vis t0Icon,1 @@ -616,15 +664,23 @@ Timer tmSerial vis h0,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",21 + spstr strCommand.txt,tTmp.txt,"~",26 covx tTmp.txt,t1Icon.pco,0,0 // icon - spstr strCommand.txt,t1Icon.txt,"~",22 + spstr strCommand.txt,t1Icon.txt,"~",27 // speed - spstr strCommand.txt,tTmp.txt,"~",23 + spstr strCommand.txt,tTmp.txt,"~",28 covx tTmp.txt,t1Speed.val,0,0 + if(t1Speed.val>120) + { + t1Speed.val=120 + } + if(t1Speed.val<-120) + { + t1Speed.val=-120 + } // lower text - spstr strCommand.txt,t1u.txt,"~",24 + spstr strCommand.txt,t1u.txt,"~",29 if(t1Icon.txt!="") { vis t1Icon,1 @@ -637,15 +693,23 @@ Timer tmSerial vis h1,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",25 + spstr strCommand.txt,tTmp.txt,"~",30 covx tTmp.txt,t2Icon.pco,0,0 // icon - spstr strCommand.txt,t2Icon.txt,"~",26 + spstr strCommand.txt,t2Icon.txt,"~",31 // speed - spstr strCommand.txt,tTmp.txt,"~",27 + spstr strCommand.txt,tTmp.txt,"~",32 covx tTmp.txt,t2Speed.val,0,0 + if(t2Speed.val>120) + { + t2Speed.val=120 + } + if(t2Speed.val<-120) + { + t2Speed.val=-120 + } // lower text - spstr strCommand.txt,t2u.txt,"~",28 + spstr strCommand.txt,t2u.txt,"~",33 if(t2Icon.txt!="") { vis t2Icon,1 @@ -658,15 +722,23 @@ Timer tmSerial vis h2,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",29 + spstr strCommand.txt,tTmp.txt,"~",34 covx tTmp.txt,t3Icon.pco,0,0 // icon - spstr strCommand.txt,t3Icon.txt,"~",30 + spstr strCommand.txt,t3Icon.txt,"~",35 // speed - spstr strCommand.txt,tTmp.txt,"~",31 + spstr strCommand.txt,tTmp.txt,"~",36 covx tTmp.txt,t3Speed.val,0,0 + if(t3Speed.val>120) + { + t3Speed.val=120 + } + if(t3Speed.val<-120) + { + t3Speed.val=-120 + } // lower text - spstr strCommand.txt,t3u.txt,"~",32 + spstr strCommand.txt,t3u.txt,"~",37 if(t3Icon.txt!="") { vis t3Icon,1 @@ -679,15 +751,23 @@ Timer tmSerial vis h3,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",33 + spstr strCommand.txt,tTmp.txt,"~",38 covx tTmp.txt,t4Icon.pco,0,0 // icon - spstr strCommand.txt,t4Icon.txt,"~",34 + spstr strCommand.txt,t4Icon.txt,"~",39 // speed - spstr strCommand.txt,tTmp.txt,"~",35 + spstr strCommand.txt,tTmp.txt,"~",40 covx tTmp.txt,t4Speed.val,0,0 + if(t4Speed.val>120) + { + t4Speed.val=120 + } + if(t4Speed.val<-120) + { + t4Speed.val=-120 + } // lower text - spstr strCommand.txt,t4u.txt,"~",36 + spstr strCommand.txt,t4u.txt,"~",41 if(t4Icon.txt!="") { vis t4Icon,1 @@ -700,15 +780,23 @@ Timer tmSerial vis h4,0 } // iconColor - spstr strCommand.txt,tTmp.txt,"~",37 + spstr strCommand.txt,tTmp.txt,"~",42 covx tTmp.txt,t5Icon.pco,0,0 // icon - spstr strCommand.txt,t5Icon.txt,"~",38 + spstr strCommand.txt,t5Icon.txt,"~",43 // speed - spstr strCommand.txt,tTmp.txt,"~",39 + spstr strCommand.txt,tTmp.txt,"~",44 covx tTmp.txt,t5Speed.val,0,0 + if(t5Speed.val>120) + { + t5Speed.val=120 + } + if(t5Speed.val<-120) + { + t5Speed.val=-120 + } // lower text - spstr strCommand.txt,t5u.txt,"~",40 + spstr strCommand.txt,t5u.txt,"~",45 if(t5Icon.txt!="") { vis t5Icon,1 diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt index 1b44aa31..ebf2df3b 100644 --- a/HMI/US/portrait/n2t-out/cardQR.txt +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -719,6 +719,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index 55223073..82159dd1 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -1121,6 +1121,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 3d108a2f..7b6f6a32 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -364,6 +364,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index ba47c7a3..a960b3ba 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -375,13 +375,6 @@ Picture p0 Disable release event after dragging: 0 Send Component ID : disabled -Hotspot m0 - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Timer tm0 Attributes Scope : local @@ -475,7 +468,6 @@ Timer tmSerial } if(tInstruction.txt=="time") { - click m0,1 //get set time to global variable spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -769,6 +761,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="timeout") { diff --git a/HMI/n2t-out-visual/cardAlarm.txt b/HMI/n2t-out-visual/cardAlarm.txt index bea9c100..5ec88385 100644 --- a/HMI/n2t-out-visual/cardAlarm.txt +++ b/HMI/n2t-out-visual/cardAlarm.txt @@ -586,7 +586,10 @@ Button b0 Touch Press Event tCode.txt=tCode.txt+"1" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b1 Attributes @@ -626,7 +629,10 @@ Button b1 Touch Press Event tCode.txt=tCode.txt+"2" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b10 Attributes @@ -666,7 +672,10 @@ Button b10 Touch Press Event tCode.txt=tCode.txt+"0" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b11 Attributes @@ -706,7 +715,10 @@ Button b11 Touch Press Event tCode.txt="" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b2 Attributes @@ -746,7 +758,10 @@ Button b2 Touch Press Event tCode.txt=tCode.txt+"3" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b3 Attributes @@ -786,7 +801,10 @@ Button b3 Touch Press Event tCode.txt=tCode.txt+"4" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b4 Attributes @@ -826,7 +844,10 @@ Button b4 Touch Press Event tCode.txt=tCode.txt+"5" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b5 Attributes @@ -866,7 +887,10 @@ Button b5 Touch Press Event tCode.txt=tCode.txt+"6" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b6 Attributes @@ -906,7 +930,10 @@ Button b6 Touch Press Event tCode.txt=tCode.txt+"7" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b7 Attributes @@ -946,7 +973,10 @@ Button b7 Touch Press Event tCode.txt=tCode.txt+"8" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b8 Attributes @@ -986,7 +1016,10 @@ Button b8 Touch Press Event tCode.txt=tCode.txt+"9" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b9 Attributes diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 5637293d..e408ff9c 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -30,10 +30,6 @@ pageTest 26 Component(s) 68 Line(s) of event code 66 Unique line(s) of event code -cardAlarm - 43 Component(s) - 459 Line(s) of event code - 268 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code @@ -42,6 +38,10 @@ pageStartup 20 Component(s) 185 Line(s) of event code 131 Unique line(s) of event code +cardAlarm + 43 Component(s) + 492 Line(s) of event code + 269 Unique line(s) of event code cardPower 48 Component(s) 483 Line(s) of event code @@ -86,5 +86,5 @@ cardEntities Total 20 Page(s) 737 Component(s) - 8778 Line(s) of event code - 2266 Unique line(s) of event code + 8811 Line(s) of event code + 2267 Unique line(s) of event code diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index 000820b6..ad6e33cb 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -318,7 +318,10 @@ Button b0 Touch Press Event tCode.txt=tCode.txt+"1" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b1 Attributes @@ -334,7 +337,10 @@ Button b1 Touch Press Event tCode.txt=tCode.txt+"2" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b10 Attributes @@ -350,7 +356,10 @@ Button b10 Touch Press Event tCode.txt=tCode.txt+"0" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b11 Attributes @@ -366,7 +375,10 @@ Button b11 Touch Press Event tCode.txt="" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b2 Attributes @@ -382,7 +394,10 @@ Button b2 Touch Press Event tCode.txt=tCode.txt+"3" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b3 Attributes @@ -398,7 +413,10 @@ Button b3 Touch Press Event tCode.txt=tCode.txt+"4" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b4 Attributes @@ -414,7 +432,10 @@ Button b4 Touch Press Event tCode.txt=tCode.txt+"5" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b5 Attributes @@ -430,7 +451,10 @@ Button b5 Touch Press Event tCode.txt=tCode.txt+"6" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b6 Attributes @@ -446,7 +470,10 @@ Button b6 Touch Press Event tCode.txt=tCode.txt+"7" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b7 Attributes @@ -462,7 +489,10 @@ Button b7 Touch Press Event tCode.txt=tCode.txt+"8" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b8 Attributes @@ -478,7 +508,10 @@ Button b8 Touch Press Event tCode.txt=tCode.txt+"9" vis tCode,1 - vis tHeading,0 + if(p0.w!=320) + { + vis tHeading,0 + } Button b9 Attributes