From 2ad0ad4c35e07e9408da842b51e6e6e090384351 Mon Sep 17 00:00:00 2001 From: joBr99 Date: Sat, 19 Mar 2022 23:31:11 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/n2t-out/cardGrid.txt | 14 +++++++------- HMI/n2t-out/nspanel_Stats.txt | 10 +++++----- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 780ecdeb..ec0e95d7 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -880,12 +880,12 @@ Timer tmSerial } if(tInstruction.txt=="entityUpd") { - // command format: entityUpd[,type,internalName,iconId,displayName,optionalValue]x4 + // command format: entityUpd[,type,internalName,iconId,iconColor,displayName,optionalValue]x6 // get Type spstr strCommand.txt,type1.txt,",",1 // get internal name spstr strCommand.txt,entn1.txt,",",2 - if(type1.txt=="delete") + if(type1.txt=="delete"||type1.txt=="") { vis tEntity1,0 vis bEntity1,0 @@ -908,7 +908,7 @@ Timer tmSerial spstr strCommand.txt,type2.txt,",",7 // get internal name spstr strCommand.txt,entn2.txt,",",8 - if(type1.txt=="delete") + if(type2.txt=="delete"||type2.txt=="") { vis tEntity2,0 vis bEntity2,0 @@ -931,7 +931,7 @@ Timer tmSerial spstr strCommand.txt,type3.txt,",",13 // get internal name spstr strCommand.txt,entn3.txt,",",14 - if(type1.txt=="delete") + if(type3.txt=="delete"||type3.txt=="") { vis tEntity3,0 vis bEntity3,0 @@ -954,7 +954,7 @@ Timer tmSerial spstr strCommand.txt,type4.txt,",",19 // get internal name spstr strCommand.txt,entn4.txt,",",20 - if(type1.txt=="delete") + if(type4.txt=="delete"||type4.txt=="") { vis tEntity4,0 vis bEntity4,0 @@ -977,7 +977,7 @@ Timer tmSerial spstr strCommand.txt,type5.txt,",",25 // get internal name spstr strCommand.txt,entn5.txt,",",26 - if(type1.txt=="delete") + if(type5.txt=="delete"||type5.txt=="") { vis tEntity5,0 vis bEntity5,0 @@ -1000,7 +1000,7 @@ Timer tmSerial spstr strCommand.txt,type6.txt,",",31 // get internal name spstr strCommand.txt,entn6.txt,",",32 - if(type1.txt=="delete") + if(type6.txt=="delete"||type6.txt=="") { vis tEntity6,0 vis bEntity6,0 diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index e978f21a..d6c92349 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -30,14 +30,14 @@ pageSwipeTest 18 Component(s) 62 Line(s) of event code 44 Unique line(s) of event code +cardGrid + 38 Component(s) + 275 Line(s) of event code + 186 Unique line(s) of event code pageTest 14 Component(s) 14 Line(s) of event code 14 Unique line(s) of event code -cardGrid - 38 Component(s) - 275 Line(s) of event code - 181 Unique line(s) of event code cardAlarm 28 Component(s) 159 Line(s) of event code @@ -63,4 +63,4 @@ Total 14 Page(s) 341 Component(s) 2963 Line(s) of event code - 742 Unique line(s) of event code + 748 Unique line(s) of event code