diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt --- HMI/n2t-out/Program.s.txt 2022-06-17 15:47:21.865539949 +0000 +++ HMI/US/portrait/n2t-out/Program.s.txt 2022-06-17 15:47:22.253557306 +0000 @@ -11,6 +11,6 @@ // dim value int dimValue=40 int dimValueNormal=100 - // fix touch offset - lcd_dev fffb 0002 0000 0020 + // fix touch offset (Removed for US version) + //lcd_dev fffb 0002 0000 0020 page pageStartup diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt --- HMI/n2t-out/cardEntities.txt 2022-06-17 15:47:21.869540128 +0000 +++ HMI/US/portrait/n2t-out/cardEntities.txt 2022-06-17 15:47:22.253557306 +0000 @@ -63,6 +63,16 @@ vis bText4,0 vis hSlider4,0 vis nNum4,0 + //ui e5 + vis btOnOff5,0 + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis tIcon5,0 + vis tEntity5,0 + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 vis bPrev,0 vis bNext,0 @@ -120,6 +130,18 @@ Text : Max. Text Size: 80 +Variable (string) entn5 + Attributes + Scope : local + Text : + Max. Text Size: 80 + +Variable (string) type5 + Attributes + Scope : local + Text : + Max. Text Size: 10 + Number nNum1 Attributes Scope : local @@ -156,6 +178,15 @@ Associated Keyboard : none Value : 0 +Number nNum5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + Text tHeading Attributes Scope : local @@ -286,6 +317,26 @@ Text : Max. Text Size : 50 +Text tEntity5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity5 + Max. Text Size : 30 + +Text tIcon5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 5 + Picture p0 Attributes Scope : local @@ -405,6 +456,34 @@ prints tSend.txt,0 prints crcval,2 +Slider hSlider5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + + Events + Touch Release Event + nNum5.val=hSlider5.val + tSend.txt="event,buttonPress2,"+entn5.txt+",number-set," + covx nNum5.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Button bDown1 Attributes Scope : local @@ -862,6 +941,106 @@ prints tSend.txt,0 prints crcval,2 +Button bStop5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn5.txt+",stop" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bDown5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn5.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bUp5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn5.txt+",up" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 20 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn5.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Dual-state Button btOnOff1 Attributes Scope : local @@ -970,6 +1149,33 @@ prints tSend.txt,0 prints crcval,2 +Dual-state Button btOnOff5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn5.txt+",OnOff," + covx btOnOff5.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,2 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + Hotspot mSpecial Attributes Scope : local @@ -1075,6 +1281,28 @@ page popupLight } +Hotspot m4 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity5.txt + pageIcons.tTmp2.txt=entn5.txt + if(type5.txt=="shutter") + { + //popupShutter.tHeading.txt=tEntity5.txt + page popupShutter + } + if(type5.txt=="light") + { + //popupLight.tEntity.txt=tEntity5.txt + page popupLight + } + Hotspot mSwipeNext Attributes Scope : local @@ -1850,6 +2078,169 @@ covx tTmp.txt,sys0,0,0 hSlider4.maxval=sys0 } + // get Type + spstr strCommand.txt,type5.txt,"~",27 + // get internal name + spstr strCommand.txt,entn5.txt,"~",28 + if(type5.txt=="delete"||type5.txt=="") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis btOnOff5,0 + vis tEntity5,0 + vis tIcon5,0 + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 + }else + { + // change icon + spstr strCommand.txt,tIcon5.txt,"~",29 + vis tIcon5,1 + // change icon color + spstr strCommand.txt,tTmp.txt,"~",30 + covx tTmp.txt,sys0,0,0 + tIcon5.pco=sys0 + // set name + spstr strCommand.txt,tEntity5.txt,"~",31 + vis tEntity5,1 + } + if(type5.txt=="shutter") + { + vis bUp5,1 + vis bStop5,1 + vis bDown5,1 + vis btOnOff5,0 + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 + // get Button State (optional Value) + spstr strCommand.txt,tId.txt,"~",32 + // up button + spstr tId.txt,tTmp.txt,"|",3 + if(tTmp.txt=="disable") + { + bUp5.pco=27501 + spstr tId.txt,bUp5.txt,"|",0 + tsw bUp5,0 + }else if(tTmp.txt=="enable") + { + bUp5.pco=65535 + spstr tId.txt,bUp5.txt,"|",0 + tsw bUp5,1 + } + // stop button + spstr tId.txt,tTmp.txt,"|",4 + if(tTmp.txt=="disable") + { + bStop5.pco=27501 + spstr tId.txt,bStop5.txt,"|",1 + tsw bStop5,0 + }else if(tTmp.txt=="enable") + { + bStop5.pco=65535 + spstr tId.txt,bStop5.txt,"|",1 + tsw bStop5,1 + } + // down button + spstr tId.txt,tTmp.txt,"|",5 + if(tTmp.txt=="disable") + { + bDown5.pco=27501 + spstr tId.txt,bDown5.txt,"|",2 + tsw bDown5,0 + }else if(tTmp.txt=="enable") + { + bDown5.pco=65535 + spstr tId.txt,bDown5.txt,"|",2 + tsw bDown5,1 + } + } + if(type5.txt=="light") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis btOnOff5,1 + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",32 + covx tTmp.txt,sys0,0,0 + btOnOff5.val=sys0 + } + if(type5.txt=="switch") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis btOnOff5,1 + vis bText5,0 + vis hSlider5,0 + vis nNum5,0 + // get Button State (optional Value) + spstr strCommand.txt,tTmp.txt,"~",32 + covx tTmp.txt,sys0,0,0 + btOnOff5.val=sys0 + } + if(type5.txt=="text") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis btOnOff5,0 + vis bText5,1 + tsw bText5,0 + vis hSlider5,0 + vis nNum5,0 + bText5.pco=65535 + bText5.pco2=65535 + // get Text (optional Value) + spstr strCommand.txt,bText5.txt,"~",32 + } + if(type5.txt=="button") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis btOnOff5,0 + vis bText5,1 + tsw bText5,1 + vis hSlider5,0 + vis nNum5,0 + bText5.pco=1374 + bText5.pco2=1374 + // get Text (optional Value) + spstr strCommand.txt,bText5.txt,"~",32 + } + if(type5.txt=="number") + { + vis bUp5,0 + vis bStop5,0 + vis bDown5,0 + vis btOnOff5,0 + vis bText5,0 + tsw bText5,0 + vis hSlider5,1 + vis nNum5,1 + // get config (optional Value) (use bText as variable) + spstr strCommand.txt,bText5.txt,"~",32 + //first value is current value + spstr bText5.txt,tTmp.txt,"|",0 + covx tTmp.txt,sys0,0,0 + hSlider5.val=sys0 + nNum5.val=sys0 + //second value is min value + spstr bText5.txt,tTmp.txt,"|",1 + covx tTmp.txt,sys0,0,0 + hSlider5.minval=sys0 + //third value is max value + spstr bText5.txt,tTmp.txt,"|",2 + covx tTmp.txt,sys0,0,0 + hSlider5.maxval=sys0 + } } if(tInstruction.txt=="pageType") { diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt --- HMI/n2t-out/pageStartup.txt 2022-06-17 15:47:21.869540128 +0000 +++ HMI/US/portrait/n2t-out/pageStartup.txt 2022-06-17 15:47:22.253557306 +0000 @@ -142,7 +142,7 @@ Disable release event after dragging: 0 Send Component ID : disabled Associated Keyboard : none - Text : please check your backend configuration + Text : pls check your backend configuration Max. Text Size : 100 Text tVersion @@ -177,7 +177,7 @@ recmod=1 bauds=115200 // startup event - tSend.txt="event,startup,"+tVersion.txt+",eu" + tSend.txt="event,startup,"+tVersion.txt+",us-p" //send calc crc btlen tSend.txt,sys0 crcrest 1,0xffff // reset CRC diff -bur HMI/n2t-out/popupLight.txt HMI/US/portrait/n2t-out/popupLight.txt --- HMI/n2t-out/popupLight.txt 2022-06-17 15:47:21.869540128 +0000 +++ HMI/US/portrait/n2t-out/popupLight.txt 2022-06-17 15:47:22.253557306 +0000 @@ -151,7 +151,7 @@ Send Component ID : disabled Associated Keyboard : none Text : - Max. Text Size : 80 + Max. Text Size : 10 Text tInstruction Attributes @@ -443,22 +443,21 @@ ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) spstr strCommand.txt,tInstruction.txt,"~",0 - spstr strCommand.txt,tTmp.txt,"~",1 - if(tInstruction.txt=="entityUpdateDetail"&&entn.txt==tTmp.txt) + if(tInstruction.txt=="entityUpdateDetail") { // change icon - spstr strCommand.txt,tIcon1.txt,"~",2 + spstr strCommand.txt,tIcon1.txt,"~",1 vis tIcon1,1 // change icon color - spstr strCommand.txt,tTmp.txt,"~",3 + spstr strCommand.txt,tTmp.txt,"~",2 covx tTmp.txt,sys0,0,0 tIcon1.pco=sys0 // get Button State - spstr strCommand.txt,tTmp.txt,"~",4 + spstr strCommand.txt,tTmp.txt,"~",3 covx tTmp.txt,sys0,0,0 btOnOff1.val=sys0 // get Brightness value - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",4 if(tTmp.txt=="disable") { vis t1,0 @@ -476,7 +475,7 @@ } } // get ColorTemp value - spstr strCommand.txt,tTmp.txt,"~",6 + spstr strCommand.txt,tTmp.txt,"~",5 if(tTmp.txt=="disable") { vis hTempSlider,0 @@ -520,7 +519,7 @@ } } // get Color value - spstr strCommand.txt,tTmp.txt,"~",7 + spstr strCommand.txt,tTmp.txt,"~",6 // disable -> isn't supported if(tTmp.txt=="disable") { @@ -541,11 +540,11 @@ } } // set t0 Color (Localization) - spstr strCommand.txt,t0.txt,"~",8 + spstr strCommand.txt,t0.txt,"~",7 // set t4 Temperature (Localization) - spstr strCommand.txt,t4.txt,"~",9 + spstr strCommand.txt,t4.txt,"~",8 // set t1 Brightness (Localization) - spstr strCommand.txt,t1.txt,"~",10 + spstr strCommand.txt,t1.txt,"~",9 } if(tInstruction.txt=="time") { diff -bur HMI/n2t-out/popupShutter.txt HMI/US/portrait/n2t-out/popupShutter.txt --- HMI/n2t-out/popupShutter.txt 2022-06-17 15:47:21.869540128 +0000 +++ HMI/US/portrait/n2t-out/popupShutter.txt 2022-06-17 15:47:22.253557306 +0000 @@ -69,7 +69,7 @@ Attributes Scope : local Text : - Max. Text Size: 80 + Max. Text Size: 10 Text tEntity Attributes @@ -441,11 +441,10 @@ ucopy strCommand.txt,4,payloadLength-5,0 // write instruction to tInstuction (debug output, but used as variable here, ui elements will be disabled by default) spstr strCommand.txt,tInstruction.txt,"~",0 - spstr strCommand.txt,tTmp.txt,"~",1 - if(tInstruction.txt=="entityUpdateDetail"&&tTmp.txt==entn.txt) + if(tInstruction.txt=="entityUpdateDetail") { // get Position value - spstr strCommand.txt,tTmp.txt,"~",2 + spstr strCommand.txt,tTmp.txt,"~",1 if(tTmp.txt=="disable") { vis tPosHeading,0 @@ -458,92 +457,92 @@ vis hPosition,1 } // set tinfo1 text - spstr strCommand.txt,tInfo1.txt,"~",3 + spstr strCommand.txt,tInfo1.txt,"~",2 // set tPosHeading (localization) - spstr strCommand.txt,tPosHeading.txt,"~",4 + spstr strCommand.txt,tPosHeading.txt,"~",3 // set tIcon1 - spstr strCommand.txt,tTmp.txt,"~",5 + spstr strCommand.txt,tTmp.txt,"~",4 if(tTmp.txt!="") { tIcon1.txt=tTmp.txt } // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",9 + spstr strCommand.txt,tTmp.txt,"~",8 if(tTmp.txt=="disable") { tsw bUp1,0 - spstr strCommand.txt,bUp1.txt,"~",6 + spstr strCommand.txt,bUp1.txt,"~",5 bUp1.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bUp1.txt,"~",6 + spstr strCommand.txt,bUp1.txt,"~",5 tsw bUp1,1 bUp1.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { tsw bStop1,0 - spstr strCommand.txt,bStop1.txt,"~",7 + spstr strCommand.txt,bStop1.txt,"~",6 bStop1.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bStop1.txt,"~",7 + spstr strCommand.txt,bStop1.txt,"~",6 tsw bStop1,1 bStop1.pco=65535 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",11 + spstr strCommand.txt,tTmp.txt,"~",10 if(tTmp.txt=="disable") { - spstr strCommand.txt,bDown1.txt,"~",8 + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,0 bDown1.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bDown1.txt,"~",8 + spstr strCommand.txt,bDown1.txt,"~",7 tsw bDown1,1 bDown1.pco=65535 } // set tTiltHeading (localization) - spstr strCommand.txt,tTiltHeading.txt,"~",12 + spstr strCommand.txt,tTiltHeading.txt,"~",11 // set icon bUp - spstr strCommand.txt,tTmp.txt,"~",16 + spstr strCommand.txt,tTmp.txt,"~",15 if(tTmp.txt=="disable") { tsw bTLeft,0 - spstr strCommand.txt,bTLeft.txt,"~",13 + spstr strCommand.txt,bTLeft.txt,"~",12 bTLeft.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bTLeft.txt,"~",13 + spstr strCommand.txt,bTLeft.txt,"~",12 tsw bTLeft,1 bTLeft.pco=65535 } // set icon bStop - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",16 if(tTmp.txt=="disable") { tsw bTStop,0 - spstr strCommand.txt,bTStop.txt,"~",14 + spstr strCommand.txt,bTStop.txt,"~",13 bTStop.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bTStop.txt,"~",14 + spstr strCommand.txt,bTStop.txt,"~",13 tsw bTStop,1 bTStop.pco=65535 } // set icon bDown - spstr strCommand.txt,tTmp.txt,"~",10 + spstr strCommand.txt,tTmp.txt,"~",9 if(tTmp.txt=="disable") { - spstr strCommand.txt,bTRight.txt,"~",15 + spstr strCommand.txt,bTRight.txt,"~",14 tsw bTRight,0 bTRight.pco=27501 }else if(tTmp.txt=="enable") { - spstr strCommand.txt,bTRight.txt,"~",15 + spstr strCommand.txt,bTRight.txt,"~",14 tsw bTRight,1 bTRight.pco=65535 }