Merge branch 'main' of github.com:joBr99/nspanel-lovelace-ui

HMI/US/landscape/diff-eu-version.txt

@@ -139,92 +139,6 @@
 │  Timer tmSerial
 │   --- HMI/n2t-out/cardGrid2.txt
 ├── +++ HMI/US/landscape/n2t-out/cardGrid2.txt
-│ @@ -555,34 +555,34 @@
-│          State            : unpressed
-│          Text             : 
-│          Max. Text Size   : 10
-│      
-│      Events
-│          Touch Press Event
-│              tmLP.en=1
-│ -            tTmp.txt=type7.txt
-│ -            pageIcons.tTmp1.txt=tEntity7.txt
-│ -            pageIcons.tTmp2.txt=entn7.txt
-│ -            pageIcons.tTmp3.txt=bEntity7.txt
-│ -            if(type7.txt=="shutter")
-│ +            tTmp.txt=type6.txt
-│ +            pageIcons.tTmp1.txt=tEntity6.txt
-│ +            pageIcons.tTmp2.txt=entn6.txt
-│ +            pageIcons.tTmp3.txt=bEntity6.txt
-│ +            if(type6.txt=="shutter")
-│              {
-│                  page popupShutter
-│              }
-│ -            if(type7.txt=="input_sel")
-│ +            if(type6.txt=="input_sel")
-│              {
-│                  page popupInSel
-│              }
-│ -            if(type7.txt=="timer")
-│ +            if(type6.txt=="timer")
-│              {
-│                  page popupTimer
-│              }
-│          
-│          Touch Release Event
-│              tmLP.en=0
-│ -            tSend.txt="event,buttonPress2,"+entn7.txt+",button"
-│ +            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
-│              //send calc crc
-│              btlen tSend.txt,sys0
-│              crcrest 1,0xffff // reset CRC
-│              crcputh 55 bb
-│              crcputs sys0,2
-│              crcputs tSend.txt,0
-│              //send cmd
-│ @@ -599,34 +599,34 @@
-│          State            : unpressed
-│          Text             : 
-│          Max. Text Size   : 10
-│      
-│      Events
-│          Touch Press Event
-│              tmLP.en=1
-│ -            tTmp.txt=type8.txt
-│ -            pageIcons.tTmp1.txt=tEntity8.txt
-│ -            pageIcons.tTmp2.txt=entn8.txt
-│ -            pageIcons.tTmp3.txt=bEntity8.txt
-│ -            if(type8.txt=="shutter")
-│ +            tTmp.txt=type6.txt
-│ +            pageIcons.tTmp1.txt=tEntity6.txt
-│ +            pageIcons.tTmp2.txt=entn6.txt
-│ +            pageIcons.tTmp3.txt=bEntity6.txt
-│ +            if(type6.txt=="shutter")
-│              {
-│                  page popupShutter
-│              }
-│ -            if(type8.txt=="input_sel")
-│ +            if(type6.txt=="input_sel")
-│              {
-│                  page popupInSel
-│              }
-│ -            if(type8.txt=="timer")
-│ +            if(type6.txt=="timer")
-│              {
-│                  page popupTimer
-│              }
-│          
-│          Touch Release Event
-│              tmLP.en=0
-│ -            tSend.txt="event,buttonPress2,"+entn8.txt+",button"
-│ +            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
-│              //send calc crc
-│              btlen tSend.txt,sys0
-│              crcrest 1,0xffff // reset CRC
-│              crcputh 55 bb
-│              crcputs sys0,2
-│              crcputs tSend.txt,0
-│              //send cmd
 │ @@ -735,21 +735,15 @@
 │          Period (ms): 500
 │          Enabled    : no

HMI/US/landscape/n2t-out-visual/cardGrid2.txt

@@ -991,26 +991,26 @@ Button bEntity7
     Events
         Touch Press Event
             tmLP.en=1
-            tTmp.txt=type6.txt
+            tTmp.txt=type7.txt
-            pageIcons.tTmp1.txt=tEntity6.txt
+            pageIcons.tTmp1.txt=tEntity7.txt
-            pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp2.txt=entn7.txt
-            pageIcons.tTmp3.txt=bEntity6.txt
+            pageIcons.tTmp3.txt=bEntity7.txt
-            if(type6.txt=="shutter")
+            if(type7.txt=="shutter")
             {
                 page popupShutter
             }
-            if(type6.txt=="input_sel")
+            if(type7.txt=="input_sel")
             {
                 page popupInSel
             }
-            if(type6.txt=="timer")
+            if(type7.txt=="timer")
             {
                 page popupTimer
             }
         
         Touch Release Event
             tmLP.en=0
-            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
+            tSend.txt="event,buttonPress2,"+entn7.txt+",button"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -1057,26 +1057,26 @@ Button bEntity8
     Events
         Touch Press Event
             tmLP.en=1
-            tTmp.txt=type6.txt
+            tTmp.txt=type8.txt
-            pageIcons.tTmp1.txt=tEntity6.txt
+            pageIcons.tTmp1.txt=tEntity8.txt
-            pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp2.txt=entn8.txt
-            pageIcons.tTmp3.txt=bEntity6.txt
+            pageIcons.tTmp3.txt=bEntity8.txt
-            if(type6.txt=="shutter")
+            if(type8.txt=="shutter")
             {
                 page popupShutter
             }
-            if(type6.txt=="input_sel")
+            if(type8.txt=="input_sel")
             {
                 page popupInSel
             }
-            if(type6.txt=="timer")
+            if(type8.txt=="timer")
             {
                 page popupTimer
             }
         
         Touch Release Event
             tmLP.en=0
-            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
+            tSend.txt="event,buttonPress2,"+entn8.txt+",button"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC

HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt

@@ -50,10 +50,10 @@ cardAlarm
 	43   Component(s)
 	500  Line(s) of event code
 	273  Unique line(s) of event code
-popupLight
+popupLightNew
-	28   Component(s)
+	23   Component(s)
-	408  Line(s) of event code
+	412  Line(s) of event code
-	225  Unique line(s) of event code
+	209  Unique line(s) of event code
 screensaver
 	46   Component(s)
 	435  Line(s) of event code
@@ -61,7 +61,11 @@ screensaver
 cardGrid2
 	52   Component(s)
 	611  Line(s) of event code
-	319  Unique line(s) of event code
+	335  Unique line(s) of event code
+popupLight
+	28   Component(s)
+	408  Line(s) of event code
+	225  Unique line(s) of event code
 cardLChart
 	33   Component(s)
 	402  Line(s) of event code
@@ -86,10 +90,6 @@ cardPower
 	54   Component(s)
 	527  Line(s) of event code
 	347  Unique line(s) of event code
-popupLightNew
-	23   Component(s)
-	412  Line(s) of event code
-	209  Unique line(s) of event code
 cardEntities
 	67   Component(s)
 	1170 Line(s) of event code
@@ -99,4 +99,4 @@ Total
 	23   Page(s)
 	875  Component(s)
 	10331 Line(s) of event code
-	2387 Unique line(s) of event code
+	2403 Unique line(s) of event code

HMI/US/landscape/n2t-out-visual/popupLight.txt

@@ -743,7 +743,7 @@ Timer tmCooldown
     Attributes
         ID         : 25
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/US/landscape/n2t-out-visual/popupLightNew.txt

@@ -504,7 +504,7 @@ Timer tmCooldown
     Attributes
         ID         : 15
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/US/landscape/n2t-out/cardGrid2.txt

@@ -559,26 +559,26 @@ Button bEntity7
     Events
         Touch Press Event
             tmLP.en=1
-            tTmp.txt=type6.txt
+            tTmp.txt=type7.txt
-            pageIcons.tTmp1.txt=tEntity6.txt
+            pageIcons.tTmp1.txt=tEntity7.txt
-            pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp2.txt=entn7.txt
-            pageIcons.tTmp3.txt=bEntity6.txt
+            pageIcons.tTmp3.txt=bEntity7.txt
-            if(type6.txt=="shutter")
+            if(type7.txt=="shutter")
             {
                 page popupShutter
             }
-            if(type6.txt=="input_sel")
+            if(type7.txt=="input_sel")
             {
                 page popupInSel
             }
-            if(type6.txt=="timer")
+            if(type7.txt=="timer")
             {
                 page popupTimer
             }
         
         Touch Release Event
             tmLP.en=0
-            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
+            tSend.txt="event,buttonPress2,"+entn7.txt+",button"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC
@@ -603,26 +603,26 @@ Button bEntity8
     Events
         Touch Press Event
             tmLP.en=1
-            tTmp.txt=type6.txt
+            tTmp.txt=type8.txt
-            pageIcons.tTmp1.txt=tEntity6.txt
+            pageIcons.tTmp1.txt=tEntity8.txt
-            pageIcons.tTmp2.txt=entn6.txt
+            pageIcons.tTmp2.txt=entn8.txt
-            pageIcons.tTmp3.txt=bEntity6.txt
+            pageIcons.tTmp3.txt=bEntity8.txt
-            if(type6.txt=="shutter")
+            if(type8.txt=="shutter")
             {
                 page popupShutter
             }
-            if(type6.txt=="input_sel")
+            if(type8.txt=="input_sel")
             {
                 page popupInSel
             }
-            if(type6.txt=="timer")
+            if(type8.txt=="timer")
             {
                 page popupTimer
             }
         
         Touch Release Event
             tmLP.en=0
-            tSend.txt="event,buttonPress2,"+entn6.txt+",button"
+            tSend.txt="event,buttonPress2,"+entn8.txt+",button"
             //send calc crc
             btlen tSend.txt,sys0
             crcrest 1,0xffff // reset CRC

HMI/US/landscape/n2t-out/popupLight.txt

@@ -395,7 +395,7 @@ Dual-state Button btOnOff1
 Timer tmCooldown
     Attributes
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/US/landscape/n2t-out/popupLightNew.txt

@@ -342,7 +342,7 @@ Dual-state Button btOnOff1
 Timer tmCooldown
     Attributes
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/US/portrait/diff-eu-version.txt

@@ -290,9 +290,9 @@
 │ +    
 │ +    Events
 │ +        Touch Release Event
-│ +            nNum5.val=hSlider5.val
+│ +            nNum6.val=hSlider6.val
 │ +            tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-│ +            covx nNum5.val,tTmp.txt,0,0
+│ +            covx nNum6.val,tTmp.txt,0,0
 │ +            tSend.txt+=tTmp.txt
 │ +            //send calc crc
 │ +            btlen tSend.txt,sys0
@@ -611,7 +611,7 @@
 │ +    Events
 │ +        Touch Press Event
 │ +            tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-│ +            covx btOnOff5.val,tTmp.txt,0,0
+│ +            covx btOnOff6.val,tTmp.txt,0,0
 │ +            tSend.txt+=tTmp.txt
 │ +            //send calc crc
 │ +            btlen tSend.txt,sys0

HMI/US/portrait/diff-filtered.txt

@@ -1,4 +1,4 @@
-+++ /dev/fd/62	2023-07-31 16:25:23.356512733 +0000
++++ /dev/fd/62	2023-08-06 20:32:34.816279572 +0000
 +I/n2t-out/Program.s.txt
 ++ HMI/US/portrait/n2t-out/Program.s.txt
 +1 +12,11 @@
@@ -59,13 +59,13 @@
 +ributes
 + Scope         : local
 + Text          : 
-+ Max. Text Size: 80
 + Max. Text Size: 38
 +
 +e (string) nent2
 +ributes
 + Scope         : local
 + Text          : 
++ Max. Text Size: 80
 + Max. Text Size: 38
 +14 +185,26 @@
 +e (string) type6
@@ -176,9 +176,9 @@
 +
 +nts
 + Touch Release Event
-+     nNum5.val=hSlider5.val
++     nNum6.val=hSlider6.val
 +     tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-+     covx nNum5.val,tTmp.txt,0,0
++     covx nNum6.val,tTmp.txt,0,0
 +     tSend.txt+=tTmp.txt
 +     //send calc crc
 +     btlen tSend.txt,sys0
@@ -360,7 +360,7 @@
 +nts
 + Touch Press Event
 +     tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-+     covx btOnOff5.val,tTmp.txt,0,0
++     covx btOnOff6.val,tTmp.txt,0,0
 +     tSend.txt+=tTmp.txt
 +     //send calc crc
 +     btlen tSend.txt,sys0
@@ -600,6 +600,13 @@
 +                                     covx tTmp.txt,sys0,0,0
 +                                     hSlider6.maxval=sys0
 +                                 }
++                             }
++                             if(tInstruction.txt=="pageType")
++                             {
++                                 sleepValue=0
++                                 //command format pageType,specialPageName
++                                 //write name of speical page to tId
++                                 spstr strCommand.txt,tId.txt,"~",1
 +I/n2t-out/cardGrid2.txt
 ++ HMI/US/portrait/n2t-out/cardGrid2.txt
 +6 +25,28 @@
@@ -857,13 +864,6 @@
 +                                     spstr strCommand.txt,tEntity9.txt,"~",66
 +                                     vis tEntity9,1
 +                                 }
-+                             }
-+                             if(tInstruction.txt=="pageType")
-+                             {
-+                                 sleepValue=0
-+                                 //command format pageType,specialPageName
-+                                 //write name of speical page to tId
-+                                 spstr strCommand.txt,tId.txt,"~",1
 +I/n2t-out/cardPower.txt
 ++ HMI/US/portrait/n2t-out/cardPower.txt
 +6 +45,16 @@

HMI/US/portrait/n2t-out-visual/cardEntities.txt

@@ -1115,9 +1115,9 @@ Slider hSlider6
     
     Events
         Touch Release Event
-            nNum5.val=hSlider5.val
+            nNum6.val=hSlider6.val
             tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-            covx nNum5.val,tTmp.txt,0,0
+            covx nNum6.val,tTmp.txt,0,0
             tSend.txt+=tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
@@ -2577,7 +2577,7 @@ Dual-state Button btOnOff6
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-            covx btOnOff5.val,tTmp.txt,0,0
+            covx btOnOff6.val,tTmp.txt,0,0
             tSend.txt+=tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0

HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt

@@ -22,14 +22,18 @@ popupTimer
 	42   Component(s)
 	516  Line(s) of event code
 	257  Unique line(s) of event code
-popupLightNew
+popupLight
-	23   Component(s)
+	28   Component(s)
-	412  Line(s) of event code
+	408  Line(s) of event code
-	209  Unique line(s) of event code
+	225  Unique line(s) of event code
 popupFan
 	27   Component(s)
 	355  Line(s) of event code
 	206  Unique line(s) of event code
+popupLightNew
+	23   Component(s)
+	412  Line(s) of event code
+	209  Unique line(s) of event code
 pageStartup
 	19   Component(s)
 	193  Line(s) of event code
@@ -46,10 +50,6 @@ cardLChart
 	33   Component(s)
 	402  Line(s) of event code
 	266  Unique line(s) of event code
-popupLight
-	28   Component(s)
-	408  Line(s) of event code
-	225  Unique line(s) of event code
 popupShutter
 	25   Component(s)
 	402  Line(s) of event code
@@ -93,10 +93,10 @@ screensaver
 cardEntities
 	91   Component(s)
 	1666 Line(s) of event code
-	708  Unique line(s) of event code
+	711  Unique line(s) of event code
 
 Total
 	23   Page(s)
 	890  Component(s)
 	10819 Line(s) of event code
-	2524 Unique line(s) of event code
+	2527 Unique line(s) of event code

HMI/US/portrait/n2t-out-visual/popupLight.txt

@@ -743,7 +743,7 @@ Timer tmCooldown
     Attributes
         ID         : 25
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/US/portrait/n2t-out-visual/popupLightNew.txt

@@ -504,7 +504,7 @@ Timer tmCooldown
     Attributes
         ID         : 15
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/US/portrait/n2t-out/cardEntities.txt

@@ -545,9 +545,9 @@ Slider hSlider6
     
     Events
         Touch Release Event
-            nNum5.val=hSlider5.val
+            nNum6.val=hSlider6.val
             tSend.txt="event,buttonPress2,"+entn6.txt+",number-set,"
-            covx nNum5.val,tTmp.txt,0,0
+            covx nNum6.val,tTmp.txt,0,0
             tSend.txt+=tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0
@@ -1327,7 +1327,7 @@ Dual-state Button btOnOff6
     Events
         Touch Press Event
             tSend.txt="event,buttonPress2,"+entn6.txt+",OnOff,"
-            covx btOnOff5.val,tTmp.txt,0,0
+            covx btOnOff6.val,tTmp.txt,0,0
             tSend.txt+=tTmp.txt
             //send calc crc
             btlen tSend.txt,sys0

HMI/US/portrait/n2t-out/popupLight.txt

@@ -395,7 +395,7 @@ Dual-state Button btOnOff1
 Timer tmCooldown
     Attributes
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/US/portrait/n2t-out/popupLightNew.txt

@@ -342,7 +342,7 @@ Dual-state Button btOnOff1
 Timer tmCooldown
     Attributes
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -26,6 +26,14 @@ popupShutter
 	25   Component(s)
 	402  Line(s) of event code
 	220  Unique line(s) of event code
+popupLightNew
+	23   Component(s)
+	412  Line(s) of event code
+	209  Unique line(s) of event code
+popupLight
+	28   Component(s)
+	408  Line(s) of event code
+	225  Unique line(s) of event code
 popupNotify
 	19   Component(s)
 	267  Line(s) of event code
@@ -50,10 +58,6 @@ cardAlarm
 	43   Component(s)
 	500  Line(s) of event code
 	273  Unique line(s) of event code
-popupLight
-	28   Component(s)
-	408  Line(s) of event code
-	225  Unique line(s) of event code
 screensaver
 	47   Component(s)
 	444  Line(s) of event code
@@ -62,10 +66,6 @@ cardThermo
 	57   Component(s)
 	540  Line(s) of event code
 	319  Unique line(s) of event code
-popupLightNew
-	23   Component(s)
-	412  Line(s) of event code
-	209  Unique line(s) of event code
 cardGrid2
 	52   Component(s)
 	617  Line(s) of event code

HMI/n2t-out-visual/popupLight.txt

@@ -743,7 +743,7 @@ Timer tmCooldown
     Attributes
         ID         : 25
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/n2t-out-visual/popupLightNew.txt

@@ -504,7 +504,7 @@ Timer tmCooldown
     Attributes
         ID         : 15
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/n2t-out/popupLight.txt

@@ -395,7 +395,7 @@ Dual-state Button btOnOff1
 Timer tmCooldown
     Attributes
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

HMI/n2t-out/popupLightNew.txt

@@ -342,7 +342,7 @@ Dual-state Button btOnOff1
 Timer tmCooldown
     Attributes
         Scope      : local
-        Period (ms): 100
+        Period (ms): 300
         Enabled    : no
     
     Events

apps/nspanel-lovelace-ui/luibackend/controller.py

@@ -169,8 +169,8 @@ class LuiController(object):
             self._pages_gen.render_card(self._current_card, send_page_type=False)
             # send detail page update, just in case
             if self._current_card.cardType in ["cardGrid", "cardGrid2", "cardEntities", "cardMedia"]:
-                if entity.startswith("light"):
+                #if entity.startswith("light"):
-                    self._pages_gen.generate_light_detail_page(res_uuid)
+                #    self._pages_gen.generate_light_detail_page(res_uuid)
                 if entity.startswith("cover"):
                     self._pages_gen.generate_shutter_detail_page(entity)
                 if entity.startswith("fan"):

apps/nspanel-lovelace-ui/luibackend/pages.py

@@ -198,8 +198,8 @@ class LuiPagesGen(object):
                 return ""
             if item.condStateNot is not None and item.condStateNot == state:
                 return ""
-            if item.condTemplate is not None and apis.ha_api.render_template(item.condTemplate):
+        if item.condTemplate is not None and apis.ha_api.render_template(item.condTemplate):
-                return ""
+            return ""
 
         # Internal types
         if entityType == "delete":