From d74ccfcd64cceea4d23a6ce8c88b2043f257b7d3 Mon Sep 17 00:00:00 2001 From: Johannes Date: Thu, 31 Mar 2022 20:20:27 +0200 Subject: [PATCH] add navigation on alarm and thermo page --- HMI/README.md | 4 +- HMI/US/portrait/n2t-out/cardEntities.txt.bkp | 2451 ++++++++++++++++++ HMI/nspanel.HMI | Bin 7483127 -> 7483127 bytes HMI/nspanel.tft | Bin 6298920 -> 6299536 bytes apps/nspanel-lovelace-ui/luibackend/pages.py | 5 +- 5 files changed, 2456 insertions(+), 4 deletions(-) create mode 100644 HMI/US/portrait/n2t-out/cardEntities.txt.bkp diff --git a/HMI/README.md b/HMI/README.md index 5604c46c..5865e340 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -123,11 +123,11 @@ The following message can be used to update the content on the cardEntities Page ### cardMedia Page -`entityUpd,|*internalNameEntiy*|*heading*|*icon*|*title*|*author*|*volume*|*playpauseicon*|currentSpeaker|speakerList-seperated-by-?` +`entityUpd,|*heading*|*navigation*|*internalNameEntiy*|*icon*|*title*|*author*|*volume*|*playpauseicon*|currentSpeaker|speakerList-seperated-by-?` ### cardAlarm Page -`entityUpd,*internalNameEntity*,*arm1*,*arm1ActionName*,*arm2*,*arm2ActionName*,*arm3*,*arm3ActionName*,*arm4*,*arm4ActionName*,*icon*,*iconcolor*,*numpadStatus*,*flashing*` +`entityUpd,*internalNameEntity*,*navigation*,*arm1*,*arm1ActionName*,*arm2*,*arm2ActionName*,*arm3*,*arm3ActionName*,*arm4*,*arm4ActionName*,*icon*,*iconcolor*,*numpadStatus*,*flashing*` ## Messages from Nextion Display diff --git a/HMI/US/portrait/n2t-out/cardEntities.txt.bkp b/HMI/US/portrait/n2t-out/cardEntities.txt.bkp new file mode 100644 index 00000000..620d62a6 --- /dev/null +++ b/HMI/US/portrait/n2t-out/cardEntities.txt.bkp @@ -0,0 +1,2451 @@ +Page cardEntities + 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 + //wup=cardEntities + //remove background & activate reparse mode + vis p0,0 + recmod=1 + bauds=115200 + //debug stuff + vis tTmp,0 + vis tSend,0 + vis tInstruction,0 + vis tId,0 + //ui e1 + vis btOnOff1,0 + vis bUp1,0 + vis bStop1,0 + vis bDown1,0 + vis tIcon1,0 + vis tEntity1,0 + vis bText1,0 + vis hSlider1,0 + vis nNum1,0 + //ui e2 + vis btOnOff2,0 + vis bUp2,0 + vis bStop2,0 + vis bDown2,0 + vis tIcon2,0 + vis tEntity2,0 + vis bText2,0 + vis hSlider2,0 + vis nNum2,0 + //ui e3 + vis btOnOff3,0 + vis bUp3,0 + vis bStop3,0 + vis bDown3,0 + vis tIcon3,0 + vis tEntity3,0 + vis bText3,0 + vis hSlider3,0 + vis nNum3,0 + //ui e4 + vis btOnOff4,0 + vis bUp4,0 + vis bStop4,0 + vis bDown4,0 + vis tIcon4,0 + vis tEntity4,0 + 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 + //ui e6 + vis btOnOff6,0 + vis bUp6,0 + vis bStop6,0 + vis bDown6,0 + vis tIcon6,0 + vis tEntity6,0 + vis bText6,0 + vis hSlider6,0 + vis nNum6,0 + +Variable (string) strCommand + Attributes + Scope : local + Text : + Max. Text Size: 500 + +Variable (string) type1 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type2 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type3 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type4 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) entn1 + Attributes + Scope : local + Text : + Max. Text Size: 70 + +Variable (string) entn2 + Attributes + Scope : local + Text : + Max. Text Size: 70 + +Variable (string) entn3 + Attributes + Scope : local + Text : + Max. Text Size: 70 + +Variable (string) entn4 + Attributes + Scope : local + Text : + Max. Text Size: 70 + +Variable (string) entn5 + Attributes + Scope : local + Text : + Max. Text Size: 70 + +Variable (string) entn6 + Attributes + Scope : local + Text : + Max. Text Size: 70 + +Variable (string) type5 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Variable (string) type6 + Attributes + Scope : local + Text : + Max. Text Size: 10 + +Number nNum1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nNum2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nNum3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nNum4 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nNum5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Number nNum6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Value : 0 + +Text tHeading + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 40 + +Text 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 tEntity2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity2 + Max. Text Size : 30 + +Text tEntity3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity3 + Max. Text Size : 30 + +Text tEntity4 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity4 + Max. Text Size : 30 + +Text tIcon1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 10 + +Text tIcon2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 30 + +Text tIcon3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 10 + +Text tIcon4 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 30 + +Text tSend + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : newtxt + Max. Text Size : 100 + +Text tTmp + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 10 + +Text tInstruction + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : + Max. Text Size : 20 + +Text tId + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + 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 : 30 + +Text tEntity6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text : tEntity6 + Max. Text Size : 30 + +Text tIcon6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none + Text :  + Max. Text Size : 30 + +Picture p0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + +Slider hSlider1 + 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 + nNum1.val=hSlider1.val + tSend.txt="event,buttonPress2,"+entn1.txt+",number-set," + covx nNum1.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hSlider2 + 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 + nNum2.val=hSlider2.val + tSend.txt="event,buttonPress2,"+entn2.txt+",number-set," + covx nNum2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hSlider3 + 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 + nNum3.val=hSlider3.val + tSend.txt="event,buttonPress2,"+entn3.txt+",number-set," + covx nNum3.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hSlider4 + 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 + nNum4.val=hSlider4.val + tSend.txt="event,buttonPress2,"+entn4.txt+",number-set," + covx nNum4.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +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,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Slider hSlider6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + Position : 50 + Upper range limit : 100 + Lower range limit : 0 + + Events + Touch Release Event + nNum6.val=hSlider6.val + tSend.txt="event,buttonPress2,"+entn6.txt+",number-set," + covx nNum6.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bDown1 + 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+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bUp1 + 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+",up" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bStop1 + 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+",stop" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bStop2 + 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,"+entn2.txt+",stop" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bDown2 + 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,"+entn2.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +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 + tSend.txt="event,buttonPress2,"+entn2.txt+",up" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bStop3 + 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,"+entn3.txt+",stop" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bDown3 + 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,"+entn3.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bUp3 + 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,"+entn3.txt+",up" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bStop4 + 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,"+entn4.txt+",stop" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bDown4 + 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,"+entn4.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bUp4 + 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,"+entn4.txt+",up" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +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,cardEntities,bPrev" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +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,cardEntities,bNext" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : newtxt + 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,1 + 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 : newtxt + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn2.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : newtxt + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn3.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText4 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : newtxt + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn4.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +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,1 + 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,1 + 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,1 + 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 : newtxt + Max. Text Size : 10 + + 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,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bStop6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn6.txt+",stop" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bDown6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn6.txt+",down" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bUp6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text :  + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn6.txt+",up" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Button bText6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : newtxt + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn6.txt+",button" + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + 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,1 + 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,"+entn2.txt+",OnOff," + covx btOnOff2.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff3 + 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,"+entn3.txt+",OnOff," + covx btOnOff3.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff4 + 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,"+entn4.txt+",OnOff," + covx btOnOff4.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +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,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Dual-state Button btOnOff6 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + State : unpressed + Text : + Max. Text Size : 10 + + Events + Touch Press Event + tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff," + covx btOnOff6.val,tTmp.txt,0,0 + tSend.txt+=tTmp.txt + //send calc crc + btlen tSend.txt,sys0 + crcrest 1,0xffff // reset CRC + crcputh 55 bb + crcputs sys0,1 + crcputs tSend.txt,0 + //send cmd + printh 55 bb + prints sys0,2 + prints tSend.txt,0 + prints crcval,2 + +Hotspot mSpecial + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + sys2=sys2+1 + sys2%=10 + //n0.val=sys2 + if(sys2==9) + { + page pageTest + } + +Hotspot m2 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity3.txt + pageIcons.tTmp2.txt=entn3.txt + if(type3.txt=="shutter") + { + //popupShutter.tHeading.txt=tEntity3.txt + page popupShutter + } + if(type3.txt=="light") + { + //popupLight.tEntity.txt=tEntity3.txt + page popupLight + } + +Hotspot m1 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity2.txt + pageIcons.tTmp2.txt=entn2.txt + if(type2.txt=="shutter") + { + //popupShutter.tHeading.txt=tEntity2.txt + page popupShutter + } + if(type2.txt=="light") + { + //popupLight.tEntity.txt=tEntity2.txt + page popupLight + } + +Hotspot m0 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity1.txt + pageIcons.tTmp2.txt=entn1.txt + if(type1.txt=="shutter") + { + //popupShutter.tHeading.txt=tEntity1.txt + page popupShutter + } + if(type1.txt=="light") + { + //popupLight.tEntity.txt=tEntity1.txt + page popupLight + } + +Hotspot m3 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity4.txt + pageIcons.tTmp2.txt=entn4.txt + if(type4.txt=="shutter") + { + //popupShutter.tHeading.txt=tEntity4.txt + page popupShutter + } + if(type4.txt=="light") + { + //popupLight.tEntity.txt=tEntity4.txt + 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 m5 + Attributes + Scope : local + Dragging : 0 + Disable release event after dragging: 0 + Send Component ID : disabled + + Events + Touch Press Event + pageIcons.tTmp1.txt=tEntity6.txt + pageIcons.tTmp2.txt=entn6.txt + if(type6.txt=="shutter") + { + //popupShutter.tHeading.txt=tEntity6.txt + page popupShutter + } + if(type6.txt=="light") + { + //popupLight.tEntity.txt=tEntity6.txt + page popupLight + } + +Timer tmSerial + Attributes + Scope : local + Period (ms): 50 + Enabled : yes + + Events + Timer Event + // data available + if(usize>1) + { + bufferPos=0 + while(bufferPosPXI5yls1enMxC#1zYM8XXq!09pazOf>0d0PYM*Noc<-h%+- z!wmpu)|hOEw+p^|-?jT^Clow??_6`AI`>&a7EB6rbEm!L6U61X@8Hf}5k`CmaR<-c z<4}-Ag5sXJ&0g8R-F4qq=(WmlVBp@pbN4tDJSxM$pt|?Af4lM6w%5|Ve*{GIO$7{2 z1rS6)42TgiA!cPNz^`cL|DWa`e;OK0L#TyXsf~uxFd9xH=pwq9M$#y{gg!*0X$*~} zaWtML&_rsdNi>FhVD-h=E%qtwxTJqEuS zUcWm5{D_)~3t-rw=2vn7Ue@yB0{pDnn#e*dN31X3b+H)Wx*FkZ3BV89`mxn|9$KsC zZR_vmZm6ladjo}4dQNof`GHM(zJYekKj7OfdOp((a8-NokrseGT25>S*l1GU?nRVE z(Efm(FZkBfsS~E1`l6a1J-^wnXR;U9YMaSEE)Q{eKbH>xxS9N$C6BG|6C;#BKgnbh zGSZZgNa?V@a-`9dYfvWRrQufP#D4LLmAOtzHul9i=Sra~j*ZvIHYUeQCbsjOGsn~w zw=BcP+U>Za@R;Z#nQVC4lFVK|CJqVCFn0EW#mb70i}^y9cH=!R=CYtg))Y2#Tx=!T z>iW74kA+>6YnQMOPKYwQd8)H(sokps8v1=mM4Y5{>@p43&}=ukX$4WS&8H$1xO)MgcKts$Ro%q3Hz!CDCy1RBWC170O-_)DoFJ2&AV)bt?3^H-oFHAiAZAVwcaJW` zTbv*QCy2laB5;BToFKx#5QL#1`6PpdBuNp>mLMI)%AZJ(%864QicG|zEZf^Vo0b14ZZfM5pnQxcB zVD-%R_+K0K9zTJVG~eS#n*i>p=L6dcuvUA(_mZAdJM=T(+kyWUXlp*{1nAUWuCN;* zkl56dN_zknYVEbUR|)PDA{rc8~tyGH&7SIUQX delta 3867 zcmd^>dr(x@9mmhTEH9t13(HFc#VF_o_jy?a6~rd3K?GEy$O;H5hTU^_aq&fTK`vci zBpTBBrCJM_#Mn%!ic+tQ6Qz~5PJJ{+ZKowx)M+PelQud&GSi3svG*=_U9tB6?#yTI zch5QZp6~tres|9A(T(#Vj}WG8ACtm3_DzZlA^q2Ta!MG6bhI;ZAx!`E6Nj0TD$bbc ztR~9uVY!7oDj|eH$dgm#%WeyKN5r}QgC~xL9b&TdK?}CD)RVeays`fvF$7KCR@sT8 z-8a{g!iz$tFjLSA2Eizp1aq(DVY%w?{n<;z zoweN75~!}xYzSiq^3J{^LUR#q@SHYEX*>TCA>oXqfBiBc`$8mL^$H<7Wc_&&A?>nm zEG1-*teG-Gz6h1pf4PE?zsUNxSd9MX)U76Dm%RR7-SD`FwAu;TD^F;gihghX@FHT~ zNXQvh+Th-1LjEjCGOz^;ST_Ax6Ct-%(!`l&Le#Q}PudiHdzYf`zd58m(hXtXQ6}Q| zD|&jTqI2I@bkT>3t~!FxkWEw_4baB|bWeaj9-z}t1pMg@&_52)Cs70cwK_-qw3uE| zv&JkjI>}xb0kp}Y20qOm3W-)eTcw+7)s-i&nxK7o7%U8)!LemDYQW?G_7sXt!yg zD#11y1~=1CSa1>j_0`z$J}(^&OWm{rc5b9&@S*S4+q7_GBb^BM+%$_Z!`;h{7-?JG zCOQh1HPTn{MR4ya;fBl&)png8dN$!bsclpRV?DU!aU-1pgIg`5SOfQ@yF{pp(`XfU zM#GC2R7P_7wPD+sM0*vG|H%GJbNVpz=?|XFM4kPBLLK zNhZ#EM=$|bzD>2@+(8qE%Dap;$@R@WJ2zuE#lurY9^HiB!|*4VC8a0)F#nwNjLmv> zk#npmu*#?J@z;?_D)aEHXM2Uhb~>5~E_5adYbA&Lm=73UXtWq+~ zQk_Hh-e)A!IvhyzQ}Y zHRqQL>srC9;kS9{1U!uJH^!{=3mS`ZRKIUk`UPFC(l7jEE+M<+V}5>t(mQ;DeaFA$ zWBW4p8WHlb{hMNC{Mu4Ns5I^&^RU72Hxd_DD(C;DNcTnwpNjS5_w@d%D$IVOMmMi)KX5K&EgW2|LSVPDk7bq}qnkly|#rrW>B zgcoB@w^-O(zaqvvKFN+a#PLbA;p>jB(P1zS)cH_V z<$VyEOcqb$X4eA2BHcyYsKbf=eqQeY`xs8H&2(oFfIq z1N?j_XtW)Hu0y;9N25+T)A6F`ZB@{_!KQ=MB#jyle!z$0sOy+x87$do%ZIKsJX(I` z#zs#3nIj9QZhht)+JL#?yG**_oCHmsd>VXofX|0Jp_~TzAMgoq$!&{(&(Aq5L$+#R o)u3~t%iOp0afFAApigX diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index ed89e4d42c5073c42e0c69f7181e9fbdf44dd755..b424247111f73890d4b039aa4d4b5647621583e1 100644 GIT binary patch delta 4991 zcmeHG2~(7367H{O9A;2KON3EkveuSMHYv4CEpbihdVv~2iKf_|88C@|A=FIIH}CWG({I21 zyx*}uzpdMGULqcM47E%w4=71rpl_~P_`}z$!Y1FSo~c`67gM3E z(CwBxhxOCu`P5kQ7g!22d%wLC=$%0C1bQdXJAvK_^iJScKLIyV2uVkJ>O%%{AS0Q` zk@`|U>Q7GOOao{j4I&qEB{y;>5Aq~0@+KehrNK0WhLRr*BYz5@KnkK@8cri9ghDBd z!f7N$&?t(e(G*3|G=|2~IEtb16iX8*j^ZhSCekFDOmEN>N~EcjM9Gvw(`Y*VhGx)j zX(pvo8l}@L%AnblNpmQR=2AB0G^jyS@v4zWr)LM?9wXn3%l5)WMqZho?XAq<{OX)| zbTV>%bM_SF9~@b%reU!IXC|qs`sF$RK9{6=#Eo_Z0F%zBI0XTOD|4;C{_=_H!EK1L zH_(cg`iDo_aL^0F7pCR}qCAzyIm29AB_qMVwWi+xXBj?8Im5zxm_|Dzd%afE-h;j7 zj(=yrsu^&pyXNUvN_&^5g1ftkcIA~Rs=G3VTa(lj@3B2i+ta?Z9Y&fSXHVmU$*KpJ zCab~9c&i|g|DLP{D6xD$S)J_V_KQK(4)5M#bR;LHs7cD`rfn%|kRDT?HPz2h{~CyX zxm;AJhTyt9Zf;PgH~p_rU24P%liiPnCc7VFOg2Bz)5P@~)Hu9hHw0OHD^^o6#mJki z&saS-7po(}pO1Lm02`vj+3=qm5I4eZfIMvmR7u7!4G_j=Ko9ei0k743Wq>Gb26Wd9 zTi9LmCj(Ae`%p5%y1R^au})2_%V2Yf>dAp6s<*f?sYLZq#`4?}HO^~Xk12NP=^kke z*IDWDzoh$ycUO+(t`aryl`D4f)E-t`*;FR`)s%{(XLsi~@%mCVP>JGwrD}o_%{NNb zbIO>ey=AJC9yfI~)oxO+MPX4fQ-kVj#X5K? z`dKg$IwBP4yrhH0jsR7nxUxopSrvMyF# zNxy@E;L;)qYx{t&37{Q9;B+*?%|m^l$N(@z83M^m5xjg1@W25eUI~EcQwXND21plv z13*j!a$#hSJ8!SiJl{!Z$!khz(YBgQ`k4q_U5}xiS4QSUvvOA}H5dh3Gm|&p)k4uY zlTY5&8Vy;g2$xcM**(FsQkm}wb|ekKHJxYQ7wkwHZ@e#9dpbhFERK61SbI7zdLY=8 z421d&4tOZolnhRLs5LrTX3M@3UuLp%s}_uw*&Nd<_^~+%?pX+Tv-p`6KQ@Plwh4Y= zF2cxc(PVQ=n-*+acXjzLyN&{c1q)dBT)OKh;8D*dH}Oq`Qxde0+n!5q;+yQzDR{wK2>+7!U=d&K6ujUq z?&{QTI|eVdHnm-6(OL4Nc-RZ=IEF6fD=$P6AykdTiX~k2QX~I$80K5bcbiY&F9D)tuNRO_r_Z6K zT4{8heJa-Rf1|LLqPgR@Mb&f7jZO!Is$7pyxB+2OG5aWHe>|{`Cn@I7OiPOGvVQ#G ztvnBh`L^XJ*1jh3GBh7VPhw}CxzXTD2-}D+>&&6(OZ?1=m2E+|w}nsZ1uNUaEqe29 z$N!XD3kEBpiggf*!CZ-LVj55fPI^GSpG9QtkL6%OWLqw7{{YJwyN@wJa2qRlkx95O1iQW+;oQ3j?eB7! zqi|nTa+;%XE>#EtI}nT(IlP5k`U>Y##W8(_%N4Bf_Xt@#5w`E-7gjFU!bAHBS0~uH zT?mJ&5pGoTt$xDQ?PQ1k!gUH}VuV(SpgnxKzi^$^+-Btx_ei}zAjI!QSiP4|I|-M# zhp##bXA$hsdtz@5!o?bX&sjLjUOw+ET#H~&_90yRBZBjO-aJ6KmKr`fK)8|n5hlNn z5PU#tAK+yJg&Vn_s|Jb(MS|Ttz%vG!Lv`|>{Ytb`g9jXmWhX|IF2)pa~QxD;Go!~nj=G)j% z&sRL9g^%j3EhOou>#g_Xv6uNco~`Ho-a=ilQMvkj8+Fk~u26G5r}@eix>V0Ae9dR{ JL6@iW{Xcb9Z%Y6G delta 4655 zcmeH{`BRi<636@P8D@qN2L-tW1(8Eo6!5|mMIBt_jK}aIyhDh0Qi9^aYDBORqC}k- zZ4VR;Ni++qYpKj8Cc3g^V#=*TH*O`nRxOfpwNj$4Cu&@0dr*JyZ&>D?o|^aj>3*N? z@B6&(_OlywN50yi+dd9sLLCz}4QexfVN0o;|7`r4xYVmVGjxagh5xj9$jbc*>APTM z#>S`}%eFXfex}dzKcDL;Dt462>iPCK(BnXl13eD(IMCxjj|2br4)~EmNIKG!2N}pn zCh{aR^&&6oO&0Q|KGc_d$d~$&ANf-N1yT?NQwa5^Pzs{~G?2n6f(B6}4W=lHrWlH) zArwdP^czZ`p)`yVDT$J4IE|o@G>S%33XP$$G>*p81e!>xG>Ilt8cm_8G>xp3PSfeP zG=pYR24zwfWm692(pxl(X44#+OE$_osSci^H1e=)TO__?Bahe@#v=5uRRe_l0Jjn|Jx0KPX(4G2o?<~lbA zh*vhaeFBJyv?e5DkI$){(Q`;M)7X9+G$l2mC+oQ zuBIyeSW8#^l@wl`u1-~kIloC)2kWuw32*%}FV5+mp>ia4=JSzKHCCTifWRFos@2(l zxw^!Jb4;9=Z5xD%rtVo0OkA363&!iOhCOV2Ic%}9dsy@}@~O3ICVJ@DW1Sjf&W&@A zB1aN0d0!nHl>B;zV=?YY+h611d`9q~5pUuXuklD)Mh3lEIwk(q!YO_{uu`&y@z?9sbUy8_4yjP1l_XB9P|qmIPTZhc^rll?E|)9< z?7D9Yawd}cWfG>Ab7zY>5I-WeIK`c^qp#elsdB0k`4aOa3Y=BW!sytF(iVhydH`SO z4cA8i+Ulh5n!A$2rkNShgQ@q?I?6E?a*31 z@zM+)dP{3DT$zC|X(r#gr47L=GdQ4Aw1^CZ?HT+-r)Uuw>~d?%GZC(3^6A^6Ezjhe zw?#Xbg^-ZVjdw&lm&I*&M6=`|tjpmocSW=0u=B3g;#H7~a8csGTjFp|nHFeCQXG&Z zN3qfh1-abtAFah)HVffriBq##yQf8A*(|QPCwko+gr^c0=d$&_=yh{=*?sLR^Jg{$ zmwc-7IQfAVfro57_kna!ts>l0+4rGzP_6RBhuRJErF?hp$G96EMM+%rNUOt+e7^fg z3&Sh!p-Cq)Z~wXQlwtaE1m|*YQtU%?@}IB8YsY=w*1@Re6$tyv5Gq$n`>S{#+9R-e z1)oKGOYnQE5NxXv#;rl@5brjR;j6Im9TM-$u3??Kf~0@lccf zTXPM)T+gQC_9`vF*nKMdtY`w~d)j}8f2!smJ?&B0T+J>|dyD0AHNw9(A+*-W_Nw8( zm}QR3)qK+|ET9%4`U3>7%?N3mxv7`1fLdOw0y@fpz&9oiij>KRG7h8lq+R8N+VQCJz-bdow4ulmuc!syI zGzTy97UmG`(8mayb|QSUlau=hbL`-`eS}>V?anTQD=dER=8(R^uI}WCeTBvDmh0_7 zh}esex0iK3!eV!Gw2!dWqHW%XP*RU@xSnsh+3LOQ?JMlOXg}?jEq*|*eSm-P6?VR! zyM!6N8ssh0fc$lY7HXLXec;cK2q8);cr|c)KPi6qAVS3$RgkNL|@tZNj*8+mDf+{C&@<^ZYd{1gE{NBBkJ&SB0El)BDOxgt=Q*AW@w3k1*K zBUqX^El8Nx5ndQ1EWQb0ax+5gALLDRl;eVh#W!(Qu>FR4ro8f8t`z-vz5AIj4Y4<4 z_E8?tU(l>>l%t>BjV6T(vK{5Sp|Xt@cO#c;rh$k4yU^b>ulszlBu?Ov0rpaT?Dy8_ F{{gt2BUAtY diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 4d0d6a79..5e043eef 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -267,7 +267,7 @@ class LuiPagesGen(object): onoffbutton = 1374 else: onoffbutton = rgb_dec565([255,255,255]) - command = f"entityUpd,|{item}|{heading}|{icon}|{title}|{author}|{volume}|{iconplaypause}|{source}|{speakerlist[:200]}|{onoffbutton}" + command = f"entityUpd,|{heading}||{item}|{icon}|{title}|{author}|{volume}|{iconplaypause}|{source}|{speakerlist[:200]}|{onoffbutton}" self._send_mqtt_msg(command) def generate_alarm_page(self, item): @@ -326,7 +326,8 @@ class LuiPagesGen(object): arm_buttons += f",{get_translation(self._locale, b)},{b}" if len(supported_modes) < 4: arm_buttons += ","*((4-len(supported_modes))*2) - command = f"entityUpd,{item}{arm_buttons},{icon},{color},{numpad},{flashing}" + navigation = "" + command = f"entityUpd,{item},{navigation}{arm_buttons},{icon},{color},{numpad},{flashing}" self._send_mqtt_msg(command) def render_page(self, page, send_page_type=True):