diff --git a/.github/workflows/nextion2text.yml b/.github/workflows/nextion2text.yml index aee6eebd..e43b3111 100644 --- a/.github/workflows/nextion2text.yml +++ b/.github/workflows/nextion2text.yml @@ -37,12 +37,12 @@ jobs: continue-on-error: true run: | python Nextion2Text.py -s -d -p -p visual -i HMI/nspanel.HMI -o HMI/n2t-out-visual - python Nextion2Text.py -s -d -i HMI/nspanel.HMI -o HMI/n2t-out + python Nextion2Text.py -d -i HMI/nspanel.HMI -o HMI/n2t-out - name: Run n2t US continue-on-error: true run: | - python Nextion2Text.py -s -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out + python Nextion2Text.py -d -i HMI/US/portrait/nspanel_US_P.HMI -o HMI/US/portrait/n2t-out diff -bur HMI/n2t-out HMI/US/portrait/n2t-out > HMI/US/portrait/diff-eu-version.txt - uses: stefanzweifel/git-auto-commit-action@v4 diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index b217e769..460ae9da 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,22 +1,524 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-03-29 07:50:32.340739774 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 07:50:32.748740333 +0000 -@@ -10,6 +10,6 @@ +--- HMI/n2t-out/Program.s.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -5,11 +5,24 @@ + int recvCrc=0 + int payloadLength=0 + int par0=0,par1=0 ++ // landsspace orientation x has 480px and y has 320px xy limits todo: adjust xy values to something that fit's resulution ++ //Maximum values in directional change for Swipes beeing detected as swipe (diagonal swipes are invalid) (for one axis at a time) ++ int xLimit=125,yLimit=125 ++ int ixLimit=-125,iyLimit=-125 ++ //Minimum values for swipes, directional changes below theese values are ignored, because they could be unintended swipes ++ int xLimitMin=60,yLimitMin=60 ++ int ixLimitMin=-60,iyLimitMin=-60 ++ // Swipe Result Vars ++ int ycR=0,xcR=0 ++ // Start End Swipe Touch Locations ++ int yc1=0,xc1=0,yc2=0,xc2=0 + // sleep timeout in s + int sleepTimeout=20 int sleepValue=0 // dim value int dimValue=40 - // fix touch offset - lcd_dev fffb 0002 0000 0020 ++ // current page ++ int nPage=0 + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup -diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt ---- HMI/n2t-out/cardEntities.txt 2022-03-29 07:50:32.340739774 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 07:50:32.752740338 +0000 -@@ -123,6 +123,34 @@ +diff -bur HMI/n2t-out/cardAlarm.txt HMI/US/portrait/n2t-out/cardAlarm.txt +--- HMI/n2t-out/cardAlarm.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/cardAlarm.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -16,6 +16,7 @@ + vis p0,0 + vis tSend,0 + vis tInstruction,0 ++ vis nPageDisp,0 + vis tTmp,0 + vis tId,0 + //vis nPageDisp,0 +@@ -38,53 +39,63 @@ + + Variable (string) strCommand + Attributes +- ID : 6 ++ ID : 7 + Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 200 + Variable (string) entn + Attributes +- ID : 9 ++ ID : 10 + Scope : local + Text : + Max. Text Size: 50 + + Variable (string) tSend + Attributes +- ID : 25 ++ ID : 26 + Scope : local + Text : + Max. Text Size: 100 + + Variable (string) va1 + Attributes +- ID : 30 ++ ID : 31 + Scope : local + Text : + Max. Text Size: 20 + + Variable (string) va2 + Attributes +- ID : 31 ++ ID : 32 + Scope : local + Text : + Max. Text Size: 20 + + Variable (string) va3 + Attributes +- ID : 32 ++ ID : 33 + Scope : local + Text : + Max. Text Size: 20 + + Variable (string) va4 + Attributes +- ID : 33 ++ ID : 34 + Scope : local + Text : + Max. Text Size: 20 + ++Number nPageDisp ++ Attributes ++ ID : 5 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Value : 0 ++ + Text tTmp + Attributes + ID : 2 +@@ -98,7 +109,7 @@ + + Text tInstruction + Attributes +- ID : 7 ++ ID : 8 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -109,7 +120,7 @@ + + Text tId + Attributes +- ID : 8 ++ ID : 9 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -120,7 +131,7 @@ + + Text tCode + Attributes +- ID : 23 ++ ID : 24 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -131,13 +142,13 @@ + + Text tIcon + Attributes +- ID : 26 ++ ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : ++ Text :  + Max. Text Size : 10 + + Picture p0 +@@ -161,7 +172,14 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardAlarm,bNext" ++ nPage=nPage+1 ++ nPageDisp.val=nPage ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -187,7 +205,14 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardAlarm,bPrev" ++ nPage=nPage-1 ++ nPageDisp.val=nPage ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -202,7 +227,7 @@ + + Button b0 + Attributes +- ID : 12 ++ ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -217,7 +242,7 @@ + + Button b1 + Attributes +- ID : 13 ++ ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -232,7 +257,7 @@ + + Button b2 + Attributes +- ID : 14 ++ ID : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -247,7 +272,7 @@ + + Button b3 + Attributes +- ID : 15 ++ ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -262,7 +287,7 @@ + + Button b4 + Attributes +- ID : 16 ++ ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -277,7 +302,7 @@ + + Button b5 + Attributes +- ID : 17 ++ ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -292,7 +317,7 @@ + + Button b6 + Attributes +- ID : 18 ++ ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -307,7 +332,7 @@ + + Button b7 + Attributes +- ID : 19 ++ ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -322,7 +347,7 @@ + + Button b8 + Attributes +- ID : 20 ++ ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -337,7 +362,7 @@ + + Button b9 + Attributes +- ID : 21 ++ ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -352,13 +377,13 @@ + + Button b10 + Attributes +- ID : 22 ++ ID : 23 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed +- Text : CLR ++ Text : CLEAR + Max. Text Size : 10 + + Events +@@ -367,14 +392,14 @@ + + Button arm1 + Attributes +- ID : 24 ++ ID : 25 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : +- Max. Text Size : 40 ++ Max. Text Size : 10 + + Events + Touch Press Event +@@ -394,18 +419,17 @@ + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 +- tCode.txt="" + + Button arm3 + Attributes +- ID : 27 ++ ID : 28 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : +- Max. Text Size : 40 ++ Max. Text Size : 10 + + Events + Touch Press Event +@@ -425,18 +449,17 @@ + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 +- tCode.txt="" + + Button arm2 + Attributes +- ID : 28 ++ ID : 29 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : +- Max. Text Size : 40 ++ Max. Text Size : 10 + + Events + Touch Press Event +@@ -456,18 +479,17 @@ + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 +- tCode.txt="" + + Button arm4 + Attributes +- ID : 29 ++ ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : +- Max. Text Size : 40 ++ Max. Text Size : 10 + + Events + Touch Press Event +@@ -487,11 +509,10 @@ + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 +- tCode.txt="" + + Timer tmSerial + Attributes +- ID : 5 ++ ID : 6 + Scope : local + Period (ms): 50 + Enabled : yes +@@ -581,12 +602,8 @@ + spstr strCommand.txt,tTmp.txt,",",10 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 +- //icon color +- spstr strCommand.txt,tTmp.txt,",",11 +- covx tTmp.txt,sys0,0,0 +- tIcon.pco=sys0 + //numpad status +- spstr strCommand.txt,tTmp.txt,",",12 ++ spstr strCommand.txt,tTmp.txt,",",11 + if(tTmp.txt!="disable") + { + vis b0,1 +@@ -602,15 +619,6 @@ + vis b10,1 + vis tCode,1 + } +- //flashing status +- spstr strCommand.txt,tTmp.txt,",",13 +- if(tTmp.txt=="enable") +- { +- tmFlash.en=1 +- }else +- { +- tmFlash.en=0 +- } + } + if(tInstruction.txt=="time") + { +@@ -691,7 +699,7 @@ + + Timer tmSleep + Attributes +- ID : 10 ++ ID : 11 + Scope : local + Period (ms): 1000 + Enabled : yes +@@ -709,28 +717,9 @@ + } + } + +-Timer tmFlash +- Attributes +- ID : 34 +- Scope : local +- Period (ms): 600 +- Enabled : no +- +- Events +- Timer Event +- if(tIcon.isbr==1) +- { +- tIcon.isbr=0 +- vis tIcon,0 +- }else +- { +- tIcon.isbr=1 +- vis tIcon,1 +- } +- + TouchCap tc0 + Attributes +- ID : 11 ++ ID : 12 + Scope: local + Value: 0 + +diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt +--- HMI/n2t-out/cardEntities.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -31,7 +31,6 @@ + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 +- vis hSlider1,0 + //ui e2 + vis btOnOff2,0 + vis bUp2,0 +@@ -40,7 +39,6 @@ + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 +- vis hSlider2,0 + //ui e3 + vis btOnOff3,0 + vis bUp3,0 +@@ -49,7 +47,6 @@ + vis tIcon3,0 + vis tEntity3,0 + vis bText3,0 +- vis hSlider3,0 + //ui e4 + vis btOnOff4,0 + vis bUp4,0 +@@ -58,7 +55,6 @@ + vis tIcon4,0 + vis tEntity4,0 + vis bText4,0 +- vis hSlider4,0 + + Variable (string) strCommand + Attributes +@@ -100,28 +96,56 @@ + ID : 49 + Scope : local + Text : +- Max. Text Size: 70 ++ Max. Text Size: 50 + + Variable (string) entn2 + Attributes + ID : 50 + Scope : local + Text : +- Max. Text Size: 70 ++ Max. Text Size: 50 + + Variable (string) entn3 + Attributes + ID : 51 + Scope : local + Text : +- Max. Text Size: 70 ++ Max. Text Size: 50 + + Variable (string) entn4 + Attributes + ID : 52 + Scope : local + Text : +- Max. Text Size: 70 ++ Max. Text Size: 50 ++ +Variable (string) entn5 + Attributes + ID : 70 @@ -44,120 +546,120 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + Scope : local + Text : + Max. Text Size: 10 -+ + Text tHeading Attributes - ID : 2 -@@ -266,6 +294,50 @@ +@@ -266,57 +290,57 @@ Text : Max. Text Size : 50 +-Picture p0 +Text tEntity5 -+ Attributes + Attributes +- ID : 1 + ID : 54 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity5 + Max. Text Size : 30 -+ + +-Slider hSlider1 +Text tIcon5 -+ Attributes + Attributes +- ID : 54 + ID : 55 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled +- Position : 50 +- Upper range limit : 100 +- Lower range limit : 0 + Associated Keyboard : none + Text :  + Max. Text Size : 30 -+ + +-Slider hSlider2 +Text tEntity6 -+ Attributes + Attributes +- ID : 55 + ID : 62 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled +- Position : 50 +- Upper range limit : 100 +- Lower range limit : 0 + Associated Keyboard : none + Text : tEntity6 + Max. Text Size : 30 -+ + +-Slider hSlider3 +Text tIcon6 -+ Attributes + Attributes +- ID : 56 + ID : 63 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled +- Position : 50 +- Upper range limit : 100 +- Lower range limit : 0 + Associated Keyboard : none + Text :  + Max. Text Size : 30 -+ - Picture p0 - Attributes - ID : 1 -@@ -276,7 +348,7 @@ - Slider hSlider1 - Attributes -- ID : 54 -+ ID : 74 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -287,7 +359,7 @@ - - Slider hSlider2 - Attributes -- ID : 55 -+ ID : 75 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -298,7 +370,7 @@ - - Slider hSlider3 - Attributes -- ID : 56 -+ ID : 76 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -309,7 +381,29 @@ - - Slider hSlider4 +-Slider hSlider4 ++Picture p0 Attributes - ID : 57 -+ ID : 77 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Position : 50 -+ Upper range limit : 100 -+ Lower range limit : 0 -+ -+Slider hSlider5 -+ Attributes -+ ID : 78 -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ Position : 50 -+ Upper range limit : 100 -+ Lower range limit : 0 -+ -+Slider hSlider6 -+ Attributes -+ ID : 79 ++ ID : 1 Scope : local Dragging : 0 Disable release event after dragging: 0 -@@ -786,6 +880,214 @@ + Send Component ID : disabled +- Position : 50 +- Upper range limit : 100 +- Lower range limit : 0 + + Button bDown1 + Attributes +@@ -643,7 +667,13 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardEntities,bPrev" ++ nPage=nPage-1 ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -669,7 +699,13 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardEntities,bNext" ++ nPage=nPage+1 ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -786,6 +822,214 @@ prints tSend.txt,0 prints crcval,2 @@ -372,7 +874,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Dual-state Button btOnOff1 Attributes ID : 23 -@@ -898,6 +1200,62 @@ +@@ -898,6 +1142,62 @@ prints tSend.txt,0 prints crcval,2 @@ -435,7 +937,7 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Hotspot mSpecial Attributes ID : 35 -@@ -1008,6 +1366,52 @@ +@@ -1008,6 +1308,52 @@ page popupLight } @@ -488,16 +990,490 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt Timer tmSerial Attributes ID : 30 -@@ -1528,6 +1932,238 @@ +@@ -1060,15 +1406,18 @@ + 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") ++ if(tInstruction.txt=="entityUpdHeading") + { +- // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 + spstr strCommand.txt,tHeading.txt,",",1 ++ } ++ if(tInstruction.txt=="entityUpd") ++ { ++ // command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4 + // get Type +- spstr strCommand.txt,type1.txt,",",3 ++ spstr strCommand.txt,type1.txt,",",1 + // get internal name +- spstr strCommand.txt,entn1.txt,",",4 +- if(type1.txt=="delete"||type1.txt=="") ++ spstr strCommand.txt,entn1.txt,",",2 ++ if(type1.txt=="delete") + { + vis bUp1,0 + vis bStop1,0 +@@ -1077,20 +1426,19 @@ + vis tEntity1,0 + vis tIcon1,0 + vis bText1,0 +- vis hSlider1,0 + }else + { + // change icon +- spstr strCommand.txt,tTmp.txt,",",5 ++ spstr strCommand.txt,tTmp.txt,",",3 covx tTmp.txt,sys0,0,0 - hSlider4.maxval=sys0 + substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 + vis tIcon1,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",6 ++ spstr strCommand.txt,tTmp.txt,",",4 + covx tTmp.txt,sys0,0,0 + tIcon1.pco=sys0 + // set name +- spstr strCommand.txt,tEntity1.txt,",",7 ++ spstr strCommand.txt,tEntity1.txt,",",5 + vis tEntity1,1 } + if(type1.txt=="shutter") +@@ -1100,7 +1448,6 @@ + vis bDown1,1 + vis btOnOff1,0 + vis bText1,0 +- vis hSlider1,0 + } + if(type1.txt=="light") + { +@@ -1109,9 +1456,8 @@ + vis bDown1,0 + vis btOnOff1,1 + vis bText1,0 +- vis hSlider1,0 + // get Button State (optional Value) +- spstr strCommand.txt,tTmp.txt,",",8 ++ spstr strCommand.txt,tTmp.txt,",",6 + covx tTmp.txt,sys0,0,0 + btOnOff1.val=sys0 + } +@@ -1122,9 +1468,8 @@ + vis bDown1,0 + vis btOnOff1,1 + vis bText1,0 +- vis hSlider1,0 + // get Button State (optional Value) +- spstr strCommand.txt,tTmp.txt,",",8 ++ spstr strCommand.txt,tTmp.txt,",",6 + covx tTmp.txt,sys0,0,0 + btOnOff1.val=sys0 + } +@@ -1136,11 +1481,10 @@ + vis btOnOff1,0 + vis bText1,1 + tsw bText1,0 +- vis hSlider1,0 + bText1.pco=65535 + bText1.pco2=65535 + // get Text (optional Value) +- spstr strCommand.txt,bText1.txt,",",8 ++ spstr strCommand.txt,bText1.txt,",",6 + } + if(type1.txt=="button") + { +@@ -1150,41 +1494,17 @@ + vis btOnOff1,0 + vis bText1,1 + tsw bText1,1 +- vis hSlider1,0 + bText1.pco=1374 + bText1.pco2=1374 + // get Text (optional Value) +- spstr strCommand.txt,bText1.txt,",",8 +- } +- if(type1.txt=="number") +- { +- vis bUp1,0 +- vis bStop1,0 +- vis bDown1,0 +- vis btOnOff1,0 +- vis bText1,0 +- tsw bText1,0 +- vis hSlider1,1 +- // get config (optional Value) (use bText as variable) +- spstr strCommand.txt,bText1.txt,",",8 +- //first value is current value +- spstr bText1.txt,tTmp.txt,"|",1 +- covx tTmp.txt,sys0,0,0 +- hSlider1.val=sys0 +- //second value is min value +- spstr bText1.txt,tTmp.txt,"|",2 +- covx tTmp.txt,sys0,0,0 +- hSlider1.minval=sys0 +- //third value is max value +- spstr bText1.txt,tTmp.txt,"|",3 +- covx tTmp.txt,sys0,0,0 +- hSlider1.maxval=sys0 ++ spstr strCommand.txt,bText1.txt,",",6 + } ++ // id2 + // get Type +- spstr strCommand.txt,type2.txt,",",9 ++ spstr strCommand.txt,type2.txt,",",7 + // get internal name +- spstr strCommand.txt,entn2.txt,",",10 +- if(type2.txt=="delete"||type2.txt=="") ++ spstr strCommand.txt,entn2.txt,",",8 ++ if(type2.txt=="delete") + { + vis bUp2,0 + vis bStop2,0 +@@ -1193,20 +1513,19 @@ + vis tEntity2,0 + vis tIcon2,0 + vis bText2,0 +- vis hSlider2,0 + }else + { +- // change icon +- spstr strCommand.txt,tTmp.txt,",",11 ++ //change icon ++ spstr strCommand.txt,tTmp.txt,",",9 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1 + vis tIcon2,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",12 ++ spstr strCommand.txt,tTmp.txt,",",10 + covx tTmp.txt,sys0,0,0 + tIcon2.pco=sys0 + // set name +- spstr strCommand.txt,tEntity2.txt,",",13 ++ spstr strCommand.txt,tEntity2.txt,",",11 + vis tEntity2,1 + } + if(type2.txt=="shutter") +@@ -1216,7 +1535,6 @@ + vis bDown2,1 + vis btOnOff2,0 + vis bText2,0 +- vis hSlider2,0 + } + if(type2.txt=="light") + { +@@ -1225,9 +1543,8 @@ + vis bDown2,0 + vis btOnOff2,1 + vis bText2,0 +- vis hSlider2,0 + // get Button State (optional Value) +- spstr strCommand.txt,tTmp.txt,",",14 ++ spstr strCommand.txt,tTmp.txt,",",12 + covx tTmp.txt,sys0,0,0 + btOnOff2.val=sys0 + } +@@ -1238,9 +1555,8 @@ + vis bDown2,0 + vis btOnOff2,1 + vis bText2,0 +- vis hSlider2,0 + // get Button State (optional Value) +- spstr strCommand.txt,tTmp.txt,",",14 ++ spstr strCommand.txt,tTmp.txt,",",12 + covx tTmp.txt,sys0,0,0 + btOnOff2.val=sys0 + } +@@ -1252,11 +1568,10 @@ + vis btOnOff2,0 + vis bText2,1 + tsw bText2,0 +- vis hSlider2,0 + bText2.pco=65535 + bText2.pco2=65535 + // get Text (optional Value) +- spstr strCommand.txt,bText2.txt,",",14 ++ spstr strCommand.txt,bText2.txt,",",12 + } + if(type2.txt=="button") + { +@@ -1266,41 +1581,17 @@ + vis btOnOff2,0 + vis bText2,1 + tsw bText2,1 +- vis hSlider2,0 + bText2.pco=1374 + bText2.pco2=1374 + // get Text (optional Value) +- spstr strCommand.txt,bText2.txt,",",14 +- } +- if(type2.txt=="number") +- { +- vis bUp2,0 +- vis bStop2,0 +- vis bDown2,0 +- vis btOnOff2,0 +- vis bText2,0 +- tsw bText2,0 +- vis hSlider2,1 +- // get config (optional Value) (use bText as variable) +- spstr strCommand.txt,bText2.txt,",",14 +- //first value is current value +- spstr bText2.txt,tTmp.txt,"|",1 +- covx tTmp.txt,sys0,0,0 +- hSlider2.val=sys0 +- //second value is min value +- spstr bText2.txt,tTmp.txt,"|",2 +- covx tTmp.txt,sys0,0,0 +- hSlider2.minval=sys0 +- //third value is max value +- spstr bText2.txt,tTmp.txt,"|",3 +- covx tTmp.txt,sys0,0,0 +- hSlider2.maxval=sys0 ++ spstr strCommand.txt,bText2.txt,",",12 + } ++ // id3 + // get Type +- spstr strCommand.txt,type3.txt,",",15 ++ spstr strCommand.txt,type3.txt,",",13 + // get internal name +- spstr strCommand.txt,entn3.txt,",",16 +- if(type3.txt=="delete"||type3.txt=="") ++ spstr strCommand.txt,entn3.txt,",",14 ++ if(type3.txt=="delete") + { + vis bUp3,0 + vis bStop3,0 +@@ -1309,20 +1600,19 @@ + vis tEntity3,0 + vis tIcon3,0 + vis bText3,0 +- vis hSlider3,0 + }else + { +- // change icon +- spstr strCommand.txt,tTmp.txt,",",17 ++ //change icon ++ spstr strCommand.txt,tTmp.txt,",",15 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1 + vis tIcon3,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",18 ++ spstr strCommand.txt,tTmp.txt,",",16 + covx tTmp.txt,sys0,0,0 + tIcon3.pco=sys0 + // set name +- spstr strCommand.txt,tEntity3.txt,",",19 ++ spstr strCommand.txt,tEntity3.txt,",",17 + vis tEntity3,1 + } + if(type3.txt=="shutter") +@@ -1332,18 +1622,16 @@ + vis bDown3,1 + vis btOnOff3,0 + vis bText3,0 +- vis hSlider3,0 + } + if(type3.txt=="light") + { + vis bUp3,0 + vis bStop3,0 + vis bDown3,0 +- vis btOnOff3,1 + vis bText3,0 +- vis hSlider3,0 ++ vis btOnOff3,1 + // get Button State (optional Value) +- spstr strCommand.txt,tTmp.txt,",",20 ++ spstr strCommand.txt,tTmp.txt,",",18 + covx tTmp.txt,sys0,0,0 + btOnOff3.val=sys0 + } +@@ -1352,11 +1640,10 @@ + vis bUp3,0 + vis bStop3,0 + vis bDown3,0 +- vis btOnOff3,1 + vis bText3,0 +- vis hSlider3,0 ++ vis btOnOff3,1 + // get Button State (optional Value) +- spstr strCommand.txt,tTmp.txt,",",20 ++ spstr strCommand.txt,tTmp.txt,",",18 + covx tTmp.txt,sys0,0,0 + btOnOff3.val=sys0 + } +@@ -1368,11 +1655,10 @@ + vis btOnOff3,0 + vis bText3,1 + tsw bText3,0 +- vis hSlider3,0 + bText3.pco=65535 + bText3.pco2=65535 + // get Text (optional Value) +- spstr strCommand.txt,bText3.txt,",",20 ++ spstr strCommand.txt,bText3.txt,",",18 + } + if(type3.txt=="button") + { +@@ -1382,41 +1668,17 @@ + vis btOnOff3,0 + vis bText3,1 + tsw bText3,1 +- vis hSlider3,0 + bText3.pco=1374 + bText3.pco2=1374 + // get Text (optional Value) +- spstr strCommand.txt,bText3.txt,",",20 +- } +- if(type3.txt=="number") +- { +- vis bUp3,0 +- vis bStop3,0 +- vis bDown3,0 +- vis btOnOff3,0 +- vis bText3,0 +- tsw bText3,0 +- vis hSlider3,1 +- // get config (optional Value) (use bText as variable) +- spstr strCommand.txt,bText3.txt,",",20 +- //first value is current value +- spstr bText3.txt,tTmp.txt,"|",1 +- covx tTmp.txt,sys0,0,0 +- hSlider3.val=sys0 +- //second value is min value +- spstr bText3.txt,tTmp.txt,"|",2 +- covx tTmp.txt,sys0,0,0 +- hSlider3.minval=sys0 +- //third value is max value +- spstr bText3.txt,tTmp.txt,"|",3 +- covx tTmp.txt,sys0,0,0 +- hSlider3.maxval=sys0 ++ spstr strCommand.txt,bText3.txt,",",18 + } ++ // id4 + // get Type +- spstr strCommand.txt,type4.txt,",",21 ++ spstr strCommand.txt,type4.txt,",",19 + // get internal name +- spstr strCommand.txt,entn4.txt,",",22 +- if(type4.txt=="delete"||type4.txt=="") ++ spstr strCommand.txt,entn4.txt,",",20 ++ if(type4.txt=="delete") + { + vis bUp4,0 + vis bStop4,0 +@@ -1425,20 +1687,19 @@ + vis tEntity4,0 + vis tIcon4,0 + vis bText4,0 +- vis hSlider4,0 + }else + { +- // change icon +- spstr strCommand.txt,tTmp.txt,",",23 ++ //change icon ++ spstr strCommand.txt,tTmp.txt,",",21 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1 + vis tIcon4,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",24 ++ spstr strCommand.txt,tTmp.txt,",",22 + covx tTmp.txt,sys0,0,0 + tIcon4.pco=sys0 + // set name +- spstr strCommand.txt,tEntity4.txt,",",25 ++ spstr strCommand.txt,tEntity4.txt,",",23 + vis tEntity4,1 + } + if(type4.txt=="shutter") +@@ -1448,18 +1709,16 @@ + vis bDown4,1 + vis btOnOff4,0 + vis bText4,0 +- vis hSlider4,0 + } + if(type4.txt=="light") + { + vis bUp4,0 + vis bStop4,0 + vis bDown4,0 +- vis btOnOff4,1 + vis bText4,0 +- vis hSlider4,0 ++ vis btOnOff4,1 + // get Button State (optional Value) +- spstr strCommand.txt,tTmp.txt,",",26 ++ spstr strCommand.txt,tTmp.txt,",",24 + covx tTmp.txt,sys0,0,0 + btOnOff4.val=sys0 + } +@@ -1468,11 +1727,10 @@ + vis bUp4,0 + vis bStop4,0 + vis bDown4,0 +- vis btOnOff4,1 + vis bText4,0 +- vis hSlider4,0 ++ vis btOnOff4,1 + // get Button State (optional Value) +- spstr strCommand.txt,tTmp.txt,",",26 ++ spstr strCommand.txt,tTmp.txt,",",24 + covx tTmp.txt,sys0,0,0 + btOnOff4.val=sys0 + } +@@ -1484,11 +1742,10 @@ + vis btOnOff4,0 + vis bText4,1 + tsw bText4,0 +- vis hSlider4,0 + bText4.pco=65535 + bText4.pco2=65535 + // get Text (optional Value) +- spstr strCommand.txt,bText4.txt,",",26 ++ spstr strCommand.txt,bText4.txt,",",24 + } + if(type4.txt=="button") + { +@@ -1498,35 +1755,184 @@ + vis btOnOff4,0 + vis bText4,1 + tsw bText4,1 +- vis hSlider4,0 + bText4.pco=1374 + bText4.pco2=1374 + // get Text (optional Value) +- spstr strCommand.txt,bText4.txt,",",26 ++ spstr strCommand.txt,bText4.txt,",",24 + } +- if(type4.txt=="number") ++ // id5 + // get Type -+ spstr strCommand.txt,type5.txt,",",27 ++ spstr strCommand.txt,type5.txt,",",25 + // get internal name -+ spstr strCommand.txt,entn5.txt,",",28 -+ if(type5.txt=="delete"||type5.txt=="") -+ { ++ spstr strCommand.txt,entn5.txt,",",26 ++ if(type5.txt=="delete") + { +- vis bUp4,0 +- vis bStop4,0 +- vis bDown4,0 +- vis btOnOff4,0 +- vis bText4,0 +- tsw bText4,0 +- vis hSlider4,1 +- // get config (optional Value) (use bText as variable) +- spstr strCommand.txt,bText4.txt,",",26 +- //first value is current value +- spstr bText4.txt,tTmp.txt,"|",1 +- covx tTmp.txt,sys0,0,0 +- hSlider4.val=sys0 +- //second value is min value +- spstr bText4.txt,tTmp.txt,"|",2 +- covx tTmp.txt,sys0,0,0 +- hSlider4.minval=sys0 +- //third value is max value +- spstr bText4.txt,tTmp.txt,"|",3 + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 @@ -505,20 +1481,20 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis tEntity5,0 + vis tIcon5,0 + vis bText5,0 -+ vis hSlider5,0 + }else + { -+ // change icon -+ spstr strCommand.txt,tTmp.txt,",",29 -+ covx tTmp.txt,sys0,0,0 ++ //change icon ++ spstr strCommand.txt,tTmp.txt,",",27 + covx tTmp.txt,sys0,0,0 +- hSlider4.maxval=sys0 + substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 + vis tIcon5,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,",",30 ++ spstr strCommand.txt,tTmp.txt,",",28 + covx tTmp.txt,sys0,0,0 + tIcon5.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity5.txt,",",31 ++ spstr strCommand.txt,tEntity5.txt,",",29 + vis tEntity5,1 + } + if(type5.txt=="shutter") @@ -528,18 +1504,16 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bDown5,1 + vis btOnOff5,0 + vis bText5,0 -+ vis hSlider5,0 + } + if(type5.txt=="light") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 -+ vis btOnOff5,1 + vis bText5,0 -+ vis hSlider5,0 ++ vis btOnOff5,1 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",32 ++ spstr strCommand.txt,tTmp.txt,",",30 + covx tTmp.txt,sys0,0,0 + btOnOff5.val=sys0 + } @@ -548,11 +1522,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 -+ vis btOnOff5,1 + vis bText5,0 -+ vis hSlider5,0 ++ vis btOnOff5,1 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",32 ++ spstr strCommand.txt,tTmp.txt,",",30 + covx tTmp.txt,sys0,0,0 + btOnOff5.val=sys0 + } @@ -564,11 +1537,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis btOnOff5,0 + vis bText5,1 + tsw bText5,0 -+ vis hSlider5,0 + bText5.pco=65535 + bText5.pco2=65535 + // get Text (optional Value) -+ spstr strCommand.txt,bText5.txt,",",32 ++ spstr strCommand.txt,bText5.txt,",",30 + } + if(type5.txt=="button") + { @@ -578,41 +1550,17 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis btOnOff5,0 + vis bText5,1 + tsw bText5,1 -+ vis hSlider5,0 + bText5.pco=1374 + bText5.pco2=1374 + // get Text (optional Value) -+ spstr strCommand.txt,bText5.txt,",",32 -+ } -+ 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 -+ // get config (optional Value) (use bText as variable) -+ spstr strCommand.txt,bText5.txt,",",32 -+ //first value is current value -+ spstr bText5.txt,tTmp.txt,"|",1 -+ covx tTmp.txt,sys0,0,0 -+ hSlider5.val=sys0 -+ //second value is min value -+ spstr bText5.txt,tTmp.txt,"|",2 -+ covx tTmp.txt,sys0,0,0 -+ hSlider5.minval=sys0 -+ //third value is max value -+ spstr bText5.txt,tTmp.txt,"|",3 -+ covx tTmp.txt,sys0,0,0 -+ hSlider5.maxval=sys0 ++ spstr strCommand.txt,bText5.txt,",",30 + } ++ // id6 + // get Type -+ spstr strCommand.txt,type6.txt,",",33 ++ spstr strCommand.txt,type6.txt,",",31 + // get internal name -+ spstr strCommand.txt,entn6.txt,",",34 -+ if(type6.txt=="delete"||type6.txt=="") ++ spstr strCommand.txt,entn6.txt,",",32 ++ if(type6.txt=="delete") + { + vis bUp6,0 + vis bStop6,0 @@ -621,20 +1569,19 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis tEntity6,0 + vis tIcon6,0 + vis bText6,0 -+ vis hSlider6,0 + }else + { -+ // change icon -+ spstr strCommand.txt,tTmp.txt,",",35 ++ //change icon ++ spstr strCommand.txt,tTmp.txt,",",33 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 + vis tIcon6,1 + // change icon color -+ spstr strCommand.txt,tTmp.txt,",",36 ++ spstr strCommand.txt,tTmp.txt,",",34 + covx tTmp.txt,sys0,0,0 + tIcon6.pco=sys0 + // set name -+ spstr strCommand.txt,tEntity6.txt,",",37 ++ spstr strCommand.txt,tEntity6.txt,",",35 + vis tEntity6,1 + } + if(type6.txt=="shutter") @@ -644,18 +1591,16 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bDown6,1 + vis btOnOff6,0 + vis bText6,0 -+ vis hSlider6,0 + } + if(type6.txt=="light") + { + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 -+ vis btOnOff6,1 + vis bText6,0 -+ vis hSlider6,0 ++ vis btOnOff6,1 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",38 ++ spstr strCommand.txt,tTmp.txt,",",36 + covx tTmp.txt,sys0,0,0 + btOnOff6.val=sys0 + } @@ -664,11 +1609,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 -+ vis btOnOff6,1 + vis bText6,0 -+ vis hSlider6,0 ++ vis btOnOff6,1 + // get Button State (optional Value) -+ spstr strCommand.txt,tTmp.txt,",",38 ++ spstr strCommand.txt,tTmp.txt,",",36 + covx tTmp.txt,sys0,0,0 + btOnOff6.val=sys0 + } @@ -680,11 +1624,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis btOnOff6,0 + vis bText6,1 + tsw bText6,0 -+ vis hSlider6,0 + bText6.pco=65535 + bText6.pco2=65535 + // get Text (optional Value) -+ spstr strCommand.txt,bText6.txt,",",38 ++ spstr strCommand.txt,bText6.txt,",",36 + } + if(type6.txt=="button") + { @@ -694,171 +1637,854 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis btOnOff6,0 + vis bText6,1 + tsw bText6,1 -+ vis hSlider6,0 + bText6.pco=1374 + bText6.pco2=1374 + // get Text (optional Value) -+ spstr strCommand.txt,bText6.txt,",",38 -+ } -+ 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 -+ // get config (optional Value) (use bText as variable) -+ spstr strCommand.txt,bText6.txt,",",38 -+ //first value is current value -+ spstr bText6.txt,tTmp.txt,"|",1 -+ covx tTmp.txt,sys0,0,0 -+ hSlider6.val=sys0 -+ //second value is min value -+ spstr bText6.txt,tTmp.txt,"|",2 -+ covx tTmp.txt,sys0,0,0 -+ hSlider6.minval=sys0 -+ //third value is max value -+ spstr bText6.txt,tTmp.txt,"|",3 -+ covx tTmp.txt,sys0,0,0 -+ hSlider6.maxval=sys0 -+ } ++ spstr strCommand.txt,bText6.txt,",",36 + } } if(tInstruction.txt=="pageType") +@@ -1541,43 +1947,30 @@ + //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") ++ if(tId.txt=="popupLight") + { +- page cardEntities ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight + } +- if(tId.txt=="cardGrid") ++ if(tId.txt=="cardThermo") + { +- page cardGrid ++ page cardThermo + } +- if(tId.txt=="popupLight") ++ if(tId.txt=="cardMedia") + { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupLight ++ page cardMedia + } +- if(tId.txt=="popupShutter") ++ if(tId.txt=="pageStartup") + { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupShutter ++ page pageStartup + } + if(tId.txt=="popupNotify") + { + page popupNotify + } +- if(tId.txt=="cardThermo") +- { +- page cardThermo +- } +- if(tId.txt=="cardMedia") ++ if(tId.txt=="cardGrid") + { +- page cardMedia ++ page cardGrid + } + if(tId.txt=="cardAlarm") + { +diff -bur HMI/n2t-out/cardGrid.txt HMI/US/portrait/n2t-out/cardGrid.txt +--- HMI/n2t-out/cardGrid.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/cardGrid.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -76,28 +76,28 @@ + ID : 18 + Scope : local + Text : +- Max. Text Size: 70 ++ Max. Text Size: 50 + + Variable (string) entn2 + Attributes + ID : 19 + Scope : local + Text : +- Max. Text Size: 70 ++ Max. Text Size: 50 + + Variable (string) entn3 + Attributes + ID : 20 + Scope : local + Text : +- Max. Text Size: 70 ++ Max. Text Size: 50 + + Variable (string) entn4 + Attributes + ID : 21 + Scope : local + Text : +- Max. Text Size: 70 ++ Max. Text Size: 50 + + Variable (string) type5 + Attributes +@@ -269,7 +269,13 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardGrid,bPrev" ++ nPage=nPage-1 ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -295,7 +301,13 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardGrid,bNext" ++ nPage=nPage+1 ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -600,14 +612,17 @@ + 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") ++ if(tInstruction.txt=="entityUpdHeading") { +- // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 + spstr strCommand.txt,tHeading.txt,",",1 ++ } ++ if(tInstruction.txt=="entityUpd") ++ { ++ // command format: entityUpd[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 + // get Type +- spstr strCommand.txt,type1.txt,",",3 ++ spstr strCommand.txt,type1.txt,",",1 + // get internal name +- spstr strCommand.txt,entn1.txt,",",4 ++ spstr strCommand.txt,entn1.txt,",",2 + if(type1.txt=="delete"||type1.txt=="") + { + vis tEntity1,0 +@@ -615,22 +630,22 @@ + }else + { + // change icon +- spstr strCommand.txt,tTmp.txt,",",5 ++ spstr strCommand.txt,tTmp.txt,",",3 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1 + vis bEntity1,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",6 ++ spstr strCommand.txt,tTmp.txt,",",4 + covx tTmp.txt,sys0,0,0 + bEntity1.pco=sys0 + // set name +- spstr strCommand.txt,tEntity1.txt,",",7 ++ spstr strCommand.txt,tEntity1.txt,",",5 + vis tEntity1,1 + } + // get Type +- spstr strCommand.txt,type2.txt,",",9 ++ spstr strCommand.txt,type2.txt,",",7 + // get internal name +- spstr strCommand.txt,entn2.txt,",",10 ++ spstr strCommand.txt,entn2.txt,",",8 + if(type2.txt=="delete"||type2.txt=="") + { + vis tEntity2,0 +@@ -638,22 +653,22 @@ + }else + { + // change icon +- spstr strCommand.txt,tTmp.txt,",",11 ++ spstr strCommand.txt,tTmp.txt,",",9 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1 + vis bEntity2,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",12 ++ spstr strCommand.txt,tTmp.txt,",",10 + covx tTmp.txt,sys0,0,0 + bEntity2.pco=sys0 + // set name +- spstr strCommand.txt,tEntity2.txt,",",13 ++ spstr strCommand.txt,tEntity2.txt,",",11 + vis tEntity2,1 + } + // get Type +- spstr strCommand.txt,type3.txt,",",15 ++ spstr strCommand.txt,type3.txt,",",13 + // get internal name +- spstr strCommand.txt,entn3.txt,",",16 ++ spstr strCommand.txt,entn3.txt,",",14 + if(type3.txt=="delete"||type3.txt=="") + { + vis tEntity3,0 +@@ -661,22 +676,22 @@ + }else + { + // change icon +- spstr strCommand.txt,tTmp.txt,",",17 ++ spstr strCommand.txt,tTmp.txt,",",15 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1 + vis bEntity3,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",18 ++ spstr strCommand.txt,tTmp.txt,",",16 + covx tTmp.txt,sys0,0,0 + bEntity3.pco=sys0 + // set name +- spstr strCommand.txt,tEntity3.txt,",",19 ++ spstr strCommand.txt,tEntity3.txt,",",17 + vis tEntity3,1 + } + // get Type +- spstr strCommand.txt,type4.txt,",",21 ++ spstr strCommand.txt,type4.txt,",",19 + // get internal name +- spstr strCommand.txt,entn4.txt,",",22 ++ spstr strCommand.txt,entn4.txt,",",20 + if(type4.txt=="delete"||type4.txt=="") + { + vis tEntity4,0 +@@ -684,22 +699,22 @@ + }else + { + // change icon +- spstr strCommand.txt,tTmp.txt,",",23 ++ spstr strCommand.txt,tTmp.txt,",",21 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1 + vis bEntity4,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",24 ++ spstr strCommand.txt,tTmp.txt,",",22 + covx tTmp.txt,sys0,0,0 + bEntity4.pco=sys0 + // set name +- spstr strCommand.txt,tEntity4.txt,",",25 ++ spstr strCommand.txt,tEntity4.txt,",",23 + vis tEntity4,1 + } + // get Type +- spstr strCommand.txt,type5.txt,",",27 ++ spstr strCommand.txt,type5.txt,",",25 + // get internal name +- spstr strCommand.txt,entn5.txt,",",28 ++ spstr strCommand.txt,entn5.txt,",",26 + if(type5.txt=="delete"||type5.txt=="") + { + vis tEntity5,0 +@@ -707,22 +722,22 @@ + }else + { + // change icon +- spstr strCommand.txt,tTmp.txt,",",29 ++ spstr strCommand.txt,tTmp.txt,",",27 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1 + vis bEntity5,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",30 ++ spstr strCommand.txt,tTmp.txt,",",28 + covx tTmp.txt,sys0,0,0 + bEntity5.pco=sys0 + // set name +- spstr strCommand.txt,tEntity5.txt,",",31 ++ spstr strCommand.txt,tEntity5.txt,",",29 + vis tEntity5,1 + } + // get Type +- spstr strCommand.txt,type6.txt,",",33 ++ spstr strCommand.txt,type6.txt,",",31 + // get internal name +- spstr strCommand.txt,entn6.txt,",",34 ++ spstr strCommand.txt,entn6.txt,",",32 + if(type6.txt=="delete"||type6.txt=="") + { + vis tEntity6,0 +@@ -730,16 +745,16 @@ + }else + { + // change icon +- spstr strCommand.txt,tTmp.txt,",",35 ++ spstr strCommand.txt,tTmp.txt,",",33 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1 + vis bEntity6,1 + // change icon color +- spstr strCommand.txt,tTmp.txt,",",36 ++ spstr strCommand.txt,tTmp.txt,",",34 + covx tTmp.txt,sys0,0,0 + bEntity6.pco=sys0 + // set name +- spstr strCommand.txt,tEntity6.txt,",",37 ++ spstr strCommand.txt,tEntity6.txt,",",35 + vis tEntity6,1 + } + } +@@ -755,43 +770,30 @@ + //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") ++ if(tId.txt=="popupLight") + { +- page cardEntities ++ pageIcons.tTmp1.txt=tTmp.txt ++ page popupLight + } +- if(tId.txt=="cardGrid") ++ if(tId.txt=="cardThermo") + { +- page cardGrid ++ page cardThermo + } +- if(tId.txt=="popupLight") ++ if(tId.txt=="cardMedia") + { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupLight ++ page cardMedia + } +- if(tId.txt=="popupShutter") ++ if(tId.txt=="pageStartup") + { +- pageIcons.tTmp1.txt=tTmp.txt +- page popupShutter ++ page pageStartup + } + if(tId.txt=="popupNotify") + { + page popupNotify + } +- if(tId.txt=="cardThermo") +- { +- page cardThermo +- } +- if(tId.txt=="cardMedia") ++ if(tId.txt=="cardEntities") + { +- page cardMedia ++ page cardEntities + } + if(tId.txt=="cardAlarm") + { diff -bur HMI/n2t-out/cardMedia.txt HMI/US/portrait/n2t-out/cardMedia.txt ---- HMI/n2t-out/cardMedia.txt 2022-03-29 07:50:32.340739774 +0000 -+++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 07:50:32.752740338 +0000 -@@ -30,21 +30,21 @@ +--- HMI/n2t-out/cardMedia.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/cardMedia.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -16,37 +16,34 @@ + vis p0,0 + vis tSend,0 + vis tInstruction,0 ++ vis nPageDisp,0 + vis tTmp,0 + vis tId,0 +- vis t5,0 + //vis nPageDisp,0 + + Variable (string) strCommand + Attributes +- ID : 7 ++ ID : 8 + Scope : local + Text : +- Max. Text Size: 500 ++ Max. Text Size: 200 Variable (string) entn Attributes - ID : 18 -+ ID : 17 ++ ID : 19 Scope : local Text : Max. Text Size: 50 - Variable (string) vaSpeakerList +-Variable (string) vaSpeakerList ++Number nPageDisp Attributes - ID : 27 -+ ID : 26 ++ ID : 6 Scope : local - Text : - Max. Text Size: 200 - - Variable (int32) vaSpeakerPos - Attributes +- Text : +- Max. Text Size: 200 +- +-Variable (int32) vaSpeakerPos +- Attributes - ID : 28 -+ ID : 27 - Scope: local - Value: 0 +- Scope: local +- Value: 0 ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ Associated Keyboard : none ++ Value : 0 -@@ -217,7 +217,7 @@ - - Text tIcon + Text tSend Attributes -- ID : 17 +@@ -56,8 +53,8 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : +- Max. Text Size : 200 ++ Text : newtxt ++ Max. Text Size : 100 + + Text tTmp + Attributes +@@ -72,7 +69,7 @@ + + Text tInstruction + Attributes +- ID : 8 ++ ID : 9 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -83,7 +80,7 @@ + + Text tId + Attributes +- ID : 9 ++ ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -94,7 +91,7 @@ + + Text tHeading + Attributes +- ID : 10 ++ ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -105,7 +102,7 @@ + + Text tTitle + Attributes +- ID : 11 ++ ID : 12 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -116,7 +113,7 @@ + + Text tAuthor + Attributes +- ID : 12 ++ ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -127,7 +124,7 @@ + + Text t2 + Attributes +- ID : 13 ++ ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -157,7 +154,7 @@ + + Text tPlayPause + Attributes +- ID : 14 ++ ID : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -187,7 +184,7 @@ + + Text t0 + Attributes +- ID : 15 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 -@@ -228,7 +228,7 @@ - - Text t1 +@@ -217,171 +214,15 @@ + + Text tIcon Attributes +- ID : 17 +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 10 +- +-Text t1 +- Attributes - ID : 22 -+ ID : 21 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -259,7 +259,7 @@ - - Text t3 - 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 +- hVolume.val=hVolume.val-5 +- // event,buttonPress2,internalNameEntity,volumeSlider,50 +- //craft command +- tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," +- covx hVolume.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,1 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Text t3 +- Attributes - ID : 23 -+ ID : 22 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -290,7 +290,7 @@ - - Text t4 - 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 +- hVolume.val=hVolume.val+5 +- // event,buttonPress2,internalNameEntity,volumeSlider,50 +- //craft command +- tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," +- covx hVolume.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,1 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Text t4 +- Attributes - ID : 24 -+ ID : 23 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -301,7 +301,7 @@ - - Text tSpeaker - Attributes +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text :  +- Max. Text Size : 10 +- +-Text tSpeaker +- Attributes - ID : 25 -+ ID : 24 ++ ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 -@@ -331,7 +331,7 @@ - - Text t6 - Attributes + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 50 +- +- Events +- Touch Press Event +- // event,buttonPress2,entn,media-next +- //craft command +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," +- tSend.txt+="speaker-sel,"+tSpeaker.txt +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,1 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- +-Text t6 +- Attributes - ID : 26 -+ ID : 25 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -354,7 +354,7 @@ - - Text t5 - 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 +- //speaker +- tSpeaker.pco=65535 +- spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val +- vaSpeakerPos.val+=1 +- if(tSpeaker.txt=="") +- { +- vaSpeakerPos.val=0 +- spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val +- } +- +-Text t5 +- Attributes - ID : 29 -+ ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 -@@ -392,7 +392,7 @@ +- 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 +- // event,buttonPress2,entn,media-next +- //craft command +- tSend.txt="event,buttonPress2," +- tSend.txt+=entn.txt+"," +- tSend.txt+="media-OnOff" +- //send calc crc +- btlen tSend.txt,sys0 +- crcrest 1,0xffff // reset CRC +- crcputh 55 bb +- crcputs sys0,1 +- crcputs tSend.txt,0 +- //send cmd +- printh 55 bb +- prints sys0,2 +- prints tSend.txt,0 +- prints crcval,2 +- + Picture p0 + Attributes + ID : 1 +@@ -392,7 +233,7 @@ Slider hVolume Attributes - ID : 16 -+ ID : 29 ++ ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 -@@ -663,7 +663,7 @@ +@@ -403,8 +244,6 @@ + + Events + Touch Release Event +- tmCooldown.en=1 +- tmCooldown.tim=800 + // event,buttonPress2,internalNameEntity,volumeSlider,50 + //craft command + tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," +@@ -435,7 +274,14 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardMedia,bNext" ++ nPage=nPage+1 ++ nPageDisp.val=nPage ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -461,7 +307,14 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardMedia,bPrev" ++ nPage=nPage-1 ++ nPageDisp.val=nPage ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -476,7 +329,7 @@ + + Timer tmSerial + Attributes +- ID : 6 ++ ID : 7 + Scope : local + Period (ms): 50 + Enabled : yes +@@ -548,32 +401,6 @@ + spstr strCommand.txt,tTmp.txt,"|",7 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 +- //speaker current +- spstr strCommand.txt,tSpeaker.txt,"|",8 +- if(tSpeaker.txt!="") +- { +- tSpeaker.pco=1374 +- }else +- { +- tSpeaker.pco=65535 +- } +- //speaker list +- spstr strCommand.txt,vaSpeakerList.txt,"|",9 +- if(vaSpeakerList.txt=="") +- { +- vis t6,0 +- } +- vaSpeakerPos.val=0 +- // on off button +- spstr strCommand.txt,tTmp.txt,"|",10 +- if(tTmp.txt=="disable") +- { +- vis t5,0 +- }else +- { +- vis t5,1 +- covx tTmp.txt,t5.pco,0,0 +- } + } + if(tInstruction.txt=="time") + { +@@ -663,7 +490,7 @@ Timer tmSleep Attributes - ID : 19 -+ ID : 18 ++ ID : 20 Scope : local Period (ms): 1000 Enabled : yes -@@ -683,7 +683,7 @@ +@@ -681,20 +508,9 @@ + } + } - Timer tmCooldown - Attributes +-Timer tmCooldown +- Attributes - ID : 21 -+ ID : 20 - Scope : local - Period (ms): 100 - Enabled : no -@@ -694,7 +694,7 @@ - +- Scope : local +- Period (ms): 100 +- Enabled : no +- +- Events +- Timer Event +- tmCooldown.en=0 +- TouchCap tc0 Attributes - ID : 20 -+ ID : 19 ++ ID : 21 Scope: local Value: 0 -Only in HMI/n2t-out: nspanel_Stats.txt -Only in HMI/US/portrait/n2t-out: nspanel_US_P_Stats.txt +diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt +--- HMI/n2t-out/cardThermo.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -269,7 +269,14 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardThermo,bNext" ++ nPage=nPage+1 ++ nPageDisp.val=nPage ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -369,7 +376,14 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,cardThermo,bPrev" ++ nPage=nPage-1 ++ nPageDisp.val=nPage ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +diff -bur HMI/n2t-out/pageIcons.txt HMI/US/portrait/n2t-out/pageIcons.txt +--- HMI/n2t-out/pageIcons.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/pageIcons.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -30,8 +30,8 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text :  +- Max. Text Size : 150 ++ Text :  ++ Max. Text Size : 120 + + Text tTmp1 + Attributes diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-03-29 07:50:32.340739774 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 07:50:32.752740338 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-03-29 08:02:34.038739908 +0000 @@ -155,7 +155,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -868,15 +2494,6 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt Max. Text Size : 100 Text tVersion -@@ -166,7 +166,7 @@ - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none -- Text : 21 -+ Text : 16 - Max. Text Size : 10 - - Picture p0 @@ -315,10 +315,6 @@ { page cardThermo @@ -888,9 +2505,116 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt if(tId.txt=="popupLight") { pageIcons.tTmp1.txt=tTmp.txt +Only in HMI/US/portrait/n2t-out: pageSwipeTest.txt +diff -bur HMI/n2t-out/pageTest.txt HMI/US/portrait/n2t-out/pageTest.txt +--- HMI/n2t-out/pageTest.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/pageTest.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -53,7 +53,7 @@ + Touch Press Event + page pageSerialTest + +-Button b3 ++Button b2 + Attributes + ID : 4 + Scope : local +@@ -61,6 +61,21 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed ++ Text : swipe ++ Max. Text Size : 10 ++ ++ Events ++ Touch Press Event ++ page pageSwipeTest ++ ++Button b3 ++ Attributes ++ ID : 5 ++ Scope : local ++ Dragging : 0 ++ Disable release event after dragging: 0 ++ Send Component ID : disabled ++ State : unpressed + Text : disable recmod + Max. Text Size : 20 + +@@ -70,7 +85,7 @@ + + Button b6 + Attributes +- ID : 5 ++ ID : 6 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -85,7 +100,7 @@ + + Button b4 + Attributes +- ID : 6 ++ ID : 7 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -100,7 +115,7 @@ + + Button b5 + Attributes +- ID : 7 ++ ID : 8 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -115,7 +130,7 @@ + + Button b7 + Attributes +- ID : 8 ++ ID : 9 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -130,7 +145,7 @@ + + Button b8 + Attributes +- ID : 9 ++ ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -146,7 +161,7 @@ + + Button b9 + Attributes +- ID : 10 ++ ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -161,7 +176,7 @@ + + Button b10 + Attributes +- ID : 11 ++ ID : 12 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 +@@ -176,7 +191,7 @@ + + Button b11 + Attributes +- ID : 12 ++ ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt ---- HMI/n2t-out/popupLight.txt 2022-03-29 07:50:32.340739774 +0000 -+++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 07:50:32.748740333 +0000 +--- HMI/n2t-out/popupLight.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/popupLight.txt 2022-03-29 08:02:34.038739908 +0000 @@ -252,8 +252,6 @@ Events @@ -909,7 +2633,21 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt //craft command tSend.txt="event,buttonPress2,"+entn.txt+",colorTempSlider," covx hTempSlider.val,tTmp.txt,0,0 -@@ -493,11 +489,8 @@ +@@ -314,7 +310,12 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,popupLight,bExit" ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +@@ -493,11 +494,8 @@ vis t2,1 vis hBrightness,1 covx tTmp.txt,sys0,0,0 @@ -921,7 +2659,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt // get ColorTemp value spstr strCommand.txt,tTmp.txt,",",5 if(tTmp.txt=="disable") -@@ -529,11 +522,6 @@ +@@ -529,11 +527,6 @@ vis hTempSlider,1 vis t3,1 vis t4,1 @@ -933,7 +2671,7 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt // mode == 0 is rgb controls currently shown if(mode.val==0) { -@@ -635,17 +623,6 @@ +@@ -635,17 +628,6 @@ } } @@ -951,3 +2689,422 @@ diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt TouchCap tc0 Attributes ID : 14 +diff -bur HMI/n2t-out/popupNotify.txt HMI/US/portrait/n2t-out/popupNotify.txt +--- HMI/n2t-out/popupNotify.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/popupNotify.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -127,7 +127,12 @@ + Events + Touch Press Event + sleepTimeout=vaOldSleepT.val +- tSend.txt="event,buttonPress2,popupNotify,bExit" ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt +--- HMI/n2t-out/popupShutter.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -180,7 +180,12 @@ + + Events + Touch Press Event +- tSend.txt="event,buttonPress2,popupShutter,bExit" ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC +diff -bur HMI/n2t-out/screensaver.txt HMI/US/portrait/n2t-out/screensaver.txt +--- HMI/n2t-out/screensaver.txt 2022-03-29 08:02:33.634746387 +0000 ++++ HMI/US/portrait/n2t-out/screensaver.txt 2022-03-29 08:02:34.038739908 +0000 +@@ -20,26 +20,12 @@ + vis tTmp,0 + vis p0,0 + //load gloabl time string from pageIcons +- //tTime.txt=vaTime.txt +- spstr vaTime.txt,tTime.txt,"?",0 +- spstr vaTime.txt,tAMPM.txt,"?",1 +- if(tAMPM.txt=="") +- { +- vis tAMPM,0 +- } ++ tTime.txt=vaTime.txt + tDate.txt=vaDate.txt + dim=dimValue + vis tSend,0 + //page open event +- // clear weather elements, to keep example content in HMI +- tMainIcon.txt="" +- tMainText.txt="" +- tForecast1.txt="" +- tF1Icon.txt="" +- tForecast1Val.txt="" +- tForecast2.txt="" +- tF2Icon.txt="" +- tForecast2Val.txt="" ++ // craft command + tSend.txt="event,screensaverOpen" + //send calc crc + btlen tSend.txt,sys0 +@@ -52,20 +38,31 @@ + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 ++ // clear weather elements, to keep example content in HMI ++ tMainIcon.txt="" ++ tMainText.txt="" ++ tMRIcon.txt="" ++ tMR.txt="" ++ tForecast1.txt="" ++ tF1Icon.txt="" ++ tForecast1Val.txt="" ++ tForecast2.txt="" ++ tF2Icon.txt="" ++ tForecast2Val.txt="" + + Variable (string) strCommand + Attributes + ID : 5 + Scope : local + Text : +- Max. Text Size: 200 ++ Max. Text Size: 100 + + Variable (string) vaTime + Attributes + ID : 10 + Scope : global + Text : +- Max. Text Size: 15 ++ Max. Text Size: 10 + + Variable (string) vaDate + Attributes +@@ -76,17 +73,11 @@ + + Variable (string) tId + Attributes +- ID : 22 ++ ID : 24 + Scope : local + Text : + Max. Text Size: 25 + +-Variable (int32) vaTap +- Attributes +- ID : 30 +- Scope: local +- Value: 0 +- + Number originPage + Attributes + ID : 3 +@@ -106,7 +97,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 50 ++ Max. Text Size : 20 + + Text tTmp + Attributes +@@ -117,7 +108,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 50 ++ Max. Text Size : 20 + + Text tTime + Attributes +@@ -128,7 +119,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : 21:32 +- Max. Text Size : 15 ++ Max. Text Size : 10 + + Text tDate + Attributes +@@ -150,7 +141,7 @@ + Send Component ID : disabled + Associated Keyboard : none + Text : +- Max. Text Size : 50 ++ Max. Text Size : 25 + + Text tMainIcon + Attributes +@@ -174,7 +165,7 @@ + Text : 2,3 °C + Max. Text Size : 10 + +-Text tForecast1 ++Text tMRIcon + Attributes + ID : 15 + Scope : local +@@ -182,10 +173,10 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : Mi ++ Text :  + Max. Text Size : 10 + +-Text tForecast1Val ++Text tMR + Attributes + ID : 16 + Scope : local +@@ -193,10 +184,10 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : 9,3 °C ++ Text : 0 mm + Max. Text Size : 10 + +-Text tF1Icon ++Text tForecast1 + Attributes + ID : 17 + Scope : local +@@ -204,10 +195,10 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text :  ++ Text : Mi + Max. Text Size : 10 + +-Text tForecast2 ++Text tForecast1Val + Attributes + ID : 18 + Scope : local +@@ -215,10 +206,10 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : Do ++ Text : 9,3 °C + Max. Text Size : 10 + +-Text tF2Icon ++Text tF1Icon + Attributes + ID : 19 + Scope : local +@@ -229,7 +220,7 @@ + Text :  + Max. Text Size : 10 + +-Text tForecast2Val ++Text tForecast2 + Attributes + ID : 20 + Scope : local +@@ -237,10 +228,10 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : 11,9 °C ++ Text : Do + Max. Text Size : 10 + +-Text t10 ++Text tF2Icon + Attributes + ID : 21 + Scope : local +@@ -248,84 +239,29 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : | +- Max. Text Size : 10 +- +-Text tAMPM +- Attributes +- ID : 23 +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : PM +- Max. Text Size : 10 +- +-Text tForecast3Val +- Attributes +- ID : 24 +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 10 +- +-Text tF3Icon +- Attributes +- ID : 25 +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 10 +- +-Text tForecast3 +- Attributes +- ID : 26 +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : +- Max. Text Size : 10 +- +-Text tForecast4 +- Attributes +- ID : 27 +- Scope : local +- Dragging : 0 +- Disable release event after dragging: 0 +- Send Component ID : disabled +- Associated Keyboard : none +- Text : ++ Text :  + Max. Text Size : 10 + +-Text tF4Icon ++Text tForecast2Val + Attributes +- ID : 28 ++ ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : ++ Text : 11,9 °C + Max. Text Size : 10 + +-Text tForecast4Val ++Text t10 + Attributes +- ID : 29 ++ ID : 23 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none +- Text : ++ Text : | + Max. Text Size : 10 + + Picture p0 +@@ -404,12 +340,7 @@ + { + //get set time to global variable + spstr strCommand.txt,vaTime.txt,",",1 +- spstr vaTime.txt,tTime.txt,"?",0 +- spstr vaTime.txt,tAMPM.txt,"?",1 +- if(tAMPM.txt=="") +- { +- vis tAMPM,0 +- } ++ tTime.txt=vaTime.txt + } + if(tInstruction.txt=="date") + { +@@ -431,38 +362,36 @@ + substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 + //tMainText + spstr strCommand.txt,tMainText.txt,"?",2 ++ //tMRIcon ++ spstr strCommand.txt,tTmp.txt,"?",3 ++ covx tTmp.txt,sys0,0,0 ++ substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 ++ //tMR ++ spstr strCommand.txt,tMR.txt,"?",4 + //tForecast1 +- spstr strCommand.txt,tForecast1.txt,"?",3 ++ spstr strCommand.txt,tForecast1.txt,"?",5 + //tF1Icon +- spstr strCommand.txt,tTmp.txt,"?",4 ++ spstr strCommand.txt,tTmp.txt,"?",6 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 + //tForecast1Val +- spstr strCommand.txt,tForecast1Val.txt,"?",5 ++ spstr strCommand.txt,tForecast1Val.txt,"?",7 + //tForecast2 +- spstr strCommand.txt,tForecast2.txt,"?",6 ++ spstr strCommand.txt,tForecast2.txt,"?",8 + //tF2Icon +- spstr strCommand.txt,tTmp.txt,"?",7 ++ spstr strCommand.txt,tTmp.txt,"?",9 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 + //tForecast2Val +- spstr strCommand.txt,tForecast2Val.txt,"?",8 +- //tForecast3 +- spstr strCommand.txt,tForecast3.txt,"?",9 +- //tF3Icon +- spstr strCommand.txt,tTmp.txt,"?",10 +- covx tTmp.txt,sys0,0,0 +- substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1 +- //tForecast3Val +- spstr strCommand.txt,tForecast3Val.txt,"?",11 +- //tForecast4 +- spstr strCommand.txt,tForecast4.txt,"?",12 +- //tF4Icon +- spstr strCommand.txt,tTmp.txt,"?",13 ++ spstr strCommand.txt,tForecast2Val.txt,"?",10 ++ } ++ if(tInstruction.txt=="page") ++ { ++ //pagenumber ++ spstr strCommand.txt,tTmp.txt,",",1 + covx tTmp.txt,sys0,0,0 +- substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 +- //tForecast4Val +- spstr strCommand.txt,tForecast4Val.txt,"?",14 ++ nPage=sys0 ++ //don't send current page number, wake will do + } + if(tInstruction.txt=="pageType") + { +@@ -535,10 +464,12 @@ + + Events + Touch Press Event +- dim=100 +- vaTap.val+=1 +- covx vaTap.val,tTmp.txt,0,0 +- tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt ++ //page open event ++ // event,pageOpen,cardEntities,pageNumber ++ // craft command ++ // convert pageNumber and write to tTmp ++ covx nPage,tTmp.txt,0,0 ++ tSend.txt="event,pageOpen,"+tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/Program.s.txt b/HMI/US/portrait/n2t-out/Program.s.txt index 43723f71..f7fbc746 100644 --- a/HMI/US/portrait/n2t-out/Program.s.txt +++ b/HMI/US/portrait/n2t-out/Program.s.txt @@ -5,11 +5,24 @@ Program.s int recvCrc=0 int payloadLength=0 int par0=0,par1=0 + // landsspace orientation x has 480px and y has 320px xy limits todo: adjust xy values to something that fit's resulution + //Maximum values in directional change for Swipes beeing detected as swipe (diagonal swipes are invalid) (for one axis at a time) + int xLimit=125,yLimit=125 + int ixLimit=-125,iyLimit=-125 + //Minimum values for swipes, directional changes below theese values are ignored, because they could be unintended swipes + int xLimitMin=60,yLimitMin=60 + int ixLimitMin=-60,iyLimitMin=-60 + // Swipe Result Vars + int ycR=0,xcR=0 + // Start End Swipe Touch Locations + int yc1=0,xc1=0,yc2=0,xc2=0 // sleep timeout in s int sleepTimeout=20 int sleepValue=0 // dim value int dimValue=40 + // current page + int nPage=0 // fix touch offset (Removed for US version) //lcd_dev fffb 0002 0000 0020 page pageStartup diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index c7f2cdec..e89faa93 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -16,6 +16,7 @@ Page cardAlarm vis p0,0 vis tSend,0 vis tInstruction,0 + vis nPageDisp,0 vis tTmp,0 vis tId,0 //vis nPageDisp,0 @@ -38,53 +39,63 @@ Page cardAlarm Variable (string) strCommand Attributes - ID : 6 + ID : 7 Scope : local Text : Max. Text Size: 200 Variable (string) entn Attributes - ID : 9 + ID : 10 Scope : local Text : Max. Text Size: 50 Variable (string) tSend Attributes - ID : 25 + ID : 26 Scope : local Text : Max. Text Size: 100 Variable (string) va1 Attributes - ID : 30 + ID : 31 Scope : local Text : Max. Text Size: 20 Variable (string) va2 Attributes - ID : 31 + ID : 32 Scope : local Text : Max. Text Size: 20 Variable (string) va3 Attributes - ID : 32 + ID : 33 Scope : local Text : Max. Text Size: 20 Variable (string) va4 Attributes - ID : 33 + ID : 34 Scope : local Text : Max. Text Size: 20 +Number nPageDisp + Attributes + ID : 5 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + Text tTmp Attributes ID : 2 @@ -98,7 +109,7 @@ Text tTmp Text tInstruction Attributes - ID : 7 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -109,7 +120,7 @@ Text tInstruction Text tId Attributes - ID : 8 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -120,7 +131,7 @@ Text tId Text tCode Attributes - ID : 23 + ID : 24 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -131,13 +142,13 @@ Text tCode Text tIcon Attributes - ID : 26 + ID : 27 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : + Text :  Max. Text Size : 10 Picture p0 @@ -161,7 +172,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm,bNext" + nPage=nPage+1 + nPageDisp.val=nPage + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -187,7 +205,14 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardAlarm,bPrev" + nPage=nPage-1 + nPageDisp.val=nPage + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -202,7 +227,7 @@ Button bPrev Button b0 Attributes - ID : 12 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +242,7 @@ Button b0 Button b1 Attributes - ID : 13 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -232,7 +257,7 @@ Button b1 Button b2 Attributes - ID : 14 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -247,7 +272,7 @@ Button b2 Button b3 Attributes - ID : 15 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -262,7 +287,7 @@ Button b3 Button b4 Attributes - ID : 16 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -277,7 +302,7 @@ Button b4 Button b5 Attributes - ID : 17 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -292,7 +317,7 @@ Button b5 Button b6 Attributes - ID : 18 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -307,7 +332,7 @@ Button b6 Button b7 Attributes - ID : 19 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -322,7 +347,7 @@ Button b7 Button b8 Attributes - ID : 20 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -337,7 +362,7 @@ Button b8 Button b9 Attributes - ID : 21 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -352,13 +377,13 @@ Button b9 Button b10 Attributes - ID : 22 + ID : 23 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed - Text : CLR + Text : CLEAR Max. Text Size : 10 Events @@ -367,14 +392,14 @@ Button b10 Button arm1 Attributes - ID : 24 + ID : 25 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 10 Events Touch Press Event @@ -394,18 +419,17 @@ Button arm1 prints sys0,2 prints tSend.txt,0 prints crcval,2 - tCode.txt="" Button arm3 Attributes - ID : 27 + ID : 28 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 10 Events Touch Press Event @@ -425,18 +449,17 @@ Button arm3 prints sys0,2 prints tSend.txt,0 prints crcval,2 - tCode.txt="" Button arm2 Attributes - ID : 28 + ID : 29 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 10 Events Touch Press Event @@ -456,18 +479,17 @@ Button arm2 prints sys0,2 prints tSend.txt,0 prints crcval,2 - tCode.txt="" Button arm4 Attributes - ID : 29 + ID : 30 Scope : local Dragging : 0 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed Text : - Max. Text Size : 40 + Max. Text Size : 10 Events Touch Press Event @@ -487,11 +509,10 @@ Button arm4 prints sys0,2 prints tSend.txt,0 prints crcval,2 - tCode.txt="" Timer tmSerial Attributes - ID : 5 + ID : 6 Scope : local Period (ms): 50 Enabled : yes @@ -581,12 +602,8 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,",",10 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon.txt,sys0,1 - //icon color - spstr strCommand.txt,tTmp.txt,",",11 - covx tTmp.txt,sys0,0,0 - tIcon.pco=sys0 //numpad status - spstr strCommand.txt,tTmp.txt,",",12 + spstr strCommand.txt,tTmp.txt,",",11 if(tTmp.txt!="disable") { vis b0,1 @@ -602,15 +619,6 @@ Timer tmSerial vis b10,1 vis tCode,1 } - //flashing status - spstr strCommand.txt,tTmp.txt,",",13 - if(tTmp.txt=="enable") - { - tmFlash.en=1 - }else - { - tmFlash.en=0 - } } if(tInstruction.txt=="time") { @@ -691,7 +699,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 10 + ID : 11 Scope : local Period (ms): 1000 Enabled : yes @@ -709,28 +717,9 @@ Timer tmSleep } } -Timer tmFlash - Attributes - ID : 34 - Scope : local - Period (ms): 600 - Enabled : no - - Events - Timer Event - if(tIcon.isbr==1) - { - tIcon.isbr=0 - vis tIcon,0 - }else - { - tIcon.isbr=1 - vis tIcon,1 - } - TouchCap tc0 Attributes - ID : 11 + ID : 12 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 0df7b03c..0794f475 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -31,7 +31,6 @@ Page cardEntities vis tIcon1,0 vis tEntity1,0 vis bText1,0 - vis hSlider1,0 //ui e2 vis btOnOff2,0 vis bUp2,0 @@ -40,7 +39,6 @@ Page cardEntities vis tIcon2,0 vis tEntity2,0 vis bText2,0 - vis hSlider2,0 //ui e3 vis btOnOff3,0 vis bUp3,0 @@ -49,7 +47,6 @@ Page cardEntities vis tIcon3,0 vis tEntity3,0 vis bText3,0 - vis hSlider3,0 //ui e4 vis btOnOff4,0 vis bUp4,0 @@ -58,7 +55,6 @@ Page cardEntities vis tIcon4,0 vis tEntity4,0 vis bText4,0 - vis hSlider4,0 Variable (string) strCommand Attributes @@ -100,28 +96,28 @@ Variable (string) entn1 ID : 49 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 50 Variable (string) entn2 Attributes ID : 50 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 50 Variable (string) entn3 Attributes ID : 51 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 50 Variable (string) entn4 Attributes ID : 52 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 50 Variable (string) entn5 Attributes @@ -346,72 +342,6 @@ Picture p0 Disable release event after dragging: 0 Send Component ID : disabled -Slider hSlider1 - Attributes - ID : 74 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Position : 50 - Upper range limit : 100 - Lower range limit : 0 - -Slider hSlider2 - Attributes - ID : 75 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Position : 50 - Upper range limit : 100 - Lower range limit : 0 - -Slider hSlider3 - Attributes - ID : 76 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Position : 50 - Upper range limit : 100 - Lower range limit : 0 - -Slider hSlider4 - Attributes - ID : 77 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Position : 50 - Upper range limit : 100 - Lower range limit : 0 - -Slider hSlider5 - Attributes - ID : 78 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Position : 50 - Upper range limit : 100 - Lower range limit : 0 - -Slider hSlider6 - Attributes - ID : 79 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Position : 50 - Upper range limit : 100 - Lower range limit : 0 - Button bDown1 Attributes ID : 11 @@ -737,7 +667,13 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities,bPrev" + nPage=nPage-1 + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -763,7 +699,13 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardEntities,bNext" + nPage=nPage+1 + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -1464,15 +1406,18 @@ Timer tmSerial ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) spstr strCommand.txt,tInstruction.txt,",",0 + if(tInstruction.txt=="entityUpdHeading") + { + spstr strCommand.txt,tHeading.txt,",",1 + } if(tInstruction.txt=="entityUpd") { - // command format: entityUpd,heading,navigation,[,type,internalName,iconId,displayName,optionalValue]x4 - spstr strCommand.txt,tHeading.txt,",",1 + // command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4 // get Type - spstr strCommand.txt,type1.txt,",",3 + spstr strCommand.txt,type1.txt,",",1 // get internal name - spstr strCommand.txt,entn1.txt,",",4 - if(type1.txt=="delete"||type1.txt=="") + spstr strCommand.txt,entn1.txt,",",2 + if(type1.txt=="delete") { vis bUp1,0 vis bStop1,0 @@ -1481,20 +1426,19 @@ Timer tmSerial vis tEntity1,0 vis tIcon1,0 vis bText1,0 - vis hSlider1,0 }else { // change icon - spstr strCommand.txt,tTmp.txt,",",5 + spstr strCommand.txt,tTmp.txt,",",3 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon1.txt,sys0,1 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,",",4 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",7 + spstr strCommand.txt,tEntity1.txt,",",5 vis tEntity1,1 } if(type1.txt=="shutter") @@ -1504,7 +1448,6 @@ Timer tmSerial vis bDown1,1 vis btOnOff1,0 vis bText1,0 - vis hSlider1,0 } if(type1.txt=="light") { @@ -1513,9 +1456,8 @@ Timer tmSerial vis bDown1,0 vis btOnOff1,1 vis bText1,0 - vis hSlider1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,",",6 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1526,9 +1468,8 @@ Timer tmSerial vis bDown1,0 vis btOnOff1,1 vis bText1,0 - vis hSlider1,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,",",6 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 } @@ -1540,11 +1481,10 @@ Timer tmSerial vis btOnOff1,0 vis bText1,1 tsw bText1,0 - vis hSlider1,0 bText1.pco=65535 bText1.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 + spstr strCommand.txt,bText1.txt,",",6 } if(type1.txt=="button") { @@ -1554,41 +1494,17 @@ Timer tmSerial vis btOnOff1,0 vis bText1,1 tsw bText1,1 - vis hSlider1,0 bText1.pco=1374 bText1.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText1.txt,",",8 - } - if(type1.txt=="number") - { - vis bUp1,0 - vis bStop1,0 - vis bDown1,0 - vis btOnOff1,0 - vis bText1,0 - tsw bText1,0 - vis hSlider1,1 - // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText1.txt,",",8 - //first value is current value - spstr bText1.txt,tTmp.txt,"|",1 - covx tTmp.txt,sys0,0,0 - hSlider1.val=sys0 - //second value is min value - spstr bText1.txt,tTmp.txt,"|",2 - covx tTmp.txt,sys0,0,0 - hSlider1.minval=sys0 - //third value is max value - spstr bText1.txt,tTmp.txt,"|",3 - covx tTmp.txt,sys0,0,0 - hSlider1.maxval=sys0 + spstr strCommand.txt,bText1.txt,",",6 } + // id2 // get Type - spstr strCommand.txt,type2.txt,",",9 + spstr strCommand.txt,type2.txt,",",7 // get internal name - spstr strCommand.txt,entn2.txt,",",10 - if(type2.txt=="delete"||type2.txt=="") + spstr strCommand.txt,entn2.txt,",",8 + if(type2.txt=="delete") { vis bUp2,0 vis bStop2,0 @@ -1597,20 +1513,19 @@ Timer tmSerial vis tEntity2,0 vis tIcon2,0 vis bText2,0 - vis hSlider2,0 }else { - // change icon - spstr strCommand.txt,tTmp.txt,",",11 + //change icon + spstr strCommand.txt,tTmp.txt,",",9 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon2.txt,sys0,1 vis tIcon2,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",12 + spstr strCommand.txt,tTmp.txt,",",10 covx tTmp.txt,sys0,0,0 tIcon2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",13 + spstr strCommand.txt,tEntity2.txt,",",11 vis tEntity2,1 } if(type2.txt=="shutter") @@ -1620,7 +1535,6 @@ Timer tmSerial vis bDown2,1 vis btOnOff2,0 vis bText2,0 - vis hSlider2,0 } if(type2.txt=="light") { @@ -1629,9 +1543,8 @@ Timer tmSerial vis bDown2,0 vis btOnOff2,1 vis bText2,0 - vis hSlider2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1642,9 +1555,8 @@ Timer tmSerial vis bDown2,0 vis btOnOff2,1 vis bText2,0 - vis hSlider2,0 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,",",12 covx tTmp.txt,sys0,0,0 btOnOff2.val=sys0 } @@ -1656,11 +1568,10 @@ Timer tmSerial vis btOnOff2,0 vis bText2,1 tsw bText2,0 - vis hSlider2,0 bText2.pco=65535 bText2.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 + spstr strCommand.txt,bText2.txt,",",12 } if(type2.txt=="button") { @@ -1670,41 +1581,17 @@ Timer tmSerial vis btOnOff2,0 vis bText2,1 tsw bText2,1 - vis hSlider2,0 bText2.pco=1374 bText2.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText2.txt,",",14 - } - if(type2.txt=="number") - { - vis bUp2,0 - vis bStop2,0 - vis bDown2,0 - vis btOnOff2,0 - vis bText2,0 - tsw bText2,0 - vis hSlider2,1 - // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText2.txt,",",14 - //first value is current value - spstr bText2.txt,tTmp.txt,"|",1 - covx tTmp.txt,sys0,0,0 - hSlider2.val=sys0 - //second value is min value - spstr bText2.txt,tTmp.txt,"|",2 - covx tTmp.txt,sys0,0,0 - hSlider2.minval=sys0 - //third value is max value - spstr bText2.txt,tTmp.txt,"|",3 - covx tTmp.txt,sys0,0,0 - hSlider2.maxval=sys0 + spstr strCommand.txt,bText2.txt,",",12 } + // id3 // get Type - spstr strCommand.txt,type3.txt,",",15 + spstr strCommand.txt,type3.txt,",",13 // get internal name - spstr strCommand.txt,entn3.txt,",",16 - if(type3.txt=="delete"||type3.txt=="") + spstr strCommand.txt,entn3.txt,",",14 + if(type3.txt=="delete") { vis bUp3,0 vis bStop3,0 @@ -1713,20 +1600,19 @@ Timer tmSerial vis tEntity3,0 vis tIcon3,0 vis bText3,0 - vis hSlider3,0 }else { - // change icon - spstr strCommand.txt,tTmp.txt,",",17 + //change icon + spstr strCommand.txt,tTmp.txt,",",15 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon3.txt,sys0,1 vis tIcon3,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",18 + spstr strCommand.txt,tTmp.txt,",",16 covx tTmp.txt,sys0,0,0 tIcon3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",19 + spstr strCommand.txt,tEntity3.txt,",",17 vis tEntity3,1 } if(type3.txt=="shutter") @@ -1736,18 +1622,16 @@ Timer tmSerial vis bDown3,1 vis btOnOff3,0 vis bText3,0 - vis hSlider3,0 } if(type3.txt=="light") { vis bUp3,0 vis bStop3,0 vis bDown3,0 - vis btOnOff3,1 vis bText3,0 - vis hSlider3,0 + vis btOnOff3,1 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,",",18 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1756,11 +1640,10 @@ Timer tmSerial vis bUp3,0 vis bStop3,0 vis bDown3,0 - vis btOnOff3,1 vis bText3,0 - vis hSlider3,0 + vis btOnOff3,1 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",20 + spstr strCommand.txt,tTmp.txt,",",18 covx tTmp.txt,sys0,0,0 btOnOff3.val=sys0 } @@ -1772,11 +1655,10 @@ Timer tmSerial vis btOnOff3,0 vis bText3,1 tsw bText3,0 - vis hSlider3,0 bText3.pco=65535 bText3.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 + spstr strCommand.txt,bText3.txt,",",18 } if(type3.txt=="button") { @@ -1786,41 +1668,17 @@ Timer tmSerial vis btOnOff3,0 vis bText3,1 tsw bText3,1 - vis hSlider3,0 bText3.pco=1374 bText3.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText3.txt,",",20 - } - if(type3.txt=="number") - { - vis bUp3,0 - vis bStop3,0 - vis bDown3,0 - vis btOnOff3,0 - vis bText3,0 - tsw bText3,0 - vis hSlider3,1 - // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText3.txt,",",20 - //first value is current value - spstr bText3.txt,tTmp.txt,"|",1 - covx tTmp.txt,sys0,0,0 - hSlider3.val=sys0 - //second value is min value - spstr bText3.txt,tTmp.txt,"|",2 - covx tTmp.txt,sys0,0,0 - hSlider3.minval=sys0 - //third value is max value - spstr bText3.txt,tTmp.txt,"|",3 - covx tTmp.txt,sys0,0,0 - hSlider3.maxval=sys0 + spstr strCommand.txt,bText3.txt,",",18 } + // id4 // get Type - spstr strCommand.txt,type4.txt,",",21 + spstr strCommand.txt,type4.txt,",",19 // get internal name - spstr strCommand.txt,entn4.txt,",",22 - if(type4.txt=="delete"||type4.txt=="") + spstr strCommand.txt,entn4.txt,",",20 + if(type4.txt=="delete") { vis bUp4,0 vis bStop4,0 @@ -1829,20 +1687,19 @@ Timer tmSerial vis tEntity4,0 vis tIcon4,0 vis bText4,0 - vis hSlider4,0 }else { - // change icon - spstr strCommand.txt,tTmp.txt,",",23 + //change icon + spstr strCommand.txt,tTmp.txt,",",21 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon4.txt,sys0,1 vis tIcon4,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",24 + spstr strCommand.txt,tTmp.txt,",",22 covx tTmp.txt,sys0,0,0 tIcon4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",25 + spstr strCommand.txt,tEntity4.txt,",",23 vis tEntity4,1 } if(type4.txt=="shutter") @@ -1852,18 +1709,16 @@ Timer tmSerial vis bDown4,1 vis btOnOff4,0 vis bText4,0 - vis hSlider4,0 } if(type4.txt=="light") { vis bUp4,0 vis bStop4,0 vis bDown4,0 - vis btOnOff4,1 vis bText4,0 - vis hSlider4,0 + vis btOnOff4,1 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1872,11 +1727,10 @@ Timer tmSerial vis bUp4,0 vis bStop4,0 vis bDown4,0 - vis btOnOff4,1 vis bText4,0 - vis hSlider4,0 + vis btOnOff4,1 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",26 + spstr strCommand.txt,tTmp.txt,",",24 covx tTmp.txt,sys0,0,0 btOnOff4.val=sys0 } @@ -1888,11 +1742,10 @@ Timer tmSerial vis btOnOff4,0 vis bText4,1 tsw bText4,0 - vis hSlider4,0 bText4.pco=65535 bText4.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 + spstr strCommand.txt,bText4.txt,",",24 } if(type4.txt=="button") { @@ -1902,41 +1755,17 @@ Timer tmSerial vis btOnOff4,0 vis bText4,1 tsw bText4,1 - vis hSlider4,0 bText4.pco=1374 bText4.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText4.txt,",",26 - } - if(type4.txt=="number") - { - vis bUp4,0 - vis bStop4,0 - vis bDown4,0 - vis btOnOff4,0 - vis bText4,0 - tsw bText4,0 - vis hSlider4,1 - // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText4.txt,",",26 - //first value is current value - spstr bText4.txt,tTmp.txt,"|",1 - covx tTmp.txt,sys0,0,0 - hSlider4.val=sys0 - //second value is min value - spstr bText4.txt,tTmp.txt,"|",2 - covx tTmp.txt,sys0,0,0 - hSlider4.minval=sys0 - //third value is max value - spstr bText4.txt,tTmp.txt,"|",3 - covx tTmp.txt,sys0,0,0 - hSlider4.maxval=sys0 + spstr strCommand.txt,bText4.txt,",",24 } + // id5 // get Type - spstr strCommand.txt,type5.txt,",",27 + spstr strCommand.txt,type5.txt,",",25 // get internal name - spstr strCommand.txt,entn5.txt,",",28 - if(type5.txt=="delete"||type5.txt=="") + spstr strCommand.txt,entn5.txt,",",26 + if(type5.txt=="delete") { vis bUp5,0 vis bStop5,0 @@ -1945,20 +1774,19 @@ Timer tmSerial vis tEntity5,0 vis tIcon5,0 vis bText5,0 - vis hSlider5,0 }else { - // change icon - spstr strCommand.txt,tTmp.txt,",",29 + //change icon + spstr strCommand.txt,tTmp.txt,",",27 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon5.txt,sys0,1 vis tIcon5,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",30 + spstr strCommand.txt,tTmp.txt,",",28 covx tTmp.txt,sys0,0,0 tIcon5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,",",31 + spstr strCommand.txt,tEntity5.txt,",",29 vis tEntity5,1 } if(type5.txt=="shutter") @@ -1968,18 +1796,16 @@ Timer tmSerial vis bDown5,1 vis btOnOff5,0 vis bText5,0 - vis hSlider5,0 } if(type5.txt=="light") { vis bUp5,0 vis bStop5,0 vis bDown5,0 - vis btOnOff5,1 vis bText5,0 - vis hSlider5,0 + vis btOnOff5,1 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",32 + spstr strCommand.txt,tTmp.txt,",",30 covx tTmp.txt,sys0,0,0 btOnOff5.val=sys0 } @@ -1988,11 +1814,10 @@ Timer tmSerial vis bUp5,0 vis bStop5,0 vis bDown5,0 - vis btOnOff5,1 vis bText5,0 - vis hSlider5,0 + vis btOnOff5,1 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",32 + spstr strCommand.txt,tTmp.txt,",",30 covx tTmp.txt,sys0,0,0 btOnOff5.val=sys0 } @@ -2004,11 +1829,10 @@ Timer tmSerial vis btOnOff5,0 vis bText5,1 tsw bText5,0 - vis hSlider5,0 bText5.pco=65535 bText5.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText5.txt,",",32 + spstr strCommand.txt,bText5.txt,",",30 } if(type5.txt=="button") { @@ -2018,41 +1842,17 @@ Timer tmSerial vis btOnOff5,0 vis bText5,1 tsw bText5,1 - vis hSlider5,0 bText5.pco=1374 bText5.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText5.txt,",",32 - } - 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 - // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText5.txt,",",32 - //first value is current value - spstr bText5.txt,tTmp.txt,"|",1 - covx tTmp.txt,sys0,0,0 - hSlider5.val=sys0 - //second value is min value - spstr bText5.txt,tTmp.txt,"|",2 - covx tTmp.txt,sys0,0,0 - hSlider5.minval=sys0 - //third value is max value - spstr bText5.txt,tTmp.txt,"|",3 - covx tTmp.txt,sys0,0,0 - hSlider5.maxval=sys0 + spstr strCommand.txt,bText5.txt,",",30 } + // id6 // get Type - spstr strCommand.txt,type6.txt,",",33 + spstr strCommand.txt,type6.txt,",",31 // get internal name - spstr strCommand.txt,entn6.txt,",",34 - if(type6.txt=="delete"||type6.txt=="") + spstr strCommand.txt,entn6.txt,",",32 + if(type6.txt=="delete") { vis bUp6,0 vis bStop6,0 @@ -2061,20 +1861,19 @@ Timer tmSerial vis tEntity6,0 vis tIcon6,0 vis bText6,0 - vis hSlider6,0 }else { - // change icon - spstr strCommand.txt,tTmp.txt,",",35 + //change icon + spstr strCommand.txt,tTmp.txt,",",33 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tIcon6.txt,sys0,1 vis tIcon6,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",36 + spstr strCommand.txt,tTmp.txt,",",34 covx tTmp.txt,sys0,0,0 tIcon6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,",",37 + spstr strCommand.txt,tEntity6.txt,",",35 vis tEntity6,1 } if(type6.txt=="shutter") @@ -2084,18 +1883,16 @@ Timer tmSerial vis bDown6,1 vis btOnOff6,0 vis bText6,0 - vis hSlider6,0 } if(type6.txt=="light") { vis bUp6,0 vis bStop6,0 vis bDown6,0 - vis btOnOff6,1 vis bText6,0 - vis hSlider6,0 + vis btOnOff6,1 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",38 + spstr strCommand.txt,tTmp.txt,",",36 covx tTmp.txt,sys0,0,0 btOnOff6.val=sys0 } @@ -2104,11 +1901,10 @@ Timer tmSerial vis bUp6,0 vis bStop6,0 vis bDown6,0 - vis btOnOff6,1 vis bText6,0 - vis hSlider6,0 + vis btOnOff6,1 // get Button State (optional Value) - spstr strCommand.txt,tTmp.txt,",",38 + spstr strCommand.txt,tTmp.txt,",",36 covx tTmp.txt,sys0,0,0 btOnOff6.val=sys0 } @@ -2120,11 +1916,10 @@ Timer tmSerial vis btOnOff6,0 vis bText6,1 tsw bText6,0 - vis hSlider6,0 bText6.pco=65535 bText6.pco2=65535 // get Text (optional Value) - spstr strCommand.txt,bText6.txt,",",38 + spstr strCommand.txt,bText6.txt,",",36 } if(type6.txt=="button") { @@ -2134,35 +1929,10 @@ Timer tmSerial vis btOnOff6,0 vis bText6,1 tsw bText6,1 - vis hSlider6,0 bText6.pco=1374 bText6.pco2=1374 // get Text (optional Value) - spstr strCommand.txt,bText6.txt,",",38 - } - 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 - // get config (optional Value) (use bText as variable) - spstr strCommand.txt,bText6.txt,",",38 - //first value is current value - spstr bText6.txt,tTmp.txt,"|",1 - covx tTmp.txt,sys0,0,0 - hSlider6.val=sys0 - //second value is min value - spstr bText6.txt,tTmp.txt,"|",2 - covx tTmp.txt,sys0,0,0 - hSlider6.minval=sys0 - //third value is max value - spstr bText6.txt,tTmp.txt,"|",3 - covx tTmp.txt,sys0,0,0 - hSlider6.maxval=sys0 + spstr strCommand.txt,bText6.txt,",",36 } } if(tInstruction.txt=="pageType") @@ -2177,36 +1947,11 @@ Timer tmSerial //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 @@ -2215,6 +1960,18 @@ Timer tmSerial { page cardMedia } + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardGrid") + { + page cardGrid + } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 7bf63ebd..97cb2068 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -76,28 +76,28 @@ Variable (string) entn1 ID : 18 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 50 Variable (string) entn2 Attributes ID : 19 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 50 Variable (string) entn3 Attributes ID : 20 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 50 Variable (string) entn4 Attributes ID : 21 Scope : local Text : - Max. Text Size: 70 + Max. Text Size: 50 Variable (string) type5 Attributes @@ -269,7 +269,13 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid,bPrev" + nPage=nPage-1 + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -295,7 +301,13 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardGrid,bNext" + nPage=nPage+1 + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -600,14 +612,17 @@ Timer tmSerial ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) spstr strCommand.txt,tInstruction.txt,",",0 + if(tInstruction.txt=="entityUpdHeading") + { + spstr strCommand.txt,tHeading.txt,",",1 + } if(tInstruction.txt=="entityUpd") { - // command format: entityUpd,heading,navigation,[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 - spstr strCommand.txt,tHeading.txt,",",1 + // command format: entityUpd[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 // get Type - spstr strCommand.txt,type1.txt,",",3 + spstr strCommand.txt,type1.txt,",",1 // get internal name - spstr strCommand.txt,entn1.txt,",",4 + spstr strCommand.txt,entn1.txt,",",2 if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 @@ -615,22 +630,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",5 + spstr strCommand.txt,tTmp.txt,",",3 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",6 + spstr strCommand.txt,tTmp.txt,",",4 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",7 + spstr strCommand.txt,tEntity1.txt,",",5 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,",",9 + spstr strCommand.txt,type2.txt,",",7 // get internal name - spstr strCommand.txt,entn2.txt,",",10 + spstr strCommand.txt,entn2.txt,",",8 if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 @@ -638,22 +653,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",11 + spstr strCommand.txt,tTmp.txt,",",9 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",12 + spstr strCommand.txt,tTmp.txt,",",10 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",13 + spstr strCommand.txt,tEntity2.txt,",",11 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,",",15 + spstr strCommand.txt,type3.txt,",",13 // get internal name - spstr strCommand.txt,entn3.txt,",",16 + spstr strCommand.txt,entn3.txt,",",14 if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 @@ -661,22 +676,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",17 + spstr strCommand.txt,tTmp.txt,",",15 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",18 + spstr strCommand.txt,tTmp.txt,",",16 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",19 + spstr strCommand.txt,tEntity3.txt,",",17 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,",",21 + spstr strCommand.txt,type4.txt,",",19 // get internal name - spstr strCommand.txt,entn4.txt,",",22 + spstr strCommand.txt,entn4.txt,",",20 if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 @@ -684,22 +699,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",23 + spstr strCommand.txt,tTmp.txt,",",21 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",24 + spstr strCommand.txt,tTmp.txt,",",22 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",25 + spstr strCommand.txt,tEntity4.txt,",",23 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,",",27 + spstr strCommand.txt,type5.txt,",",25 // get internal name - spstr strCommand.txt,entn5.txt,",",28 + spstr strCommand.txt,entn5.txt,",",26 if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 @@ -707,22 +722,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",29 + spstr strCommand.txt,tTmp.txt,",",27 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",30 + spstr strCommand.txt,tTmp.txt,",",28 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,",",31 + spstr strCommand.txt,tEntity5.txt,",",29 vis tEntity5,1 } // get Type - spstr strCommand.txt,type6.txt,",",33 + spstr strCommand.txt,type6.txt,",",31 // get internal name - spstr strCommand.txt,entn6.txt,",",34 + spstr strCommand.txt,entn6.txt,",",32 if(type6.txt=="delete"||type6.txt=="") { vis tEntity6,0 @@ -730,16 +745,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",35 + spstr strCommand.txt,tTmp.txt,",",33 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1 vis bEntity6,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",36 + spstr strCommand.txt,tTmp.txt,",",34 covx tTmp.txt,sys0,0,0 bEntity6.pco=sys0 // set name - spstr strCommand.txt,tEntity6.txt,",",37 + spstr strCommand.txt,tEntity6.txt,",",35 vis tEntity6,1 } } @@ -755,36 +770,11 @@ Timer tmSerial //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 @@ -793,6 +783,18 @@ Timer tmSerial { page cardMedia } + if(tId.txt=="pageStartup") + { + page pageStartup + } + if(tId.txt=="popupNotify") + { + page popupNotify + } + if(tId.txt=="cardEntities") + { + page cardEntities + } if(tId.txt=="cardAlarm") { page cardAlarm diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 9aea1b73..4c02643c 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -16,37 +16,34 @@ Page cardMedia vis p0,0 vis tSend,0 vis tInstruction,0 + vis nPageDisp,0 vis tTmp,0 vis tId,0 - vis t5,0 //vis nPageDisp,0 Variable (string) strCommand Attributes - ID : 7 - Scope : local - Text : - Max. Text Size: 500 - -Variable (string) entn - Attributes - ID : 17 - Scope : local - Text : - Max. Text Size: 50 - -Variable (string) vaSpeakerList - Attributes - ID : 26 + ID : 8 Scope : local Text : Max. Text Size: 200 -Variable (int32) vaSpeakerPos +Variable (string) entn Attributes - ID : 27 - Scope: local - Value: 0 + ID : 19 + Scope : local + Text : + Max. Text Size: 50 + +Number nPageDisp + Attributes + ID : 6 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 Text tSend Attributes @@ -56,8 +53,8 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : - Max. Text Size : 200 + Text : newtxt + Max. Text Size : 100 Text tTmp Attributes @@ -72,7 +69,7 @@ Text tTmp Text tInstruction Attributes - ID : 8 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -83,7 +80,7 @@ Text tInstruction Text tId Attributes - ID : 9 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -94,7 +91,7 @@ Text tId Text tHeading Attributes - ID : 10 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -105,7 +102,7 @@ Text tHeading Text tTitle Attributes - ID : 11 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -116,7 +113,7 @@ Text tTitle Text tAuthor Attributes - ID : 12 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -127,7 +124,7 @@ Text tAuthor Text t2 Attributes - ID : 13 + ID : 14 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -157,7 +154,7 @@ Text t2 Text tPlayPause Attributes - ID : 14 + ID : 15 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -187,7 +184,7 @@ Text tPlayPause Text t0 Attributes - ID : 15 + ID : 16 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -217,7 +214,7 @@ Text t0 Text tIcon Attributes - ID : 16 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -226,162 +223,6 @@ Text tIcon Text : Max. Text Size : 10 -Text t1 - Attributes - ID : 21 - 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 - hVolume.val=hVolume.val-5 - // event,buttonPress2,internalNameEntity,volumeSlider,50 - //craft command - tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," - covx hVolume.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,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Text t3 - Attributes - ID : 22 - 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 - hVolume.val=hVolume.val+5 - // event,buttonPress2,internalNameEntity,volumeSlider,50 - //craft command - tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," - covx hVolume.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,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Text t4 - Attributes - ID : 23 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text :  - Max. Text Size : 10 - -Text tSpeaker - Attributes - ID : 24 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 50 - - Events - Touch Press Event - // event,buttonPress2,entn,media-next - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="speaker-sel,"+tSpeaker.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Text t6 - Attributes - ID : 25 - 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 - //speaker - tSpeaker.pco=65535 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - vaSpeakerPos.val+=1 - if(tSpeaker.txt=="") - { - vaSpeakerPos.val=0 - spstr vaSpeakerList.txt,tSpeaker.txt,"?",vaSpeakerPos.val - } - -Text t5 - Attributes - ID : 28 - 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 - // event,buttonPress2,entn,media-next - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="media-OnOff" - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,1 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - Picture p0 Attributes ID : 1 @@ -392,7 +233,7 @@ Picture p0 Slider hVolume Attributes - ID : 29 + ID : 17 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -403,8 +244,6 @@ Slider hVolume Events Touch Release Event - tmCooldown.en=1 - tmCooldown.tim=800 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -435,7 +274,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia,bNext" + nPage=nPage+1 + nPageDisp.val=nPage + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -461,7 +307,14 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardMedia,bPrev" + nPage=nPage-1 + nPageDisp.val=nPage + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -476,7 +329,7 @@ Button bPrev Timer tmSerial Attributes - ID : 6 + ID : 7 Scope : local Period (ms): 50 Enabled : yes @@ -548,32 +401,6 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"|",7 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tPlayPause.txt,sys0,1 - //speaker current - spstr strCommand.txt,tSpeaker.txt,"|",8 - if(tSpeaker.txt!="") - { - tSpeaker.pco=1374 - }else - { - tSpeaker.pco=65535 - } - //speaker list - spstr strCommand.txt,vaSpeakerList.txt,"|",9 - if(vaSpeakerList.txt=="") - { - vis t6,0 - } - vaSpeakerPos.val=0 - // on off button - spstr strCommand.txt,tTmp.txt,"|",10 - if(tTmp.txt=="disable") - { - vis t5,0 - }else - { - vis t5,1 - covx tTmp.txt,t5.pco,0,0 - } } if(tInstruction.txt=="time") { @@ -663,7 +490,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 18 + ID : 20 Scope : local Period (ms): 1000 Enabled : yes @@ -681,20 +508,9 @@ Timer tmSleep } } -Timer tmCooldown - Attributes - ID : 20 - Scope : local - Period (ms): 100 - Enabled : no - - Events - Timer Event - tmCooldown.en=0 - TouchCap tc0 Attributes - ID : 19 + ID : 21 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out/cardThermo.txt b/HMI/US/portrait/n2t-out/cardThermo.txt index a50ca8e0..1d2a044b 100644 --- a/HMI/US/portrait/n2t-out/cardThermo.txt +++ b/HMI/US/portrait/n2t-out/cardThermo.txt @@ -269,7 +269,14 @@ Button bNext Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo,bNext" + nPage=nPage+1 + nPageDisp.val=nPage + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC @@ -369,7 +376,14 @@ Button bPrev Events Touch Press Event - tSend.txt="event,buttonPress2,cardThermo,bPrev" + nPage=nPage-1 + nPageDisp.val=nPage + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out/nspanel_US_P_Stats.txt deleted file mode 100644 index 0e26178d..00000000 --- a/HMI/US/portrait/n2t-out/nspanel_US_P_Stats.txt +++ /dev/null @@ -1,62 +0,0 @@ -Program.s - 0 Component(s) - 9 Line(s) of event code - 9 Unique line(s) of event code -pageIcons - 6 Component(s) - 0 Line(s) of event code - 0 Unique line(s) of event code -pageSerialTest - 13 Component(s) - 48 Line(s) of event code - 43 Unique line(s) of event code -popupLight - 26 Component(s) - 306 Line(s) of event code - 167 Unique line(s) of event code -pageStartup - 19 Component(s) - 146 Line(s) of event code - 111 Unique line(s) of event code -popupNotify - 17 Component(s) - 179 Line(s) of event code - 118 Unique line(s) of event code -pageTest - 13 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code -cardAlarm - 35 Component(s) - 276 Line(s) of event code - 172 Unique line(s) of event code -popupShutter - 19 Component(s) - 179 Line(s) of event code - 102 Unique line(s) of event code -cardThermo - 42 Component(s) - 406 Line(s) of event code - 218 Unique line(s) of event code -screensaver - 31 Component(s) - 183 Line(s) of event code - 133 Unique line(s) of event code -cardGrid - 39 Component(s) - 388 Line(s) of event code - 224 Unique line(s) of event code -cardEntities - 80 Component(s) - 1172 Line(s) of event code - 468 Unique line(s) of event code -cardMedia - 30 Component(s) - 278 Line(s) of event code - 139 Unique line(s) of event code - -Total - 13 Page(s) - 370 Component(s) - 3583 Line(s) of event code - 959 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out/pageIcons.txt b/HMI/US/portrait/n2t-out/pageIcons.txt index f66a3fae..a7e9bd13 100644 --- a/HMI/US/portrait/n2t-out/pageIcons.txt +++ b/HMI/US/portrait/n2t-out/pageIcons.txt @@ -30,8 +30,8 @@ Text tIcons Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text :  - Max. Text Size : 150 + Text :  + Max. Text Size : 120 Text tTmp1 Attributes diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index f1256b85..025b2e53 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -166,7 +166,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 16 + Text : 21 Max. Text Size : 10 Picture p0 diff --git a/HMI/US/portrait/n2t-out/pageSwipeTest.txt b/HMI/US/portrait/n2t-out/pageSwipeTest.txt new file mode 100644 index 00000000..4dc13bca --- /dev/null +++ b/HMI/US/portrait/n2t-out/pageSwipeTest.txt @@ -0,0 +1,294 @@ +Page pageSwipeTest + Attributes + ID : 0 + 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 + +Number nXS + Attributes + ID : 7 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nYE + Attributes + ID : 8 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nYS + Attributes + ID : 9 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nXE + Attributes + ID : 10 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nYR + Attributes + ID : 12 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nXR + Attributes + ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Text tDesc1 + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : X-Start:\r\nX-End:\r\nY-Start:\r\nY-End: + Max. Text Size : 70 + +Text t2 + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : Swipe Dir\r\nold: + Max. Text Size : 70 + +Text tDirection + Attributes + ID : 6 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : newtxt + Max. Text Size : 10 + +Text t0 + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : Difference\r\nX\r\nY + Max. Text Size : 60 + +Text tStatusNew + Attributes + ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : newtxt + Max. Text Size : 40 + +Text t3 + Attributes + ID : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : new direction: + Max. Text Size : 50 + +Text tDirNew + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : newtxt + Max. Text Size : 40 + +Text t1 + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : new status: + Max. Text Size : 50 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Button b8 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : back + Max. Text Size : 10 + + Events + Touch Press Event + page pageTest + +Timer tm0 + Attributes + ID : 5 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + if(tc0.val!=0) + { + xc2=tch0 + yc2=tch1 + //debug + nXE.val=xc2 + nYE.val=yc2 + } + +TouchCap tc0 + Attributes + ID : 4 + Scope: local + Value: 0 + + Events + Touch Press Event + if(tc0.val==9) // This is the location of the brightness slider + { + xc1=0 + yc1=0 + }else + { + xc1=tch0 + yc1=tch1 + //debug + nXS.val=xc1 + nYS.val=yc1 + tm0.en=1 + } + + Touch Release Event + tm0.en=0 + if(tc0.val==9) // This is the location of the brightness slider + { + }else + { + if(tch0==0) + // When this is zero we can interpret that as the real end of the drag event + { + xcR=xc1-xc2 + ycR=yc1-yc2 + // //debug + // nXR.val=xcR + // nYR.val=ycR + // if(xcR>125) + // { + // tDirection.txt="left" + // }else if(xcR<-125) + // { + // tDirection.txt="right" + // }else if(ycR>125) + // { + // tDirection.txt="up" + // }else if(ycR<-125) + // { + // tDirection.txt="down" + // }else + // { + // tDirection.txt="invalid" + // } + // new method + // one of the difference values should be low to be a valid direction, in case it has a high value it's not a valid swipe, because it's diagonal + // x difference between -125 and 125 (swipe on y-axis) + if(xcR>ixLimit&&xcRyLimitMin) + { + tDirNew.txt="up" + }else + { + tDirNew.txt="invalid" + } + // y difference between -125 and 125 (swipe on x-axis) + }else if(ycR>iyLimit&&ycRxLimitMin) + { + tDirNew.txt="left" + }else + { + tDirNew.txt="invalid" + } + //diagonal swipe invalid + }else + { + tStatusNew.txt="invalid" + tDirNew.txt="diagonal" + } + } + } + diff --git a/HMI/US/portrait/n2t-out/pageTest.txt b/HMI/US/portrait/n2t-out/pageTest.txt index eca9f9a6..e1389545 100644 --- a/HMI/US/portrait/n2t-out/pageTest.txt +++ b/HMI/US/portrait/n2t-out/pageTest.txt @@ -53,7 +53,7 @@ Button b1 Touch Press Event page pageSerialTest -Button b3 +Button b2 Attributes ID : 4 Scope : local @@ -61,6 +61,21 @@ Button b3 Disable release event after dragging: 0 Send Component ID : disabled State : unpressed + Text : swipe + Max. Text Size : 10 + + Events + Touch Press Event + page pageSwipeTest + +Button b3 + Attributes + ID : 5 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed Text : disable recmod Max. Text Size : 20 @@ -70,7 +85,7 @@ Button b3 Button b6 Attributes - ID : 5 + ID : 6 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -85,7 +100,7 @@ Button b6 Button b4 Attributes - ID : 6 + ID : 7 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -100,7 +115,7 @@ Button b4 Button b5 Attributes - ID : 7 + ID : 8 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -115,7 +130,7 @@ Button b5 Button b7 Attributes - ID : 8 + ID : 9 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -130,7 +145,7 @@ Button b7 Button b8 Attributes - ID : 9 + ID : 10 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -146,7 +161,7 @@ Button b8 Button b9 Attributes - ID : 10 + ID : 11 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -161,7 +176,7 @@ Button b9 Button b10 Attributes - ID : 11 + ID : 12 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -176,7 +191,7 @@ Button b10 Button b11 Attributes - ID : 12 + ID : 13 Scope : local Dragging : 0 Disable release event after dragging: 0 diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 3664688f..b7b2473b 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -310,7 +310,12 @@ Button b0 Events Touch Press Event - tSend.txt="event,buttonPress2,popupLight,bExit" + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index fad07276..3c3e4bfc 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -127,7 +127,12 @@ Button b0 Events Touch Press Event sleepTimeout=vaOldSleepT.val - tSend.txt="event,buttonPress2,popupNotify,bExit" + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 0bc4ddf3..75d40717 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -180,7 +180,12 @@ Button b0 Events Touch Press Event - tSend.txt="event,buttonPress2,popupShutter,bExit" + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index dad8e568..0f28268c 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -20,26 +20,12 @@ Page screensaver vis tTmp,0 vis p0,0 //load gloabl time string from pageIcons - //tTime.txt=vaTime.txt - spstr vaTime.txt,tTime.txt,"?",0 - spstr vaTime.txt,tAMPM.txt,"?",1 - if(tAMPM.txt=="") - { - vis tAMPM,0 - } + tTime.txt=vaTime.txt tDate.txt=vaDate.txt dim=dimValue vis tSend,0 //page open event - // clear weather elements, to keep example content in HMI - tMainIcon.txt="" - tMainText.txt="" - tForecast1.txt="" - tF1Icon.txt="" - tForecast1Val.txt="" - tForecast2.txt="" - tF2Icon.txt="" - tForecast2Val.txt="" + // craft command tSend.txt="event,screensaverOpen" //send calc crc btlen tSend.txt,sys0 @@ -52,20 +38,31 @@ Page screensaver prints sys0,2 prints tSend.txt,0 prints crcval,2 + // clear weather elements, to keep example content in HMI + tMainIcon.txt="" + tMainText.txt="" + tMRIcon.txt="" + tMR.txt="" + tForecast1.txt="" + tF1Icon.txt="" + tForecast1Val.txt="" + tForecast2.txt="" + tF2Icon.txt="" + tForecast2Val.txt="" Variable (string) strCommand Attributes ID : 5 Scope : local Text : - Max. Text Size: 200 + Max. Text Size: 100 Variable (string) vaTime Attributes ID : 10 Scope : global Text : - Max. Text Size: 15 + Max. Text Size: 10 Variable (string) vaDate Attributes @@ -76,17 +73,11 @@ Variable (string) vaDate Variable (string) tId Attributes - ID : 22 + ID : 24 Scope : local Text : Max. Text Size: 25 -Variable (int32) vaTap - Attributes - ID : 30 - Scope: local - Value: 0 - Number originPage Attributes ID : 3 @@ -106,7 +97,7 @@ Text tInstruction Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 50 + Max. Text Size : 20 Text tTmp Attributes @@ -117,7 +108,7 @@ Text tTmp Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 50 + Max. Text Size : 20 Text tTime Attributes @@ -127,8 +118,8 @@ Text tTime Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 21:32 - Max. Text Size : 15 + Text : 21:32 + Max. Text Size : 10 Text tDate Attributes @@ -150,7 +141,7 @@ Text tSend Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 50 + Max. Text Size : 25 Text tMainIcon Attributes @@ -174,7 +165,7 @@ Text tMainText Text : 2,3 °C Max. Text Size : 10 -Text tForecast1 +Text tMRIcon Attributes ID : 15 Scope : local @@ -182,12 +173,34 @@ Text tForecast1 Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none + Text :  + Max. Text Size : 10 + +Text tMR + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : 0 mm + Max. Text Size : 10 + +Text tForecast1 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none Text : Mi Max. Text Size : 10 Text tForecast1Val Attributes - ID : 16 + ID : 18 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -198,7 +211,7 @@ Text tForecast1Val Text tF1Icon Attributes - ID : 17 + ID : 19 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -209,7 +222,7 @@ Text tF1Icon Text tForecast2 Attributes - ID : 18 + ID : 20 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -220,7 +233,7 @@ Text tForecast2 Text tF2Icon Attributes - ID : 19 + ID : 21 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -231,7 +244,7 @@ Text tF2Icon Text tForecast2Val Attributes - ID : 20 + ID : 22 Scope : local Dragging : 0 Disable release event after dragging: 0 @@ -241,17 +254,6 @@ Text tForecast2Val Max. Text Size : 10 Text t10 - Attributes - ID : 21 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : | - Max. Text Size : 10 - -Text tAMPM Attributes ID : 23 Scope : local @@ -259,73 +261,7 @@ Text tAMPM Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : PM - Max. Text Size : 10 - -Text tForecast3Val - Attributes - ID : 24 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tF3Icon - Attributes - ID : 25 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast3 - Attributes - ID : 26 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast4 - Attributes - ID : 27 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tF4Icon - Attributes - ID : 28 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : - Max. Text Size : 10 - -Text tForecast4Val - Attributes - ID : 29 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Associated Keyboard : none - Text : + Text : | Max. Text Size : 10 Picture p0 @@ -404,12 +340,7 @@ Timer tmSerial { //get set time to global variable spstr strCommand.txt,vaTime.txt,",",1 - spstr vaTime.txt,tTime.txt,"?",0 - spstr vaTime.txt,tAMPM.txt,"?",1 - if(tAMPM.txt=="") - { - vis tAMPM,0 - } + tTime.txt=vaTime.txt } if(tInstruction.txt=="date") { @@ -431,38 +362,36 @@ Timer tmSerial substr pageIcons.tIcons.txt,tMainIcon.txt,sys0,1 //tMainText spstr strCommand.txt,tMainText.txt,"?",2 + //tMRIcon + spstr strCommand.txt,tTmp.txt,"?",3 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,tMRIcon.txt,sys0,1 + //tMR + spstr strCommand.txt,tMR.txt,"?",4 //tForecast1 - spstr strCommand.txt,tForecast1.txt,"?",3 + spstr strCommand.txt,tForecast1.txt,"?",5 //tF1Icon - spstr strCommand.txt,tTmp.txt,"?",4 + spstr strCommand.txt,tTmp.txt,"?",6 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF1Icon.txt,sys0,1 //tForecast1Val - spstr strCommand.txt,tForecast1Val.txt,"?",5 + spstr strCommand.txt,tForecast1Val.txt,"?",7 //tForecast2 - spstr strCommand.txt,tForecast2.txt,"?",6 + spstr strCommand.txt,tForecast2.txt,"?",8 //tF2Icon - spstr strCommand.txt,tTmp.txt,"?",7 + spstr strCommand.txt,tTmp.txt,"?",9 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,tF2Icon.txt,sys0,1 //tForecast2Val - spstr strCommand.txt,tForecast2Val.txt,"?",8 - //tForecast3 - spstr strCommand.txt,tForecast3.txt,"?",9 - //tF3Icon - spstr strCommand.txt,tTmp.txt,"?",10 + spstr strCommand.txt,tForecast2Val.txt,"?",10 + } + if(tInstruction.txt=="page") + { + //pagenumber + spstr strCommand.txt,tTmp.txt,",",1 covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tF3Icon.txt,sys0,1 - //tForecast3Val - spstr strCommand.txt,tForecast3Val.txt,"?",11 - //tForecast4 - spstr strCommand.txt,tForecast4.txt,"?",12 - //tF4Icon - spstr strCommand.txt,tTmp.txt,"?",13 - covx tTmp.txt,sys0,0,0 - substr pageIcons.tIcons.txt,tF4Icon.txt,sys0,1 - //tForecast4Val - spstr strCommand.txt,tForecast4Val.txt,"?",14 + nPage=sys0 + //don't send current page number, wake will do } if(tInstruction.txt=="pageType") { @@ -535,10 +464,12 @@ TouchCap tc0 Events Touch Press Event - dim=100 - vaTap.val+=1 - covx vaTap.val,tTmp.txt,0,0 - tSend.txt="event,buttonPress2,screensaver,bExit,"+tTmp.txt + //page open event + // event,pageOpen,cardEntities,pageNumber + // craft command + // convert pageNumber and write to tTmp + covx nPage,tTmp.txt,0,0 + tSend.txt="event,pageOpen,"+tTmp.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt deleted file mode 100644 index 3f11f478..00000000 --- a/HMI/n2t-out/nspanel_Stats.txt +++ /dev/null @@ -1,62 +0,0 @@ -Program.s - 0 Component(s) - 10 Line(s) of event code - 10 Unique line(s) of event code -pageIcons - 6 Component(s) - 0 Line(s) of event code - 0 Unique line(s) of event code -pageTest - 13 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code -pageSerialTest - 13 Component(s) - 48 Line(s) of event code - 43 Unique line(s) of event code -popupShutter - 19 Component(s) - 179 Line(s) of event code - 102 Unique line(s) of event code -popupNotify - 17 Component(s) - 179 Line(s) of event code - 118 Unique line(s) of event code -cardGrid - 39 Component(s) - 388 Line(s) of event code - 224 Unique line(s) of event code -cardMedia - 30 Component(s) - 278 Line(s) of event code - 139 Unique line(s) of event code -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code -cardThermo - 42 Component(s) - 406 Line(s) of event code - 218 Unique line(s) of event code -cardAlarm - 35 Component(s) - 276 Line(s) of event code - 172 Unique line(s) of event code -popupLight - 27 Component(s) - 323 Line(s) of event code - 174 Unique line(s) of event code -screensaver - 31 Component(s) - 183 Line(s) of event code - 133 Unique line(s) of event code -cardEntities - 58 Component(s) - 842 Line(s) of event code - 360 Unique line(s) of event code - -Total - 13 Page(s) - 349 Component(s) - 3275 Line(s) of event code - 882 Unique line(s) of event code