diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 970ddd93..e69de29b 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,923 +0,0 @@ ---- HMI/n2t-out -+++ HMI/US/landscape/n2t-out -├── file list -│ @@ -14,9 +14,8 @@ -│ popupFan.txt -│ popupInSel.txt -│ popupLight.txt -│ popupNotify.txt -│ popupShutter.txt -│ popupThermo.txt -│ popupTimer.txt -│ -screensaver.txt -│ -screensaver2.txt -│ +screensaver.txt -│ --- HMI/n2t-out/Program.s.txt -├── +++ HMI/US/landscape/n2t-out/Program.s.txt -│ @@ -11,9 +11,9 @@ -│ // 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 -│ + //lcd_dev fffb 0002 0000 0020 -│ page pageStartup -│ --- HMI/n2t-out/cardAlarm.txt -├── +++ HMI/US/landscape/n2t-out/cardAlarm.txt -│ @@ -902,18 +902,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardChart.txt -├── +++ HMI/US/landscape/n2t-out/cardChart.txt -│ @@ -635,18 +635,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardEntities.txt -├── +++ HMI/US/landscape/n2t-out/cardEntities.txt -│ @@ -1885,18 +1885,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/landscape/n2t-out/cardGrid.txt -│ @@ -870,18 +870,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardLChart.txt -├── +++ HMI/US/landscape/n2t-out/cardLChart.txt -│ @@ -616,18 +616,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/landscape/n2t-out/cardMedia.txt -│ @@ -1154,18 +1154,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardPower.txt -├── +++ HMI/US/landscape/n2t-out/cardPower.txt -│ @@ -35,27 +35,27 @@ -│ 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<54;sys0++) -│ + for(sys0=0;sys0<48;sys0++) -│ { -│ if(b[sys0].type==98||b[sys0].type==116) -│ { -│ b[sys0].bco=defaultBcoColor -│ b[sys0].pco=defaultFontColor -│ } -│ if(defaultBcoColor==0) -│ { -│ if(b[sys0].type==1) -│ { -│ - b[sys0].pic=21 -│ - b[sys0].pic1=21 -│ + b[sys0].pic=19 -│ + b[sys0].pic1=19 -│ b[sys0].pic2=15 -│ } -│ } -│ } -│ -│ Variable (string) nent1 -│ Attributes -│ @@ -69,15 +69,15 @@ -│ Text : -│ Max. Text Size: 80 -│ -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 1000 -│ + Max. Text Size: 275 -│ -│ Variable (int32) t0Speed -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ Variable (int32) t1Speed -│ @@ -135,24 +135,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text :  -│ Max. Text Size : 5 -│ -│ -Text t0o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t0u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -175,24 +165,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text :  -│ Max. Text Size : 5 -│ -│ -Text t1o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t1u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -205,24 +185,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : î ° -│ Max. Text Size : 5 -│ -│ -Text t2o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t2u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -235,24 +205,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : î ° -│ Max. Text Size : 5 -│ -│ -Text t3o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t3u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -265,24 +225,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : î´½ -│ Max. Text Size : 5 -│ -│ -Text t4o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t4u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -295,24 +245,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text :  -│ Max. Text Size : 5 -│ -│ -Text t5o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t5u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -535,85 +475,79 @@ -│ h0.val=h0.minval -│ } -│ if(sys0h1.maxval) -│ { -│ h1.val=h1.minval -│ } -│ if(sys0h2.maxval) -│ { -│ h2.val=h2.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,"~",33 -│ - // upper text -│ - spstr strCommand.txt,t0o.txt,"~",32 -│ + spstr strCommand.txt,t0u.txt,"~",25 -│ 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,"~",38 -│ + spstr strCommand.txt,tTmp.txt,"~",26 -│ covx tTmp.txt,t1Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t1Icon.txt,"~",37 -│ + spstr strCommand.txt,t1Icon.txt,"~",27 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",41 -│ + 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,"~",40 -│ - // upper text -│ - spstr strCommand.txt,t1o.txt,"~",39 -│ + spstr strCommand.txt,t1u.txt,"~",29 -│ 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,"~",45 -│ + spstr strCommand.txt,tTmp.txt,"~",30 -│ covx tTmp.txt,t2Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t2Icon.txt,"~",44 -│ + spstr strCommand.txt,t2Icon.txt,"~",31 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",48 -│ + 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,"~",47 -│ - // upper text -│ - spstr strCommand.txt,t2o.txt,"~",46 -│ + spstr strCommand.txt,t2u.txt,"~",33 -│ 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,"~",52 -│ + spstr strCommand.txt,tTmp.txt,"~",34 -│ covx tTmp.txt,t3Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t3Icon.txt,"~",51 -│ + spstr strCommand.txt,t3Icon.txt,"~",35 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",55 -│ + 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,"~",54 -│ - // upper text -│ - spstr strCommand.txt,t3o.txt,"~",53 -│ + spstr strCommand.txt,t3u.txt,"~",37 -│ 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,"~",59 -│ + spstr strCommand.txt,tTmp.txt,"~",38 -│ covx tTmp.txt,t4Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t4Icon.txt,"~",58 -│ + spstr strCommand.txt,t4Icon.txt,"~",39 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",62 -│ + 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,"~",61 -│ - // upper text -│ - spstr strCommand.txt,t4o.txt,"~",60 -│ + spstr strCommand.txt,t4u.txt,"~",41 -│ 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,"~",66 -│ + spstr strCommand.txt,tTmp.txt,"~",42 -│ covx tTmp.txt,t5Icon.pco,0,0 -│ // icon -│ - spstr strCommand.txt,t5Icon.txt,"~",65 -│ + spstr strCommand.txt,t5Icon.txt,"~",43 -│ // speed -│ - spstr strCommand.txt,tTmp.txt,"~",69 -│ + 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,"~",68 -│ - // upper text -│ - spstr strCommand.txt,t5o.txt,"~",67 -│ + spstr strCommand.txt,t5u.txt,"~",45 -│ if(t5Icon.txt!="") -│ { -│ vis t5Icon,1 -│ vis t5u,1 -│ vis h5,1 -│ }else -│ { -│ @@ -919,18 +845,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ @@ -969,14 +891,18 @@ -│ { -│ 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 -│ @@ -669,18 +669,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardThermo.txt -├── +++ HMI/US/landscape/n2t-out/cardThermo.txt -│ @@ -1071,18 +1071,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/pageStartup.txt -├── +++ HMI/US/landscape/n2t-out/pageStartup.txt -│ @@ -179,15 +179,15 @@ -│ Max. Text Size : 10 -│ -│ Events -│ Touch Press Event -│ recmod=1 -│ bauds=115200 -│ // startup event -│ - tSend.txt="event,startup,"+tVersion.txt+",eu" -│ + tSend.txt="event,startup,"+tVersion.txt+",us-l" -│ //send calc crc -│ btlen tSend.txt,sys0 -│ crcrest 1,0xffff // reset CRC -│ crcputh 55 bb -│ crcputs sys0,2 -│ crcputs tSend.txt,0 -│ //send cmd -│ @@ -320,18 +320,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/screensaver.txt -├── +++ HMI/US/landscape/n2t-out/screensaver.txt -│ @@ -29,17 +29,14 @@ -│ } -│ tDate.txt=pageIcons.vaDate.txt -│ dim=dimValue -│ vis tSend,0 -│ //page open event -│ // clear weather elements, to keep example content in HMI -│ -│ - Postinitialize Event -│ - click m0,1 -│ - -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 600 -│ -│ Variable (string) strTmp -│ @@ -103,35 +100,14 @@ -│ Value: 0 -│ -│ Variable (int32) ycR -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ -Text m0 -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 10 -│ - -│ - Events -│ - Touch Press Event -│ - tTmp.txt="change model conf to us-l/p " -│ - strlen tTmp.txt,sys1 -│ - sya1=sys1*11+m0.h-48/2 -│ - for(sys0=0;sys01) + { + bufferPos=0 + while(bufferPos-125&&xcR.val<125) + { + //tStatusNew.txt="x low, -> y" + // check if below minimum value (change is negative) + if(ycR.val<-80) + { + //tDirNew.txt="down" + tSend.txt="event,buttonPress2,screensaver,swipeDown" + }else if(ycR.val>80) + { + //tDirNew.txt="up" + tSend.txt="event,buttonPress2,screensaver,swipeUp" + }else + { + //tDirNew.txt="invalid" + } + // y difference between -125 and 125 (swipe on x-axis) + }else if(ycR.val>-125&&ycR.val<125) + { + //tStatusNew.txt="y low, -> x" + if(xcR.val<-80) + { + //tDirNew.txt="right" + tSend.txt="event,buttonPress2,screensaver,swipeRight" + }else if(xcR.val>80) + { + //tDirNew.txt="left" + tSend.txt="event,buttonPress2,screensaver,swipeLeft" + }else + { + //tDirNew.txt="invalid" + } + //diagonal swipe invalid + }else + { + //tStatusNew.txt="invalid" + //tDirNew.txt="diagonal" + } + } + //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 + diff --git a/HMI/US/landscape/n2t-out/screensaver2.txt b/HMI/US/landscape/n2t-out/screensaver2.txt new file mode 100644 index 00000000..0e920862 --- /dev/null +++ b/HMI/US/landscape/n2t-out/screensaver2.txt @@ -0,0 +1,978 @@ +Page screensaver2 + 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 + recmod=1 + baud=115200 + vis tInstruction,0 + vis tTmp,0 + vis p0,0 + vis tNotifyHead,0 + vis tNotifyText,0 + //load gloabl time string from pageIcons + //tTime.txt=vaTime.txt + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 + spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 + if(tAMPM.txt=="") + { + vis tAMPM,0 + } + tDate.txt=pageIcons.vaDate.txt + dim=dimValue + vis tSend,0 + //page open event + // clear weather elements, to keep example content in HMI + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 1979 + +Variable (string) strTmp + Attributes + Scope : local + Text : + Max. Text Size: 2 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 25 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (int32) vaTap + Attributes + Scope: local + Value: 0 + +Variable (int32) xc1 + Attributes + Scope: local + Value: 0 + +Variable (int32) xc2 + Attributes + Scope: local + Value: 0 + +Variable (int32) xcR + Attributes + Scope: local + Value: 0 + +Variable (int32) yc1 + Attributes + Scope: local + Value: 0 + +Variable (int32) yc2 + Attributes + Scope: local + Value: 0 + +Variable (int32) ycR + Attributes + Scope: local + Value: 0 + +Text d1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text d1Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text d2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text d2Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text d3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text d3Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e1Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e1Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e2Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e2Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e3Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e3Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e4Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e4Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e4Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e5Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e5Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e5Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e6Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e6Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e6Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text f1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text f2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text f3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text f4Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text f5Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text tAMPM + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : PM + Max. Text Size : 10 + +Text tDate + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : Thursday, 02.02 + Max. Text Size : 30 + +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tIcon2 + 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 + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +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 tNotifyHead + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 35 + +Text tNotifyText + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 120 + +Text tTime + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : 21:32 + Max. Text Size : 15 + +Text tTimeAdd + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Timer tm0 + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + if(tc0.val!=0) + { + xc2.val=tch0 + yc2.val=tch1 + } + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos-125&&xcR.val<125) + { + //tStatusNew.txt="x low, -> y" + // check if below minimum value (change is negative) + if(ycR.val<-80) + { + //tDirNew.txt="down" + tSend.txt="event,buttonPress2,screensaver,swipeDown" + }else if(ycR.val>80) + { + //tDirNew.txt="up" + tSend.txt="event,buttonPress2,screensaver,swipeUp" + }else + { + //tDirNew.txt="invalid" + } + // y difference between -125 and 125 (swipe on x-axis) + }else if(ycR.val>-125&&ycR.val<125) + { + //tStatusNew.txt="y low, -> x" + if(xcR.val<-80) + { + //tDirNew.txt="right" + tSend.txt="event,buttonPress2,screensaver,swipeRight" + }else if(xcR.val>80) + { + //tDirNew.txt="left" + tSend.txt="event,buttonPress2,screensaver,swipeLeft" + }else + { + //tDirNew.txt="invalid" + } + //diagonal swipe invalid + }else + { + //tStatusNew.txt="invalid" + //tDirNew.txt="diagonal" + } + } + //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 + diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 0600baa9..e69de29b 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,1731 +0,0 @@ ---- HMI/n2t-out -+++ HMI/US/portrait/n2t-out -├── file list -│ @@ -14,9 +14,8 @@ -│ popupFan.txt -│ popupInSel.txt -│ popupLight.txt -│ popupNotify.txt -│ popupShutter.txt -│ popupThermo.txt -│ popupTimer.txt -│ -screensaver.txt -│ -screensaver2.txt -│ +screensaver.txt -│ --- HMI/n2t-out/Program.s.txt -├── +++ HMI/US/portrait/n2t-out/Program.s.txt -│ @@ -10,10 +10,10 @@ -│ 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 -│ + // fix touch offset (Removed for US version) -│ + //lcd_dev fffb 0002 0000 0020 -│ page pageStartup -│ --- HMI/n2t-out/cardAlarm.txt -├── +++ HMI/US/portrait/n2t-out/cardAlarm.txt -│ @@ -902,18 +902,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardChart.txt -├── +++ HMI/US/portrait/n2t-out/cardChart.txt -│ @@ -635,18 +635,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardEntities.txt -├── +++ HMI/US/portrait/n2t-out/cardEntities.txt -│ @@ -61,16 +61,36 @@ -│ vis tIcon4,0 -│ vis tEntity4,0 -│ vis bText4,0 -│ vis hSlider4,0 -│ vis nNum4,0 -│ vis bPrev,0 -│ vis bNext,0 -│ + //ui e5 -│ + vis btOnOff5,0 -│ + vis bUp5,0 -│ + vis bStop5,0 -│ + vis bDown5,0 -│ + vis tIcon5,0 -│ + vis tEntity5,0 -│ + vis bText5,0 -│ + vis hSlider5,0 -│ + vis nNum5,0 -│ + //ui e6 -│ + vis btOnOff6,0 -│ + vis bUp6,0 -│ + vis bStop6,0 -│ + vis bDown6,0 -│ + vis tIcon6,0 -│ + vis tEntity6,0 -│ + vis bText6,0 -│ + vis hSlider6,0 -│ + vis nNum6,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) -│ @@ -86,45 +106,57 @@ -│ } -│ } -│ -│ Variable (string) entn1 -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 80 -│ + Max. Text Size: 65 -│ -│ Variable (string) entn2 -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 80 -│ + Max. Text Size: 65 -│ -│ Variable (string) entn3 -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 80 -│ + Max. Text Size: 65 -│ -│ Variable (string) entn4 -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 80 -│ + Max. Text Size: 65 -│ + -│ +Variable (string) entn5 -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 65 -│ + -│ +Variable (string) entn6 -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 65 -│ -│ Variable (string) nent1 -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 80 -│ + Max. Text Size: 40 -│ -│ Variable (string) nent2 -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 80 -│ + Max. Text Size: 40 -│ -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 500 -│ -│ @@ -154,14 +186,26 @@ -│ -│ Variable (string) type4 -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 10 -│ -│ +Variable (string) type5 -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 10 -│ + -│ +Variable (string) type6 -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 10 -│ + -│ Number nNum1 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -190,14 +234,32 @@ -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Value : 0 -│ -│ +Number nNum5 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Value : 0 -│ + -│ +Number nNum6 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Value : 0 -│ + -│ Text tEntity1 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -230,14 +292,34 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : tEntity4 -│ Max. Text Size : 30 -│ -│ +Text tEntity5 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : tEntity5 -│ + Max. Text Size : 30 -│ + -│ +Text tEntity6 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text : tEntity5 -│ + Max. Text Size : 30 -│ + -│ Text tHeading -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -280,14 +362,34 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text :  -│ Max. Text Size : 5 -│ -│ +Text tIcon5 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 5 -│ + -│ +Text tIcon6 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Associated Keyboard : none -│ + Text :  -│ + Max. Text Size : 5 -│ + -│ Text tId -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -429,14 +531,70 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Slider hSlider5 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Position : 50 -│ + Upper range limit : 100 -│ + Lower range limit : 0 -│ + -│ + Events -│ + Touch Release Event -│ + nNum5.val=hSlider5.val -│ + tSend.txt="event,buttonPress2,"+entn5.txt+",number-set," -│ + covx nNum5.val,tTmp.txt,0,0 -│ + tSend.txt+=tTmp.txt -│ + //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 -│ + -│ +Slider hSlider6 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + Position : 50 -│ + Upper range limit : 100 -│ + Lower range limit : 0 -│ + -│ + Events -│ + Touch Release Event -│ + nNum5.val=hSlider5.val -│ + tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," -│ + covx nNum5.val,tTmp.txt,0,0 -│ + tSend.txt+=tTmp.txt -│ + //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 bDown1 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ @@ -529,14 +687,64 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Button bDown5 -│ + 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,"+entn5.txt+",down" -│ + //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 bDown6 -│ + 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,"+entn6.txt+",down" -│ + //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 bNext -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ @@ -679,14 +887,64 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Button bStop5 -│ + 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,"+entn5.txt+",stop" -│ + //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 bStop6 -│ + 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,"+entn6.txt+",stop" -│ + //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 bText1 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ @@ -779,14 +1037,64 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Button bText5 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + State : unpressed -│ + Text : -│ + Max. Text Size : 45 -│ + -│ + Events -│ + Touch Press Event -│ + tSend.txt="event,buttonPress2,"+entn5.txt+",button" -│ + //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 bText6 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + State : unpressed -│ + Text : -│ + Max. Text Size : 45 -│ + -│ + Events -│ + Touch Press Event -│ + tSend.txt="event,buttonPress2,"+entn6.txt+",button" -│ + //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 bUp1 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ @@ -879,14 +1187,64 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Button bUp5 -│ + 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,"+entn5.txt+",up" -│ + //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 bUp6 -│ + 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,"+entn6.txt+",up" -│ + //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 -│ + -│ Dual-state Button btOnOff1 -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ State : unpressed -│ @@ -987,14 +1345,68 @@ -│ crcputs tSend.txt,0 -│ //send cmd -│ printh 55 bb -│ prints sys0,2 -│ prints tSend.txt,0 -│ prints crcval,2 -│ -│ +Dual-state Button btOnOff5 -│ + 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,"+entn5.txt+",OnOff," -│ + covx btOnOff5.val,tTmp.txt,0,0 -│ + tSend.txt+=tTmp.txt -│ + //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 -│ + -│ +Dual-state Button btOnOff6 -│ + 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,"+entn6.txt+",OnOff," -│ + covx btOnOff5.val,tTmp.txt,0,0 -│ + tSend.txt+=tTmp.txt -│ + //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 -│ -│ @@ -1127,14 +1539,84 @@ -│ page popupInSel -│ } -│ if(type4.txt=="timer") -│ { -│ page popupTimer -│ } -│ -│ +Hotspot m4 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + -│ + Events -│ + Touch Press Event -│ + pageIcons.tTmp1.txt=tEntity5.txt -│ + pageIcons.tTmp2.txt=entn5.txt -│ + pageIcons.tTmp3.txt=tIcon5.txt -│ + if(type5.txt=="shutter") -│ + { -│ + //popupShutter.tHeading.txt=tEntity5.txt -│ + page popupShutter -│ + } -│ + if(type5.txt=="light") -│ + { -│ + //popupLight.tEntity.txt=tEntity5.txt -│ + page popupLight -│ + } -│ + if(type5.txt=="fan") -│ + { -│ + page popupFan -│ + } -│ + if(type5.txt=="input_sel") -│ + { -│ + page popupInSel -│ + } -│ + if(type5.txt=="timer") -│ + { -│ + page popupTimer -│ + } -│ + -│ +Hotspot m5 -│ + Attributes -│ + Scope : local -│ + Dragging : 0 -│ + Disable release event after dragging: 0 -│ + Send Component ID : disabled -│ + -│ + Events -│ + Touch Press Event -│ + pageIcons.tTmp1.txt=tEntity6.txt -│ + pageIcons.tTmp2.txt=entn6.txt -│ + pageIcons.tTmp3.txt=tIcon6.txt -│ + if(type6.txt=="shutter") -│ + { -│ + //popupShutter.tHeading.txt=tEntity5.txt -│ + page popupShutter -│ + } -│ + if(type6.txt=="light") -│ + { -│ + //popupLight.tEntity.txt=tEntity5.txt -│ + page popupLight -│ + } -│ + if(type6.txt=="fan") -│ + { -│ + page popupFan -│ + } -│ + if(type6.txt=="input_sel") -│ + { -│ + page popupInSel -│ + } -│ + if(type6.txt=="timer") -│ + { -│ + page popupTimer -│ + } -│ + -│ Hotspot mSpecial -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ -│ @@ -1862,14 +2344,312 @@ -│ covx tTmp.txt,sys0,0,0 -│ hSlider4.minval=sys0 -│ //third value is max value -│ spstr bText4.txt,tTmp.txt,"|",2 -│ covx tTmp.txt,sys0,0,0 -│ hSlider4.maxval=sys0 -│ } -│ + // get Type -│ + spstr strCommand.txt,type5.txt,"~",38 -│ + // get internal name -│ + spstr strCommand.txt,entn5.txt,"~",39 -│ + if(type5.txt=="delete"||type5.txt=="") -│ + { -│ + vis bUp5,0 -│ + vis bStop5,0 -│ + vis bDown5,0 -│ + vis btOnOff5,0 -│ + vis tEntity5,0 -│ + vis tIcon5,0 -│ + vis bText5,0 -│ + vis hSlider5,0 -│ + vis nNum5,0 -│ + }else -│ + { -│ + // change icon -│ + spstr strCommand.txt,tIcon5.txt,"~",40 -│ + vis tIcon5,1 -│ + // change icon color -│ + spstr strCommand.txt,tTmp.txt,"~",41 -│ + covx tTmp.txt,sys0,0,0 -│ + tIcon5.pco=sys0 -│ + // set name -│ + spstr strCommand.txt,tEntity5.txt,"~",42 -│ + vis tEntity5,1 -│ + } -│ + if(type5.txt=="shutter") -│ + { -│ + vis bUp5,1 -│ + vis bStop5,1 -│ + vis bDown5,1 -│ + vis btOnOff5,0 -│ + vis bText5,0 -│ + vis hSlider5,0 -│ + vis nNum5,0 -│ + // get Button State (optional Value) -│ + spstr strCommand.txt,tId.txt,"~",43 -│ + // up button -│ + spstr tId.txt,tTmp.txt,"|",3 -│ + if(tTmp.txt=="disable") -│ + { -│ + bUp5.pco=27501 -│ + spstr tId.txt,bUp5.txt,"|",0 -│ + tsw bUp5,0 -│ + }else if(tTmp.txt=="enable") -│ + { -│ + bUp5.pco=65535 -│ + spstr tId.txt,bUp5.txt,"|",0 -│ + tsw bUp5,1 -│ + } -│ + // stop button -│ + spstr tId.txt,tTmp.txt,"|",4 -│ + if(tTmp.txt=="disable") -│ + { -│ + bStop5.pco=27501 -│ + spstr tId.txt,bStop5.txt,"|",1 -│ + tsw bStop5,0 -│ + }else if(tTmp.txt=="enable") -│ + { -│ + bStop5.pco=65535 -│ + spstr tId.txt,bStop5.txt,"|",1 -│ + tsw bStop5,1 -│ + } -│ + // down button -│ + spstr tId.txt,tTmp.txt,"|",5 -│ + if(tTmp.txt=="disable") -│ + { -│ + bDown5.pco=27501 -│ + spstr tId.txt,bDown5.txt,"|",2 -│ + tsw bDown5,0 -│ + }else if(tTmp.txt=="enable") -│ + { -│ + bDown5.pco=65535 -│ + spstr tId.txt,bDown5.txt,"|",2 -│ + tsw bDown5,1 -│ + } -│ + } -│ + if(type5.txt=="light"||type5.txt=="switch"||type5.txt=="fan") -│ + { -│ + vis bUp5,0 -│ + vis bStop5,0 -│ + vis bDown5,0 -│ + vis btOnOff5,1 -│ + vis bText5,0 -│ + vis hSlider5,0 -│ + vis nNum5,0 -│ + // get Button State (optional Value) -│ + spstr strCommand.txt,tTmp.txt,"~",43 -│ + covx tTmp.txt,sys0,0,0 -│ + btOnOff5.val=sys0 -│ + } -│ + if(type5.txt=="text"||type5.txt=="timer") -│ + { -│ + vis bUp5,0 -│ + vis bStop5,0 -│ + vis bDown5,0 -│ + vis btOnOff5,0 -│ + vis bText5,1 -│ + tsw bText5,0 -│ + vis hSlider5,0 -│ + vis nNum5,0 -│ + bText5.pco=65535 -│ + bText5.pco2=65535 -│ + // get Text (optional Value) -│ + spstr strCommand.txt,bText5.txt,"~",43 -│ + } -│ + if(type5.txt=="button"||type5.txt=="input_sel") -│ + { -│ + vis bUp5,0 -│ + vis bStop5,0 -│ + vis bDown5,0 -│ + vis btOnOff5,0 -│ + vis bText5,1 -│ + tsw bText5,1 -│ + vis hSlider5,0 -│ + vis nNum5,0 -│ + bText5.pco=1374 -│ + bText5.pco2=1374 -│ + // get Text (optional Value) -│ + spstr strCommand.txt,bText5.txt,"~",43 -│ + } -│ + if(type5.txt=="number") -│ + { -│ + vis bUp5,0 -│ + vis bStop5,0 -│ + vis bDown5,0 -│ + vis btOnOff5,0 -│ + vis bText5,0 -│ + tsw bText5,0 -│ + vis hSlider5,1 -│ + vis nNum5,1 -│ + // get config (optional Value) (use bText as variable) -│ + spstr strCommand.txt,bText5.txt,"~",43 -│ + //first value is current value -│ + spstr bText5.txt,tTmp.txt,"|",0 -│ + covx tTmp.txt,sys0,0,0 -│ + hSlider5.val=sys0 -│ + nNum5.val=sys0 -│ + //second value is min value -│ + spstr bText5.txt,tTmp.txt,"|",1 -│ + covx tTmp.txt,sys0,0,0 -│ + hSlider5.minval=sys0 -│ + //third value is max value -│ + spstr bText5.txt,tTmp.txt,"|",2 -│ + covx tTmp.txt,sys0,0,0 -│ + hSlider5.maxval=sys0 -│ + } -│ + // get Type -│ + spstr strCommand.txt,type6.txt,"~",44 -│ + // get internal name -│ + spstr strCommand.txt,entn6.txt,"~",45 -│ + if(type6.txt=="delete"||type6.txt=="") -│ + { -│ + vis bUp6,0 -│ + vis bStop6,0 -│ + vis bDown6,0 -│ + vis btOnOff6,0 -│ + vis tEntity6,0 -│ + vis tIcon6,0 -│ + vis bText6,0 -│ + vis hSlider6,0 -│ + vis nNum6,0 -│ + }else -│ + { -│ + // change icon -│ + spstr strCommand.txt,tIcon6.txt,"~",46 -│ + vis tIcon6,1 -│ + // change icon color -│ + spstr strCommand.txt,tTmp.txt,"~",47 -│ + covx tTmp.txt,sys0,0,0 -│ + tIcon6.pco=sys0 -│ + // set name -│ + spstr strCommand.txt,tEntity6.txt,"~",48 -│ + vis tEntity6,1 -│ + } -│ + if(type6.txt=="shutter") -│ + { -│ + vis bUp6,1 -│ + vis bStop6,1 -│ + vis bDown6,1 -│ + vis btOnOff6,0 -│ + vis bText6,0 -│ + vis hSlider6,0 -│ + vis nNum6,0 -│ + // get Button State (optional Value) -│ + spstr strCommand.txt,tId.txt,"~",49 -│ + // up button -│ + spstr tId.txt,tTmp.txt,"|",3 -│ + if(tTmp.txt=="disable") -│ + { -│ + bUp6.pco=27501 -│ + spstr tId.txt,bUp6.txt,"|",0 -│ + tsw bUp6,0 -│ + }else if(tTmp.txt=="enable") -│ + { -│ + bUp6.pco=65535 -│ + spstr tId.txt,bUp6.txt,"|",0 -│ + tsw bUp6,1 -│ + } -│ + // stop button -│ + spstr tId.txt,tTmp.txt,"|",4 -│ + if(tTmp.txt=="disable") -│ + { -│ + bStop6.pco=27501 -│ + spstr tId.txt,bStop6.txt,"|",1 -│ + tsw bStop6,0 -│ + }else if(tTmp.txt=="enable") -│ + { -│ + bStop6.pco=65535 -│ + spstr tId.txt,bStop6.txt,"|",1 -│ + tsw bStop6,1 -│ + } -│ + // down button -│ + spstr tId.txt,tTmp.txt,"|",5 -│ + if(tTmp.txt=="disable") -│ + { -│ + bDown6.pco=27501 -│ + spstr tId.txt,bDown6.txt,"|",2 -│ + tsw bDown6,0 -│ + }else if(tTmp.txt=="enable") -│ + { -│ + bDown6.pco=65535 -│ + spstr tId.txt,bDown6.txt,"|",2 -│ + tsw bDown6,1 -│ + } -│ + } -│ + if(type6.txt=="light"||type6.txt=="switch"||type6.txt=="fan") -│ + { -│ + vis bUp6,0 -│ + vis bStop6,0 -│ + vis bDown6,0 -│ + vis btOnOff6,1 -│ + vis bText6,0 -│ + vis hSlider6,0 -│ + vis nNum6,0 -│ + // get Button State (optional Value) -│ + spstr strCommand.txt,tTmp.txt,"~",49 -│ + covx tTmp.txt,sys0,0,0 -│ + btOnOff6.val=sys0 -│ + } -│ + if(type6.txt=="text"||type6.txt=="timer") -│ + { -│ + vis bUp6,0 -│ + vis bStop6,0 -│ + vis bDown6,0 -│ + vis btOnOff6,0 -│ + vis bText6,1 -│ + tsw bText6,0 -│ + vis hSlider6,0 -│ + vis nNum6,0 -│ + bText6.pco=65535 -│ + bText6.pco2=65535 -│ + // get Text (optional Value) -│ + spstr strCommand.txt,bText6.txt,"~",49 -│ + } -│ + if(type6.txt=="button"||type6.txt=="input_sel") -│ + { -│ + vis bUp6,0 -│ + vis bStop6,0 -│ + vis bDown6,0 -│ + vis btOnOff6,0 -│ + vis bText6,1 -│ + tsw bText6,1 -│ + vis hSlider6,0 -│ + vis nNum6,0 -│ + bText6.pco=1374 -│ + bText6.pco2=1374 -│ + // get Text (optional Value) -│ + spstr strCommand.txt,bText6.txt,"~",49 -│ + } -│ + if(type6.txt=="number") -│ + { -│ + vis bUp6,0 -│ + vis bStop6,0 -│ + vis bDown6,0 -│ + vis btOnOff6,0 -│ + vis bText6,0 -│ + tsw bText6,0 -│ + vis hSlider6,1 -│ + vis nNum6,1 -│ + // get config (optional Value) (use bText as variable) -│ + spstr strCommand.txt,bText6.txt,"~",49 -│ + //first value is current value -│ + spstr bText6.txt,tTmp.txt,"|",0 -│ + covx tTmp.txt,sys0,0,0 -│ + hSlider6.val=sys0 -│ + nNum6.val=sys0 -│ + //second value is min value -│ + spstr bText6.txt,tTmp.txt,"|",1 -│ + covx tTmp.txt,sys0,0,0 -│ + hSlider6.minval=sys0 -│ + //third value is max value -│ + spstr bText6.txt,tTmp.txt,"|",2 -│ + covx tTmp.txt,sys0,0,0 -│ + hSlider6.maxval=sys0 -│ + } -│ } -│ if(tInstruction.txt=="pageType") -│ { -│ sleepValue=0 -│ //command format pageType,specialPageName -│ //write name of speical page to tId -│ spstr strCommand.txt,tId.txt,"~",1 -│ @@ -1885,18 +2665,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardGrid.txt -├── +++ HMI/US/portrait/n2t-out/cardGrid.txt -│ @@ -870,18 +870,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardLChart.txt -├── +++ HMI/US/portrait/n2t-out/cardLChart.txt -│ @@ -616,18 +616,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardMedia.txt -├── +++ HMI/US/portrait/n2t-out/cardMedia.txt -│ @@ -1154,18 +1154,14 @@ -│ { -│ page pageStartup -│ } -│ if(tId.txt=="screensaver") -│ { -│ page screensaver -│ } -│ - if(tId.txt=="screensaver2") -│ - { -│ - page screensaver2 -│ - } -│ if(tId.txt=="cardEntities") -│ { -│ page cardEntities -│ } -│ if(tId.txt=="cardGrid") -│ { -│ page cardGrid -│ --- HMI/n2t-out/cardPower.txt -├── +++ HMI/US/portrait/n2t-out/cardPower.txt -│ @@ -35,27 +35,27 @@ -│ 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<54;sys0++) -│ + for(sys0=0;sys0<48;sys0++) -│ { -│ if(b[sys0].type==98||b[sys0].type==116) -│ { -│ b[sys0].bco=defaultBcoColor -│ b[sys0].pco=defaultFontColor -│ } -│ if(defaultBcoColor==0) -│ { -│ if(b[sys0].type==1) -│ { -│ - b[sys0].pic=21 -│ - b[sys0].pic1=21 -│ + b[sys0].pic=19 -│ + b[sys0].pic1=19 -│ b[sys0].pic2=15 -│ } -│ } -│ } -│ -│ Variable (string) nent1 -│ Attributes -│ @@ -69,46 +69,82 @@ -│ Text : -│ Max. Text Size: 80 -│ -│ Variable (string) strCommand -│ Attributes -│ Scope : local -│ Text : -│ - Max. Text Size: 1000 -│ + Max. Text Size: 275 -│ -│ Variable (int32) t0Speed -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ +Variable (string) t0o -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 1 -│ + -│ Variable (int32) t1Speed -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ +Variable (string) t1o -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 1 -│ + -│ Variable (int32) t2Speed -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ +Variable (string) t2o -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 1 -│ + -│ Variable (int32) t3Speed -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ +Variable (string) t3o -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 1 -│ + -│ Variable (int32) t4Speed -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ +Variable (string) t4o -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 1 -│ + -│ Variable (int32) t5Speed -│ Attributes -│ Scope: local -│ Value: 0 -│ -│ +Variable (string) t5o -│ + Attributes -│ + Scope : local -│ + Text : -│ + Max. Text Size: 1 -│ + -│ Variable (string) tId -│ Attributes -│ Scope : local -│ Text : -│ Max. Text Size: 20 -│ -│ Variable (string) tInstruction -│ @@ -135,24 +171,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text :  -│ Max. Text Size : 5 -│ -│ -Text t0o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t0u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -175,24 +201,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text :  -│ Max. Text Size : 5 -│ -│ -Text t1o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t1u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -205,24 +221,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : î ° -│ Max. Text Size : 5 -│ -│ -Text t2o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t2u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -235,24 +241,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : î ° -│ Max. Text Size : 5 -│ -│ -Text t3o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t3u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -265,24 +261,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text : î´½ -│ Max. Text Size : 5 -│ -│ -Text t4o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t4u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -295,24 +281,14 @@ -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ Text :  -│ Max. Text Size : 5 -│ -│ -Text t5o -│ - Attributes -│ - Scope : local -│ - Dragging : 0 -│ - Disable release event after dragging: 0 -│ - Send Component ID : disabled -│ - Associated Keyboard : none -│ - Text : -│ - Max. Text Size : 20 -│ - -│ Text t5u -│ Attributes -│ Scope : local -│ Dragging : 0 -│ Disable release event after dragging: 0 -│ Send Component ID : disabled -│ Associated Keyboard : none -│ @@ -535,85 +511,79 @@ -│ h0.val=h0.minval -│ } -│ if(sys0h1.maxval) -│ { -│ h1.val=h1.minval -│ } -│ if(sys0h2.maxval) -│ { -│ h2.val=h2.minval -│ } -│ if(sys0h3.maxval) -│ { -│ h3.val=h3.minval -│ } -│ if(sys0h4.maxval) -│ { -│ h4.val=h4.minval -│ } -│ if(sys0h5.maxval) -│ { -│ h5.val=h5.minval -│ } -│ if(sys0h1.maxval) -+ { -+ h1.val=h1.minval -+ } -+ if(sys0h2.maxval) -+ { -+ h2.val=h2.minval -+ } -+ if(sys0h3.maxval) -+ { -+ h3.val=h3.minval -+ } -+ if(sys0h4.maxval) -+ { -+ h4.val=h4.minval -+ } -+ if(sys0h5.maxval) -+ { -+ h5.val=h5.minval -+ } -+ if(sys01) + { + bufferPos=0 + while(bufferPos-125&&xcR.val<125) + { + //tStatusNew.txt="x low, -> y" + // check if below minimum value (change is negative) + if(ycR.val<-80) + { + //tDirNew.txt="down" + tSend.txt="event,buttonPress2,screensaver,swipeDown" + }else if(ycR.val>80) + { + //tDirNew.txt="up" + tSend.txt="event,buttonPress2,screensaver,swipeUp" + }else + { + //tDirNew.txt="invalid" + } + // y difference between -125 and 125 (swipe on x-axis) + }else if(ycR.val>-125&&ycR.val<125) + { + //tStatusNew.txt="y low, -> x" + if(xcR.val<-80) + { + //tDirNew.txt="right" + tSend.txt="event,buttonPress2,screensaver,swipeRight" + }else if(xcR.val>80) + { + //tDirNew.txt="left" + tSend.txt="event,buttonPress2,screensaver,swipeLeft" + }else + { + //tDirNew.txt="invalid" + } + //diagonal swipe invalid + }else + { + //tStatusNew.txt="invalid" + //tDirNew.txt="diagonal" + } + } + //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 + diff --git a/HMI/US/portrait/n2t-out/screensaver2.txt b/HMI/US/portrait/n2t-out/screensaver2.txt new file mode 100644 index 00000000..0e920862 --- /dev/null +++ b/HMI/US/portrait/n2t-out/screensaver2.txt @@ -0,0 +1,978 @@ +Page screensaver2 + 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 + recmod=1 + baud=115200 + vis tInstruction,0 + vis tTmp,0 + vis p0,0 + vis tNotifyHead,0 + vis tNotifyText,0 + //load gloabl time string from pageIcons + //tTime.txt=vaTime.txt + spstr pageIcons.vaTime.txt,tTime.txt,"?",0 + spstr pageIcons.vaTime.txt,tAMPM.txt,"?",1 + if(tAMPM.txt=="") + { + vis tAMPM,0 + } + tDate.txt=pageIcons.vaDate.txt + dim=dimValue + vis tSend,0 + //page open event + // clear weather elements, to keep example content in HMI + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 1979 + +Variable (string) strTmp + Attributes + Scope : local + Text : + Max. Text Size: 2 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 25 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 50 + +Variable (int32) vaTap + Attributes + Scope: local + Value: 0 + +Variable (int32) xc1 + Attributes + Scope: local + Value: 0 + +Variable (int32) xc2 + Attributes + Scope: local + Value: 0 + +Variable (int32) xcR + Attributes + Scope: local + Value: 0 + +Variable (int32) yc1 + Attributes + Scope: local + Value: 0 + +Variable (int32) yc2 + Attributes + Scope: local + Value: 0 + +Variable (int32) ycR + Attributes + Scope: local + Value: 0 + +Text d1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text d1Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text d2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text d2Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text d3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text d3Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e1Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e1Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e2Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e2Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e3Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e3Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e4Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e4Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e4Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e5Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e5Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e5Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e6Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text e6Name + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text e6Val + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text f1Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text f2Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text f3Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text f4Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text f5Icon + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +Text tAMPM + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : PM + Max. Text Size : 10 + +Text tDate + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : Thursday, 02.02 + Max. Text Size : 30 + +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tIcon2 + 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 + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 4 + +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 tNotifyHead + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 35 + +Text tNotifyText + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 120 + +Text tTime + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : 21:32 + Max. Text Size : 15 + +Text tTimeAdd + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Timer tm0 + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + if(tc0.val!=0) + { + xc2.val=tch0 + yc2.val=tch1 + } + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPos-125&&xcR.val<125) + { + //tStatusNew.txt="x low, -> y" + // check if below minimum value (change is negative) + if(ycR.val<-80) + { + //tDirNew.txt="down" + tSend.txt="event,buttonPress2,screensaver,swipeDown" + }else if(ycR.val>80) + { + //tDirNew.txt="up" + tSend.txt="event,buttonPress2,screensaver,swipeUp" + }else + { + //tDirNew.txt="invalid" + } + // y difference between -125 and 125 (swipe on x-axis) + }else if(ycR.val>-125&&ycR.val<125) + { + //tStatusNew.txt="y low, -> x" + if(xcR.val<-80) + { + //tDirNew.txt="right" + tSend.txt="event,buttonPress2,screensaver,swipeRight" + }else if(xcR.val>80) + { + //tDirNew.txt="left" + tSend.txt="event,buttonPress2,screensaver,swipeLeft" + }else + { + //tDirNew.txt="invalid" + } + //diagonal swipe invalid + }else + { + //tStatusNew.txt="invalid" + //tDirNew.txt="diagonal" + } + } + //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 +