From 81f432bbdd27c6685e4e4377d77d31c67ccaf98b Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Sun, 20 Mar 2022 00:14:24 +0000
Subject: [PATCH] Merge branch 'main' of
 https://github.com/joBr99/nspanel-lovelace-ui (add nextion2text)

---
 HMI/n2t-out/cardGrid.txt      | 96 +++++++++++++++++------------------
 HMI/n2t-out/nspanel_Stats.txt | 14 ++---
 2 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/HMI/n2t-out/cardGrid.txt b/HMI/n2t-out/cardGrid.txt
index 5634d000..1e101cb4 100644
--- a/HMI/n2t-out/cardGrid.txt
+++ b/HMI/n2t-out/cardGrid.txt
@@ -638,16 +638,13 @@ Button bEntity1
     
     Events
         Touch Press Event
+            tmLP.en=1
+            tTmp.txt=type1.txt
             pageIcons.tTmp1.txt=tEntity1.txt
             pageIcons.tTmp2.txt=entn1.txt
-            if(type1.txt=="shutter")
-            {
-                page popupShutter
-            }
-            if(type1.txt=="light")
-            {
-                page popupLight
-            }
+        
+        Touch Release Event
+            tmLP.en=0
             // event,1,tHeading,tEntityName,1,up
             //craft command
             // convert pageNumber and write to tTmp
@@ -702,16 +699,13 @@ Button bEntity2
     
     Events
         Touch Press Event
+            tmLP.en=1
+            tTmp.txt=type2.txt
             pageIcons.tTmp1.txt=tEntity2.txt
             pageIcons.tTmp2.txt=entn2.txt
-            if(type2.txt=="shutter")
-            {
-                page popupShutter
-            }
-            if(type2.txt=="light")
-            {
-                page popupLight
-            }
+        
+        Touch Release Event
+            tmLP.en=0
             // event,1,tHeading,tEntityName,1,up
             //craft command
             // convert pageNumber and write to tTmp
@@ -766,16 +760,13 @@ Button bEntity3
     
     Events
         Touch Press Event
+            tmLP.en=1
+            tTmp.txt=type3.txt
             pageIcons.tTmp1.txt=tEntity3.txt
             pageIcons.tTmp2.txt=entn3.txt
-            if(type3.txt=="shutter")
-            {
-                page popupShutter
-            }
-            if(type3.txt=="light")
-            {
-                page popupLight
-            }
+        
+        Touch Release Event
+            tmLP.en=0
             // event,1,tHeading,tEntityName,1,up
             //craft command
             // convert pageNumber and write to tTmp
@@ -830,16 +821,13 @@ Button bEntity4
     
     Events
         Touch Press Event
+            tmLP.en=1
+            tTmp.txt=type4.txt
             pageIcons.tTmp1.txt=tEntity4.txt
             pageIcons.tTmp2.txt=entn4.txt
-            if(type4.txt=="shutter")
-            {
-                page popupShutter
-            }
-            if(type4.txt=="light")
-            {
-                page popupLight
-            }
+        
+        Touch Release Event
+            tmLP.en=0
             // event,1,tHeading,tEntityName,1,up
             //craft command
             // convert pageNumber and write to tTmp
@@ -894,16 +882,13 @@ Button bEntity5
     
     Events
         Touch Press Event
+            tmLP.en=1
+            tTmp.txt=type5.txt
             pageIcons.tTmp1.txt=tEntity5.txt
             pageIcons.tTmp2.txt=entn5.txt
-            if(type5.txt=="shutter")
-            {
-                page popupShutter
-            }
-            if(type5.txt=="light")
-            {
-                page popupLight
-            }
+        
+        Touch Release Event
+            tmLP.en=0
             // event,1,tHeading,tEntityName,1,up
             //craft command
             // convert pageNumber and write to tTmp
@@ -958,16 +943,13 @@ Button bEntity6
     
     Events
         Touch Press Event
+            tmLP.en=1
+            tTmp.txt=type6.txt
             pageIcons.tTmp1.txt=tEntity6.txt
             pageIcons.tTmp2.txt=entn6.txt
-            if(type6.txt=="shutter")
-            {
-                page popupShutter
-            }
-            if(type6.txt=="light")
-            {
-                page popupLight
-            }
+        
+        Touch Release Event
+            tmLP.en=0
             // event,1,tHeading,tEntityName,1,up
             //craft command
             // convert pageNumber and write to tTmp
@@ -1308,6 +1290,24 @@ Timer tmSleep
                 }
             }
         
+Timer tmLP
+    Attributes
+        ID         : 38
+        Scope      : local
+        Period (ms): 500
+        Enabled    : no
+    
+    Events
+        Timer Event
+            if(tTmp.txt=="shutter")
+            {
+                page popupShutter
+            }
+            if(tTmp.txt=="light")
+            {
+                page popupLight
+            }
+        
 TouchCap tc0
     Attributes
         ID   : 22
diff --git a/HMI/n2t-out/nspanel_Stats.txt b/HMI/n2t-out/nspanel_Stats.txt
index 1e3e016a..84cfe555 100644
--- a/HMI/n2t-out/nspanel_Stats.txt
+++ b/HMI/n2t-out/nspanel_Stats.txt
@@ -34,6 +34,10 @@ pageTest
 	14   Component(s)
 	14   Line(s) of event code
 	14   Unique line(s) of event code
+cardGrid
+	39   Component(s)
+	397  Line(s) of event code
+	219  Unique line(s) of event code
 cardAlarm
 	28   Component(s)
 	159  Line(s) of event code
@@ -54,13 +58,9 @@ cardThermo
 	42   Component(s)
 	450  Line(s) of event code
 	221  Unique line(s) of event code
-cardGrid
-	38   Component(s)
-	419  Line(s) of event code
-	221  Unique line(s) of event code
 
 Total
 	14   Page(s)
-	341  Component(s)
-	3107 Line(s) of event code
-	758  Unique line(s) of event code
+	342  Component(s)
+	3085 Line(s) of event code
+	764  Unique line(s) of event code