From 73b33f74031b36c81279f53125f0b8c7121d0d29 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 19 Mar 2022 23:13:44 +0000 Subject: [PATCH] Merge branch 'main' of https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text) --- HMI/n2t-out/cardEntities.txt | 2 +- HMI/n2t-out/cardGrid.txt | 25 ++++++++++++++++++++++++- HMI/n2t-out/nspanel_Stats.txt | 16 ++++++++-------- 3 files changed, 33 insertions(+), 10 deletions(-) diff --git a/HMI/n2t-out/cardEntities.txt b/HMI/n2t-out/cardEntities.txt index bfc7e5b1..c55c06e6 100644 --- a/HMI/n2t-out/cardEntities.txt +++ b/HMI/n2t-out/cardEntities.txt @@ -88,7 +88,7 @@ Variable (string) strCommand ID : 27 Scope : local Text : - Max. Text Size: 350 + Max. Text Size: 500 Variable (string) type1 Attributes diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt index 9a0f1761..780ecdeb 100644 --- a/HMI/n2t-out/cardGrid.txt +++ b/HMI/n2t-out/cardGrid.txt @@ -65,7 +65,7 @@ Variable (string) strCommand ID : 4 Scope : local Text : - Max. Text Size: 350 + Max. Text Size: 500 Variable (string) type1 Attributes @@ -996,6 +996,29 @@ Timer tmSerial spstr strCommand.txt,tEntity5.txt,",",29 vis tEntity5,1 } + // get Type + spstr strCommand.txt,type6.txt,",",31 + // get internal name + spstr strCommand.txt,entn6.txt,",",32 + if(type1.txt=="delete") + { + vis tEntity6,0 + vis bEntity6,0 + }else + { + // change icon + spstr strCommand.txt,tTmp.txt,",",33 + covx tTmp.txt,sys0,0,0 + substr pageIcons.tIcons.txt,bEntity6.txt,sys0,1 + vis bEntity6,1 + // change icon color + spstr strCommand.txt,tTmp.txt,",",34 + covx tTmp.txt,sys0,0,0 + bEntity6.pco=sys0 + // set name + spstr strCommand.txt,tEntity6.txt,",",35 + vis tEntity6,1 + } } if(tInstruction.txt=="pageType") { diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt index 9d25043e..e978f21a 100644 --- a/HMI/n2t-out/nspanel_Stats.txt +++ b/HMI/n2t-out/nspanel_Stats.txt @@ -36,8 +36,8 @@ pageTest 14 Unique line(s) of event code cardGrid 38 Component(s) - 257 Line(s) of event code - 170 Unique line(s) of event code + 275 Line(s) of event code + 181 Unique line(s) of event code cardAlarm 28 Component(s) 159 Line(s) of event code @@ -50,17 +50,17 @@ 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 - 221 Unique line(s) of event code cardEntities 55 Component(s) 823 Line(s) of event code 322 Unique line(s) of event code +cardThermo + 42 Component(s) + 450 Line(s) of event code + 221 Unique line(s) of event code Total 14 Page(s) 341 Component(s) - 2945 Line(s) of event code - 732 Unique line(s) of event code + 2963 Line(s) of event code + 742 Unique line(s) of event code