diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index b1b5e65d..c8925da9 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,1201 +1,25 @@ --- HMI/n2t-out +++ HMI/US/landscape/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/landscape/n2t-out/Program.s.txt -│ @@ -10,10 +10,8 @@ -│ int sleepValue=0 -│ // dim value -│ int dimValue=40 -│ int dimValueNormal=100 -│ //color vars -│ int defaultFontColor=65535 -│ int defaultBcoColor=6371 -│ - // fix touch offset -│ - lcd_dev fffb 0002 0000 0020 -│ page pageStartup -│ --- HMI/n2t-out/cardAlarm.txt -├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt -│ @@ -34,15 +34,15 @@ -│ vis b9,0 -│ vis b10,0 -│ vis b11,0 -│ vis tCode,0 -│ vis bPrev,0 -│ vis bNext,0 -│ cardAlarm.bco=defaultBcoColor -│ - for(sys0=0;sys0<44;sys0++) -│ + for(sys0=0;sys0<40;sys0++) -│ { -│ if(b[sys0].type==98||b[sys0].type==116) -│ { -│ b[sys0].bco=defaultBcoColor -│ //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,209 +303,154 @@ -│ State : unpressed -│ Text : 1 -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ tCode.txt=tCode.txt+"1" -│ - vis tCode,1 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - 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 -│ - if(p0.w!=320) -│ - { -│ - vis tHeading,0 -│ - } -│ -│ Button b9 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ @@ -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) -│ 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 -│ { -│ @@ -744,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 -│ @@ -824,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 -│ } -│ @@ -948,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/landscape/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/landscape/n2t-out/cardEntities.txt -│ @@ -62,15 +62,15 @@ -│ vis tEntity4,0 -│ vis bText4,0 -│ vis hSlider4,0 -│ vis nNum4,0 -│ vis bPrev,0 -│ vis bNext,0 -│ cardEntities.bco=defaultBcoColor -│ - for(sys0=0;sys0<67;sys0++) -│ + for(sys0=0;sys0<65;sys0++) -│ { -│ if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) -│ { -│ b[sys0].bco=defaultBcoColor -│ b[sys0].pco=defaultFontColor -│ } -│ if(b[sys0].type==53&&defaultBcoColor==0) -│ @@ -1931,18 +1931,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/landscape/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/landscape/n2t-out/cardMedia.txt -│ @@ -25,15 +25,15 @@ -│ vis bEntity1,0 -│ vis bEntity2,0 -│ vis bEntity3,0 -│ vis bEntity4,0 -│ vis bEntity5,0 -│ vis bEntity6,0 -│ cardMedia.bco=defaultBcoColor -│ - for(sys0=0;sys0<54;sys0++) -│ + for(sys0=0;sys0<34;sys0++) -│ { -│ if(b[sys0].type==98||b[sys0].type==116) -│ { -│ b[sys0].bco=defaultBcoColor -│ b[sys0].pco=defaultFontColor -│ } -│ } -│ @@ -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/landscape/n2t-out/cardPower.txt -│ @@ -35,15 +35,15 @@ -│ vis t0Icon,0 -│ vis t1Icon,0 -│ vis t2Icon,0 -│ vis t3Icon,0 -│ vis t4Icon,0 -│ vis t5Icon,0 -│ cardPower.bco=defaultBcoColor -│ - for(sys0=0;sys0<48;sys0++) -│ + for(sys0=0;sys0<43;sys0++) -│ { -│ if(b[sys0].type==98||b[sys0].type==116) -│ { -│ b[sys0].bco=defaultBcoColor -│ b[sys0].pco=defaultFontColor -│ } -│ if(defaultBcoColor==0) -│ @@ -273,111 +273,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 tHome2 -│ - 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 : 10 -│ - -│ -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 -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ -│ Slider h0 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ - Position : 600 -│ - Upper range limit : 1200 -│ + Position : 50 -│ + Upper range limit : 100 -│ Lower range limit : 0 -│ -│ Slider h1 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ - Position : 600 -│ - Upper range limit : 1200 -│ + Position : 50 -│ + Upper range limit : 100 -│ Lower range limit : 0 -│ -│ Slider h2 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ - Position : 600 -│ - Upper range limit : 1200 -│ + Position : 50 -│ + Upper range limit : 100 -│ Lower range limit : 0 -│ -│ Slider h3 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ - Position : 600 -│ - Upper range limit : 1200 -│ + Position : 50 -│ + Upper range limit : 100 -│ Lower range limit : 0 -│ -│ Slider h4 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ - Position : 600 -│ - Upper range limit : 1200 -│ + Position : 50 -│ + Upper range limit : 100 -│ Lower range limit : 0 -│ -│ Slider h5 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ - Position : 600 -│ - Upper range limit : 1200 -│ + Position : 50 -│ + Upper range limit : 100 -│ Lower range limit : 0 -│ -│ Button bNext -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ @@ -463,92 +433,74 @@ -│ Attributes -│ Scope : local -│ Period (ms): 100 -│ Enabled : yes -│ -│ Events -│ Timer Event -│ - if(t0Speed.val!=0) -│ + sys0=h0.val+t0Speed.val -│ + if(sys0>h0.maxval) -│ { -│ - sys0=h0.val+t0Speed.val -│ - if(sys0>h0.maxval) -│ - { -│ - h0.val=h0.minval -│ - } -│ - if(sys0h1.maxval) -│ - { -│ - h1.val=h1.minval -│ - } -│ - if(sys0h1.maxval) -│ { -│ - sys0=h2.val+t2Speed.val -│ - if(sys0>h2.maxval) -│ - { -│ - h2.val=h2.minval -│ - } -│ - if(sys0h3.maxval) -│ - { -│ - h3.val=h3.minval -│ - } -│ - if(sys0h2.maxval) -│ { -│ - sys0=h4.val+t4Speed.val -│ - if(sys0>h4.maxval) -│ - { -│ - h4.val=h4.minval -│ - } -│ - if(sys0h5.maxval) -│ - { -│ - h5.val=h5.minval -│ - } -│ - if(sys0h3.maxval) -│ + { -│ + h3.val=h3.minval -│ } -│ + if(sys0h4.maxval) -│ + { -│ + h4.val=h4.minval -│ + } -│ + if(sys0h5.maxval) -│ + { -│ + h5.val=h5.minval -│ + } -│ + 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 -│ { -│ @@ -891,18 +785,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/cardQR.txt -├── +++ HMI/US/landscape/n2t-out/cardQR.txt -│ @@ -602,19 +602,19 @@ -│ // get Text (optional Value) -│ spstr strCommand.txt,bText2.txt,"~",26 -│ } -│ if(type2.txt=="delete"||type2.txt=="") -│ { -│ if(type1.txt=="delete"||type1.txt=="") -│ { -│ - qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt -│ + qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt -│ } -│ }else -│ { -│ - qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt -│ + qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt -│ } -│ } -│ if(tInstruction.txt=="time") -│ { -│ // 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/landscape/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/landscape/n2t-out/pageStartup.txt -│ @@ -35,20 +35,14 @@ -│ -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 50 -│ -│ -Variable (string) strTmp -│ - Attributes -│ - Scope : local -│ - Text : -│ - Max. Text Size: 2 -│ - -│ Number frame_ptr -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -145,15 +139,15 @@ -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ - Max. Text Size : 30 -│ + Max. Text Size : 10 -│ +│ @@ -154,15 +154,15 @@ │ Text tVersion │ Attributes │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 │ Send Component ID : disabled -│ @@ -179,15 +173,15 @@ +│ Associated Keyboard : none +│ - Text : 48 +│ + Text : 49 +│ Max. Text Size : 10 +│ +│ Picture p0 +│ Attributes +│ Scope : local +│ Dragging : 0 +│ Disable release event after dragging: 0 +│ @@ -179,15 +179,15 @@ │ Max. Text Size : 10 │ │ Events @@ -1212,28 +36,9 @@ │ 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/landscape/n2t-out/screensaver.txt -│ @@ -29,22 +29,19 @@ +│ @@ -29,17 +29,14 @@ │ } │ tDate.txt=pageIcons.vaDate.txt │ dim=dimValue @@ -1248,15 +53,9 @@ │ Attributes │ Scope : local │ Text : -│ - Max. Text Size: 400 -│ + Max. Text Size: 200 +│ Max. Text Size: 400 │ │ Variable (string) strTmp -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 2 -│ │ @@ -103,35 +100,14 @@ │ Value: 0 │ @@ -1293,95 +92,7 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -294,65 +270,65 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 10 -│ -│ -Text tMainIcon -│ +Text tMR -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 10 -│ -│ -Text tMainIconAlt -│ +Text tMRIcon -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 10 -│ -│ -Text tMainIconAlt2 -│ +Text tMainIcon -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 10 -│ -│ -Text tMainText -│ +Text tMainIconAlt -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 10 -│ -│ -Text tMainTextAlt -│ +Text tMainText -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ Max. Text Size : 10 -│ -│ -Text tMainTextAlt2 -│ +Text tMainTextAlt -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : -│ @@ -468,14 +444,15 @@ -│ // here is the location where acual code should be -│ // write command to variable strCommand -│ ucopy strCommand.txt,4,payloadLength-5,0 -│ // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) -│ spstr strCommand.txt,tInstruction.txt,"~",0 -│ if(tInstruction.txt=="wake") -│ { -│ + //dim=100 -│ click tc0,1 -│ } -│ if(tInstruction.txt=="dimmode") -│ { -│ // get value -│ spstr strCommand.txt,tTmp.txt,"~",1 -│ covx tTmp.txt,dimValue,0,0 -│ @@ -494,15 +471,14 @@ +│ @@ -494,15 +470,15 @@ │ if(tTmp.txt!="") │ { │ covx tTmp.txt,defaultFontColor,0,0 @@ -1390,6 +101,7 @@ │ if(tInstruction.txt=="time") │ { │ - click m0,1 +│ + //click m0,1 │ //get set time to global variable │ spstr strCommand.txt,pageIcons.vaTime.txt,"~",1 │ spstr pageIcons.vaTime.txt,tTime.txt,"?",0 @@ -1397,286 +109,3 @@ │ if(tAMPM.txt=="") │ { │ vis tAMPM,0 -│ @@ -513,14 +489,20 @@ -│ } -│ if(tInstruction.txt=="date") -│ { -│ //get set date to global variable -│ spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 -│ tDate.txt=pageIcons.vaDate.txt -│ } -│ + if(tInstruction.txt=="timeout") -│ + { -│ + //set timeout to global var -│ + spstr strCommand.txt,tTmp.txt,"~",1 -│ + covx tTmp.txt,sleepTimeout,0,0 -│ + } -│ if(tInstruction.txt=="statusUpdate") -│ { -│ //statusIcon1 -│ spstr strCommand.txt,tIcon1.txt,"~",1 -│ spstr strCommand.txt,tTmp.txt,"~",2 -│ covx tTmp.txt,tIcon1.pco,0,0 -│ //statusIcon2 -│ @@ -536,101 +518,95 @@ -│ if(tTmp.txt!="") -│ { -│ tIcon2.font=3 -│ } -│ } -│ if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") -│ { -│ + vis tMainIcon,1 -│ + vis tMainIconAlt,0 -│ + vis tMainText,1 -│ + vis tMainTextAlt,0 -│ + vis tMRIcon,0 -│ + vis tMR,0 -│ //tMainIcon -│ - spstr strCommand.txt,tMainIcon.txt,"~",3 -│ + spstr strCommand.txt,tMainIcon.txt,"~",1 -│ tMainIconAlt.txt=tMainIcon.txt -│ - //tMainIcon Color -│ - spstr strCommand.txt,tTmp.txt,"~",4 -│ - covx tTmp.txt,tMainIcon.pco,0,0 -│ - tMainIconAlt.pco=tMainIcon.pco -│ //tMainText -│ - spstr strCommand.txt,tMainText.txt,"~",6 -│ + spstr strCommand.txt,tMainText.txt,"~",2 -│ tMainTextAlt.txt=tMainText.txt -│ //tForecast1 -│ - spstr strCommand.txt,tForecast1.txt,"~",11 -│ + spstr strCommand.txt,tForecast1.txt,"~",3 -│ //tF1Icon -│ - spstr strCommand.txt,tF1Icon.txt,"~",9 -│ - //tF1Icon Color -│ - spstr strCommand.txt,tTmp.txt,"~",10 -│ - covx tTmp.txt,tF1Icon.pco,0,0 -│ + spstr strCommand.txt,tF1Icon.txt,"~",4 -│ //tForecast1Val -│ - spstr strCommand.txt,tForecast1Val.txt,"~",12 -│ + spstr strCommand.txt,tForecast1Val.txt,"~",5 -│ //tForecast2 -│ - spstr strCommand.txt,tForecast2.txt,"~",17 -│ + spstr strCommand.txt,tForecast2.txt,"~",6 -│ //tF2Icon -│ - spstr strCommand.txt,tF2Icon.txt,"~",15 -│ - //tF2Icon Color -│ - spstr strCommand.txt,tTmp.txt,"~",16 -│ - covx tTmp.txt,tF2Icon.pco,0,0 -│ + spstr strCommand.txt,tF2Icon.txt,"~",7 -│ //tForecast2Val -│ - spstr strCommand.txt,tForecast2Val.txt,"~",18 -│ + spstr strCommand.txt,tForecast2Val.txt,"~",8 -│ //tForecast3 -│ - spstr strCommand.txt,tForecast3.txt,"~",23 -│ + spstr strCommand.txt,tForecast3.txt,"~",9 -│ //tF3Icon -│ - spstr strCommand.txt,tF3Icon.txt,"~",21 -│ - //tF3Icon Color -│ - spstr strCommand.txt,tTmp.txt,"~",22 -│ - covx tTmp.txt,tF3Icon.pco,0,0 -│ + spstr strCommand.txt,tF3Icon.txt,"~",10 -│ //tForecast3Val -│ - spstr strCommand.txt,tForecast3Val.txt,"~",24 -│ + spstr strCommand.txt,tForecast3Val.txt,"~",11 -│ //tForecast4 -│ - spstr strCommand.txt,tForecast4.txt,"~",29 -│ + spstr strCommand.txt,tForecast4.txt,"~",12 -│ //tF4Icon -│ - spstr strCommand.txt,tF4Icon.txt,"~",27 -│ - //tF4Icon Color -│ - spstr strCommand.txt,tTmp.txt,"~",28 -│ - covx tTmp.txt,tF4Icon.pco,0,0 -│ + spstr strCommand.txt,tF4Icon.txt,"~",13 -│ //tForecast4Val -│ - spstr strCommand.txt,tForecast4Val.txt,"~",30 -│ + spstr strCommand.txt,tForecast4Val.txt,"~",14 -│ //alternative layout -│ - //tMainTextAlt2 -│ - spstr strCommand.txt,tMainTextAlt2.txt,"~",36 -│ - //tMainIconAlt2 -│ - spstr strCommand.txt,tMainIconAlt2.txt,"~",33 -│ - //tMainIconAlt2 Color -│ - spstr strCommand.txt,tTmp.txt,"~",34 -│ - covx tTmp.txt,tMainIconAlt2.pco,0,0 -│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) -│ + //tMRIcon -│ + spstr strCommand.txt,tMRIcon.txt,"~",15 -│ + if(tMRIcon.txt!=""&&p0.w!=320) -│ { -│ //value for tMRIcon, activate alternative layout -│ vis tMainIcon,0 -│ vis tMainText,0 -│ vis tMainTextAlt,1 -│ vis tMainIconAlt,1 -│ - vis tMainTextAlt2,1 -│ - vis tMainIconAlt2,1 -│ + vis tMRIcon,1 -│ + vis tMR,1 -│ vis tForecast1,0 -│ vis tF1Icon,0 -│ vis tForecast1Val,0 -│ //move forecast values to the right -│ tForecast4.txt=tForecast3.txt -│ tForecast3.txt=tForecast2.txt -│ tForecast2.txt=tForecast1.txt -│ tForecast4Val.txt=tForecast3Val.txt -│ tForecast3Val.txt=tForecast2Val.txt -│ tForecast2Val.txt=tForecast1Val.txt -│ tF4Icon.txt=tF3Icon.txt -│ tF3Icon.txt=tF2Icon.txt -│ tF2Icon.txt=tF1Icon.txt -│ - tF4Icon.pco=tF3Icon.pco -│ - tF3Icon.pco=tF2Icon.pco -│ - tF2Icon.pco=tF1Icon.pco -│ - }else -│ + } -│ + //tMR -│ + spstr strCommand.txt,tMR.txt,"~",16 -│ + //statusIcon1 -│ + spstr strCommand.txt,tIcon1.txt,"~",17 -│ + spstr strCommand.txt,tTmp.txt,"~",18 -│ + covx tTmp.txt,tIcon1.pco,0,0 -│ + //statusIcon2 -│ + spstr strCommand.txt,tIcon2.txt,"~",19 -│ + spstr strCommand.txt,tTmp.txt,"~",20 -│ + covx tTmp.txt,tIcon2.pco,0,0 -│ + spstr strCommand.txt,tTmp.txt,"~",21 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ + spstr strCommand.txt,tTmp.txt,"~",22 -│ + if(tTmp.txt!="") -│ { -│ - vis tMainIcon,1 -│ - vis tMainIconAlt,0 -│ - vis tMainText,1 -│ - vis tMainTextAlt,0 -│ - vis tMainTextAlt2,0 -│ - vis tMainIconAlt2,0 -│ + tIcon2.font=3 -│ } -│ } -│ if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") -│ { -│ spstr strCommand.txt,tTmp.txt,"~",1 -│ covx tTmp.txt,tTime.bco,0,0 -│ if(tTime.bco!=screensaver.bco) -│ @@ -638,16 +614,17 @@ -│ screensaver.bco=tTime.bco -│ tAMPM.bco=tTime.bco -│ tDate.bco=tTime.bco -│ tMainIcon.bco=tTime.bco -│ tMainText.bco=tTime.bco -│ tMainIconAlt.bco=tTime.bco -│ tMainTextAlt.bco=tTime.bco -│ - tMainTextAlt2.bco=tTime.bco -│ - tMainIconAlt2.bco=tTime.bco -│ + tMRIcon.bco=tTime.bco -│ + tMR.bco=tTime.bco -│ + tMRIcon.bco=tTime.bco -│ tIcon1.bco=tTime.bco -│ tIcon2.bco=tTime.bco -│ tForecast1.bco=tTime.bco -│ tForecast1Val.bco=tTime.bco -│ tF1Icon.bco=tTime.bco -│ tForecast2.bco=tTime.bco -│ tForecast2Val.bco=tTime.bco -│ @@ -663,42 +640,56 @@ -│ spstr strCommand.txt,tTmp.txt,"~",2 -│ covx tTmp.txt,tTime.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",3 -│ covx tTmp.txt,tAMPM.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",4 -│ covx tTmp.txt,tDate.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",5 -│ + covx tTmp.txt,tMainIcon.pco,0,0 -│ + tMainIconAlt.pco=tMainIcon.pco -│ + spstr strCommand.txt,tTmp.txt,"~",6 -│ covx tTmp.txt,tMainText.pco,0,0 -│ tMainTextAlt.pco=tMainText.pco -│ - spstr strCommand.txt,tTmp.txt,"~",6 -│ - covx tTmp.txt,tForecast1.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",7 -│ - covx tTmp.txt,tForecast2.pco,0,0 -│ + covx tTmp.txt,tForecast1.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",8 -│ - covx tTmp.txt,tForecast3.pco,0,0 -│ + covx tTmp.txt,tForecast2.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",9 -│ - covx tTmp.txt,tForecast4.pco,0,0 -│ + covx tTmp.txt,tForecast3.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",10 -│ - covx tTmp.txt,tForecast1Val.pco,0,0 -│ + covx tTmp.txt,tForecast4.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",11 -│ - covx tTmp.txt,tForecast2Val.pco,0,0 -│ + covx tTmp.txt,tF1Icon.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",12 -│ - covx tTmp.txt,tForecast3Val.pco,0,0 -│ + covx tTmp.txt,tF2Icon.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",13 -│ - covx tTmp.txt,tForecast4Val.pco,0,0 -│ + covx tTmp.txt,tF3Icon.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",14 -│ - covx tTmp.txt,t10.bco,0,0 -│ + covx tTmp.txt,tF4Icon.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",15 -│ - covx tTmp.txt,tMainTextAlt2.pco,0,0 -│ - //spstr strCommand.txt,tTmp.txt,"~",16 -│ - //covx tTmp.txt,tMR.pco,0,0 -│ + covx tTmp.txt,tForecast1Val.pco,0,0 -│ + spstr strCommand.txt,tTmp.txt,"~",16 -│ + covx tTmp.txt,tForecast2Val.pco,0,0 -│ spstr strCommand.txt,tTmp.txt,"~",17 -│ + covx tTmp.txt,tForecast3Val.pco,0,0 -│ + spstr strCommand.txt,tTmp.txt,"~",18 -│ + covx tTmp.txt,tForecast4Val.pco,0,0 -│ + spstr strCommand.txt,tTmp.txt,"~",19 -│ + covx tTmp.txt,t10.bco,0,0 -│ + spstr strCommand.txt,tTmp.txt,"~",20 -│ + covx tTmp.txt,tMRIcon.pco,0,0 -│ + spstr strCommand.txt,tTmp.txt,"~",21 -│ + covx tTmp.txt,tMR.pco,0,0 -│ + spstr strCommand.txt,tTmp.txt,"~",22 -│ covx tTmp.txt,tTimeAdd.pco,0,0 -│ - if(tMainTextAlt2.txt!=""&&p0.w!=320) -│ + if(tMRIcon.txt!=""&&p0.w!=320) -│ { -│ + tF4Icon.pco=tF3Icon.pco -│ + tF3Icon.pco=tF2Icon.pco -│ + tF2Icon.pco=tF1Icon.pco -│ tForecast4Val.pco=tForecast3Val.pco -│ tForecast3Val.pco=tForecast2Val.pco -│ tForecast2Val.pco=tForecast1Val.pco -│ tForecast4.pco=tForecast3.pco -│ tForecast3.pco=tForecast2.pco -│ tForecast2.pco=tForecast1.pco -│ } -│ @@ -793,24 +784,14 @@ -│ { -│ 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 -│ } -│ // end of user code -│ udelete payloadLength-1 -│ bufferPos=0 -│ } -│ } -│ } diff --git a/HMI/US/landscape/n2t-out-visual/Program.s.txt b/HMI/US/landscape/n2t-out-visual/Program.s.txt index cc6080ba..217dbf1f 100644 --- a/HMI/US/landscape/n2t-out-visual/Program.s.txt +++ b/HMI/US/landscape/n2t-out-visual/Program.s.txt @@ -14,4 +14,6 @@ Program.s //color vars int defaultFontColor=65535 int defaultBcoColor=6371 + // fix touch offset + lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index cbd6397f..fd95357e 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -46,7 +46,7 @@ Page cardAlarm vis bPrev,0 vis bNext,0 cardAlarm.bco=defaultBcoColor - for(sys0=0;sys0<40;sys0++) + for(sys0=0;sys0<44;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -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 : 80 + y coordinate : 24 + Width : 227 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + 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 @@ -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 @@ -1136,7 +1221,7 @@ Hotspot mSwipeUp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 12 y coordinate : 0 Width : 426 Height : 9 @@ -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/landscape/n2t-out-visual/cardChart.txt b/HMI/US/landscape/n2t-out-visual/cardChart.txt index 692fbef8..9789a5ad 100644 --- a/HMI/US/landscape/n2t-out-visual/cardChart.txt +++ b/HMI/US/landscape/n2t-out-visual/cardChart.txt @@ -189,7 +189,7 @@ XFloat x0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 188 + x coordinate : 189 y coordinate : 84 Width : 100 Height : 30 @@ -221,7 +221,7 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 81 + x coordinate : 82 y coordinate : 26 Width : 320 Height : 30 @@ -268,7 +268,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 + x coordinate : 407 y coordinate : 16 Width : 50 Height : 50 @@ -315,7 +315,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 25 y coordinate : 16 Width : 50 Height : 50 @@ -362,7 +362,7 @@ Hotspot m0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 35 + x coordinate : 36 y coordinate : 90 Width : 410 Height : 220 @@ -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/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index 83975b4c..31b21619 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -74,7 +74,7 @@ Page cardEntities vis bPrev,0 vis bNext,0 cardEntities.bco=defaultBcoColor - for(sys0=0;sys0<65;sys0++) + for(sys0=0;sys0<67;sys0++) { if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) { @@ -2890,6 +2890,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index ee0a79fb..2768291c 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -174,7 +174,7 @@ Text tEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 21 + x coordinate : 22 y coordinate : 155 Width : 140 Height : 30 @@ -204,7 +204,7 @@ Text tEntity2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 168 + x coordinate : 169 y coordinate : 155 Width : 140 Height : 30 @@ -234,7 +234,7 @@ Text tEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 314 + x coordinate : 315 y coordinate : 155 Width : 140 Height : 30 @@ -264,7 +264,7 @@ Text tEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 21 + x coordinate : 16 y coordinate : 274 Width : 140 Height : 30 @@ -294,7 +294,7 @@ Text tEntity5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 168 + x coordinate : 169 y coordinate : 274 Width : 140 Height : 30 @@ -324,7 +324,7 @@ Text tEntity6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 314 + x coordinate : 315 y coordinate : 274 Width : 140 Height : 30 @@ -354,7 +354,7 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 126 + x coordinate : 127 y coordinate : 26 Width : 227 Height : 30 @@ -384,7 +384,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 126 + x coordinate : 111 y coordinate : 290 Width : 39 Height : 30 @@ -414,7 +414,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 0 y coordinate : 290 Width : 100 Height : 30 @@ -444,7 +444,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 415 + x coordinate : 400 y coordinate : 290 Width : 34 Height : 30 @@ -491,7 +491,7 @@ Button bEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 21 + x coordinate : 22 y coordinate : 75 Width : 140 Height : 80 @@ -558,7 +558,7 @@ Button bEntity2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 167 + x coordinate : 168 y coordinate : 75 Width : 140 Height : 80 @@ -625,7 +625,7 @@ Button bEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 314 + x coordinate : 315 y coordinate : 75 Width : 140 Height : 80 @@ -692,7 +692,7 @@ Button bEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 21 + x coordinate : 22 y coordinate : 194 Width : 140 Height : 80 @@ -759,7 +759,7 @@ Button bEntity5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 168 + x coordinate : 169 y coordinate : 194 Width : 140 Height : 80 @@ -826,7 +826,7 @@ Button bEntity6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 314 + x coordinate : 315 y coordinate : 194 Width : 140 Height : 80 @@ -893,7 +893,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 + x coordinate : 407 y coordinate : 16 Width : 50 Height : 50 @@ -940,7 +940,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 25 + x coordinate : 26 y coordinate : 16 Width : 49 Height : 50 @@ -987,7 +987,7 @@ Hotspot mSpecial Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 323 + x coordinate : 308 y coordinate : 0 Width : 83 Height : 67 @@ -1053,7 +1053,7 @@ Hotspot mSwipeUp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 12 y coordinate : 0 Width : 426 Height : 9 @@ -1368,6 +1368,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardLChart.txt b/HMI/US/landscape/n2t-out-visual/cardLChart.txt new file mode 100644 index 00000000..d42cb2a6 --- /dev/null +++ b/HMI/US/landscape/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 : 480 + 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 : 81 + y coordinate : 26 + Width : 320 + 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 : 480 + Height : 320 + 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 : 406 + 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 : 24 + 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 : 35 + y coordinate : 90 + Width : 410 + Height : 220 + 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 : 471 + y coordinate : 5 + Width : 9 + Height : 310 + 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 : 426 + 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/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 66963752..8c1b3b07 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -37,7 +37,7 @@ Page cardMedia vis bEntity5,0 vis bEntity6,0 cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<34;sys0++) + for(sys0=0;sys0<54;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -1322,7 +1322,7 @@ Hotspot mSwipeUp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 12 y coordinate : 0 Width : 426 Height : 9 @@ -1692,6 +1692,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardPower.txt b/HMI/US/landscape/n2t-out-visual/cardPower.txt index 6fc11f3c..bfdbe592 100644 --- a/HMI/US/landscape/n2t-out-visual/cardPower.txt +++ b/HMI/US/landscape/n2t-out-visual/cardPower.txt @@ -47,7 +47,7 @@ Page cardPower vis t4Icon,0 vis t5Icon,0 cardPower.bco=defaultBcoColor - for(sys0=0;sys0<43;sys0++) + for(sys0=0;sys0<48;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -158,7 +158,7 @@ Text t0Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 33 + x coordinate : 34 y coordinate : 80 Width : 60 Height : 60 @@ -190,7 +190,7 @@ Text t0u Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 97 + x coordinate : 98 y coordinate : 132 Width : 108 Height : 30 @@ -220,7 +220,7 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 213 + x coordinate : 214 y coordinate : 70 Width : 60 Height : 230 @@ -252,7 +252,7 @@ Text t1Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 33 + x coordinate : 34 y coordinate : 156 Width : 60 Height : 60 @@ -284,7 +284,7 @@ Text t1u Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 97 + x coordinate : 98 y coordinate : 209 Width : 108 Height : 30 @@ -314,7 +314,7 @@ Text t2Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 33 + x coordinate : 34 y coordinate : 232 Width : 60 Height : 60 @@ -346,7 +346,7 @@ Text t2u Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 97 + x coordinate : 98 y coordinate : 285 Width : 108 Height : 30 @@ -376,7 +376,7 @@ Text t3Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 + x coordinate : 394 y coordinate : 80 Width : 60 Height : 60 @@ -408,7 +408,7 @@ Text t3u Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 277 + x coordinate : 278 y coordinate : 132 Width : 108 Height : 30 @@ -438,7 +438,7 @@ Text t4Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 + x coordinate : 394 y coordinate : 156 Width : 60 Height : 60 @@ -470,7 +470,7 @@ Text t4u Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 277 + x coordinate : 278 y coordinate : 209 Width : 108 Height : 30 @@ -500,7 +500,7 @@ Text t5Icon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 393 + x coordinate : 394 y coordinate : 232 Width : 60 Height : 60 @@ -532,7 +532,7 @@ Text t5u Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 277 + x coordinate : 278 y coordinate : 285 Width : 108 Height : 30 @@ -562,7 +562,7 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 81 + x coordinate : 82 y coordinate : 26 Width : 320 Height : 30 @@ -592,10 +592,40 @@ Text tHome Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 215 + x coordinate : 216 y coordinate : 214 Width : 56 - Height : 81 + Height : 54 + 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 : bottom + Input Type : character + Text : + Max. Text Size : 10 + 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 : 216 + y coordinate : 271 + Width : 56 + Height : 28 Effect : load Effect Priority : 0 Effect Time : 300 @@ -609,7 +639,67 @@ Text tHome Vertical Alignment : center Input Type : character Text : - Max. Text Size : 20 + Max. Text Size : 10 + 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 : 216 + y coordinate : 73 + Width : 56 + Height : 54 + 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 : bottom + Input Type : character + Text : + Max. Text Size : 10 + 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 : 216 + y coordinate : 130 + Width : 56 + Height : 28 + 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 : 10 Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -639,7 +729,7 @@ Slider h0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 93 + x coordinate : 94 y coordinate : 88 Width : 120 Height : 44 @@ -652,8 +742,8 @@ Slider h0 Cursor height : 255 Back. Picture ID : 18 Slided Back. Picture ID : 18 - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h1 @@ -664,7 +754,7 @@ Slider h1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 93 + x coordinate : 94 y coordinate : 165 Width : 120 Height : 44 @@ -677,8 +767,8 @@ Slider h1 Cursor height : 255 Back. Picture ID : 18 Slided Back. Picture ID : 18 - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h2 @@ -689,7 +779,7 @@ Slider h2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 93 + x coordinate : 94 y coordinate : 241 Width : 120 Height : 44 @@ -702,8 +792,8 @@ Slider h2 Cursor height : 255 Back. Picture ID : 18 Slided Back. Picture ID : 18 - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h3 @@ -714,7 +804,7 @@ Slider h3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 273 + x coordinate : 274 y coordinate : 88 Width : 120 Height : 44 @@ -727,8 +817,8 @@ Slider h3 Cursor height : 255 Back. Picture ID : 18 Slided Back. Picture ID : 18 - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h4 @@ -739,7 +829,7 @@ Slider h4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 273 + x coordinate : 274 y coordinate : 165 Width : 120 Height : 44 @@ -752,8 +842,8 @@ Slider h4 Cursor height : 255 Back. Picture ID : 18 Slided Back. Picture ID : 18 - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h5 @@ -764,7 +854,7 @@ Slider h5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 273 + x coordinate : 274 y coordinate : 241 Width : 120 Height : 44 @@ -777,8 +867,8 @@ Slider h5 Cursor height : 255 Back. Picture ID : 18 Slided Back. Picture ID : 18 - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Button bNext @@ -789,7 +879,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 + x coordinate : 407 y coordinate : 16 Width : 50 Height : 50 @@ -836,7 +926,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 25 y coordinate : 16 Width : 50 Height : 50 @@ -923,7 +1013,7 @@ Hotspot mSwipeUp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 12 y coordinate : 0 Width : 426 Height : 9 @@ -944,66 +1034,84 @@ Timer tm0 Events Timer Event - sys0=h0.val+t0Speed.val - if(sys0>h0.maxval) + if(t0Speed.val!=0) { - h0.val=h0.minval + sys0=h0.val+t0Speed.val + if(sys0>h0.maxval) + { + h0.val=h0.minval + } + if(sys0h1.maxval) + { + h1.val=h1.minval + } + if(sys0h1.maxval) + if(t2Speed.val!=0) { - h1.val=h1.minval + sys0=h2.val+t2Speed.val + if(sys0>h2.maxval) + { + h2.val=h2.minval + } + if(sys0h3.maxval) + { + h3.val=h3.minval + } + if(sys0h2.maxval) + if(t4Speed.val!=0) { - h2.val=h2.minval + sys0=h4.val+t4Speed.val + if(sys0>h4.maxval) + { + h4.val=h4.minval + } + if(sys0h5.maxval) + { + h5.val=h5.minval + } + if(sys0h3.maxval) - { - h3.val=h3.minval - } - if(sys0h4.maxval) - { - h4.val=h4.minval - } - if(sys0h5.maxval) - { - h5.val=h5.minval - } - if(sys0120) + { + 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 +1250,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 +1279,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 +1308,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 +1337,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 +1366,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 @@ -1297,6 +1463,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt index 5ab149e9..a65a6eba 100644 --- a/HMI/US/landscape/n2t-out-visual/cardQR.txt +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -676,7 +676,7 @@ Hotspot mSwipeUp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 12 y coordinate : 0 Width : 426 Height : 9 @@ -907,11 +907,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt } }else { - qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt } } if(tInstruction.txt=="time") @@ -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/landscape/n2t-out-visual/cardThermo.txt b/HMI/US/landscape/n2t-out-visual/cardThermo.txt index 3d42c408..6861d8e6 100644 --- a/HMI/US/landscape/n2t-out-visual/cardThermo.txt +++ b/HMI/US/landscape/n2t-out-visual/cardThermo.txt @@ -1406,7 +1406,7 @@ Hotspot mSwipePrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 0 y coordinate : 5 Width : 9 Height : 310 @@ -1426,7 +1426,7 @@ Hotspot mSwipeUp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 12 y coordinate : 0 Width : 426 Height : 9 @@ -1845,6 +1845,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index fb4db672..5f8eec66 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -1,7 +1,7 @@ Program.s 0 Component(s) - 12 Line(s) of event code - 12 Unique line(s) of event code + 13 Line(s) of event code + 13 Unique line(s) of event code pageIcons 7 Component(s) 0 Line(s) of event code @@ -14,73 +14,77 @@ popupShutter 25 Component(s) 398 Line(s) of event code 218 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 popupInSel 34 Component(s) 617 Line(s) of event code 295 Unique line(s) of event code -pageStartup - 19 Component(s) - 181 Line(s) of event code - 129 Unique line(s) of event code -screensaver - 46 Component(s) - 429 Line(s) of event code - 301 Unique line(s) of event code -popupLight - 28 Component(s) - 408 Line(s) of event code - 225 Unique line(s) of event code +pageTest + 26 Component(s) + 68 Line(s) of event code + 66 Unique line(s) of event code popupFan 27 Component(s) 351 Line(s) of event code 204 Unique line(s) of event code -popupTimer - 42 Component(s) - 512 Line(s) of event code - 255 Unique line(s) of event code -cardChart - 33 Component(s) - 425 Line(s) of event code - 290 Unique line(s) of event code -pageTest - 21 Component(s) - 66 Line(s) of event code - 64 Unique line(s) of event code -cardGrid - 44 Component(s) - 511 Line(s) of event code - 289 Unique line(s) of event code -cardMedia - 59 Component(s) - 637 Line(s) of event code - 316 Unique line(s) of event code -cardThermo - 57 Component(s) - 528 Line(s) of event code - 313 Unique line(s) of event code -cardAlarm - 42 Component(s) - 415 Line(s) of event code - 253 Unique line(s) of event code -cardPower - 45 Component(s) - 412 Line(s) of event code - 289 Unique line(s) of event code -cardQR - 34 Component(s) - 398 Line(s) of event code - 232 Unique line(s) of event code popupThermo 44 Component(s) 519 Line(s) of event code 274 Unique line(s) of event code +cardQR + 34 Component(s) + 402 Line(s) of event code + 234 Unique line(s) of event code +pageStartup + 20 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 +popupLight + 28 Component(s) + 408 Line(s) of event code + 225 Unique line(s) of event code +popupTimer + 42 Component(s) + 512 Line(s) of event code + 255 Unique line(s) of event code +cardThermo + 57 Component(s) + 532 Line(s) of event code + 315 Unique line(s) of event code +cardMedia + 59 Component(s) + 641 Line(s) of event code + 318 Unique line(s) of event code cardEntities 67 Component(s) - 1158 Line(s) of event code - 526 Unique line(s) of event code + 1162 Line(s) of event code + 528 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) + 487 Line(s) of event code + 326 Unique line(s) of event code +screensaver + 46 Component(s) + 418 Line(s) of event code + 299 Unique line(s) of event code Total - 19 Page(s) - 693 Component(s) - 8234 Line(s) of event code - 2125 Unique line(s) of event code + 20 Page(s) + 736 Component(s) + 8814 Line(s) of event code + 2263 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index d0494dd7..8e299085 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -48,6 +48,13 @@ Variable (string) strCommand Text : Max. Text Size: 50 +Variable (string) strTmp + Attributes + ID : 19 + Scope : local + Text : + Max. Text Size: 2 + Number frame_ptr Attributes ID : 10 @@ -373,7 +380,7 @@ Text tTmp Vertical Alignment : center Input Type : character Text : - Max. Text Size : 10 + Max. Text Size : 30 Word wrap : disabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -402,7 +409,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 48 + Text : 49 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -659,6 +666,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/pageTest.txt b/HMI/US/landscape/n2t-out-visual/pageTest.txt index ff46f405..6015e7a5 100644 --- a/HMI/US/landscape/n2t-out-visual/pageTest.txt +++ b/HMI/US/landscape/n2t-out-visual/pageTest.txt @@ -31,6 +31,13 @@ Variable (string) strCommand Text : Max. Text Size: 20 +Variable (string) strTmp + Attributes + ID : 25 + Scope : local + Text : + Max. Text Size: 2 + Variable (string) tInstruction Attributes ID : 16 @@ -75,6 +82,36 @@ Text tBench Horizontal Spacing : 0 Vertical Spacing : 0 +Text tTmp + Attributes + ID : 24 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 49 + y coordinate : 48 + Width : 257 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 65535 + Font Color : 0 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : test123test123 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Picture p0 Attributes ID : 1 @@ -280,8 +317,44 @@ Button b13 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 152 - y coordinate : 245 + x coordinate : 406 + y coordinate : 133 + Width : 43 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 0 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : showqq + Max. Text Size : 10 + Word wrap : enabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + showqq + +Button b14 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 Width : 100 Height : 50 Effect : load @@ -304,9 +377,77 @@ Button b13 Horizontal Spacing : 0 Vertical Spacing : 0 +Button b15 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 236 + y coordinate : 263 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 0 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : cardLchart + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + Events Touch Press Event - showqq + page cardLChart + +Button b16 + Attributes + ID : 23 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 135 + y coordinate : 263 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 0 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : chart + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + page cardChart Button b2 Attributes diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index e9c8fbf9..bf4c1c5b 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -134,7 +134,7 @@ Text tEntity Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 80 + x coordinate : 75 y coordinate : 48 Width : 195 Height : 30 @@ -164,7 +164,7 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 27 + x coordinate : 22 y coordinate : 63 Width : 45 Height : 30 @@ -194,7 +194,7 @@ Text tInfo1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 80 + x coordinate : 75 y coordinate : 76 Width : 195 Height : 30 @@ -224,7 +224,7 @@ Text tPosHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 79 + x coordinate : 74 y coordinate : 122 Width : 188 Height : 30 @@ -254,7 +254,7 @@ Text tTiltHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 79 + x coordinate : 74 y coordinate : 231 Width : 191 Height : 30 @@ -301,7 +301,7 @@ Slider hPosition Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 79 + x coordinate : 74 y coordinate : 152 Width : 335 Height : 43 @@ -345,7 +345,7 @@ Slider hTilt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 79 + x coordinate : 74 y coordinate : 261 Width : 335 Height : 43 @@ -389,7 +389,7 @@ Button b0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 412 + x coordinate : 407 y coordinate : 8 Width : 50 Height : 50 @@ -436,7 +436,7 @@ Button bDown1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 401 + x coordinate : 396 y coordinate : 95 Width : 50 Height : 50 @@ -483,7 +483,7 @@ Button bStop1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 349 + x coordinate : 344 y coordinate : 95 Width : 50 Height : 50 @@ -530,7 +530,7 @@ Button bTLeft Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 297 + x coordinate : 292 y coordinate : 205 Width : 50 Height : 50 @@ -577,7 +577,7 @@ Button bTRight Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 401 + x coordinate : 396 y coordinate : 205 Width : 50 Height : 50 @@ -624,7 +624,7 @@ Button bTStop Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 349 + x coordinate : 344 y coordinate : 205 Width : 50 Height : 50 @@ -671,7 +671,7 @@ Button bUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 297 + x coordinate : 292 y coordinate : 95 Width : 50 Height : 50 diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index cf34fb8e..38a40f5b 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -46,11 +46,11 @@ Variable (string) strCommand ID : 4 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) strTmp Attributes - ID : 45 + ID : 41 Scope : local Text : Max. Text Size: 2 @@ -64,21 +64,21 @@ Variable (string) tId Variable (string) tInstruction Attributes - ID : 30 + ID : 28 Scope : local Text : Max. Text Size: 50 Variable (string) tSend Attributes - ID : 34 + ID : 30 Scope : local Text : Max. Text Size: 50 Variable (string) tTmp Attributes - ID : 31 + ID : 29 Scope : local Text : Max. Text Size: 50 @@ -91,37 +91,37 @@ Variable (int32) vaTap Variable (int32) xc1 Attributes - ID : 39 + ID : 35 Scope: local Value: 0 Variable (int32) xc2 Attributes - ID : 41 + ID : 37 Scope: local Value: 0 Variable (int32) xcR Attributes - ID : 44 + ID : 40 Scope: local Value: 0 Variable (int32) yc1 Attributes - ID : 40 + ID : 36 Scope: local Value: 0 Variable (int32) yc2 Attributes - ID : 42 + ID : 38 Scope: local Value: 0 Variable (int32) ycR Attributes - ID : 43 + ID : 39 Scope: local Value: 0 @@ -577,7 +577,7 @@ Text tForecast4Val Text tIcon1 Attributes - ID : 35 + ID : 31 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -607,7 +607,7 @@ Text tIcon1 Text tIcon2 Attributes - ID : 36 + ID : 32 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -635,66 +635,6 @@ Text tIcon2 Horizontal Spacing : 0 Vertical Spacing : 0 -Text tMR - Attributes - ID : 29 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 159 - y coordinate : 276 - Width : 62 - Height : 21 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 0 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : left - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - -Text tMRIcon - Attributes - ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 116 - y coordinate : 272 - Width : 40 - Height : 35 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : solid color - Style : flat - Associated Keyboard : none - Font ID : 1 - Back. Color : 0 - Font Color : 65535 - Horizontal Alignment : center - Vertical Alignment : center - Input Type : character - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - Text tMainIcon Attributes ID : 7 @@ -733,20 +673,50 @@ Text tMainIconAlt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 - y coordinate : 227 - Width : 100 - Height : 66 + x coordinate : 26 + y coordinate : 216 + Width : 54 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 Fill : solid color Style : flat Associated Keyboard : none - Font ID : 4 + Font ID : 3 Back. Color : 0 Font Color : 65535 - Horizontal Alignment : center + Horizontal Alignment : right + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMainIconAlt2 + Attributes + ID : 44 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 26 + y coordinate : 265 + Width : 54 + Height : 45 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : right Vertical Alignment : center Input Type : character Text : @@ -793,10 +763,10 @@ Text tMainTextAlt Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 119 - y coordinate : 216 - Width : 106 - Height : 42 + x coordinate : 84 + y coordinate : 215 + Width : 135 + Height : 45 Effect : load Effect Priority : 0 Effect Time : 300 @@ -806,7 +776,37 @@ Text tMainTextAlt Font ID : 3 Back. Color : 0 Font Color : 65535 - Horizontal Alignment : left + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tMainTextAlt2 + Attributes + ID : 42 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 84 + y coordinate : 265 + Width : 135 + Height : 45 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 3 + Back. Color : 0 + Font Color : 65535 + Horizontal Alignment : center Vertical Alignment : center Input Type : character Text : @@ -817,7 +817,7 @@ Text tMainTextAlt Text tNotifyHead Attributes - ID : 32 + ID : 43 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -847,7 +847,7 @@ Text tNotifyHead Text tNotifyText Attributes - ID : 33 + ID : 45 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -907,7 +907,7 @@ Text tTime Text tTimeAdd Attributes - ID : 37 + ID : 33 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -954,7 +954,7 @@ Picture p0 Timer tm0 Attributes - ID : 38 + ID : 34 Scope : local Period (ms): 50 Enabled : yes @@ -1021,7 +1021,6 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="wake") { - //dim=100 click tc0,1 } if(tInstruction.txt=="dimmode") @@ -1048,6 +1047,7 @@ 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 @@ -1066,12 +1066,6 @@ Timer tmSerial spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 tDate.txt=pageIcons.vaDate.txt } - if(tInstruction.txt=="timeout") - { - //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sleepTimeout,0,0 - } if(tInstruction.txt=="statusUpdate") { //statusIcon1 @@ -1095,54 +1089,69 @@ Timer tmSerial } if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { - vis tMainIcon,1 - vis tMainIconAlt,0 - vis tMainText,1 - vis tMainTextAlt,0 - vis tMRIcon,0 - vis tMR,0 //tMainIcon - spstr strCommand.txt,tMainIcon.txt,"~",1 + spstr strCommand.txt,tMainIcon.txt,"~",3 tMainIconAlt.txt=tMainIcon.txt + //tMainIcon Color + spstr strCommand.txt,tTmp.txt,"~",4 + covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco //tMainText - spstr strCommand.txt,tMainText.txt,"~",2 + spstr strCommand.txt,tMainText.txt,"~",6 tMainTextAlt.txt=tMainText.txt //tForecast1 - spstr strCommand.txt,tForecast1.txt,"~",3 + spstr strCommand.txt,tForecast1.txt,"~",11 //tF1Icon - spstr strCommand.txt,tF1Icon.txt,"~",4 + spstr strCommand.txt,tF1Icon.txt,"~",9 + //tF1Icon Color + spstr strCommand.txt,tTmp.txt,"~",10 + covx tTmp.txt,tF1Icon.pco,0,0 //tForecast1Val - spstr strCommand.txt,tForecast1Val.txt,"~",5 + spstr strCommand.txt,tForecast1Val.txt,"~",12 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"~",6 + spstr strCommand.txt,tForecast2.txt,"~",17 //tF2Icon - spstr strCommand.txt,tF2Icon.txt,"~",7 + spstr strCommand.txt,tF2Icon.txt,"~",15 + //tF2Icon Color + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,tF2Icon.pco,0,0 //tForecast2Val - spstr strCommand.txt,tForecast2Val.txt,"~",8 + spstr strCommand.txt,tForecast2Val.txt,"~",18 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"~",9 + spstr strCommand.txt,tForecast3.txt,"~",23 //tF3Icon - spstr strCommand.txt,tF3Icon.txt,"~",10 + spstr strCommand.txt,tF3Icon.txt,"~",21 + //tF3Icon Color + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tF3Icon.pco,0,0 //tForecast3Val - spstr strCommand.txt,tForecast3Val.txt,"~",11 + spstr strCommand.txt,tForecast3Val.txt,"~",24 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"~",12 + spstr strCommand.txt,tForecast4.txt,"~",29 //tF4Icon - spstr strCommand.txt,tF4Icon.txt,"~",13 + spstr strCommand.txt,tF4Icon.txt,"~",27 + //tF4Icon Color + spstr strCommand.txt,tTmp.txt,"~",28 + covx tTmp.txt,tF4Icon.pco,0,0 //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"~",14 + spstr strCommand.txt,tForecast4Val.txt,"~",30 //alternative layout - //tMRIcon - spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!=""&&p0.w!=320) + //tMainTextAlt2 + spstr strCommand.txt,tMainTextAlt2.txt,"~",36 + //tMainIconAlt2 + spstr strCommand.txt,tMainIconAlt2.txt,"~",33 + //tMainIconAlt2 Color + spstr strCommand.txt,tTmp.txt,"~",34 + covx tTmp.txt,tMainIconAlt2.pco,0,0 + if(tMainTextAlt2.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 vis tMainText,0 vis tMainTextAlt,1 vis tMainIconAlt,1 - vis tMRIcon,1 - vis tMR,1 + vis tMainTextAlt2,1 + vis tMainIconAlt2,1 vis tForecast1,0 vis tF1Icon,0 vis tForecast1Val,0 @@ -1156,26 +1165,17 @@ Timer tmSerial tF4Icon.txt=tF3Icon.txt tF3Icon.txt=tF2Icon.txt tF2Icon.txt=tF1Icon.txt - } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 - //statusIcon1 - spstr strCommand.txt,tIcon1.txt,"~",17 - spstr strCommand.txt,tTmp.txt,"~",18 - covx tTmp.txt,tIcon1.pco,0,0 - //statusIcon2 - spstr strCommand.txt,tIcon2.txt,"~",19 - spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - if(tTmp.txt!="") + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco + }else { - tIcon1.font=3 - } - spstr strCommand.txt,tTmp.txt,"~",22 - if(tTmp.txt!="") - { - tIcon2.font=3 + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMainTextAlt2,0 + vis tMainIconAlt2,0 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") @@ -1191,9 +1191,8 @@ Timer tmSerial tMainText.bco=tTime.bco tMainIconAlt.bco=tTime.bco tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco + tMainTextAlt2.bco=tTime.bco + tMainIconAlt2.bco=tTime.bco tIcon1.bco=tTime.bco tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco @@ -1217,48 +1216,34 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,tMainIcon.pco,0,0 - tMainIconAlt.pco=tMainIcon.pco - spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 tMainTextAlt.pco=tMainText.pco - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tForecast1.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast2.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,tForecast3.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",9 covx tTmp.txt,tForecast4.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",11 - covx tTmp.txt,tF1Icon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",12 - covx tTmp.txt,tF2Icon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",13 - covx tTmp.txt,tF3Icon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",14 - covx tTmp.txt,tF4Icon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,tForecast1Val.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",11 covx tTmp.txt,tForecast2Val.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,tForecast3Val.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",13 covx tTmp.txt,tForecast4Val.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,t10.bco,0,0 - spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMR.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,tMainTextAlt2.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",16 + //covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,tTimeAdd.pco,0,0 - if(tMRIcon.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!=""&&p0.w!=320) { - tF4Icon.pco=tF3Icon.pco - tF3Icon.pco=tF2Icon.pco - tF2Icon.pco=tF1Icon.pco tForecast4Val.pco=tForecast3Val.pco tForecast3Val.pco=tForecast2Val.pco tForecast2Val.pco=tForecast1Val.pco @@ -1361,6 +1346,16 @@ Timer tmSerial { 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 } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/Program.s.txt b/HMI/US/landscape/n2t-out/Program.s.txt index cc6080ba..217dbf1f 100644 --- a/HMI/US/landscape/n2t-out/Program.s.txt +++ b/HMI/US/landscape/n2t-out/Program.s.txt @@ -14,4 +14,6 @@ Program.s //color vars int defaultFontColor=65535 int defaultBcoColor=6371 + // fix touch offset + lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index 8e63de4b..ad6e33cb 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -38,7 +38,7 @@ Page cardAlarm vis bPrev,0 vis bNext,0 cardAlarm.bco=defaultBcoColor - for(sys0=0;sys0<40;sys0++) + for(sys0=0;sys0<44;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -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/landscape/n2t-out/cardChart.txt b/HMI/US/landscape/n2t-out/cardChart.txt index b45f5530..7fd94478 100644 --- a/HMI/US/landscape/n2t-out/cardChart.txt +++ b/HMI/US/landscape/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/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index 0784d32e..05517a76 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -66,7 +66,7 @@ Page cardEntities vis bPrev,0 vis bNext,0 cardEntities.bco=defaultBcoColor - for(sys0=0;sys0<65;sys0++) + for(sys0=0;sys0<67;sys0++) { if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) { @@ -1935,6 +1935,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 1ad6c8f4..f9b70050 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/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/landscape/n2t-out/cardLChart.txt b/HMI/US/landscape/n2t-out/cardLChart.txt new file mode 100644 index 00000000..951d7614 --- /dev/null +++ b/HMI/US/landscape/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/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index b7909860..6db7cb92 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -29,7 +29,7 @@ Page cardMedia vis bEntity5,0 vis bEntity6,0 cardMedia.bco=defaultBcoColor - for(sys0=0;sys0<34;sys0++) + for(sys0=0;sys0<54;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -1204,6 +1204,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardPower.txt b/HMI/US/landscape/n2t-out/cardPower.txt index a29d2d83..adea13c4 100644 --- a/HMI/US/landscape/n2t-out/cardPower.txt +++ b/HMI/US/landscape/n2t-out/cardPower.txt @@ -39,7 +39,7 @@ Page cardPower vis t4Icon,0 vis t5Icon,0 cardPower.bco=defaultBcoColor - for(sys0=0;sys0<43;sys0++) + for(sys0=0;sys0<48;sys0++) { if(b[sys0].type==98||b[sys0].type==116) { @@ -277,7 +277,37 @@ Text tHome Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 20 + Max. Text Size : 10 + +Text tHome2 + 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 : 10 + +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 Picture p0 Attributes @@ -292,8 +322,8 @@ Slider h0 Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h1 @@ -302,8 +332,8 @@ Slider h1 Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h2 @@ -312,8 +342,8 @@ Slider h2 Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h3 @@ -322,8 +352,8 @@ Slider h3 Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h4 @@ -332,8 +362,8 @@ Slider h4 Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Slider h5 @@ -342,8 +372,8 @@ Slider h5 Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled - Position : 50 - Upper range limit : 100 + Position : 600 + Upper range limit : 1200 Lower range limit : 0 Button bNext @@ -437,66 +467,84 @@ Timer tm0 Events Timer Event - sys0=h0.val+t0Speed.val - if(sys0>h0.maxval) + if(t0Speed.val!=0) { - h0.val=h0.minval + sys0=h0.val+t0Speed.val + if(sys0>h0.maxval) + { + h0.val=h0.minval + } + if(sys0h1.maxval) + { + h1.val=h1.minval + } + if(sys0h1.maxval) + if(t2Speed.val!=0) { - h1.val=h1.minval + sys0=h2.val+t2Speed.val + if(sys0>h2.maxval) + { + h2.val=h2.minval + } + if(sys0h3.maxval) + { + h3.val=h3.minval + } + if(sys0h2.maxval) + if(t4Speed.val!=0) { - h2.val=h2.minval + sys0=h4.val+t4Speed.val + if(sys0>h4.maxval) + { + h4.val=h4.minval + } + if(sys0h5.maxval) + { + h5.val=h5.minval + } + if(sys0h3.maxval) - { - h3.val=h3.minval - } - if(sys0h4.maxval) - { - h4.val=h4.minval - } - if(sys0h5.maxval) - { - h5.val=h5.minval - } - if(sys0120) + { + 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 +682,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 +711,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 +740,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 +769,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 +798,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 @@ -789,6 +895,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt index 1b44aa31..7855710f 100644 --- a/HMI/US/landscape/n2t-out/cardQR.txt +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -606,11 +606,11 @@ Timer tmSerial { if(type1.txt=="delete"||type1.txt=="") { - qrcode m1.x,m1.y,200,6371,65535,-1,vaQR.txt + qrcode m1.x,m1.y,200,defaultBcoColor,65535,-1,vaQR.txt } }else { - qrcode m0.x,m0.y,200,6371,65535,-1,vaQR.txt + qrcode m0.x,m0.y,200,defaultBcoColor,65535,-1,vaQR.txt } } if(tInstruction.txt=="time") @@ -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/landscape/n2t-out/cardThermo.txt b/HMI/US/landscape/n2t-out/cardThermo.txt index 55223073..82159dd1 100644 --- a/HMI/US/landscape/n2t-out/cardThermo.txt +++ b/HMI/US/landscape/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/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index ae3e9107..404d3347 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -39,6 +39,12 @@ Variable (string) strCommand Text : Max. Text Size: 50 +Variable (string) strTmp + Attributes + Scope : local + Text : + Max. Text Size: 2 + Number frame_ptr Attributes Scope : local @@ -143,7 +149,7 @@ Text tTmp Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 10 + Max. Text Size : 30 Text tVersion Attributes @@ -152,7 +158,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 48 + Text : 49 Max. Text Size : 10 Picture p0 @@ -364,6 +370,10 @@ Timer tmSerial { page cardChart } + if(tId.txt=="cardLChart") + { + page cardLChart + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/pageTest.txt b/HMI/US/landscape/n2t-out/pageTest.txt index 24c80390..b8b1c0c0 100644 --- a/HMI/US/landscape/n2t-out/pageTest.txt +++ b/HMI/US/landscape/n2t-out/pageTest.txt @@ -22,6 +22,12 @@ Variable (string) strCommand Text : Max. Text Size: 20 +Variable (string) strTmp + Attributes + Scope : local + Text : + Max. Text Size: 2 + Variable (string) tInstruction Attributes Scope : local @@ -44,6 +50,16 @@ Text tBench Text : Max. Text Size : 20 +Text tTmp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : test123test123 + Max. Text Size : 30 + Picture p0 Attributes Scope : local @@ -128,13 +144,51 @@ Button b13 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : newtxt + Text : showqq Max. Text Size : 10 Events Touch Press Event showqq +Button b14 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : newtxt + Max. Text Size : 10 + +Button b15 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : cardLchart + Max. Text Size : 10 + + Events + Touch Press Event + page cardLChart + +Button b16 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : chart + Max. Text Size : 10 + + Events + Touch Press Event + page cardChart + Button b2 Attributes Scope : local diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index ca6ebb09..217b04c1 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -37,7 +37,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 400 Variable (string) strTmp Attributes @@ -274,26 +274,6 @@ Text tIcon2 Text : Max. Text Size : 10 -Text tMR - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tMRIcon - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - Text tMainIcon Attributes Scope : local @@ -314,6 +294,16 @@ Text tMainIconAlt Text : Max. Text Size : 10 +Text tMainIconAlt2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + Text tMainText Attributes Scope : local @@ -334,6 +324,16 @@ Text tMainTextAlt Text : Max. Text Size : 10 +Text tMainTextAlt2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + Text tNotifyHead Attributes Scope : local @@ -448,7 +448,6 @@ Timer tmSerial spstr strCommand.txt,tInstruction.txt,"~",0 if(tInstruction.txt=="wake") { - //dim=100 click tc0,1 } if(tInstruction.txt=="dimmode") @@ -475,6 +474,7 @@ 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 @@ -493,12 +493,6 @@ Timer tmSerial spstr strCommand.txt,pageIcons.vaDate.txt,"~",1 tDate.txt=pageIcons.vaDate.txt } - if(tInstruction.txt=="timeout") - { - //set timeout to global var - spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sleepTimeout,0,0 - } if(tInstruction.txt=="statusUpdate") { //statusIcon1 @@ -522,54 +516,69 @@ Timer tmSerial } if(tInstruction.txt=="weatherUpdate"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { - vis tMainIcon,1 - vis tMainIconAlt,0 - vis tMainText,1 - vis tMainTextAlt,0 - vis tMRIcon,0 - vis tMR,0 //tMainIcon - spstr strCommand.txt,tMainIcon.txt,"~",1 + spstr strCommand.txt,tMainIcon.txt,"~",3 tMainIconAlt.txt=tMainIcon.txt + //tMainIcon Color + spstr strCommand.txt,tTmp.txt,"~",4 + covx tTmp.txt,tMainIcon.pco,0,0 + tMainIconAlt.pco=tMainIcon.pco //tMainText - spstr strCommand.txt,tMainText.txt,"~",2 + spstr strCommand.txt,tMainText.txt,"~",6 tMainTextAlt.txt=tMainText.txt //tForecast1 - spstr strCommand.txt,tForecast1.txt,"~",3 + spstr strCommand.txt,tForecast1.txt,"~",11 //tF1Icon - spstr strCommand.txt,tF1Icon.txt,"~",4 + spstr strCommand.txt,tF1Icon.txt,"~",9 + //tF1Icon Color + spstr strCommand.txt,tTmp.txt,"~",10 + covx tTmp.txt,tF1Icon.pco,0,0 //tForecast1Val - spstr strCommand.txt,tForecast1Val.txt,"~",5 + spstr strCommand.txt,tForecast1Val.txt,"~",12 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"~",6 + spstr strCommand.txt,tForecast2.txt,"~",17 //tF2Icon - spstr strCommand.txt,tF2Icon.txt,"~",7 + spstr strCommand.txt,tF2Icon.txt,"~",15 + //tF2Icon Color + spstr strCommand.txt,tTmp.txt,"~",16 + covx tTmp.txt,tF2Icon.pco,0,0 //tForecast2Val - spstr strCommand.txt,tForecast2Val.txt,"~",8 + spstr strCommand.txt,tForecast2Val.txt,"~",18 //tForecast3 - spstr strCommand.txt,tForecast3.txt,"~",9 + spstr strCommand.txt,tForecast3.txt,"~",23 //tF3Icon - spstr strCommand.txt,tF3Icon.txt,"~",10 + spstr strCommand.txt,tF3Icon.txt,"~",21 + //tF3Icon Color + spstr strCommand.txt,tTmp.txt,"~",22 + covx tTmp.txt,tF3Icon.pco,0,0 //tForecast3Val - spstr strCommand.txt,tForecast3Val.txt,"~",11 + spstr strCommand.txt,tForecast3Val.txt,"~",24 //tForecast4 - spstr strCommand.txt,tForecast4.txt,"~",12 + spstr strCommand.txt,tForecast4.txt,"~",29 //tF4Icon - spstr strCommand.txt,tF4Icon.txt,"~",13 + spstr strCommand.txt,tF4Icon.txt,"~",27 + //tF4Icon Color + spstr strCommand.txt,tTmp.txt,"~",28 + covx tTmp.txt,tF4Icon.pco,0,0 //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"~",14 + spstr strCommand.txt,tForecast4Val.txt,"~",30 //alternative layout - //tMRIcon - spstr strCommand.txt,tMRIcon.txt,"~",15 - if(tMRIcon.txt!=""&&p0.w!=320) + //tMainTextAlt2 + spstr strCommand.txt,tMainTextAlt2.txt,"~",36 + //tMainIconAlt2 + spstr strCommand.txt,tMainIconAlt2.txt,"~",33 + //tMainIconAlt2 Color + spstr strCommand.txt,tTmp.txt,"~",34 + covx tTmp.txt,tMainIconAlt2.pco,0,0 + if(tMainTextAlt2.txt!=""&&p0.w!=320) { //value for tMRIcon, activate alternative layout vis tMainIcon,0 vis tMainText,0 vis tMainTextAlt,1 vis tMainIconAlt,1 - vis tMRIcon,1 - vis tMR,1 + vis tMainTextAlt2,1 + vis tMainIconAlt2,1 vis tForecast1,0 vis tF1Icon,0 vis tForecast1Val,0 @@ -583,26 +592,17 @@ Timer tmSerial tF4Icon.txt=tF3Icon.txt tF3Icon.txt=tF2Icon.txt tF2Icon.txt=tF1Icon.txt - } - //tMR - spstr strCommand.txt,tMR.txt,"~",16 - //statusIcon1 - spstr strCommand.txt,tIcon1.txt,"~",17 - spstr strCommand.txt,tTmp.txt,"~",18 - covx tTmp.txt,tIcon1.pco,0,0 - //statusIcon2 - spstr strCommand.txt,tIcon2.txt,"~",19 - spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tIcon2.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - if(tTmp.txt!="") + tF4Icon.pco=tF3Icon.pco + tF3Icon.pco=tF2Icon.pco + tF2Icon.pco=tF1Icon.pco + }else { - tIcon1.font=3 - } - spstr strCommand.txt,tTmp.txt,"~",22 - if(tTmp.txt!="") - { - tIcon2.font=3 + vis tMainIcon,1 + vis tMainIconAlt,0 + vis tMainText,1 + vis tMainTextAlt,0 + vis tMainTextAlt2,0 + vis tMainIconAlt2,0 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") @@ -618,9 +618,8 @@ Timer tmSerial tMainText.bco=tTime.bco tMainIconAlt.bco=tTime.bco tMainTextAlt.bco=tTime.bco - tMRIcon.bco=tTime.bco - tMR.bco=tTime.bco - tMRIcon.bco=tTime.bco + tMainTextAlt2.bco=tTime.bco + tMainIconAlt2.bco=tTime.bco tIcon1.bco=tTime.bco tIcon2.bco=tTime.bco tForecast1.bco=tTime.bco @@ -644,48 +643,34 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",4 covx tTmp.txt,tDate.pco,0,0 spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,tMainIcon.pco,0,0 - tMainIconAlt.pco=tMainIcon.pco - spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tMainText.pco,0,0 tMainTextAlt.pco=tMainText.pco - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",6 covx tTmp.txt,tForecast1.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",8 + spstr strCommand.txt,tTmp.txt,"~",7 covx tTmp.txt,tForecast2.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",8 covx tTmp.txt,tForecast3.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",9 covx tTmp.txt,tForecast4.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",11 - covx tTmp.txt,tF1Icon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",12 - covx tTmp.txt,tF2Icon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",13 - covx tTmp.txt,tF3Icon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",14 - covx tTmp.txt,tF4Icon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",15 + spstr strCommand.txt,tTmp.txt,"~",10 covx tTmp.txt,tForecast1Val.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",11 covx tTmp.txt,tForecast2Val.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",12 covx tTmp.txt,tForecast3Val.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",18 + spstr strCommand.txt,tTmp.txt,"~",13 covx tTmp.txt,tForecast4Val.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",19 + spstr strCommand.txt,tTmp.txt,"~",14 covx tTmp.txt,t10.bco,0,0 - spstr strCommand.txt,tTmp.txt,"~",20 - covx tTmp.txt,tMRIcon.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",21 - covx tTmp.txt,tMR.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",22 + spstr strCommand.txt,tTmp.txt,"~",15 + covx tTmp.txt,tMainTextAlt2.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",16 + //covx tTmp.txt,tMR.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",17 covx tTmp.txt,tTimeAdd.pco,0,0 - if(tMRIcon.txt!=""&&p0.w!=320) + if(tMainTextAlt2.txt!=""&&p0.w!=320) { - tF4Icon.pco=tF3Icon.pco - tF3Icon.pco=tF2Icon.pco - tF2Icon.pco=tF1Icon.pco tForecast4Val.pco=tForecast3Val.pco tForecast3Val.pco=tForecast2Val.pco tForecast2Val.pco=tForecast1Val.pco @@ -788,6 +773,16 @@ Timer tmSerial { 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 } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index a233c1e1..622d1543 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2023-01-23 19:17:01.556599214 +0000 ++++ /dev/fd/62 2023-01-24 16:45:43.397784493 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardEntities.txt