From ee66eb13f6dcce286fbd20f1dfc75a9c82ec27b9 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 19 Mar 2022 22:50:58 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/n2t-out/cardGrid.txt | 64 +++++++++++++++++++++-------------- HMI/n2t-out/nspanel_Stats.txt | 20 +++++------ HMI/n2t-out/popupLight.txt | 2 +- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index cbf7ae14..9a0f1761 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -30,6 +30,18 @@ Page cardGrid vis tSend,0 vis tInstruction,0 vis tId,0 + vis bEntity1,0 + vis bEntity2,0 + vis bEntity3,0 + vis bEntity4,0 + vis bEntity5,0 + vis bEntity6,0 + vis tEntity1,0 + vis tEntity2,0 + vis tEntity3,0 + vis tEntity4,0 + vis tEntity5,0 + vis tEntity6,0 //page open event // event,pageOpen,cardEntities,pageNumber // craft command @@ -163,7 +175,7 @@ Text tHeading Horizontal Alignment : center Vertical Alignment : center Input Type : character - Text : test + Text : Max. Text Size : 40 Word wrap : disabled Horizontal Spacing : 0 @@ -870,9 +882,9 @@ Timer tmSerial { // command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4 // get Type - spstr strCommand.txt,type1.txt,",",6 + spstr strCommand.txt,type1.txt,",",1 // get internal name - spstr strCommand.txt,entn1.txt,",",7 + spstr strCommand.txt,entn1.txt,",",2 if(type1.txt=="delete") { vis tEntity1,0 @@ -880,22 +892,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",8 + spstr strCommand.txt,tTmp.txt,",",3 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity1.txt,sys0,1 vis bEntity1,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",9 + spstr strCommand.txt,tTmp.txt,",",4 covx tTmp.txt,sys0,0,0 bEntity1.pco=sys0 // set name - spstr strCommand.txt,tEntity1.txt,",",10 + spstr strCommand.txt,tEntity1.txt,",",5 vis tEntity1,1 } // get Type - spstr strCommand.txt,type2.txt,",",11 + spstr strCommand.txt,type2.txt,",",7 // get internal name - spstr strCommand.txt,entn2.txt,",",12 + spstr strCommand.txt,entn2.txt,",",8 if(type1.txt=="delete") { vis tEntity2,0 @@ -903,22 +915,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",13 + spstr strCommand.txt,tTmp.txt,",",9 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity2.txt,sys0,1 vis bEntity2,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",14 + spstr strCommand.txt,tTmp.txt,",",10 covx tTmp.txt,sys0,0,0 bEntity2.pco=sys0 // set name - spstr strCommand.txt,tEntity2.txt,",",15 + spstr strCommand.txt,tEntity2.txt,",",11 vis tEntity2,1 } // get Type - spstr strCommand.txt,type3.txt,",",16 + spstr strCommand.txt,type3.txt,",",13 // get internal name - spstr strCommand.txt,entn3.txt,",",17 + spstr strCommand.txt,entn3.txt,",",14 if(type1.txt=="delete") { vis tEntity3,0 @@ -926,22 +938,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",18 + spstr strCommand.txt,tTmp.txt,",",15 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity3.txt,sys0,1 vis bEntity3,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",19 + spstr strCommand.txt,tTmp.txt,",",16 covx tTmp.txt,sys0,0,0 bEntity3.pco=sys0 // set name - spstr strCommand.txt,tEntity3.txt,",",20 + spstr strCommand.txt,tEntity3.txt,",",17 vis tEntity3,1 } // get Type - spstr strCommand.txt,type4.txt,",",21 + spstr strCommand.txt,type4.txt,",",19 // get internal name - spstr strCommand.txt,entn4.txt,",",22 + spstr strCommand.txt,entn4.txt,",",20 if(type1.txt=="delete") { vis tEntity4,0 @@ -949,22 +961,22 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",23 + spstr strCommand.txt,tTmp.txt,",",21 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity4.txt,sys0,1 vis bEntity4,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",24 + spstr strCommand.txt,tTmp.txt,",",22 covx tTmp.txt,sys0,0,0 bEntity4.pco=sys0 // set name - spstr strCommand.txt,tEntity4.txt,",",25 + spstr strCommand.txt,tEntity4.txt,",",23 vis tEntity4,1 } // get Type - spstr strCommand.txt,type5.txt,",",26 + spstr strCommand.txt,type5.txt,",",25 // get internal name - spstr strCommand.txt,entn5.txt,",",27 + spstr strCommand.txt,entn5.txt,",",26 if(type1.txt=="delete") { vis tEntity5,0 @@ -972,16 +984,16 @@ Timer tmSerial }else { // change icon - spstr strCommand.txt,tTmp.txt,",",28 + spstr strCommand.txt,tTmp.txt,",",27 covx tTmp.txt,sys0,0,0 substr pageIcons.tIcons.txt,bEntity5.txt,sys0,1 vis bEntity5,1 // change icon color - spstr strCommand.txt,tTmp.txt,",",29 + spstr strCommand.txt,tTmp.txt,",",28 covx tTmp.txt,sys0,0,0 bEntity5.pco=sys0 // set name - spstr strCommand.txt,tEntity5.txt,",",30 + spstr strCommand.txt,tEntity5.txt,",",29 vis tEntity5,1 } } diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 08fd20bc..9d25043e 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -30,18 +30,14 @@ pageSwipeTest 18 Component(s) 62 Line(s) of event code 44 Unique line(s) of event code -cardGrid - 38 Component(s) - 245 Line(s) of event code - 158 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -popupLight - 27 Component(s) - 297 Line(s) of event code - 154 Unique line(s) of event code +cardGrid + 38 Component(s) + 257 Line(s) of event code + 170 Unique line(s) of event code cardAlarm 28 Component(s) 159 Line(s) of event code @@ -50,6 +46,10 @@ cardMedia 22 Component(s) 222 Line(s) of event code 116 Unique line(s) of event code +popupLight + 27 Component(s) + 297 Line(s) of event code + 154 Unique line(s) of event code cardThermo 42 Component(s) 450 Line(s) of event code @@ -62,5 +62,5 @@ cardEntities Total 14 Page(s) 341 Component(s) - 2933 Line(s) of event code - 739 Unique line(s) of event code + 2945 Line(s) of event code + 732 Unique line(s) of event code diff --git a/HMI/n2t-out/popupLight.txt b/HMI/n2t-out/popupLight.txt index 5574ee30..4868efe8 100644 --- a/HMI/n2t-out/popupLight.txt +++ b/HMI/n2t-out/popupLight.txt @@ -63,7 +63,7 @@ Variable (string) strCommand ID : 17 Scope : local Text : - Max. Text Size: 50 + Max. Text Size: 100 Variable (string) entn Attributes