diff --git a/HMI/README.md b/HMI/README.md index 0d77a411..90ecccfc 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -89,7 +89,7 @@ The following message can be used to update the content on the cardEntities Page `~light~light.entityName~1~17299~Light1~0` -`~shutter~cover.entityName~0~17299~Shutter2~` +`~shutter~cover.entityName~0~17299~Shutter2~iconUp|iconStop|iconDown` `~delete~~~~~` @@ -111,7 +111,7 @@ The following message can be used to update the content on the cardEntities Page ### popupShutter Page -`entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition` +`entityUpdateDetail~*ignored*~*sliderPos*~2ndrow~textPosition~icon1~iconUp~iconStop~iconDown` `entityUpdateDetail~1~77` @@ -123,9 +123,9 @@ The following message can be used to update the content on the cardEntities Page ### cardThermo Page -`entityUpd~*heading*~*navigation*~*internalNameEntiy*~*currentTemp*~*destTemp*~*status*~*minTemp*~*maxTemp*~*stepTemp*[[~*iconId*~*activeColor*~*state*~*hvac_action*]]` +`entityUpd~*heading*~*navigation*~*internalNameEntiy*~*currentTemp*~*destTemp*~*status*~*minTemp*~*maxTemp*~*stepTemp*[[~*iconId*~*activeColor*~*state*~*hvac_action*]]~tCurTempLbl~tStateLbl~tALbl~iconTemperature~dstTempTwoTempMode` -`[[]]` are not part of the command~ this part repeats 9 times for the buttons +`[[]]` are not part of the command~ this part repeats 8 times for the buttons ### cardMedia Page @@ -135,6 +135,9 @@ The following message can be used to update the content on the cardEntities Page `entityUpd~*internalNameEntity*~*navigation*~*arm1*~*arm1ActionName*~*arm2*~*arm2ActionName*~*arm3*~*arm3ActionName*~*arm4*~*arm4ActionName*~*icon*~*iconcolor*~*numpadStatus*~*flashing*` +### cardQR Page + +`entityUpd,heading,navigation,textQR[,type,internalName,iconId,displayName,optionalValue]x2` ## Messages from Nextion Display diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 18cf4acf..aebc8351 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000 -+++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-07 23:31:12.408706139 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/landscape/n2t-out/Program.s.txt 2022-05-22 08:52:06.663941704 +0000 @@ -11,6 +11,4 @@ // dim value int dimValue=40 @@ -9,8 +9,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt - lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 -+++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-07 23:31:12.412706142 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/landscape/n2t-out/pageStartup.txt 2022-05-22 08:52:06.667941783 +0000 @@ -177,7 +177,7 @@ recmod=1 bauds=115200 diff --git a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt index fc701937..0669f985 100644 --- a/HMI/US/landscape/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out-visual/cardAlarm.txt @@ -101,7 +101,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 421 + x coordinate : 406 y coordinate : 277 Width : 34 Height : 30 @@ -131,7 +131,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 0 y coordinate : 290 Width : 100 Height : 30 @@ -161,7 +161,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 114 + x coordinate : 99 y coordinate : 290 Width : 39 Height : 30 @@ -995,6 +995,117 @@ Button arm4 prints crcval,2 tCode.txt="" +Hotspot mSwipeNext + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 471 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 450 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 5 @@ -1234,6 +1345,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/cardEntities.txt b/HMI/US/landscape/n2t-out-visual/cardEntities.txt index b5d38aa0..764d0cad 100644 --- a/HMI/US/landscape/n2t-out-visual/cardEntities.txt +++ b/HMI/US/landscape/n2t-out-visual/cardEntities.txt @@ -2018,6 +2018,117 @@ Hotspot m3 page popupLight } +Hotspot mSwipeNext + Attributes + ID : 62 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 471 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 63 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 454 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 64 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 30 @@ -2138,6 +2249,44 @@ Timer tmSerial vis bText1,0 vis hSlider1,0 vis nNum1,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",8 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp1.pco=27501 + tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + } } if(type1.txt=="light") { @@ -2260,6 +2409,44 @@ Timer tmSerial vis bText2,0 vis hSlider2,0 vis nNum2,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",14 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp2.pco=27501 + tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + } } if(type2.txt=="light") { @@ -2382,6 +2569,44 @@ Timer tmSerial vis bText3,0 vis hSlider3,0 vis nNum3,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",20 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp3.pco=27501 + tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + } } if(type3.txt=="light") { @@ -2504,6 +2729,44 @@ Timer tmSerial vis bText4,0 vis hSlider4,0 vis nNum4,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",26 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp4.pco=27501 + tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + } } if(type4.txt=="light") { @@ -2644,6 +2907,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardGrid.txt b/HMI/US/landscape/n2t-out-visual/cardGrid.txt index 58543f86..24d9bcb5 100644 --- a/HMI/US/landscape/n2t-out-visual/cardGrid.txt +++ b/HMI/US/landscape/n2t-out-visual/cardGrid.txt @@ -144,7 +144,7 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 126 + x coordinate : 128 y coordinate : 26 Width : 227 Height : 30 @@ -174,7 +174,7 @@ Text tEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 21 + x coordinate : 23 y coordinate : 155 Width : 140 Height : 30 @@ -204,7 +204,7 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 0 y coordinate : 0 Width : 230 Height : 24 @@ -234,7 +234,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 415 + x coordinate : 400 y coordinate : 290 Width : 34 Height : 30 @@ -264,7 +264,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 0 y coordinate : 290 Width : 100 Height : 30 @@ -294,7 +294,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 126 + x coordinate : 111 y coordinate : 290 Width : 39 Height : 30 @@ -324,7 +324,7 @@ Text tEntity2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 172 + x coordinate : 174 y coordinate : 155 Width : 140 Height : 30 @@ -354,7 +354,7 @@ Text tEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 322 + x coordinate : 324 y coordinate : 155 Width : 140 Height : 30 @@ -384,7 +384,7 @@ Text tEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 21 + x coordinate : 23 y coordinate : 274 Width : 140 Height : 30 @@ -414,7 +414,7 @@ Text tEntity5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 172 + x coordinate : 174 y coordinate : 274 Width : 140 Height : 30 @@ -444,7 +444,7 @@ Text tEntity6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 322 + x coordinate : 324 y coordinate : 274 Width : 140 Height : 30 @@ -474,7 +474,7 @@ Picture p0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 + x coordinate : 1 y coordinate : 0 Width : 479 Height : 319 @@ -491,7 +491,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 26 y coordinate : 16 Width : 50 Height : 50 @@ -545,7 +545,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 + x coordinate : 408 y coordinate : 16 Width : 50 Height : 50 @@ -592,7 +592,7 @@ Button bEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 51 + x coordinate : 53 y coordinate : 75 Width : 80 Height : 80 @@ -650,7 +650,7 @@ Button bEntity2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 202 + x coordinate : 204 y coordinate : 75 Width : 80 Height : 80 @@ -708,7 +708,7 @@ Button bEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 352 + x coordinate : 354 y coordinate : 75 Width : 80 Height : 80 @@ -766,7 +766,7 @@ Button bEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 51 + x coordinate : 37 y coordinate : 194 Width : 80 Height : 80 @@ -824,7 +824,7 @@ Button bEntity5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 202 + x coordinate : 204 y coordinate : 194 Width : 80 Height : 80 @@ -882,7 +882,7 @@ Button bEntity6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 352 + x coordinate : 354 y coordinate : 194 Width : 80 Height : 80 @@ -940,7 +940,7 @@ Hotspot mSpecial Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 323 + x coordinate : 322 y coordinate : 0 Width : 83 Height : 67 @@ -958,6 +958,117 @@ Hotspot mSpecial page pageTest } +Hotspot mSwipeNext + Attributes + ID : 39 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 471 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 40 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 41 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 7 @@ -1222,6 +1333,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out-visual/cardMedia.txt b/HMI/US/landscape/n2t-out-visual/cardMedia.txt index 2bc18c40..52ba5c7a 100644 --- a/HMI/US/landscape/n2t-out-visual/cardMedia.txt +++ b/HMI/US/landscape/n2t-out-visual/cardMedia.txt @@ -64,7 +64,7 @@ Text tSend Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 15 + x coordinate : 17 y coordinate : 0 Width : 230 Height : 15 @@ -94,7 +94,7 @@ Text tTmp Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 29 + x coordinate : 31 y coordinate : 156 Width : 27 Height : 30 @@ -124,7 +124,7 @@ Text tInstruction Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 311 + x coordinate : 313 y coordinate : 0 Width : 100 Height : 20 @@ -154,7 +154,7 @@ Text tId Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 64 + x coordinate : 66 y coordinate : 159 Width : 30 Height : 30 @@ -184,7 +184,7 @@ Text tHeading Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 126 + x coordinate : 128 y coordinate : 26 Width : 228 Height : 30 @@ -214,9 +214,9 @@ Text tTitle Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 99 + x coordinate : 101 y coordinate : 78 - Width : 360 + Width : 358 Height : 25 Effect : load Effect Priority : 0 @@ -244,9 +244,9 @@ Text tAuthor Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 100 + x coordinate : 102 y coordinate : 108 - Width : 360 + Width : 358 Height : 25 Effect : load Effect Priority : 0 @@ -274,7 +274,7 @@ Text t2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 321 + x coordinate : 319 y coordinate : 145 Width : 50 Height : 50 @@ -323,7 +323,7 @@ Text tPlayPause Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 218 + x coordinate : 216 y coordinate : 145 Width : 50 Height : 50 @@ -372,7 +372,7 @@ Text t0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 111 + x coordinate : 109 y coordinate : 145 Width : 50 Height : 50 @@ -421,7 +421,7 @@ Text tIcon Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 26 + x coordinate : 28 y coordinate : 75 Width : 71 Height : 62 @@ -451,7 +451,7 @@ Text t1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 20 + x coordinate : 24 y coordinate : 201 Width : 50 Height : 50 @@ -475,7 +475,7 @@ Text t1 Events Touch Press Event - hVolume.val=hVolume.val-5 + hVolume.val=hVolume.val-1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -501,7 +501,7 @@ Text t3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 412 + x coordinate : 410 y coordinate : 201 Width : 50 Height : 50 @@ -525,7 +525,7 @@ Text t3 Events Touch Press Event - hVolume.val=hVolume.val+5 + hVolume.val=hVolume.val+1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -551,7 +551,7 @@ Text t4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 36 + x coordinate : 38 y coordinate : 262 Width : 50 Height : 50 @@ -581,7 +581,7 @@ Text tSpeaker Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 109 + x coordinate : 111 y coordinate : 262 Width : 267 Height : 50 @@ -630,7 +630,7 @@ Text t6 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 396 + x coordinate : 398 y coordinate : 262 Width : 50 Height : 50 @@ -672,7 +672,7 @@ Text t5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 412 + x coordinate : 410 y coordinate : 145 Width : 50 Height : 50 @@ -738,9 +738,9 @@ Slider hVolume Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 74 + x coordinate : 78 y coordinate : 206 - Width : 335 + Width : 328 Height : 43 Effect : load Effect Priority : 0 @@ -784,7 +784,7 @@ Button bNext Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 406 + x coordinate : 408 y coordinate : 16 Width : 50 Height : 50 @@ -831,7 +831,7 @@ Button bPrev Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 24 + x coordinate : 26 y coordinate : 16 Width : 50 Height : 50 @@ -877,6 +877,117 @@ Button bPrev prints tSend.txt,0 prints crcval,2 +Hotspot mSwipeNext + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 471 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 451 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 32 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 6 @@ -1078,6 +1189,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/cardQR.txt b/HMI/US/landscape/n2t-out-visual/cardQR.txt new file mode 100644 index 00000000..56cc825e --- /dev/null +++ b/HMI/US/landscape/n2t-out-visual/cardQR.txt @@ -0,0 +1,1036 @@ +Page cardQR + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 480 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 6371 + + Events + Preinitialize Event + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + //ui e1 + vis btOnOff1,0 + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 + //ui e2 + vis btOnOff2,0 + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 + +Variable (string) strCommand + Attributes + ID : 6 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) entn + Attributes + ID : 7 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tSend + Attributes + ID : 10 + Scope : local + Text : + Max. Text Size: 100 + +Variable (string) tTmp + Attributes + ID : 14 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + ID : 15 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 16 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) entn1 + Attributes + ID : 26 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + ID : 27 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) type1 + Attributes + ID : 28 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + ID : 29 + Scope : local + Text : + Max. Text Size: 10 + +Text tEntity1 + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 286 + y coordinate : 97 + Width : 170 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon1 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 234 + y coordinate : 96 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tEntity2 + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 287 + y coordinate : 204 + Width : 170 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 23 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 235 + y coordinate : 203 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHeading + Attributes + ID : 25 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 81 + y coordinate : 26 + Width : 320 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 480 + Height : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +QR Code qr0 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 28 + y coordinate : 91 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Logo overlay : no + Text : + Max. Text Size : 105 + +Button bNext + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 406 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bPrev + Attributes + ID : 4 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 24 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText1 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 235 + y coordinate : 146 + Width : 214 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText2 + Attributes + ID : 24 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 237 + y coordinate : 253 + Width : 213 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff1 + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 399 + y coordinate : 137 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed) : 1 + Back. Picture ID (Pressed) : 2 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff2 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 400 + y coordinate : 244 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed) : 1 + Back. Picture ID (Pressed) : 2 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + ID : 11 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 471 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 12 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 454 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Timer tmSerial + Attributes + ID : 5 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosxTempMin1.val) + { + xTempDest1.val=xTempDest1.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdHigh," + //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button bUp2 Attributes ID : 39 Scope : local @@ -1046,8 +1324,8 @@ Dual-state Button btUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 337 - y coordinate : 46 + x coordinate : 193 + y coordinate : 67 Width : 50 Height : 50 Effect : load @@ -1072,17 +1350,17 @@ Dual-state Button btUp1 Events Touch Press Event - if(xTempDest.valxTempMin.val) + if(xTempDest2.val>xTempMin2.val) { - xTempDest.val=xTempDest.val-xTempStep.val + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdLow," + //convert temperature + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btUp + Attributes + ID : 51 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 272 + y coordinate : 68 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color (Unpressed) : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 6371 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 50712 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + if(xTempDest.valxTempMin1.val) + { + xTempDest.val=xTempDest.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 471 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 453 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes - ID : 5 + ID : 3 Scope : local Period (ms): 50 Enabled : yes @@ -1240,22 +1745,22 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0 @@ -1265,7 +1770,6 @@ Timer tmSerial vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") @@ -1386,20 +1890,33 @@ Timer tmSerial //enable vis bt7,1 } - //bt8 - spstr strCommand.txt,bt8.txt,"~",42 - if(bt8.txt!="") + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + spstr strCommand.txt,tStateLbl.txt,"~",43 + //Text tALbl + spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") { - // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,"~",44 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,"~",45 - //enable - vis bt8,1 + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 } } if(tInstruction.txt=="pageType") @@ -1456,6 +1973,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { @@ -1493,7 +2014,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 17 + ID : 12 Scope : local Period (ms): 1000 Enabled : yes @@ -1524,7 +2045,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 18 + ID : 13 Scope: local Value: 0 diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 7ed4eba2..c3223464 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -7,52 +7,56 @@ pageIcons 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 -pageStartup - 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code + 14 Component(s) + 14 Line(s) of event code + 14 Unique line(s) of event code popupNotify 17 Component(s) - 196 Line(s) of event code - 123 Unique line(s) of event code -popupShutter - 20 Component(s) - 193 Line(s) of event code - 109 Unique line(s) of event code -popupLight - 27 Component(s) - 341 Line(s) of event code - 185 Unique line(s) of event code -cardMedia - 30 Component(s) - 331 Line(s) of event code - 171 Unique line(s) of event code -cardAlarm - 35 Component(s) - 345 Line(s) of event code - 216 Unique line(s) of event code + 200 Line(s) of event code + 125 Unique line(s) of event code +pageStartup + 19 Component(s) + 154 Line(s) of event code + 115 Unique line(s) of event code screensaver 35 Component(s) - 292 Line(s) of event code - 235 Unique line(s) of event code -cardGrid - 39 Component(s) - 420 Line(s) of event code - 246 Unique line(s) of event code -cardEntities - 62 Component(s) - 966 Line(s) of event code - 412 Unique line(s) of event code + 296 Line(s) of event code + 237 Unique line(s) of event code +cardAlarm + 38 Component(s) + 364 Line(s) of event code + 224 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code +popupLight + 27 Component(s) + 345 Line(s) of event code + 187 Unique line(s) of event code cardThermo - 41 Component(s) - 444 Line(s) of event code - 249 Unique line(s) of event code + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code +cardMedia + 33 Component(s) + 350 Line(s) of event code + 179 Unique line(s) of event code +cardGrid + 42 Component(s) + 439 Line(s) of event code + 254 Unique line(s) of event code +cardQR + 30 Component(s) + 363 Line(s) of event code + 205 Unique line(s) of event code +cardEntities + 65 Component(s) + 1121 Line(s) of event code + 491 Unique line(s) of event code Total - 12 Page(s) - 344 Component(s) - 3701 Line(s) of event code - 1024 Unique line(s) of event code + 13 Page(s) + 402 Component(s) + 4443 Line(s) of event code + 1167 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/pageStartup.txt b/HMI/US/landscape/n2t-out-visual/pageStartup.txt index 99094960..6b1c61b9 100644 --- a/HMI/US/landscape/n2t-out-visual/pageStartup.txt +++ b/HMI/US/landscape/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 34 + Text : 35 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -418,8 +418,8 @@ Picture p0 Opacity : 127 x coordinate : 0 y coordinate : 0 - Width : 480 - Height : 320 + Width : 479 + Height : 319 Effect : load Effect Priority : 0 Effect Time : 300 @@ -625,6 +625,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/pageTest.txt b/HMI/US/landscape/n2t-out-visual/pageTest.txt index 2e75ae45..9205bf4b 100644 --- a/HMI/US/landscape/n2t-out-visual/pageTest.txt +++ b/HMI/US/landscape/n2t-out-visual/pageTest.txt @@ -436,3 +436,39 @@ Button b1 Touch Press Event bauds=115200 +Button b2 + Attributes + ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 244 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 1 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : qr + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + page cardQR + diff --git a/HMI/US/landscape/n2t-out-visual/popupLight.txt b/HMI/US/landscape/n2t-out-visual/popupLight.txt index 02080052..115a4ef2 100644 --- a/HMI/US/landscape/n2t-out-visual/popupLight.txt +++ b/HMI/US/landscape/n2t-out-visual/popupLight.txt @@ -154,7 +154,7 @@ Text t1 Opacity : 127 x coordinate : 25 y coordinate : 226 - Width : 208 + Width : 211 Height : 30 Effect : load Effect Priority : 0 @@ -244,7 +244,7 @@ Text t4 Opacity : 127 x coordinate : 24 y coordinate : 143 - Width : 229 + Width : 242 Height : 30 Effect : load Effect Priority : 0 @@ -964,6 +964,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/popupNotify.txt b/HMI/US/landscape/n2t-out-visual/popupNotify.txt index 86983fec..0f1aee02 100644 --- a/HMI/US/landscape/n2t-out-visual/popupNotify.txt +++ b/HMI/US/landscape/n2t-out-visual/popupNotify.txt @@ -590,6 +590,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out-visual/popupShutter.txt b/HMI/US/landscape/n2t-out-visual/popupShutter.txt index ce19912b..bc4f5fff 100644 --- a/HMI/US/landscape/n2t-out-visual/popupShutter.txt +++ b/HMI/US/landscape/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -624,12 +624,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + } } if(tInstruction.txt=="dimmode") { @@ -707,6 +758,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 @@ -718,15 +773,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 92e8968c..b3756ba7 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1131,6 +1131,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/cardAlarm.txt b/HMI/US/landscape/n2t-out/cardAlarm.txt index a147c095..f076f39d 100644 --- a/HMI/US/landscape/n2t-out/cardAlarm.txt +++ b/HMI/US/landscape/n2t-out/cardAlarm.txt @@ -466,6 +466,90 @@ Button arm4 prints crcval,2 tCode.txt="" +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -704,6 +788,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/cardEntities.txt b/HMI/US/landscape/n2t-out/cardEntities.txt index db0622ec..157f7426 100644 --- a/HMI/US/landscape/n2t-out/cardEntities.txt +++ b/HMI/US/landscape/n2t-out/cardEntities.txt @@ -1074,6 +1074,90 @@ Hotspot m3 page popupLight } +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -1193,6 +1277,44 @@ Timer tmSerial vis bText1,0 vis hSlider1,0 vis nNum1,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",8 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp1.pco=27501 + tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + } } if(type1.txt=="light") { @@ -1315,6 +1437,44 @@ Timer tmSerial vis bText2,0 vis hSlider2,0 vis nNum2,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",14 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp2.pco=27501 + tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + } } if(type2.txt=="light") { @@ -1437,6 +1597,44 @@ Timer tmSerial vis bText3,0 vis hSlider3,0 vis nNum3,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",20 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp3.pco=27501 + tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + } } if(type3.txt=="light") { @@ -1559,6 +1757,44 @@ Timer tmSerial vis bText4,0 vis hSlider4,0 vis nNum4,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",26 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp4.pco=27501 + tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + } } if(type4.txt=="light") { @@ -1699,6 +1935,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardGrid.txt b/HMI/US/landscape/n2t-out/cardGrid.txt index 75c6d368..12d623a0 100644 --- a/HMI/US/landscape/n2t-out/cardGrid.txt +++ b/HMI/US/landscape/n2t-out/cardGrid.txt @@ -522,6 +522,90 @@ Hotspot mSpecial page pageTest } +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -785,6 +869,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/cardMedia.txt b/HMI/US/landscape/n2t-out/cardMedia.txt index 7494bc84..3cfbfe02 100644 --- a/HMI/US/landscape/n2t-out/cardMedia.txt +++ b/HMI/US/landscape/n2t-out/cardMedia.txt @@ -223,7 +223,7 @@ Text t1 Events Touch Press Event - hVolume.val=hVolume.val-5 + hVolume.val=hVolume.val-1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -253,7 +253,7 @@ Text t3 Events Touch Press Event - hVolume.val=hVolume.val+5 + hVolume.val=hVolume.val+1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -456,6 +456,90 @@ Button bPrev prints tSend.txt,0 prints crcval,2 +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -656,6 +740,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/cardQR.txt b/HMI/US/landscape/n2t-out/cardQR.txt new file mode 100644 index 00000000..bb7d2918 --- /dev/null +++ b/HMI/US/landscape/n2t-out/cardQR.txt @@ -0,0 +1,744 @@ +Page cardQR + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + + Events + Preinitialize Event + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + //ui e1 + vis btOnOff1,0 + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 + //ui e2 + vis btOnOff2,0 + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) entn + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 100 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) entn1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) type1 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Text tEntity1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity1 + Max. Text Size : 30 + +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text tEntity2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity1 + Max. Text Size : 30 + +Text tIcon2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +QR Code qr0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Text : + Max. Text Size : 105 + +Button bNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bPrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosxTempMin.val) + if(xTempDest1.val>xTempMin1.val) { - xTempDest.val=xTempDest.val-xTempStep.val + xTempDest1.val=xTempDest1.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdHigh," + //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button bUp2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + if(xTempDest2.valxTempMin2.val) + { + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdLow," + //convert temperature + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + if(xTempDest.valxTempMin1.val) + { + xTempDest.val=xTempDest.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -679,22 +964,22 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0 @@ -704,7 +989,6 @@ Timer tmSerial vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") @@ -825,20 +1109,33 @@ Timer tmSerial //enable vis bt7,1 } - //bt8 - spstr strCommand.txt,bt8.txt,"~",42 - if(bt8.txt!="") + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + spstr strCommand.txt,tStateLbl.txt,"~",43 + //Text tALbl + spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") { - // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,"~",44 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,"~",45 - //enable - vis bt8,1 + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 } } if(tInstruction.txt=="pageType") @@ -895,6 +1192,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/landscape/n2t-out/pageStartup.txt b/HMI/US/landscape/n2t-out/pageStartup.txt index bf6ed019..ee1a0274 100644 --- a/HMI/US/landscape/n2t-out/pageStartup.txt +++ b/HMI/US/landscape/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 34 + Text : 35 Max. Text Size : 10 Picture p0 @@ -330,6 +330,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/pageTest.txt b/HMI/US/landscape/n2t-out/pageTest.txt index efade5e5..03a79fd7 100644 --- a/HMI/US/landscape/n2t-out/pageTest.txt +++ b/HMI/US/landscape/n2t-out/pageTest.txt @@ -176,3 +176,17 @@ Button b1 Touch Press Event bauds=115200 +Button b2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : qr + Max. Text Size : 10 + + Events + Touch Press Event + page cardQR + diff --git a/HMI/US/landscape/n2t-out/popupLight.txt b/HMI/US/landscape/n2t-out/popupLight.txt index 5e24181f..3e3da25b 100644 --- a/HMI/US/landscape/n2t-out/popupLight.txt +++ b/HMI/US/landscape/n2t-out/popupLight.txt @@ -618,6 +618,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/popupNotify.txt b/HMI/US/landscape/n2t-out/popupNotify.txt index af719e18..0f032184 100644 --- a/HMI/US/landscape/n2t-out/popupNotify.txt +++ b/HMI/US/landscape/n2t-out/popupNotify.txt @@ -381,6 +381,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/n2t-out/popupShutter.txt b/HMI/US/landscape/n2t-out/popupShutter.txt index 0542a922..5fca3dc8 100644 --- a/HMI/US/landscape/n2t-out/popupShutter.txt +++ b/HMI/US/landscape/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -339,12 +339,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + } } if(tInstruction.txt=="dimmode") { @@ -422,6 +473,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 @@ -433,15 +488,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 57c23fe5..48a71dd0 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -607,6 +607,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index 6facd517..a33bc8a0 100644 Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index 45307069..043e26e0 100644 Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ diff --git a/HMI/US/portrait/diff-eu-version-known-good.txt b/HMI/US/portrait/diff-eu-version-known-good.txt index fdf0a6f6..3e84edcd 100644 --- a/HMI/US/portrait/diff-eu-version-known-good.txt +++ b/HMI/US/portrait/diff-eu-version-known-good.txt @@ -338,6 +338,28 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tId.txt,"~",32 ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="0") ++ { ++ bUp5.pco=27501 ++ tsw bUp5,0 ++ }else ++ { ++ bUp5.pco=65535 ++ tsw bUp5,1 ++ } ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="0") ++ { ++ bDown5.pco=27501 ++ tsw bDown5,0 ++ }else ++ { ++ bDown5.pco=65535 ++ tsw bDown5,1 ++ } + } + if(type5.txt=="light") + { diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index bd5ef5e2..aeac48ab 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1,6 +1,6 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt ---- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000 -+++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +0000 +--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 @@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt + //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-05-07 23:31:11.388705442 +0000 -+++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000 +--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000 @@ -62,6 +62,16 @@ vis bText4,0 vis hSlider4,0 @@ -294,10 +294,10 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + page popupLight + } + - Timer tmSerial + Hotspot mSwipeNext Attributes - Scope : local -@@ -1644,6 +1872,128 @@ + Scope : local +@@ -1880,6 +2108,166 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } @@ -338,6 +338,44 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 ++ // get Button State (optional Value) ++ spstr strCommand.txt,tId.txt,"~",32 ++ // up button ++ spstr tId.txt,tTmp.txt,"|",0 ++ if(tTmp.txt=="disable") ++ { ++ bUp5.pco=27501 ++ tsw bUp5,0 ++ }else if(tTmp.txt!="") ++ { ++ bUp5.pco=65535 ++ bUp5.txt=tTmp.txt ++ tsw bUp5,1 ++ } ++ // stop button ++ spstr tId.txt,tTmp.txt,"|",1 ++ if(tTmp.txt=="disable") ++ { ++ bStop5.pco=27501 ++ tsw bStop5,0 ++ }else if(tTmp.txt!="") ++ { ++ bStop5.pco=65535 ++ bStop5.txt=tTmp.txt ++ tsw bStop5,1 ++ } ++ // down button ++ spstr tId.txt,tTmp.txt,"|",2 ++ if(tTmp.txt=="disable") ++ { ++ bDown5.pco=27501 ++ tsw bDown5,0 ++ }else if(tTmp.txt!="") ++ { ++ bDown5.pco=65535 ++ bDown5.txt=tTmp.txt ++ tsw bDown5,1 ++ } + } + if(type5.txt=="light") + { @@ -426,330 +464,9 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt } if(tInstruction.txt=="pageType") { -diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt ---- HMI/n2t-out/cardThermo.txt 2022-05-07 23:31:11.388705442 +0000 -+++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000 -@@ -247,26 +247,30 @@ - prints tSend.txt,0 - prints crcval,2 - --Button bPrev -+Button bDown - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text :  -+ Text : - Max. Text Size : 10 - - Events - Touch Press Event -- tSend.txt="event,buttonPress2,cardThermo," -- if(bPrev.txt=="") -- { -- tSend.txt+="bUp" -- }else -+ if(xTempDest.val>xTempMin.val) - { -- tSend.txt+="bPrev" -+ xTempDest.val=xTempDest.val-xTempStep.val - } -+ // event,buttonPress2,entn,tempUpd,X -+ //craft command -+ tSend.txt="event,buttonPress2," -+ tSend.txt+=entn.txt+"," -+ tSend.txt+="tempUpd," -+ //convert temperature -+ covx xTempDest.val,tTmp.txt,0,0 -+ tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC -@@ -279,21 +283,30 @@ - prints tSend.txt,0 - prints crcval,2 - --Dual-state Button bt0 -+Button bUp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed -- Text :  -+ Text : - Max. Text Size : 10 - - Events - Touch Press Event -+ if(xTempDest.valxTempMin.val) -- { -- xTempDest.val=xTempDest.val-xTempStep.val -- } -- // event,buttonPress2,entn,tempUpd,X - //craft command -- tSend.txt="event,buttonPress2," -- tSend.txt+=entn.txt+"," -- tSend.txt+="tempUpd," -- //convert temperature -- covx xTempDest.val,tTmp.txt,0,0 -- tSend.txt+=tTmp.txt -+ tSend.txt="event,buttonPress2,"+entn.txt -+ tSend.txt+=",hvac_action,"+va8.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt ---- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 -+++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000 +--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 ++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:52:05.927852627 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled @@ -768,12 +485,3 @@ diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC -@@ -351,7 +351,7 @@ - - Events - Timer Event -- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame -+ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame - frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end - doevents // finish drawing before next timer event triggers - if(frame_ptr.val==1820) diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index c52976ff..9b0ffe96 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,337 +1,30 @@ -+++ HMI/US/portrait/diff-eu-version.txt 2022-05-07 23:31:11.916705803 +0000 -+--- HMI/n2t-out/Program.s.txt 2022-05-07 23:31:11.384705439 +0000 -++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-07 23:31:11.864705767 +0000 -+--- HMI/n2t-out/cardEntities.txt 2022-05-07 23:31:11.388705442 +0000 -++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-07 23:31:11.868705770 +0000 -+diff -bur HMI/n2t-out/cardThermo.txt HMI/US/portrait/n2t-out/cardThermo.txt -+--- HMI/n2t-out/cardThermo.txt 2022-05-07 23:31:11.388705442 +0000 -++++ HMI/US/portrait/n2t-out/cardThermo.txt 2022-05-07 23:31:11.868705770 +0000 -+@@ -247,26 +247,30 @@ -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+-Button bPrev -++Button bDown -+ Attributes ++++ HMI/US/portrait/diff-eu-version.txt 2022-05-22 08:52:06.071870294 +0000 ++--- HMI/n2t-out/Program.s.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/Program.s.txt 2022-05-22 08:52:05.927852627 +0000 ++--- HMI/n2t-out/cardEntities.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-05-22 08:52:05.927852627 +0000 ++ Hotspot mSwipeNext + Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text :  -++ Text : -+ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -+- tSend.txt="event,buttonPress2,cardThermo," -+- if(bPrev.txt=="") -+- { -+- tSend.txt+="bUp" -+- }else -++ if(xTempDest.val>xTempMin.val) -+ { -+- tSend.txt+="bPrev" -++ xTempDest.val=xTempDest.val-xTempStep.val -+ } -++ // event,buttonPress2,entn,tempUpd,X -++ //craft command -++ tSend.txt="event,buttonPress2," -++ tSend.txt+=entn.txt+"," -++ tSend.txt+="tempUpd," -++ //convert temperature -++ covx xTempDest.val,tTmp.txt,0,0 -++ tSend.txt+=tTmp.txt -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+@@ -279,21 +283,30 @@ -+ prints tSend.txt,0 -+ prints crcval,2 -+ -+-Dual-state Button bt0 -++Button bUp -+ Attributes -+ Scope : local -+ Dragging : 0 -+ Disable release event after dragging: 0 -+ Send Component ID : disabled -+ State : unpressed -+- Text :  -++ Text : -+ Max. Text Size : 10 -+ -+ Events -+ Touch Press Event -++ if(xTempDest.valxTempMin.val) -+- { -+- xTempDest.val=xTempDest.val-xTempStep.val -+- } -+- // event,buttonPress2,entn,tempUpd,X -+ //craft command -+- tSend.txt="event,buttonPress2," -+- tSend.txt+=entn.txt+"," -+- tSend.txt+="tempUpd," -+- //convert temperature -+- covx xTempDest.val,tTmp.txt,0,0 -+- tSend.txt+=tTmp.txt -++ tSend.txt="event,buttonPress2,"+entn.txt -++ tSend.txt+=",hvac_action,"+va8.txt -+ //send calc crc -+ btlen tSend.txt,sys0 -+ crcrest 1,0xffff // reset CRC -+--- HMI/n2t-out/pageStartup.txt 2022-05-07 23:31:11.384705439 +0000 -++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-07 23:31:11.864705767 +0000 -+@@ -351,7 +351,7 @@ -+ -+ Events -+ Timer Event -+- xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame -++ xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame -+ frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end -+ doevents // finish drawing before next timer event triggers -+ if(frame_ptr.val==1820) ++@@ -1880,6 +2108,166 @@ +++ // up button +++ if(tTmp.txt=="disable") +++ }else if(tTmp.txt!="") +++ bUp5.txt=tTmp.txt +++ // stop button +++ if(tTmp.txt=="disable") +++ { +++ bStop5.pco=27501 +++ tsw bStop5,0 +++ }else if(tTmp.txt!="") +++ { +++ bStop5.pco=65535 +++ bStop5.txt=tTmp.txt +++ tsw bStop5,1 +++ } +++ // down button +++ spstr tId.txt,tTmp.txt,"|",2 +++ if(tTmp.txt=="disable") +++ }else if(tTmp.txt!="") +++ bDown5.txt=tTmp.txt ++--- HMI/n2t-out/pageStartup.txt 2022-05-22 08:52:05.367816736 +0000 +++++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-05-22 08:52:05.927852627 +0000 diff --git a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt index a0acf2e2..b25bdace 100644 --- a/HMI/US/portrait/n2t-out-visual/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out-visual/cardAlarm.txt @@ -995,6 +995,117 @@ Button arm4 prints crcval,2 tCode.txt="" +Hotspot mSwipeNext + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 37 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 5 @@ -1234,6 +1345,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardEntities.txt b/HMI/US/portrait/n2t-out-visual/cardEntities.txt index 7f14f350..b911f7cb 100644 --- a/HMI/US/portrait/n2t-out-visual/cardEntities.txt +++ b/HMI/US/portrait/n2t-out-visual/cardEntities.txt @@ -169,7 +169,7 @@ Number nNum1 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 100 + y coordinate : 77 Width : 46 Height : 50 Effect : load @@ -199,7 +199,7 @@ Number nNum2 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 180 + y coordinate : 154 Width : 46 Height : 50 Effect : load @@ -229,7 +229,7 @@ Number nNum3 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 260 + y coordinate : 232 Width : 45 Height : 50 Effect : load @@ -259,7 +259,7 @@ Number nNum4 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 340 + y coordinate : 311 Width : 44 Height : 50 Effect : load @@ -288,8 +288,8 @@ Number nNum5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 265 - y coordinate : 420 + x coordinate : 268 + y coordinate : 391 Width : 44 Height : 50 Effect : load @@ -348,10 +348,10 @@ Text tEntity1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 - y coordinate : 70 - Width : 300 - Height : 30 + x coordinate : 49 + y coordinate : 76 + Width : 115 + Height : 53 Effect : load Effect Priority : 0 Effect Time : 300 @@ -366,7 +366,7 @@ Text tEntity1 Input Type : character Text : tEntity1 Max. Text Size : 30 - Word wrap : disabled + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -378,10 +378,10 @@ Text tEntity2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 - y coordinate : 150 - Width : 300 - Height : 30 + x coordinate : 49 + y coordinate : 152 + Width : 115 + Height : 53 Effect : load Effect Priority : 0 Effect Time : 300 @@ -396,7 +396,7 @@ Text tEntity2 Input Type : character Text : tEntity2 Max. Text Size : 30 - Word wrap : disabled + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -408,10 +408,10 @@ Text tEntity3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 + x coordinate : 49 y coordinate : 230 - Width : 300 - Height : 30 + Width : 115 + Height : 53 Effect : load Effect Priority : 0 Effect Time : 300 @@ -426,7 +426,7 @@ Text tEntity3 Input Type : character Text : tEntity3 Max. Text Size : 30 - Word wrap : disabled + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -438,10 +438,10 @@ Text tEntity4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 + x coordinate : 49 y coordinate : 310 - Width : 300 - Height : 30 + Width : 115 + Height : 53 Effect : load Effect Priority : 0 Effect Time : 300 @@ -456,7 +456,7 @@ Text tEntity4 Input Type : character Text : tEntity4 Max. Text Size : 30 - Word wrap : disabled + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -468,9 +468,9 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 118 - y coordinate : 105 - Width : 45 + x coordinate : 15 + y coordinate : 84 + Width : 33 Height : 30 Effect : load Effect Priority : 0 @@ -498,9 +498,9 @@ Text tIcon2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 118 - y coordinate : 185 - Width : 45 + x coordinate : 15 + y coordinate : 163 + Width : 33 Height : 30 Effect : load Effect Priority : 0 @@ -528,9 +528,9 @@ Text tIcon3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 118 - y coordinate : 270 - Width : 45 + x coordinate : 13 + y coordinate : 241 + Width : 33 Height : 30 Effect : load Effect Priority : 0 @@ -558,9 +558,9 @@ Text tIcon4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 118 - y coordinate : 350 - Width : 45 + x coordinate : 15 + y coordinate : 321 + Width : 32 Height : 30 Effect : load Effect Priority : 0 @@ -708,10 +708,10 @@ Text tEntity5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 10 + x coordinate : 49 y coordinate : 390 - Width : 300 - Height : 30 + Width : 115 + Height : 53 Effect : load Effect Priority : 0 Effect Time : 300 @@ -726,7 +726,7 @@ Text tEntity5 Input Type : character Text : tEntity5 Max. Text Size : 30 - Word wrap : disabled + Word wrap : enabled Horizontal Spacing : 0 Vertical Spacing : 0 @@ -738,9 +738,9 @@ Text tIcon5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 118 - y coordinate : 430 - Width : 45 + x coordinate : 15 + y coordinate : 401 + Width : 33 Height : 30 Effect : load Effect Priority : 0 @@ -786,7 +786,7 @@ Slider hSlider1 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 100 + y coordinate : 80 Width : 100 Height : 43 Effect : load @@ -829,7 +829,7 @@ Slider hSlider2 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 180 + y coordinate : 157 Width : 100 Height : 43 Effect : load @@ -872,7 +872,7 @@ Slider hSlider3 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 260 + y coordinate : 235 Width : 100 Height : 43 Effect : load @@ -915,7 +915,7 @@ Slider hSlider4 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 340 + y coordinate : 314 Width : 100 Height : 43 Effect : load @@ -958,7 +958,7 @@ Slider hSlider5 Send Component ID : disabled Opacity : 127 x coordinate : 164 - y coordinate : 420 + y coordinate : 394 Width : 100 Height : 43 Effect : load @@ -1001,7 +1001,7 @@ Button bDown1 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 100 + y coordinate : 77 Width : 50 Height : 50 Effect : load @@ -1048,7 +1048,7 @@ Button bUp1 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 100 + y coordinate : 77 Width : 50 Height : 50 Effect : load @@ -1095,7 +1095,7 @@ Button bStop1 Send Component ID : disabled Opacity : 127 x coordinate : 215 - y coordinate : 100 + y coordinate : 77 Width : 50 Height : 50 Effect : load @@ -1142,7 +1142,7 @@ Button bStop2 Send Component ID : disabled Opacity : 127 x coordinate : 215 - y coordinate : 180 + y coordinate : 154 Width : 50 Height : 50 Effect : load @@ -1188,8 +1188,8 @@ Button bDown2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 269 - y coordinate : 153 + x coordinate : 265 + y coordinate : 154 Width : 50 Height : 50 Effect : load @@ -1236,7 +1236,7 @@ Button bUp2 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 180 + y coordinate : 154 Width : 50 Height : 50 Effect : load @@ -1283,7 +1283,7 @@ Button bStop3 Send Component ID : disabled Opacity : 127 x coordinate : 215 - y coordinate : 260 + y coordinate : 232 Width : 50 Height : 50 Effect : load @@ -1330,7 +1330,7 @@ Button bDown3 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 260 + y coordinate : 233 Width : 50 Height : 50 Effect : load @@ -1377,7 +1377,7 @@ Button bUp3 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 260 + y coordinate : 232 Width : 50 Height : 50 Effect : load @@ -1424,7 +1424,7 @@ Button bStop4 Send Component ID : disabled Opacity : 127 x coordinate : 215 - y coordinate : 340 + y coordinate : 311 Width : 50 Height : 50 Effect : load @@ -1471,7 +1471,7 @@ Button bDown4 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 340 + y coordinate : 311 Width : 50 Height : 50 Effect : load @@ -1518,7 +1518,7 @@ Button bUp4 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 340 + y coordinate : 311 Width : 50 Height : 50 Effect : load @@ -1666,7 +1666,7 @@ Button bText1 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 105 + y coordinate : 82 Width : 145 Height : 30 Effect : load @@ -1713,7 +1713,7 @@ Button bText2 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 185 + y coordinate : 159 Width : 145 Height : 30 Effect : load @@ -1760,7 +1760,7 @@ Button bText3 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 270 + y coordinate : 242 Width : 145 Height : 30 Effect : load @@ -1807,7 +1807,7 @@ Button bText4 Send Component ID : disabled Opacity : 127 x coordinate : 165 - y coordinate : 350 + y coordinate : 321 Width : 145 Height : 30 Effect : load @@ -1853,8 +1853,8 @@ Button bStop5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 215 - y coordinate : 420 + x coordinate : 218 + y coordinate : 391 Width : 50 Height : 50 Effect : load @@ -1900,8 +1900,8 @@ Button bDown5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 265 - y coordinate : 420 + x coordinate : 268 + y coordinate : 391 Width : 50 Height : 50 Effect : load @@ -1947,8 +1947,8 @@ Button bUp5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 165 - y coordinate : 420 + x coordinate : 168 + y coordinate : 391 Width : 50 Height : 50 Effect : load @@ -1994,8 +1994,8 @@ Button bText5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 165 - y coordinate : 430 + x coordinate : 168 + y coordinate : 401 Width : 145 Height : 30 Effect : load @@ -2042,7 +2042,7 @@ Dual-state Button btOnOff1 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 100 + y coordinate : 77 Width : 50 Height : 50 Effect : load @@ -2087,7 +2087,7 @@ Dual-state Button btOnOff2 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 180 + y coordinate : 154 Width : 50 Height : 50 Effect : load @@ -2132,7 +2132,7 @@ Dual-state Button btOnOff3 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 260 + y coordinate : 232 Width : 50 Height : 50 Effect : load @@ -2177,7 +2177,7 @@ Dual-state Button btOnOff4 Send Component ID : disabled Opacity : 127 x coordinate : 265 - y coordinate : 340 + y coordinate : 311 Width : 50 Height : 50 Effect : load @@ -2221,8 +2221,8 @@ Dual-state Button btOnOff5 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 265 - y coordinate : 420 + x coordinate : 268 + y coordinate : 391 Width : 50 Height : 50 Effect : load @@ -2292,10 +2292,10 @@ Hotspot m2 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 230 - Width : 320 - Height : 75 + x coordinate : 13 + y coordinate : 221 + Width : 150 + Height : 71 Effect : load Effect Priority : 0 Effect Time : 300 @@ -2323,9 +2323,9 @@ Hotspot m1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 150 - Width : 320 + x coordinate : 14 + y coordinate : 142 + Width : 150 Height : 75 Effect : load Effect Priority : 0 @@ -2354,9 +2354,9 @@ Hotspot m0 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 70 - Width : 320 + x coordinate : 14 + y coordinate : 64 + Width : 150 Height : 75 Effect : load Effect Priority : 0 @@ -2385,10 +2385,10 @@ Hotspot m3 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 310 - Width : 320 - Height : 75 + x coordinate : 16 + y coordinate : 302 + Width : 150 + Height : 73 Effect : load Effect Priority : 0 Effect Time : 300 @@ -2416,10 +2416,10 @@ Hotspot m4 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 0 - y coordinate : 390 - Width : 320 - Height : 75 + x coordinate : 13 + y coordinate : 380 + Width : 150 + Height : 73 Effect : load Effect Priority : 0 Effect Time : 300 @@ -2439,6 +2439,117 @@ Hotspot m4 page popupLight } +Hotspot mSwipeNext + Attributes + ID : 74 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 313 + y coordinate : 3 + Width : 5 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 75 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 8 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 76 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 7 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 30 @@ -2559,6 +2670,44 @@ Timer tmSerial vis bText1,0 vis hSlider1,0 vis nNum1,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",8 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp1.pco=27501 + tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + } } if(type1.txt=="light") { @@ -2681,6 +2830,44 @@ Timer tmSerial vis bText2,0 vis hSlider2,0 vis nNum2,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",14 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp2.pco=27501 + tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + } } if(type2.txt=="light") { @@ -2803,6 +2990,44 @@ Timer tmSerial vis bText3,0 vis hSlider3,0 vis nNum3,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",20 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp3.pco=27501 + tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + } } if(type3.txt=="light") { @@ -2925,6 +3150,44 @@ Timer tmSerial vis bText4,0 vis hSlider4,0 vis nNum4,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",26 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp4.pco=27501 + tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + } } if(type4.txt=="light") { @@ -3047,6 +3310,44 @@ Timer tmSerial vis bText5,0 vis hSlider5,0 vis nNum5,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",32 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp5.pco=27501 + tsw bUp5,0 + }else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + }else if(tTmp.txt!="") + { + bStop5.pco=65535 + bStop5.txt=tTmp.txt + tsw bStop5,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + }else if(tTmp.txt!="") + { + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 + } } if(type5.txt=="light") { @@ -3187,6 +3488,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardGrid.txt b/HMI/US/portrait/n2t-out-visual/cardGrid.txt index fdb5dba0..fd9109c9 100644 --- a/HMI/US/portrait/n2t-out-visual/cardGrid.txt +++ b/HMI/US/portrait/n2t-out-visual/cardGrid.txt @@ -958,6 +958,117 @@ Hotspot mSpecial page pageTest } +Hotspot mSwipeNext + Attributes + ID : 39 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 40 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 41 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 7 @@ -1222,6 +1333,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out-visual/cardMedia.txt b/HMI/US/portrait/n2t-out-visual/cardMedia.txt index 81fedbce..5a041859 100644 --- a/HMI/US/portrait/n2t-out-visual/cardMedia.txt +++ b/HMI/US/portrait/n2t-out-visual/cardMedia.txt @@ -475,7 +475,7 @@ Text t1 Events Touch Press Event - hVolume.val=hVolume.val-5 + hVolume.val=hVolume.val-1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -525,7 +525,7 @@ Text t3 Events Touch Press Event - hVolume.val=hVolume.val+5 + hVolume.val=hVolume.val+1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -877,6 +877,117 @@ Button bPrev prints tSend.txt,0 prints crcval,2 +Hotspot mSwipeNext + Attributes + ID : 30 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 31 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 32 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes ID : 6 @@ -1078,6 +1189,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/cardQR.txt b/HMI/US/portrait/n2t-out-visual/cardQR.txt new file mode 100644 index 00000000..48ec60fb --- /dev/null +++ b/HMI/US/portrait/n2t-out-visual/cardQR.txt @@ -0,0 +1,1036 @@ +Page cardQR + Attributes + ID : 0 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + Width : 320 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + Fill : solid color + Back. Color : 6371 + + Events + Preinitialize Event + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + //ui e1 + vis btOnOff1,0 + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 + //ui e2 + vis btOnOff2,0 + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 + +Variable (string) strCommand + Attributes + ID : 6 + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) entn + Attributes + ID : 7 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tSend + Attributes + ID : 10 + Scope : local + Text : + Max. Text Size: 100 + +Variable (string) tTmp + Attributes + ID : 11 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + ID : 12 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + ID : 13 + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) entn1 + Attributes + ID : 23 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + ID : 24 + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) type1 + Attributes + ID : 28 + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + ID : 29 + Scope : local + Text : + Max. Text Size: 10 + +Text tEntity1 + Attributes + ID : 15 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 112 + y coordinate : 292 + Width : 170 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon1 + Attributes + ID : 16 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 60 + y coordinate : 291 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tEntity2 + Attributes + ID : 19 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 113 + y coordinate : 388 + Width : 170 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 0 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : left + Vertical Alignment : center + Input Type : character + Text : tEntity1 + Max. Text Size : 30 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tIcon2 + Attributes + ID : 20 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 61 + y coordinate : 387 + Width : 45 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 1 + Back. Color : 6371 + Font Color : 17299 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text :  + Max. Text Size : 5 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Text tHeading + Attributes + ID : 22 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 66 + y coordinate : 26 + Width : 189 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Associated Keyboard : none + Font ID : 2 + Back. Color : 6371 + Font Color : 65535 + Horizontal Alignment : center + Vertical Alignment : center + Input Type : character + Text : + Max. Text Size : 40 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + +Picture p0 + Attributes + ID : 1 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 0 + Width : 319 + Height : 479 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Picture ID : 0 + +QR Code qr0 + Attributes + ID : 14 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 68 + y coordinate : 78 + Width : 200 + Height : 200 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Logo overlay : no + Text : + Max. Text Size : 105 + +Button bNext + Attributes + ID : 3 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 262 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bPrev + Attributes + ID : 4 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 9 + y coordinate : 16 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 3 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText1 + Attributes + ID : 17 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 61 + y coordinate : 339 + Width : 214 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText2 + Attributes + ID : 21 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 63 + y coordinate : 434 + Width : 213 + Height : 30 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 0 + Back. Color : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 14823 + Font Color (Unpressed) : 65535 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff1 + Attributes + ID : 2 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 225 + y coordinate : 330 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed) : 1 + Back. Picture ID (Pressed) : 2 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff2 + Attributes + ID : 18 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 226 + y coordinate : 425 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : image + Font ID : 0 + Background Picture ID (Unpressed) : 1 + Back. Picture ID (Pressed) : 2 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + ID : 25 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 26 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 27 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Timer tmSerial + Attributes + ID : 5 + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosxTempMin.val) - { - xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature - covx xTempDest.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Button bUp - Attributes - ID : 12 - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - Opacity : 127 - x coordinate : 251 - y coordinate : 189 - Width : 64 - Height : 64 - Effect : load - Effect Priority : 0 - Effect Time : 300 - Fill : image - Font ID : 0 - Background Picture ID (Unpressed) : 9 - Back. Picture ID (Pressed) : 9 - Horizontal Alignment : center - Vertical Alignment : center - State : unpressed - Text : - Max. Text Size : 10 - Word wrap : disabled - Horizontal Spacing : 0 - Vertical Spacing : 0 - - Events - Touch Press Event - if(xTempDest.valxTempMin1.val) + { + xTempDest1.val=xTempDest1.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdHigh," + //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button bUp2 + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 57 + y coordinate : 168 + Width : 50 + Height : 50 Effect : load Effect Priority : 0 Effect Time : 300 @@ -1122,8 +1341,8 @@ Dual-state Button bt8 Font Color (Pressed) : 64512 Horizontal Alignment : center Vertical Alignment : center - State : pressed - Text :  + State : unpressed + Text :  Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -1131,9 +1350,18 @@ Dual-state Button bt8 Events Touch Press Event + if(xTempDest2.valxTempMin2.val) + { + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdLow," + //convert temperature + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btUp + Attributes + ID : 48 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 136 + y coordinate : 169 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color (Unpressed) : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 6371 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 50712 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + if(xTempDest.valxTempMin1.val) + { + xTempDest.val=xTempDest.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + ID : 53 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 311 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 54 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 10 + y coordinate : 0 + Width : 300 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 55 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 470 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes - ID : 5 + ID : 3 Scope : local Period (ms): 50 Enabled : yes @@ -1232,22 +1745,22 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0 @@ -1257,7 +1770,6 @@ Timer tmSerial vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") @@ -1378,20 +1890,33 @@ Timer tmSerial //enable vis bt7,1 } - //bt8 - spstr strCommand.txt,bt8.txt,"~",42 - if(bt8.txt!="") + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + spstr strCommand.txt,tStateLbl.txt,"~",43 + //Text tALbl + spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") { - // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,"~",44 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,"~",45 - //enable - vis bt8,1 + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 } } if(tInstruction.txt=="pageType") @@ -1448,6 +1973,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { @@ -1485,7 +2014,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 19 + ID : 12 Scope : local Period (ms): 1000 Enabled : yes @@ -1516,7 +2045,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 20 + ID : 13 Scope: local Value: 0 diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 7c9d0d04..16421cb3 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -2,57 +2,61 @@ Program.s 0 Component(s) 10 Line(s) of event code 10 Unique line(s) of event code -pageTest - 13 Component(s) - 13 Line(s) of event code - 13 Unique line(s) of event code pageIcons 6 Component(s) 0 Line(s) of event code 0 Unique line(s) of event code +pageTest + 14 Component(s) + 14 Line(s) of event code + 14 Unique line(s) of event code popupNotify 17 Component(s) - 196 Line(s) of event code - 123 Unique line(s) of event code -popupShutter - 20 Component(s) - 193 Line(s) of event code - 109 Unique line(s) of event code -cardGrid - 39 Component(s) - 420 Line(s) of event code - 246 Unique line(s) of event code + 200 Line(s) of event code + 125 Unique line(s) of event code pageStartup 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code -screensaver - 35 Component(s) - 292 Line(s) of event code - 235 Unique line(s) of event code -cardMedia - 30 Component(s) - 331 Line(s) of event code - 171 Unique line(s) of event code -cardAlarm - 35 Component(s) - 345 Line(s) of event code - 216 Unique line(s) of event code + 154 Line(s) of event code + 115 Unique line(s) of event code +popupShutter + 20 Component(s) + 241 Line(s) of event code + 138 Unique line(s) of event code popupLight 27 Component(s) - 341 Line(s) of event code - 185 Unique line(s) of event code + 345 Line(s) of event code + 187 Unique line(s) of event code +cardQR + 30 Component(s) + 363 Line(s) of event code + 205 Unique line(s) of event code cardThermo - 41 Component(s) - 444 Line(s) of event code - 249 Unique line(s) of event code + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code +cardAlarm + 38 Component(s) + 364 Line(s) of event code + 224 Unique line(s) of event code +cardMedia + 33 Component(s) + 350 Line(s) of event code + 179 Unique line(s) of event code +cardGrid + 42 Component(s) + 439 Line(s) of event code + 254 Unique line(s) of event code +screensaver + 35 Component(s) + 296 Line(s) of event code + 237 Unique line(s) of event code cardEntities - 74 Component(s) - 1159 Line(s) of event code - 481 Unique line(s) of event code + 77 Component(s) + 1348 Line(s) of event code + 576 Unique line(s) of event code Total - 12 Page(s) - 356 Component(s) - 3894 Line(s) of event code - 1080 Unique line(s) of event code + 13 Page(s) + 414 Component(s) + 4670 Line(s) of event code + 1239 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/pageStartup.txt b/HMI/US/portrait/n2t-out-visual/pageStartup.txt index 63b4a396..ddbc233b 100644 --- a/HMI/US/portrait/n2t-out-visual/pageStartup.txt +++ b/HMI/US/portrait/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 34 + Text : 35 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -625,6 +625,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 @@ -647,7 +651,7 @@ Timer tmSpinner Events Timer Event - xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame + xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end doevents // finish drawing before next timer event triggers if(frame_ptr.val==1820) diff --git a/HMI/US/portrait/n2t-out-visual/pageTest.txt b/HMI/US/portrait/n2t-out-visual/pageTest.txt index 43982705..95767d06 100644 --- a/HMI/US/portrait/n2t-out-visual/pageTest.txt +++ b/HMI/US/portrait/n2t-out-visual/pageTest.txt @@ -436,3 +436,39 @@ Button b1 Touch Press Event bauds=115200 +Button b2 + Attributes + ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 38 + y coordinate : 317 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 3 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : qr + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + page cardQR + diff --git a/HMI/US/portrait/n2t-out-visual/popupLight.txt b/HMI/US/portrait/n2t-out-visual/popupLight.txt index 6f319541..3d5b2156 100644 --- a/HMI/US/portrait/n2t-out-visual/popupLight.txt +++ b/HMI/US/portrait/n2t-out-visual/popupLight.txt @@ -537,8 +537,8 @@ Slider hTempSlider Fill : image Cursor width : auto Cursor height : 255 - Back. Picture ID : 8 - Slided Back. Picture ID : 10 + Back. Picture ID : 7 + Slided Back. Picture ID : 8 Position : 50 Upper range limit : 100 Lower range limit : 0 @@ -964,6 +964,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/popupNotify.txt b/HMI/US/portrait/n2t-out-visual/popupNotify.txt index f609307f..e3d8bf9a 100644 --- a/HMI/US/portrait/n2t-out-visual/popupNotify.txt +++ b/HMI/US/portrait/n2t-out-visual/popupNotify.txt @@ -310,7 +310,7 @@ Button b2 Style : flat Font ID : 2 Back. Color : 6371 - Back. Picture ID (Pressed) : 9 + Back. Picture ID (Pressed) : 8 Back. Color (Pressed) : 1024 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 @@ -359,7 +359,7 @@ Button b1 Style : flat Font ID : 2 Back. Color : 6371 - Back. Picture ID (Pressed) : 9 + Back. Picture ID (Pressed) : 8 Back. Color (Pressed) : 1024 Font Color (Unpressed) : 65535 Font Color (Pressed) : 65535 @@ -590,6 +590,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out-visual/popupShutter.txt b/HMI/US/portrait/n2t-out-visual/popupShutter.txt index f777db70..2cfd938c 100644 --- a/HMI/US/portrait/n2t-out-visual/popupShutter.txt +++ b/HMI/US/portrait/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -624,12 +624,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + } } if(tInstruction.txt=="dimmode") { @@ -707,6 +758,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 @@ -718,15 +773,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 4b4b1ac3..cb7debc3 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1131,6 +1131,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardAlarm.txt b/HMI/US/portrait/n2t-out/cardAlarm.txt index a147c095..f076f39d 100644 --- a/HMI/US/portrait/n2t-out/cardAlarm.txt +++ b/HMI/US/portrait/n2t-out/cardAlarm.txt @@ -466,6 +466,90 @@ Button arm4 prints crcval,2 tCode.txt="" +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -704,6 +788,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt b/HMI/US/portrait/n2t-out/cardEntities.txt index 9a17912f..c25f8fdc 100644 --- a/HMI/US/portrait/n2t-out/cardEntities.txt +++ b/HMI/US/portrait/n2t-out/cardEntities.txt @@ -1302,6 +1302,90 @@ Hotspot m4 page popupLight } +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -1421,6 +1505,44 @@ Timer tmSerial vis bText1,0 vis hSlider1,0 vis nNum1,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",8 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp1.pco=27501 + tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + } } if(type1.txt=="light") { @@ -1543,6 +1665,44 @@ Timer tmSerial vis bText2,0 vis hSlider2,0 vis nNum2,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",14 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp2.pco=27501 + tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + } } if(type2.txt=="light") { @@ -1665,6 +1825,44 @@ Timer tmSerial vis bText3,0 vis hSlider3,0 vis nNum3,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",20 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp3.pco=27501 + tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + } } if(type3.txt=="light") { @@ -1787,6 +1985,44 @@ Timer tmSerial vis bText4,0 vis hSlider4,0 vis nNum4,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",26 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp4.pco=27501 + tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + } } if(type4.txt=="light") { @@ -1909,6 +2145,44 @@ Timer tmSerial vis bText5,0 vis hSlider5,0 vis nNum5,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",32 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp5.pco=27501 + tsw bUp5,0 + }else if(tTmp.txt!="") + { + bUp5.pco=65535 + bUp5.txt=tTmp.txt + tsw bUp5,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + tsw bStop5,0 + }else if(tTmp.txt!="") + { + bStop5.pco=65535 + bStop5.txt=tTmp.txt + tsw bStop5,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + tsw bDown5,0 + }else if(tTmp.txt!="") + { + bDown5.pco=65535 + bDown5.txt=tTmp.txt + tsw bDown5,1 + } } if(type5.txt=="light") { @@ -2049,6 +2323,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardGrid.txt b/HMI/US/portrait/n2t-out/cardGrid.txt index 75c6d368..12d623a0 100644 --- a/HMI/US/portrait/n2t-out/cardGrid.txt +++ b/HMI/US/portrait/n2t-out/cardGrid.txt @@ -522,6 +522,90 @@ Hotspot mSpecial page pageTest } +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -785,6 +869,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/cardMedia.txt b/HMI/US/portrait/n2t-out/cardMedia.txt index 7494bc84..3cfbfe02 100644 --- a/HMI/US/portrait/n2t-out/cardMedia.txt +++ b/HMI/US/portrait/n2t-out/cardMedia.txt @@ -223,7 +223,7 @@ Text t1 Events Touch Press Event - hVolume.val=hVolume.val-5 + hVolume.val=hVolume.val-1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -253,7 +253,7 @@ Text t3 Events Touch Press Event - hVolume.val=hVolume.val+5 + hVolume.val=hVolume.val+1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -456,6 +456,90 @@ Button bPrev prints tSend.txt,0 prints crcval,2 +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -656,6 +740,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/cardQR.txt b/HMI/US/portrait/n2t-out/cardQR.txt new file mode 100644 index 00000000..bb7d2918 --- /dev/null +++ b/HMI/US/portrait/n2t-out/cardQR.txt @@ -0,0 +1,744 @@ +Page cardQR + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + + Events + Preinitialize Event + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + //ui e1 + vis btOnOff1,0 + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 + //ui e2 + vis btOnOff2,0 + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) entn + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 100 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) entn1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) type1 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Text tEntity1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity1 + Max. Text Size : 30 + +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text tEntity2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity1 + Max. Text Size : 30 + +Text tIcon2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +QR Code qr0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Text : + Max. Text Size : 105 + +Button bNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bPrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosxTempMin.val) - { - xTempDest.val=xTempDest.val-xTempStep.val - } - // event,buttonPress2,entn,tempUpd,X - //craft command - tSend.txt="event,buttonPress2," - tSend.txt+=entn.txt+"," - tSend.txt+="tempUpd," - //convert temperature - covx xTempDest.val,tTmp.txt,0,0 - tSend.txt+=tTmp.txt - //send calc crc - btlen tSend.txt,sys0 - crcrest 1,0xffff // reset CRC - crcputh 55 bb - crcputs sys0,2 - crcputs tSend.txt,0 - //send cmd - printh 55 bb - prints sys0,2 - prints tSend.txt,0 - prints crcval,2 - -Button bUp - Attributes - Scope : local - Dragging : 0 - Disable release event after dragging: 0 - Send Component ID : disabled - State : unpressed - Text : - Max. Text Size : 10 - - Events - Touch Press Event - if(xTempDest.valxTempMin1.val) + { + xTempDest1.val=xTempDest1.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdHigh," + //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button bUp2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + if(xTempDest2.valxTempMin2.val) + { + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdLow," + //convert temperature + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + if(xTempDest.valxTempMin1.val) + { + xTempDest.val=xTempDest.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -679,22 +964,22 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0 @@ -704,7 +989,6 @@ Timer tmSerial vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") @@ -825,20 +1109,33 @@ Timer tmSerial //enable vis bt7,1 } - //bt8 - spstr strCommand.txt,bt8.txt,"~",42 - if(bt8.txt!="") + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + spstr strCommand.txt,tStateLbl.txt,"~",43 + //Text tALbl + spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") { - // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,"~",44 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,"~",45 - //enable - vis bt8,1 + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 } } if(tInstruction.txt=="pageType") @@ -895,6 +1192,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/US/portrait/n2t-out/pageStartup.txt b/HMI/US/portrait/n2t-out/pageStartup.txt index 5311b94a..8c5a41dc 100644 --- a/HMI/US/portrait/n2t-out/pageStartup.txt +++ b/HMI/US/portrait/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 34 + Text : 35 Max. Text Size : 10 Picture p0 @@ -330,6 +330,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 @@ -351,7 +355,7 @@ Timer tmSpinner Events Timer Event - xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,11 // draw the current frame + xpic mSpinner.x,mSpinner.y,spinner_w.val,140,frame_ptr.val,0,9 // draw the current frame frame_ptr.val+=spinner_w.val%frapic_w.val // advance the pointer to the next frame in the pic resource and roll over at the end doevents // finish drawing before next timer event triggers if(frame_ptr.val==1820) diff --git a/HMI/US/portrait/n2t-out/pageTest.txt b/HMI/US/portrait/n2t-out/pageTest.txt index efade5e5..03a79fd7 100644 --- a/HMI/US/portrait/n2t-out/pageTest.txt +++ b/HMI/US/portrait/n2t-out/pageTest.txt @@ -176,3 +176,17 @@ Button b1 Touch Press Event bauds=115200 +Button b2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : qr + Max. Text Size : 10 + + Events + Touch Press Event + page cardQR + diff --git a/HMI/US/portrait/n2t-out/popupLight.txt b/HMI/US/portrait/n2t-out/popupLight.txt index 5e24181f..3e3da25b 100644 --- a/HMI/US/portrait/n2t-out/popupLight.txt +++ b/HMI/US/portrait/n2t-out/popupLight.txt @@ -618,6 +618,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/popupNotify.txt b/HMI/US/portrait/n2t-out/popupNotify.txt index af719e18..0f032184 100644 --- a/HMI/US/portrait/n2t-out/popupNotify.txt +++ b/HMI/US/portrait/n2t-out/popupNotify.txt @@ -381,6 +381,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/n2t-out/popupShutter.txt b/HMI/US/portrait/n2t-out/popupShutter.txt index 0542a922..5fca3dc8 100644 --- a/HMI/US/portrait/n2t-out/popupShutter.txt +++ b/HMI/US/portrait/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -339,12 +339,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + } } if(tInstruction.txt=="dimmode") { @@ -422,6 +473,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 @@ -433,15 +488,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 57c23fe5..48a71dd0 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -607,6 +607,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/US/portrait/nspanel.tft b/HMI/US/portrait/nspanel.tft new file mode 100644 index 00000000..e93aa1ba Binary files /dev/null and b/HMI/US/portrait/nspanel.tft differ diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index 95e063e4..90bfa81b 100644 Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index c9f29666..e5dd5368 100644 Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ diff --git a/HMI/code_gen/pages/cardEntitiesSerial.py b/HMI/code_gen/pages/cardEntitiesSerial.py index e35321a4..8fcd077f 100644 --- a/HMI/code_gen/pages/cardEntitiesSerial.py +++ b/HMI/code_gen/pages/cardEntitiesSerial.py @@ -48,6 +48,50 @@ for i in range(1,6): vis bText{i},0 vis hSlider{i},0 vis nNum{i},0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",{idxstart+5} + + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + {{ + bUp{i}.pco=27501 + tsw bUp{i},0 + }} + else if(tTmp.txt!="") + {{ + bUp{i}.pco=65535 + bUp{i}.txt=tTmp.txt + tsw bUp{i},1 + }} + + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + {{ + bStop{i}.pco=27501 + tsw bStop{i},0 + }} + else if(tTmp.txt!="") + {{ + bStop{i}.pco=65535 + bStop{i}.txt=tTmp.txt + tsw bStop{i},1 + }} + + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + {{ + bDown{i}.pco=27501 + tsw bDown{i},0 + }} + else if(tTmp.txt!="") + {{ + bDown{i}.pco=65535 + bDown{i}.txt=tTmp.txt + tsw bDown{i},1 + }} }} if(type{i}.txt=="light") {{ diff --git a/HMI/code_gen/pages/cardThermo.py b/HMI/code_gen/pages/cardThermo.py index 920c2c3e..371e6009 100644 --- a/HMI/code_gen/pages/cardThermo.py +++ b/HMI/code_gen/pages/cardThermo.py @@ -10,22 +10,22 @@ text += """ //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0 @@ -35,11 +35,10 @@ text += """ vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 """ start = 10 -for i in range(0,9): +for i in range(0,8): idxstart = start + i*4 text += f""" //bt{i} @@ -59,6 +58,34 @@ for i in range(0,9): }}""" text += """ + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + spstr strCommand.txt,tStateLbl.txt,"~",43 + //Text tALbl + spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") + { + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 + } } """ + sharedfoot print(text) diff --git a/HMI/code_gen/pages/out.txt b/HMI/code_gen/pages/out.txt new file mode 100644 index 00000000..42c39fd9 --- /dev/null +++ b/HMI/code_gen/pages/out.txt @@ -0,0 +1,1034 @@ + +// data available +if(usize>1) +{ + bufferPos=0 + while(bufferPos1) + { + bufferPos=0 + while(bufferPosxTempMin1.val) + { + xTempDest1.val=xTempDest1.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdHigh," + //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button bUp2 Attributes ID : 39 Scope : local @@ -1046,8 +1324,8 @@ Dual-state Button btUp1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 337 - y coordinate : 46 + x coordinate : 178 + y coordinate : 67 Width : 50 Height : 50 Effect : load @@ -1072,17 +1350,17 @@ Dual-state Button btUp1 Events Touch Press Event - if(xTempDest.valxTempMin.val) + if(xTempDest2.val>xTempMin2.val) { - xTempDest.val=xTempDest.val-xTempStep.val + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdLow," + //convert temperature + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btUp + Attributes + ID : 51 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 257 + y coordinate : 68 + Width : 50 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : flat + Font ID : 1 + Back. Color (Unpressed) : 6371 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 6371 + Font Color (Unpressed) : 50712 + Font Color (Pressed) : 50712 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text :  + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + if(xTempDest.valxTempMin1.val) + { + xTempDest.val=xTempDest.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + ID : 34 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 440 + y coordinate : 5 + Width : 40 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + ID : 35 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 12 + y coordinate : 0 + Width : 426 + Height : 9 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + ID : 36 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 5 + Width : 9 + Height : 310 + Effect : load + Effect Priority : 0 + Effect Time : 300 + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes - ID : 5 + ID : 3 Scope : local Period (ms): 50 Enabled : yes @@ -1240,22 +1745,22 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0 @@ -1265,7 +1770,6 @@ Timer tmSerial vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") @@ -1386,20 +1890,33 @@ Timer tmSerial //enable vis bt7,1 } - //bt8 - spstr strCommand.txt,bt8.txt,"~",42 - if(bt8.txt!="") + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + spstr strCommand.txt,tStateLbl.txt,"~",43 + //Text tALbl + spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") { - // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,"~",44 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,"~",45 - //enable - vis bt8,1 + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 } } if(tInstruction.txt=="pageType") @@ -1456,6 +1973,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { @@ -1493,7 +2014,7 @@ Timer tmSerial Timer tmSleep Attributes - ID : 17 + ID : 12 Scope : local Period (ms): 1000 Enabled : yes @@ -1524,7 +2045,7 @@ Timer tmSleep TouchCap tc0 Attributes - ID : 18 + ID : 13 Scope: local Value: 0 diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index df2b1e9b..254fe31b 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -7,52 +7,56 @@ pageIcons 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 -cardMedia - 30 Component(s) - 331 Line(s) of event code - 171 Unique line(s) of event code -popupNotify - 17 Component(s) - 196 Line(s) of event code - 123 Unique line(s) of event code + 14 Component(s) + 14 Line(s) of event code + 14 Unique line(s) of event code pageStartup 19 Component(s) - 150 Line(s) of event code - 113 Unique line(s) of event code -screensaver - 35 Component(s) - 292 Line(s) of event code - 235 Unique line(s) of event code -cardGrid - 39 Component(s) - 420 Line(s) of event code - 246 Unique line(s) of event code + 154 Line(s) of event code + 115 Unique line(s) of event code +cardMedia + 33 Component(s) + 350 Line(s) of event code + 179 Unique line(s) of event code +popupNotify + 17 Component(s) + 200 Line(s) of event code + 125 Unique line(s) of event code popupShutter 20 Component(s) - 193 Line(s) of event code - 109 Unique line(s) of event code + 241 Line(s) of event code + 138 Unique line(s) of event code +screensaver + 35 Component(s) + 296 Line(s) of event code + 237 Unique line(s) of event code popupLight 27 Component(s) - 341 Line(s) of event code - 185 Unique line(s) of event code -cardThermo - 41 Component(s) - 444 Line(s) of event code - 249 Unique line(s) of event code -cardAlarm - 35 Component(s) 345 Line(s) of event code - 216 Unique line(s) of event code + 187 Unique line(s) of event code +cardQR + 30 Component(s) + 363 Line(s) of event code + 205 Unique line(s) of event code +cardGrid + 42 Component(s) + 439 Line(s) of event code + 254 Unique line(s) of event code +cardAlarm + 38 Component(s) + 364 Line(s) of event code + 224 Unique line(s) of event code +cardThermo + 56 Component(s) + 546 Line(s) of event code + 290 Unique line(s) of event code cardEntities - 62 Component(s) - 966 Line(s) of event code - 412 Unique line(s) of event code + 65 Component(s) + 1121 Line(s) of event code + 491 Unique line(s) of event code Total - 12 Page(s) - 344 Component(s) - 3702 Line(s) of event code - 1025 Unique line(s) of event code + 13 Page(s) + 402 Component(s) + 4444 Line(s) of event code + 1168 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/pageStartup.txt b/HMI/n2t-out-visual/pageStartup.txt index e9156d7f..157539bd 100644 --- a/HMI/n2t-out-visual/pageStartup.txt +++ b/HMI/n2t-out-visual/pageStartup.txt @@ -402,7 +402,7 @@ Text tVersion Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : 34 + Text : 35 Max. Text Size : 10 Word wrap : disabled Horizontal Spacing : 0 @@ -625,6 +625,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/pageTest.txt b/HMI/n2t-out-visual/pageTest.txt index 2e75ae45..9205bf4b 100644 --- a/HMI/n2t-out-visual/pageTest.txt +++ b/HMI/n2t-out-visual/pageTest.txt @@ -436,3 +436,39 @@ Button b1 Touch Press Event bauds=115200 +Button b2 + Attributes + ID : 13 + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Opacity : 127 + x coordinate : 0 + y coordinate : 244 + Width : 100 + Height : 50 + Effect : load + Effect Priority : 0 + Effect Time : 300 + Fill : solid color + Style : 3D auto + Font ID : 1 + Back. Color : 50712 + Back. Picture ID (Pressed) : 65535 + Back. Color (Pressed) : 1024 + Font Color (Unpressed) : 0 + Font Color (Pressed) : 65535 + Horizontal Alignment : center + Vertical Alignment : center + State : unpressed + Text : qr + Max. Text Size : 10 + Word wrap : disabled + Horizontal Spacing : 0 + Vertical Spacing : 0 + + Events + Touch Press Event + page cardQR + diff --git a/HMI/n2t-out-visual/popupLight.txt b/HMI/n2t-out-visual/popupLight.txt index 9612c841..62a672ea 100644 --- a/HMI/n2t-out-visual/popupLight.txt +++ b/HMI/n2t-out-visual/popupLight.txt @@ -964,6 +964,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupNotify.txt b/HMI/n2t-out-visual/popupNotify.txt index b46c7bf0..e4ce7e39 100644 --- a/HMI/n2t-out-visual/popupNotify.txt +++ b/HMI/n2t-out-visual/popupNotify.txt @@ -590,6 +590,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out-visual/popupShutter.txt b/HMI/n2t-out-visual/popupShutter.txt index b5c04178..baddcd3a 100644 --- a/HMI/n2t-out-visual/popupShutter.txt +++ b/HMI/n2t-out-visual/popupShutter.txt @@ -50,7 +50,7 @@ Variable (string) strCommand ID : 10 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -624,12 +624,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + } } if(tInstruction.txt=="dimmode") { @@ -707,6 +758,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 @@ -718,15 +773,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index d44101d5..29e98118 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -1131,6 +1131,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardAlarm.txt b/HMI/n2t-out/cardAlarm.txt index a147c095..f076f39d 100644 --- a/HMI/n2t-out/cardAlarm.txt +++ b/HMI/n2t-out/cardAlarm.txt @@ -466,6 +466,90 @@ Button arm4 prints crcval,2 tCode.txt="" +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -704,6 +788,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index db0622ec..157f7426 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -1074,6 +1074,90 @@ Hotspot m3 page popupLight } +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -1193,6 +1277,44 @@ Timer tmSerial vis bText1,0 vis hSlider1,0 vis nNum1,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",8 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp1.pco=27501 + tsw bUp1,0 + }else if(tTmp.txt!="") + { + bUp1.pco=65535 + bUp1.txt=tTmp.txt + tsw bUp1,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop1.pco=27501 + tsw bStop1,0 + }else if(tTmp.txt!="") + { + bStop1.pco=65535 + bStop1.txt=tTmp.txt + tsw bStop1,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown1.pco=27501 + tsw bDown1,0 + }else if(tTmp.txt!="") + { + bDown1.pco=65535 + bDown1.txt=tTmp.txt + tsw bDown1,1 + } } if(type1.txt=="light") { @@ -1315,6 +1437,44 @@ Timer tmSerial vis bText2,0 vis hSlider2,0 vis nNum2,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",14 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp2.pco=27501 + tsw bUp2,0 + }else if(tTmp.txt!="") + { + bUp2.pco=65535 + bUp2.txt=tTmp.txt + tsw bUp2,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop2.pco=27501 + tsw bStop2,0 + }else if(tTmp.txt!="") + { + bStop2.pco=65535 + bStop2.txt=tTmp.txt + tsw bStop2,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown2.pco=27501 + tsw bDown2,0 + }else if(tTmp.txt!="") + { + bDown2.pco=65535 + bDown2.txt=tTmp.txt + tsw bDown2,1 + } } if(type2.txt=="light") { @@ -1437,6 +1597,44 @@ Timer tmSerial vis bText3,0 vis hSlider3,0 vis nNum3,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",20 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp3.pco=27501 + tsw bUp3,0 + }else if(tTmp.txt!="") + { + bUp3.pco=65535 + bUp3.txt=tTmp.txt + tsw bUp3,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop3.pco=27501 + tsw bStop3,0 + }else if(tTmp.txt!="") + { + bStop3.pco=65535 + bStop3.txt=tTmp.txt + tsw bStop3,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown3.pco=27501 + tsw bDown3,0 + }else if(tTmp.txt!="") + { + bDown3.pco=65535 + bDown3.txt=tTmp.txt + tsw bDown3,1 + } } if(type3.txt=="light") { @@ -1559,6 +1757,44 @@ Timer tmSerial vis bText4,0 vis hSlider4,0 vis nNum4,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",26 + // up button + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="disable") + { + bUp4.pco=27501 + tsw bUp4,0 + }else if(tTmp.txt!="") + { + bUp4.pco=65535 + bUp4.txt=tTmp.txt + tsw bUp4,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="disable") + { + bStop4.pco=27501 + tsw bStop4,0 + }else if(tTmp.txt!="") + { + bStop4.pco=65535 + bStop4.txt=tTmp.txt + tsw bStop4,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",2 + if(tTmp.txt=="disable") + { + bDown4.pco=27501 + tsw bDown4,0 + }else if(tTmp.txt!="") + { + bDown4.pco=65535 + bDown4.txt=tTmp.txt + tsw bDown4,1 + } } if(type4.txt=="light") { @@ -1699,6 +1935,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 75c6d368..12d623a0 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -522,6 +522,90 @@ Hotspot mSpecial page pageTest } +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -785,6 +869,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/cardMedia.txt b/HMI/n2t-out/cardMedia.txt index 7494bc84..3cfbfe02 100644 --- a/HMI/n2t-out/cardMedia.txt +++ b/HMI/n2t-out/cardMedia.txt @@ -223,7 +223,7 @@ Text t1 Events Touch Press Event - hVolume.val=hVolume.val-5 + hVolume.val=hVolume.val-1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -253,7 +253,7 @@ Text t3 Events Touch Press Event - hVolume.val=hVolume.val+5 + hVolume.val=hVolume.val+1 // event,buttonPress2,internalNameEntity,volumeSlider,50 //craft command tSend.txt="event,buttonPress2,"+entn.txt+",volumeSlider," @@ -456,6 +456,90 @@ Button bPrev prints tSend.txt,0 prints crcval,2 +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -656,6 +740,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/cardQR.txt b/HMI/n2t-out/cardQR.txt new file mode 100644 index 00000000..bb7d2918 --- /dev/null +++ b/HMI/n2t-out/cardQR.txt @@ -0,0 +1,744 @@ +Page cardQR + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Locked : no + Swide up page ID : disabled + Swide down page ID : disabled + Swide left page ID : disabled + Swide right page ID : disabled + + Events + Preinitialize Event + vis p0,0 + vis tSend,0 + vis tInstruction,0 + vis tTmp,0 + vis tId,0 + vis bPrev,0 + vis bNext,0 + //ui e1 + vis btOnOff1,0 + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 + //ui e2 + vis btOnOff2,0 + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 200 + +Variable (string) entn + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) tSend + Attributes + Scope : local + Text : + Max. Text Size: 100 + +Variable (string) tTmp + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) tId + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) tInstruction + Attributes + Scope : local + Text : + Max. Text Size: 20 + +Variable (string) entn1 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) entn2 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) type1 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Text tEntity1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity1 + Max. Text Size : 30 + +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text tEntity2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity1 + Max. Text Size : 30 + +Text tIcon2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +QR Code qr0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Text : + Max. Text Size : 105 + +Button bNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm,bNext" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bPrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,cardAlarm," + if(bPrev.txt=="") + { + tSend.txt+="bUp" + }else + { + tSend.txt+="bPrev" + } + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn1.txt+",OnOff," + covx btOnOff1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosxTempMin.val) + if(xTempDest1.val>xTempMin1.val) { - xTempDest.val=xTempDest.val-xTempStep.val + xTempDest1.val=xTempDest1.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdHigh," + //convert temperature + covx xTempDest1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button bUp2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + if(xTempDest2.valxTempMin2.val) + { + xTempDest2.val=xTempDest2.val-xTempStep2.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpdLow," + //convert temperature + covx xTempDest2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + if(xTempDest.valxTempMin1.val) + { + xTempDest.val=xTempDest.val-xTempStep1.val + } + // event,buttonPress2,entn,tempUpd,X + //craft command + tSend.txt="event,buttonPress2," + tSend.txt+=entn.txt+"," + tSend.txt+="tempUpd," + //convert temperature + covx xTempDest.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSwipeNext + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing right button if swiped on the right side of the screen + // + spstr tId.txt,tTmp.txt,"|",1 + if(tTmp.txt=="1") + { + click bNext,1 + } + +Hotspot mSwipeUp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing up button if swiped on the top side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="2") + { + click bPrev,1 + } + +Hotspot mSwipePrev + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + //This thin hotspot down the edge will intercept swipes + //from the bezel into the screen area before the + //Nextion register touch for any other components - + //IF the hotspot is 'layered' at the top (use the up + //arrow at the far left of the Nextion Editor Tool Bar). + // + //Calibrate how wide the edge hotspot has to be on your + //own physical device using this screen to test the + //x & y coordinates where the swipe is first detected.) + //--------------------------- + //The navigation text is stored as local variable within tld.txt + //Pressing left button if swiped on the left side of the screen + // + spstr tId.txt,tTmp.txt,"|",0 + if(tTmp.txt=="1") + { + click bPrev,1 + } + Timer tmSerial Attributes Scope : local @@ -679,22 +964,22 @@ Timer tmSerial //entity name spstr strCommand.txt,entn.txt,"~",3 //currentTemp - spstr strCommand.txt,tTmp.txt,"~",4 - covx tTmp.txt,xTempCurr.val,0,0 + spstr strCommand.txt,tCurTemp.txt,"~",4 //dstTemp spstr strCommand.txt,tTmp.txt,"~",5 - covx tTmp.txt,xTempDest.val,0,0 + covx tTmp.txt,xTempDest1.val,0,0 + xTempDest.val=xTempDest1.val //status spstr strCommand.txt,tStatus.txt,"~",6 //minTemp spstr strCommand.txt,tTmp.txt,"~",7 - covx tTmp.txt,xTempMin.val,0,0 + covx tTmp.txt,xTempMin1.val,0,0 //maxTemp spstr strCommand.txt,tTmp.txt,"~",8 - covx tTmp.txt,xTempMax.val,0,0 + covx tTmp.txt,xTempMax1.val,0,0 //tempStep spstr strCommand.txt,tTmp.txt,"~",9 - covx tTmp.txt,xTempStep.val,0,0 + covx tTmp.txt,xTempStep1.val,0,0 // disable all buttons vis bt0,0 vis bt1,0 @@ -704,7 +989,6 @@ Timer tmSerial vis bt5,0 vis bt6,0 vis bt7,0 - vis bt8,0 //bt0 spstr strCommand.txt,bt0.txt,"~",10 if(bt0.txt!="") @@ -825,20 +1109,33 @@ Timer tmSerial //enable vis bt7,1 } - //bt8 - spstr strCommand.txt,bt8.txt,"~",42 - if(bt8.txt!="") + //Text tCurTempLbl + spstr strCommand.txt,tCurTempLbl.txt,"~",42 + //Text tStateLbl + spstr strCommand.txt,tStateLbl.txt,"~",43 + //Text tALbl + spstr strCommand.txt,tALbl.txt,"~",44 + //Text tCF + spstr strCommand.txt,tCF.txt,"~",45 + tCF1.txt=tCF.txt + tCF2.txt=tCF.txt + //Second Temperature + spstr strCommand.txt,tTmp.txt,"~",46 + if(tTmp.txt!="") { - // set text color on active state - spstr strCommand.txt,tTmp.txt,"~",43 - covx tTmp.txt,bt8.pco2,0,0 - // set state - spstr strCommand.txt,tTmp.txt,"~",44 - covx tTmp.txt,bt8.val,0,0 - // save action - spstr strCommand.txt,va8.txt,"~",45 - //enable - vis bt8,1 + covx tTmp.txt,xTempDest2.val,0,0 + vis btUp,0 + vis xTempDest,0 + vis btDown,0 + vis tCF,0 + vis btUp1,1 + vis xTempDest1,1 + vis btDown1,1 + vis tCF1,1 + vis bUp2,1 + vis xTempDest2,1 + vis bDown2,1 + vis tCF2,1 } } if(tInstruction.txt=="pageType") @@ -895,6 +1192,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } if(tInstruction.txt=="time") { diff --git a/HMI/n2t-out/pageStartup.txt b/HMI/n2t-out/pageStartup.txt index acdcef82..23c2525b 100644 --- a/HMI/n2t-out/pageStartup.txt +++ b/HMI/n2t-out/pageStartup.txt @@ -152,7 +152,7 @@ Text tVersion Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : 34 + Text : 35 Max. Text Size : 10 Picture p0 @@ -330,6 +330,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/pageTest.txt b/HMI/n2t-out/pageTest.txt index efade5e5..03a79fd7 100644 --- a/HMI/n2t-out/pageTest.txt +++ b/HMI/n2t-out/pageTest.txt @@ -176,3 +176,17 @@ Button b1 Touch Press Event bauds=115200 +Button b2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : qr + Max. Text Size : 10 + + Events + Touch Press Event + page cardQR + diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 5e24181f..3e3da25b 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -618,6 +618,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupNotify.txt b/HMI/n2t-out/popupNotify.txt index af719e18..0f032184 100644 --- a/HMI/n2t-out/popupNotify.txt +++ b/HMI/n2t-out/popupNotify.txt @@ -381,6 +381,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/n2t-out/popupShutter.txt b/HMI/n2t-out/popupShutter.txt index 0542a922..5fca3dc8 100644 --- a/HMI/n2t-out/popupShutter.txt +++ b/HMI/n2t-out/popupShutter.txt @@ -41,7 +41,7 @@ Variable (string) strCommand Attributes Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 200 Variable (string) entn Attributes @@ -339,12 +339,63 @@ Timer tmSerial { // get Position value spstr strCommand.txt,tTmp.txt,"~",1 - covx tTmp.txt,sys0,0,0 - hPosition.val=sys0 + if(tTmp.txt=="disable") + { + vis tPosHeading,0 + vis hPosition,0 + }else + { + covx tTmp.txt,sys0,0,0 + hPosition.val=sys0 + vis tPosHeading,1 + vis hPosition,1 + } // set tinfo1 text spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) spstr strCommand.txt,tPosHeading.txt,"~",3 + // set tIcon1 + spstr strCommand.txt,tTmp.txt,"~",4 + if(tTmp.txt!="") + { + tIcon1.txt=tTmp.txt + } + // set icon bUp + spstr strCommand.txt,tTmp.txt,"~",5 + if(tTmp.txt=="disable") + { + tsw bUp1,0 + bUp1.pco=27501 + }else if(tTmp.txt!="") + { + bUp1.txt=tTmp.txt + tsw bUp1,1 + bUp1.pco=65535 + } + // set icon bStop + spstr strCommand.txt,tTmp.txt,"~",6 + if(tTmp.txt=="disable") + { + tsw bStop1,0 + bStop1.pco=27501 + }else if(tTmp.txt!="") + { + bStop1.txt=tTmp.txt + tsw bStop1,1 + bStop1.pco=65535 + } + // set icon bDown + spstr strCommand.txt,tTmp.txt,"~",7 + if(tTmp.txt=="disable") + { + tsw bDown1,0 + bDown1.pco=27501 + }else if(tTmp.txt!="") + { + bDown1.txt=tTmp.txt + tsw bDown1,1 + bDown1.pco=65535 + } } if(tInstruction.txt=="dimmode") { @@ -422,6 +473,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 @@ -433,15 +488,6 @@ Timer tmSerial // next character bufferPos++ } - if(bufferPos==usize) - { - // copy whole buffer to t1.txt, for debugging - //ucopy t2.txt,0,usize,0 - // ucopy n2.val,0,usize,0 - // clear whole buffer - //code_c - //bufferPos=0 - } } TouchCap tc0 diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 57c23fe5..48a71dd0 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -607,6 +607,10 @@ Timer tmSerial { page cardAlarm } + if(tId.txt=="cardQR") + { + page cardQR + } } // end of user code udelete payloadLength-1 diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 07f99179..e1c3a28d 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 57f156ed..c18f3814 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/README.md b/README.md index be1c27ed..288d2ce7 100644 --- a/README.md +++ b/README.md @@ -16,6 +16,8 @@ Or an TypeScript on your ioBroker Instance in case you are an ioBroker User. NsPanel needs to be flashed with Tasmota (or upcoming with ESPHome) +![nspanel-rl](doc-pics/nspanel-rl.png) + ## Features - Entities Page with support for cover, switch, input_boolean, binary_sensor, sensor, button, number, scenes, script, input_button and light, input_text (read-only), lock, fan @@ -23,8 +25,9 @@ NsPanel needs to be flashed with Tasmota (or upcoming with ESPHome) - Detail Pages for Lights (Brightness, Temperature and Color of the Light) and for Covers (Position) - Thermostat Page - Media Player Card -- Alarm Control Panel +- Alarm Control Card - Screensaver Page with Time, Date and Weather Information +- Card with QrCode to display WiFi Information - Localization possible (currently 38 languages) - **Everything is dynamically configurable by a yaml config, no need to code or touch Nextion Editor** @@ -76,7 +79,7 @@ For more detailed Instructions see the following Sections: This section describes the Installation Steps for HomeAssistant, follow each step. -
1. Installing HomeAssiant Add-Ons +
1. Installing HomeAssistant Add-Ons

### Installing AppDaemon @@ -104,7 +107,7 @@ Install Studio Code Server from Home Assistant's Supervisor Add-on Store to easi

-
2. Installing HomeAssiant Community Store +
2. Installing HomeAssistant Community Store

### Installing HACS @@ -347,6 +350,14 @@ nspanel-1: entity: media_player.example_item - type: cardAlarm entity: alarm_control_panel.alarmo + - type: cardQR + title: Guest Wifi + qr_code: "WIFI:S:test_ssid;T:WPA;P:test_pw;;" + entities: + - entity: iText.Name.test_ssid + icon: wifi + - entity: iText.Password.test_pw + icon: key ``` key | optional | type | default | description @@ -370,7 +381,8 @@ key | optional | type | default | description `sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity. `locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization. `dateFormatBabel` | True | string | `full` | formatting options on https://babel.pocoo.org/en/latest/dates.html?highlight=name%20of%20day#date-fields -`timeFormat` | True | string | `%H:%M` | Time Format on screensaver. Substring after `?` is displayed in a seperate smaller textbox. Useful for 12h time format with AM/PM `"%I:%M ?%p"` +`timeFormat` | True | string | `%H:%M` | Time Format on screensaver. Substring after `?` is displayed in a seperate smaller textbox. Useful for 12h time format with AM/PM 

`"%I:%M   ?%p"`
+`dateAdditonalTemplate` | True | string | `" - {{ states('sun.sun') }}"` | Addional Text dispayed after Date, can contain Homeassistant Templates `dateFormat` | True | string | `%A, %d. %B %Y` | date format used if babel is not installed `cards` | False | complex | | configuration for cards that are displayed on panel `screensaver` | True | complex | | configuration for screensaver @@ -447,7 +459,7 @@ key | optional | type | default | description `weatherOverrideForecast4` | True | complex | `None` | sensor entity from home assistant here to override the forth weather forecast item on the screensaver `doubleTapToUnlock` | True | boolean | `False` | requires to tap screensaver two times `alternativeLayout` | True | boolean | `False` | alternative layout with humidity -`defaultCard` | True | string | `None` | default page after exiting screensaver; only works with top level cards defined in cards; needs to be a navigation item, see subpages (navigate.type_key) +`defaultCard` | True | string | `None` | default page after exiting screensaver; only works with top level cards defined in cards; needs to be a navigation item, see subpages (navigate.type_key) This config option will also be evaluated as a HomeAssistant Template. `key` | True | string | `None` | Used by navigate items Example for the weatherOverride config options: @@ -492,6 +504,12 @@ Only the icons listed in the [Icon Cheatsheet](https://htmlpreview.github.io/?ht icon: lightbulb ``` +#### Fahrenheit on cardThermo +```yaml + - type: cardThermo + entity: climate.example_item + temperatureUnit: fahrenheit +``` #### Subpages You can configure entities with with the prefix `navigate`, that are navigating to cards, in case it's hidden card, the navigation items will change and the arrow is bringing you back to the privious page. diff --git a/apps/nspanel-lovelace-ui/luibackend/config.py b/apps/nspanel-lovelace-ui/luibackend/config.py index c8f4f6cb..7ed583f5 100644 --- a/apps/nspanel-lovelace-ui/luibackend/config.py +++ b/apps/nspanel-lovelace-ui/luibackend/config.py @@ -71,6 +71,7 @@ class LuiBackendConfig(object): 'locale': "en_US", 'timeFormat': "%H:%M", 'dateFormatBabel': "full", + 'dateAdditonalTemplate': "", 'dateFormat': "%A, %d. %B %Y", 'cards': [{ 'type': 'cardEntities', @@ -95,6 +96,7 @@ class LuiBackendConfig(object): }, { 'type': 'climate', 'entity': 'climate.test_item', + 'temperatureUnit': 'celsius' }], 'screensaver': { 'type': 'screensaver', diff --git a/apps/nspanel-lovelace-ui/luibackend/controller.py b/apps/nspanel-lovelace-ui/luibackend/controller.py index 544f590a..37709ad5 100644 --- a/apps/nspanel-lovelace-ui/luibackend/controller.py +++ b/apps/nspanel-lovelace-ui/luibackend/controller.py @@ -136,8 +136,12 @@ class LuiController(object): # internal buttons if entity_id == "screensaver" and button_type == "bExit": # get default card if there is one - if self._config.get("screensaver.defaultCard") is not None: - dstCard = self._config.searchCard(self._config.get("screensaver.defaultCard")) + defaultCard = self._config.get("screensaver.defaultCard") + if defaultCard is not None: + defaultCard = self._ha_api.render_template(defaultCard) + self._ha_api.log(f"Searching for the following page as defaultPage: {defaultCard}") + dstCard = self._config.searchCard(defaultCard) + self._ha_api.log(f"Result for the following page as defaultPage: {dstCard}") if dstCard is not None: self._previous_cards = [] self._previous_cards.append(dstCard) diff --git a/apps/nspanel-lovelace-ui/luibackend/localization.py b/apps/nspanel-lovelace-ui/luibackend/localization.py index e0a66f41..51cf9618 100644 --- a/apps/nspanel-lovelace-ui/luibackend/localization.py +++ b/apps/nspanel-lovelace-ui/luibackend/localization.py @@ -883,6 +883,7 @@ translations = { } def get_translation(locale, input): + locale = locale.split("_")[0] en_fallback_res = translations.get("en").get(input, input) if locale in translations: return translations.get(locale).get(input, en_fallback_res) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index f93ff6e0..835975ff 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -48,7 +48,10 @@ class LuiPagesGen(object): else: dateformat = self._config.get("dateFormat") date = datetime.datetime.now().strftime(dateformat) - self._send_mqtt_msg(f"date~{date}") + + addTemplate = self._config.get("dateAdditonalTemplate") + addDateText = self._ha_api.render_template(addTemplate) + self._send_mqtt_msg(f"date~{date}{addDateText}") def page_type(self, target_page): self._send_mqtt_msg(f"pageType~{target_page}") @@ -57,7 +60,7 @@ class LuiPagesGen(object): global babel_spec we_name = self._config._config_screensaver.entity.entityId unit = self._config._config_screensaver.raw_config.get("weatherUnit", "celsius") - + if self._ha_api.entity_exists(we_name): we = self._ha_api.get_entity(we_name) else: @@ -140,8 +143,18 @@ class LuiPagesGen(object): entity = self._ha_api.get_entity(entityId) name = name if name is not None else entity.attributes.friendly_name if entityType == "cover": - icon_id = get_icon_id_ha("cover", state=entity.state, overwrite=icon) - return f"~shutter~{entityId}~{icon_id}~17299~{name}~" + icon_id = get_icon_id_ha("cover", state=entity.state, overwrite=icon) + icon_up = get_icon_id("arrow-up") + icon_stop = get_icon_id("stop") + icon_down = get_icon_id("arrow-down") + pos = int(entity.attributes.get("current_position", 50)) + if pos == 100: + status = f"disable|{icon_stop}|{icon_down}" + elif pos == 0: + status = f"{icon_up}|{icon_stop}|disable" + else: + status = f"{icon_up}|{icon_stop}|{icon_down}" + return f"~shutter~{entityId}~{icon_id}~17299~{name}~{status}" if entityType in "light": switch_val = 1 if entity.state == "on" else 0 icon_color = self.get_entity_color(entity) @@ -198,16 +211,23 @@ class LuiPagesGen(object): command += self.generate_entities_item(item) self._send_mqtt_msg(command) - - - def generate_thermo_page(self, navigation, entity): + def generate_thermo_page(self, navigation, entity, temp_unit): item = entity.entityId + + if(temp_unit == "celsius"): + temperature_unit_icon = get_icon_id("temperature-celsius") + temperature_unit = "°C" + + else: + temperature_unit_icon = get_icon_id("temperature-fahrenheit") + temperature_unit = "°F" + if not self._ha_api.entity_exists(item): - command = f"entityUpd~{heading}~{navigation}~{item}~220~220~Not found~150~300~5" + command = f"entityUpd~Not found~{navigation}~{item}~check~220~apps.yaml~150~300~5~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~Please~your~~" else: entity = self._ha_api.get_entity(item) heading = entity.attributes.friendly_name - current_temp = int(get_attr_safe(entity, "current_temperature", 0)*10) + current_temp = get_attr_safe(entity, "current_temperature", "") dest_temp = int(get_attr_safe(entity, "temperature", 0)*10) status = get_attr_safe(entity, "hvac_action", "") status = get_translation(self._locale,status) @@ -243,29 +263,20 @@ class LuiPagesGen(object): icon_res += f"~{icon_id}~{color_on}~{state}~{mode}" len_hvac_modes = len(hvac_modes) - if len_hvac_modes%2 == 0: - # even - padding_len = int((4-len_hvac_modes)/2) - icon_res = "~"*4*padding_len + icon_res + "~"*4*padding_len - # use last 4 icons - icon_res = "~"*4*5 + icon_res - else: - # uneven - padding_len = int((5-len_hvac_modes)/2) - icon_res = "~"*4*padding_len + icon_res + "~"*4*padding_len - # use first 5 icons - icon_res = icon_res + "~"*4*4 - command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp}~{dest_temp}~{status}~{min_temp}~{max_temp}~{step_temp}{icon_res}" + padding_len = 8-len_hvac_modes + icon_res = icon_res + "~"*4*padding_len + + command = f"entityUpd~{heading}~{navigation}~{item}~{current_temp} {temperature_unit}~{dest_temp}~{status}~{min_temp}~{max_temp}~{step_temp}{icon_res}~Currently~State~Action~{temperature_unit_icon}" self._send_mqtt_msg(command) def generate_media_page(self, navigation, entity): item = entity.entityId if not self._ha_api.entity_exists(item): - command = f"entityUpd~|Not found||{item}|{get_icon_id('alert-circle-outline')}|Please check your|apps.yaml in AppDaemon|50|{get_icon_id('alert-circle-outline')}" + command = f"entityUpd~Not found~{navigation}~{item}~{get_icon_id('alert-circle-outline')}~Please check your~apps.yaml in AppDaemon~~0~{get_icon_id('alert-circle-outline')}~~~disable" else: entity = self._ha_api.get_entity(item) heading = entity.attributes.friendly_name - icon = 0 + icon = get_icon_id('alert-circle-outline') title = get_attr_safe(entity, "media_title", "") author = get_attr_safe(entity, "media_artist", "") volume = int(get_attr_safe(entity, "volume_level", 0)*100) @@ -295,7 +306,7 @@ class LuiPagesGen(object): def generate_alarm_page(self, navigation, entity): item = entity.entityId if not self._ha_api.entity_exists(item): - command = f"entityUpd~{item}~~Not found~Not found~Check your~Check your~apps.~apps.~yaml~yaml~0~~0" + command = f"entityUpd~{item}~{navigation}~Not found~Not found~Check your~Check your~apps.~apps.~yaml~yaml~0~~0" else: entity = self._ha_api.get_entity(item) icon = get_icon_id("shield-off") @@ -351,14 +362,16 @@ class LuiPagesGen(object): command = f"entityUpd~{item}~{navigation}{arm_buttons}~{icon}~{color}~{numpad}~{flashing}" self._send_mqtt_msg(command) - def render_card(self, card, send_page_type=True): + def render_card(self, card, send_page_type=True): self._ha_api.log(f"Started rendering of page {card.pos} with type {card.cardType}") + if len(self._config._config_cards) == 1: navigation = "0|0" else: navigation = "1|1" if card.pos is None: - navigation = "2|0" + navigation = "2|0" + # Switch to page if send_page_type: self.page_type(card.cardType) @@ -367,7 +380,8 @@ class LuiPagesGen(object): self.generate_entities_page(navigation, card.title, card.entities) return if card.cardType == "cardThermo": - self.generate_thermo_page(navigation, card.entity) + temp_unit = card.raw_config.get("temperatureUnit", "celsius") + self.generate_thermo_page(navigation, card.entity, temp_unit) if card.cardType == "cardMedia": self.generate_media_page(navigation, card.entity) if card.cardType == "cardAlarm": @@ -409,9 +423,27 @@ class LuiPagesGen(object): def generate_shutter_detail_page(self, entity): entity = self._ha_api.get_entity(entity) - pos = int(entity.attributes.get("current_position", 50)) + icon_id = get_icon_id_ha("cover", state=entity.state) + + pos = entity.attributes.get("current_position") + if pos is None: + pos_status = entity.state + pos = "disable" + else: + pos_status = pos + + + icon_up = get_icon_id("arrow-up") + icon_stop = get_icon_id("stop") + icon_down = get_icon_id("arrow-down") + + if pos == 100: + icon_up = "disable" + elif pos == 0: + icon_down = "disable" + pos_translation = get_translation(self._locale, "position") - self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos}~{pos_translation}") + self._send_mqtt_msg(f"entityUpdateDetail~{pos}~{pos_translation}: {pos_status}~{pos_translation}~{icon_id}~{icon_up}~{icon_stop}~{icon_down}") def send_message_page(self, id, heading, msg, b1, b2): self._send_mqtt_msg(f"pageType~popupNotify") diff --git a/doc-pics/nspanel-rl.png b/doc-pics/nspanel-rl.png new file mode 100644 index 00000000..7660dea2 Binary files /dev/null and b/doc-pics/nspanel-rl.png differ diff --git a/doc-pics/screens.png b/doc-pics/screens.png index 9b252905..8889598e 100644 Binary files a/doc-pics/screens.png and b/doc-pics/screens.png differ