Update nspanel-lovelace-ui.py

Catch exception for missing sensor values separately

HMI/README.md

@@ -348,7 +348,7 @@ Example alternative layout: `weatherUpdate~~~A~21130~~-0.7C~~~B~63469~Sat~3.6C~~
 </tbody>
 </table>
 
-`color~background~tTime~timeAMPM~tDate~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainTextAlt2~tMR~tTimeAdd`
+`color~background~tTime~timeAMPM~tDate~tMainText~tForecast1~tForecast2~tForecast3~tForecast4~tForecast1Val~tForecast2Val~tForecast3Val~tForecast4Val~bar~tMainTextAlt2~tTimeAdd`
 
 <table>
 <thead>
@@ -493,14 +493,6 @@ Example alternative layout: `weatherUpdate~~~A~21130~~-0.7C~~~B~63469~Sat~3.6C~~
     <td></td>
     <td></td>
     <td></td>
-    <td>tMR</td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>17</td>
-    <td></td>
-    <td></td>
-    <td></td>
     <td>tTimeAdd</td>
     <td></td>
   </tr>

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

@@ -1,5 +1,93 @@
 --- HMI/n2t-out
 +++ HMI/US/landscape/n2t-out
+│   --- HMI/n2t-out/cardPower.txt
+├── +++ HMI/US/landscape/n2t-out/cardPower.txt
+│ @@ -475,85 +475,79 @@
+│                      h0.val=h0.minval
+│                  }
+│                  if(sys0<h0.minval)
+│                  {
+│                      h0.val=h0.maxval
+│                  }
+│                  h0.val+=t0Speed.val
+│ -                ref t0u
+│              }
+│              if(t1Speed.val!=0)
+│              {
+│                  sys0=h1.val+t1Speed.val
+│                  if(sys0>h1.maxval)
+│                  {
+│                      h1.val=h1.minval
+│                  }
+│                  if(sys0<h1.minval)
+│                  {
+│                      h1.val=h1.maxval
+│                  }
+│                  h1.val+=t1Speed.val
+│ -                ref t1u
+│              }
+│              if(t2Speed.val!=0)
+│              {
+│                  sys0=h2.val+t2Speed.val
+│                  if(sys0>h2.maxval)
+│                  {
+│                      h2.val=h2.minval
+│                  }
+│                  if(sys0<h2.minval)
+│                  {
+│                      h2.val=h2.maxval
+│                  }
+│                  h2.val+=t2Speed.val
+│ -                ref t2u
+│              }
+│              if(t3Speed.val!=0)
+│              {
+│                  sys0=h3.val+t3Speed.val
+│                  if(sys0>h3.maxval)
+│                  {
+│                      h3.val=h3.minval
+│                  }
+│                  if(sys0<h3.minval)
+│                  {
+│                      h3.val=h3.maxval
+│                  }
+│                  h3.val+=t3Speed.val
+│ -                ref t3u
+│              }
+│              if(t4Speed.val!=0)
+│              {
+│                  sys0=h4.val+t4Speed.val
+│                  if(sys0>h4.maxval)
+│                  {
+│                      h4.val=h4.minval
+│                  }
+│                  if(sys0<h4.minval)
+│                  {
+│                      h4.val=h4.maxval
+│                  }
+│                  h4.val+=t4Speed.val
+│ -                ref t4u
+│              }
+│              if(t5Speed.val!=0)
+│              {
+│                  sys0=h5.val+t5Speed.val
+│                  if(sys0>h5.maxval)
+│                  {
+│                      h5.val=h5.minval
+│                  }
+│                  if(sys0<h5.minval)
+│                  {
+│                      h5.val=h5.maxval
+│                  }
+│                  h5.val+=t5Speed.val
+│ -                ref t5u
+│              }
+│          
+│  Timer tmSerial
+│      Attributes
+│          Scope      : local
+│          Period (ms): 50
+│          Enabled    : yes
 │   --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/landscape/n2t-out/pageStartup.txt
 │ @@ -179,15 +179,15 @@
@@ -36,7 +124,7 @@
 │      Attributes
 │          Scope         : local
 │          Text          : 
-│          Max. Text Size: 400
+│          Max. Text Size: 600
 │      
 │  Variable (string) strTmp
 │ @@ -103,35 +100,14 @@

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

@@ -46,6 +46,10 @@ pageStartup
 	20   Component(s)
 	185  Line(s) of event code
 	131  Unique line(s) of event code
+screensaver
+	46   Component(s)
+	418  Line(s) of event code
+	298  Unique line(s) of event code
 cardGrid
 	44   Component(s)
 	515  Line(s) of event code
@@ -78,10 +82,6 @@ cardPower
 	48   Component(s)
 	487  Line(s) of event code
 	326  Unique line(s) of event code
-screensaver
-	46   Component(s)
-	418  Line(s) of event code
-	299  Unique line(s) of event code
 
 Total
 	20   Page(s)

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

@@ -46,7 +46,7 @@ Variable (string) strCommand
         ID            : 4
         Scope         : local
         Text          : 
-        Max. Text Size: 400
+        Max. Text Size: 600
     
 Variable (string) strTmp
     Attributes
@@ -1238,9 +1238,7 @@ Timer tmSerial
                                         covx tTmp.txt,t10.bco,0,0
                                         spstr strCommand.txt,tTmp.txt,"~",15
                                         covx tTmp.txt,tMainTextAlt2.pco,0,0
-                                        //spstr strCommand.txt,tTmp.txt,"~",16
+                                        spstr strCommand.txt,tTmp.txt,"~",16
-                                        //covx tTmp.txt,tMR.pco,0,0
-                                        spstr strCommand.txt,tTmp.txt,"~",17
                                         covx tTmp.txt,tTimeAdd.pco,0,0
                                         if(tMainTextAlt2.txt!=""&&p0.w!=320)
                                         {

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

@@ -37,7 +37,7 @@ Variable (string) strCommand
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 400
+        Max. Text Size: 600
     
 Variable (string) strTmp
     Attributes
@@ -665,9 +665,7 @@ Timer tmSerial
                                         covx tTmp.txt,t10.bco,0,0
                                         spstr strCommand.txt,tTmp.txt,"~",15
                                         covx tTmp.txt,tMainTextAlt2.pco,0,0
-                                        //spstr strCommand.txt,tTmp.txt,"~",16
+                                        spstr strCommand.txt,tTmp.txt,"~",16
-                                        //covx tTmp.txt,tMR.pco,0,0
-                                        spstr strCommand.txt,tTmp.txt,"~",17
                                         covx tTmp.txt,tTimeAdd.pco,0,0
                                         if(tMainTextAlt2.txt!=""&&p0.w!=320)
                                         {

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

@@ -1047,6 +1047,94 @@
 │                                          //command format pageType,specialPageName
 │                                          //write name of speical page to tId
 │                                          spstr strCommand.txt,tId.txt,"~",1
+│   --- HMI/n2t-out/cardPower.txt
+├── +++ HMI/US/portrait/n2t-out/cardPower.txt
+│ @@ -475,85 +475,79 @@
+│                      h0.val=h0.minval
+│                  }
+│                  if(sys0<h0.minval)
+│                  {
+│                      h0.val=h0.maxval
+│                  }
+│                  h0.val+=t0Speed.val
+│ -                ref t0u
+│              }
+│              if(t1Speed.val!=0)
+│              {
+│                  sys0=h1.val+t1Speed.val
+│                  if(sys0>h1.maxval)
+│                  {
+│                      h1.val=h1.minval
+│                  }
+│                  if(sys0<h1.minval)
+│                  {
+│                      h1.val=h1.maxval
+│                  }
+│                  h1.val+=t1Speed.val
+│ -                ref t1u
+│              }
+│              if(t2Speed.val!=0)
+│              {
+│                  sys0=h2.val+t2Speed.val
+│                  if(sys0>h2.maxval)
+│                  {
+│                      h2.val=h2.minval
+│                  }
+│                  if(sys0<h2.minval)
+│                  {
+│                      h2.val=h2.maxval
+│                  }
+│                  h2.val+=t2Speed.val
+│ -                ref t2u
+│              }
+│              if(t3Speed.val!=0)
+│              {
+│                  sys0=h3.val+t3Speed.val
+│                  if(sys0>h3.maxval)
+│                  {
+│                      h3.val=h3.minval
+│                  }
+│                  if(sys0<h3.minval)
+│                  {
+│                      h3.val=h3.maxval
+│                  }
+│                  h3.val+=t3Speed.val
+│ -                ref t3u
+│              }
+│              if(t4Speed.val!=0)
+│              {
+│                  sys0=h4.val+t4Speed.val
+│                  if(sys0>h4.maxval)
+│                  {
+│                      h4.val=h4.minval
+│                  }
+│                  if(sys0<h4.minval)
+│                  {
+│                      h4.val=h4.maxval
+│                  }
+│                  h4.val+=t4Speed.val
+│ -                ref t4u
+│              }
+│              if(t5Speed.val!=0)
+│              {
+│                  sys0=h5.val+t5Speed.val
+│                  if(sys0>h5.maxval)
+│                  {
+│                      h5.val=h5.minval
+│                  }
+│                  if(sys0<h5.minval)
+│                  {
+│                      h5.val=h5.maxval
+│                  }
+│                  h5.val+=t5Speed.val
+│ -                ref t5u
+│              }
+│          
+│  Timer tmSerial
+│      Attributes
+│          Scope      : local
+│          Period (ms): 50
+│          Enabled    : yes
 │   --- HMI/n2t-out/pageStartup.txt
 ├── +++ HMI/US/portrait/n2t-out/pageStartup.txt
 │ @@ -35,20 +35,14 @@
@@ -1121,7 +1209,7 @@
 │      Attributes
 │          Scope         : local
 │          Text          : 
-│          Max. Text Size: 400
+│          Max. Text Size: 600
 │      
 │  Variable (string) strTmp
 │ @@ -103,35 +100,14 @@

HMI/US/portrait/diff-filtered.txt

@@ -1,4 +1,4 @@
-+++ /dev/fd/62	2023-01-25 19:09:43.447986033 +0000
++++ /dev/fd/62	2023-01-30 16:39:29.795510871 +0000
 +I/n2t-out/Program.s.txt
 ++ HMI/US/portrait/n2t-out/Program.s.txt
 +I/n2t-out/cardEntities.txt
@@ -54,13 +54,13 @@
 +ributes
 + Scope         : local
 + Text          : 
++ Max. Text Size: 80
 + Max. Text Size: 40
 +
 +e (string) nent2
 +ributes
 + Scope         : local
 + Text          : 
-+ Max. Text Size: 80
 + Max. Text Size: 40
 +14 +186,26 @@
 +e (string) type6
@@ -466,6 +466,94 @@
 +                                     covx tTmp.txt,sys0,0,0
 +                                     hSlider6.maxval=sys0
 +                                 }
++I/n2t-out/cardPower.txt
+++ HMI/US/portrait/n2t-out/cardPower.txt
++85 +475,79 @@
++             h0.val=h0.minval
++         }
++         if(sys0<h0.minval)
++         {
++             h0.val=h0.maxval
++         }
++         h0.val+=t0Speed.val
++         ref t0u
++     }
++     if(t1Speed.val!=0)
++     {
++         sys0=h1.val+t1Speed.val
++         if(sys0>h1.maxval)
++         {
++             h1.val=h1.minval
++         }
++         if(sys0<h1.minval)
++         {
++             h1.val=h1.maxval
++         }
++         h1.val+=t1Speed.val
++         ref t1u
++     }
++     if(t2Speed.val!=0)
++     {
++         sys0=h2.val+t2Speed.val
++         if(sys0>h2.maxval)
++         {
++             h2.val=h2.minval
++         }
++         if(sys0<h2.minval)
++         {
++             h2.val=h2.maxval
++         }
++         h2.val+=t2Speed.val
++         ref t2u
++     }
++     if(t3Speed.val!=0)
++     {
++         sys0=h3.val+t3Speed.val
++         if(sys0>h3.maxval)
++         {
++             h3.val=h3.minval
++         }
++         if(sys0<h3.minval)
++         {
++             h3.val=h3.maxval
++         }
++         h3.val+=t3Speed.val
++         ref t3u
++     }
++     if(t4Speed.val!=0)
++     {
++         sys0=h4.val+t4Speed.val
++         if(sys0>h4.maxval)
++         {
++             h4.val=h4.minval
++         }
++         if(sys0<h4.minval)
++         {
++             h4.val=h4.maxval
++         }
++         h4.val+=t4Speed.val
++         ref t4u
++     }
++     if(t5Speed.val!=0)
++     {
++         sys0=h5.val+t5Speed.val
++         if(sys0>h5.maxval)
++         {
++             h5.val=h5.minval
++         }
++         if(sys0<h5.minval)
++         {
++             h5.val=h5.maxval
++         }
++         h5.val+=t5Speed.val
++         ref t5u
++     }
++ 
++mSerial
++ributes
++ Scope      : local
++ Period (ms): 50
++ Enabled    : yes
 +I/n2t-out/pageStartup.txt
 ++ HMI/US/portrait/n2t-out/pageStartup.txt
 +0 +35,14 @@
@@ -506,7 +594,7 @@
 +ributes
 + Scope         : local
 + Text          : 
-+ Max. Text Size: 400
++ Max. Text Size: 600
 +
 +e (string) strTmp
 +35 +100,14 @@

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

@@ -61,7 +61,7 @@ cardChart
 screensaver
 	46   Component(s)
 	418  Line(s) of event code
-	299  Unique line(s) of event code
+	298  Unique line(s) of event code
 popupTimer
 	42   Component(s)
 	512  Line(s) of event code

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

@@ -46,7 +46,7 @@ Variable (string) strCommand
         ID            : 4
         Scope         : local
         Text          : 
-        Max. Text Size: 400
+        Max. Text Size: 600
     
 Variable (string) strTmp
     Attributes
@@ -1238,9 +1238,7 @@ Timer tmSerial
                                         covx tTmp.txt,t10.bco,0,0
                                         spstr strCommand.txt,tTmp.txt,"~",15
                                         covx tTmp.txt,tMainTextAlt2.pco,0,0
-                                        //spstr strCommand.txt,tTmp.txt,"~",16
+                                        spstr strCommand.txt,tTmp.txt,"~",16
-                                        //covx tTmp.txt,tMR.pco,0,0
-                                        spstr strCommand.txt,tTmp.txt,"~",17
                                         covx tTmp.txt,tTimeAdd.pco,0,0
                                         if(tMainTextAlt2.txt!=""&&p0.w!=320)
                                         {

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

@@ -37,7 +37,7 @@ Variable (string) strCommand
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 400
+        Max. Text Size: 600
     
 Variable (string) strTmp
     Attributes
@@ -665,9 +665,7 @@ Timer tmSerial
                                         covx tTmp.txt,t10.bco,0,0
                                         spstr strCommand.txt,tTmp.txt,"~",15
                                         covx tTmp.txt,tMainTextAlt2.pco,0,0
-                                        //spstr strCommand.txt,tTmp.txt,"~",16
+                                        spstr strCommand.txt,tTmp.txt,"~",16
-                                        //covx tTmp.txt,tMR.pco,0,0
-                                        spstr strCommand.txt,tTmp.txt,"~",17
                                         covx tTmp.txt,tTimeAdd.pco,0,0
                                         if(tMainTextAlt2.txt!=""&&p0.w!=320)
                                         {

HMI/n2t-out-visual/cardPower.txt

@@ -191,7 +191,7 @@ Text t0u
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 82
-        y coordinate                        : 132
+        y coordinate                        : 119
         Width                               : 108
         Height                              : 30
         Effect                              : load
@@ -285,7 +285,7 @@ Text t1u
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 82
-        y coordinate                        : 209
+        y coordinate                        : 195
         Width                               : 108
         Height                              : 30
         Effect                              : load
@@ -347,7 +347,7 @@ Text t2u
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 82
-        y coordinate                        : 285
+        y coordinate                        : 272
         Width                               : 108
         Height                              : 30
         Effect                              : load
@@ -409,7 +409,7 @@ Text t3u
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 262
-        y coordinate                        : 132
+        y coordinate                        : 119
         Width                               : 108
         Height                              : 30
         Effect                              : load
@@ -471,7 +471,7 @@ Text t4u
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 262
-        y coordinate                        : 209
+        y coordinate                        : 195
         Width                               : 108
         Height                              : 30
         Effect                              : load
@@ -533,7 +533,7 @@ Text t5u
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 262
-        y coordinate                        : 285
+        y coordinate                        : 272
         Width                               : 108
         Height                              : 30
         Effect                              : load
@@ -755,7 +755,7 @@ Slider h1
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 78
-        y coordinate                        : 165
+        y coordinate                        : 164
         Width                               : 120
         Height                              : 44
         Effect                              : load
@@ -830,7 +830,7 @@ Slider h4
         Send Component ID                   : disabled
         Opacity                             : 127
         x coordinate                        : 258
-        y coordinate                        : 165
+        y coordinate                        : 164
         Width                               : 120
         Height                              : 44
         Effect                              : load
@@ -1046,6 +1046,7 @@ Timer tm0
                     h0.val=h0.maxval
                 }
                 h0.val+=t0Speed.val
+                ref t0u
             }
             if(t1Speed.val!=0)
             {
@@ -1059,6 +1060,7 @@ Timer tm0
                     h1.val=h1.maxval
                 }
                 h1.val+=t1Speed.val
+                ref t1u
             }
             if(t2Speed.val!=0)
             {
@@ -1072,6 +1074,7 @@ Timer tm0
                     h2.val=h2.maxval
                 }
                 h2.val+=t2Speed.val
+                ref t2u
             }
             if(t3Speed.val!=0)
             {
@@ -1085,6 +1088,7 @@ Timer tm0
                     h3.val=h3.maxval
                 }
                 h3.val+=t3Speed.val
+                ref t3u
             }
             if(t4Speed.val!=0)
             {
@@ -1098,6 +1102,7 @@ Timer tm0
                     h4.val=h4.maxval
                 }
                 h4.val+=t4Speed.val
+                ref t4u
             }
             if(t5Speed.val!=0)
             {
@@ -1111,6 +1116,7 @@ Timer tm0
                     h5.val=h5.maxval
                 }
                 h5.val+=t5Speed.val
+                ref t5u
             }
         
 Timer tmSerial

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -30,10 +30,10 @@ pageTest
 	26   Component(s)
 	68   Line(s) of event code
 	66   Unique line(s) of event code
-cardPower
+screensaver
-	48   Component(s)
+	47   Component(s)
-	487  Line(s) of event code
+	428  Line(s) of event code
-	326  Unique line(s) of event code
+	306  Unique line(s) of event code
 popupFan
 	27   Component(s)
 	351  Line(s) of event code
@@ -62,10 +62,10 @@ cardMedia
 	59   Component(s)
 	641  Line(s) of event code
 	318  Unique line(s) of event code
-screensaver
+cardPower
-	47   Component(s)
+	48   Component(s)
-	428  Line(s) of event code
+	493  Line(s) of event code
-	307  Unique line(s) of event code
+	332  Unique line(s) of event code
 popupTimer
 	42   Component(s)
 	512  Line(s) of event code
@@ -86,5 +86,5 @@ cardEntities
 Total
 	20   Page(s)
 	737  Component(s)
-	8810 Line(s) of event code
+	8816 Line(s) of event code
-	2264 Unique line(s) of event code
+	2270 Unique line(s) of event code

HMI/n2t-out-visual/screensaver.txt

@@ -49,7 +49,7 @@ Variable (string) strCommand
         ID            : 4
         Scope         : local
         Text          : 
-        Max. Text Size: 400
+        Max. Text Size: 600
     
 Variable (string) strTmp
     Attributes
@@ -1282,9 +1282,7 @@ Timer tmSerial
                                         covx tTmp.txt,t10.bco,0,0
                                         spstr strCommand.txt,tTmp.txt,"~",15
                                         covx tTmp.txt,tMainTextAlt2.pco,0,0
-                                        //spstr strCommand.txt,tTmp.txt,"~",16
+                                        spstr strCommand.txt,tTmp.txt,"~",16
-                                        //covx tTmp.txt,tMR.pco,0,0
-                                        spstr strCommand.txt,tTmp.txt,"~",17
                                         covx tTmp.txt,tTimeAdd.pco,0,0
                                         if(tMainTextAlt2.txt!=""&&p0.w!=320)
                                         {

HMI/n2t-out/cardPower.txt

@@ -479,6 +479,7 @@ Timer tm0
                     h0.val=h0.maxval
                 }
                 h0.val+=t0Speed.val
+                ref t0u
             }
             if(t1Speed.val!=0)
             {
@@ -492,6 +493,7 @@ Timer tm0
                     h1.val=h1.maxval
                 }
                 h1.val+=t1Speed.val
+                ref t1u
             }
             if(t2Speed.val!=0)
             {
@@ -505,6 +507,7 @@ Timer tm0
                     h2.val=h2.maxval
                 }
                 h2.val+=t2Speed.val
+                ref t2u
             }
             if(t3Speed.val!=0)
             {
@@ -518,6 +521,7 @@ Timer tm0
                     h3.val=h3.maxval
                 }
                 h3.val+=t3Speed.val
+                ref t3u
             }
             if(t4Speed.val!=0)
             {
@@ -531,6 +535,7 @@ Timer tm0
                     h4.val=h4.maxval
                 }
                 h4.val+=t4Speed.val
+                ref t4u
             }
             if(t5Speed.val!=0)
             {
@@ -544,6 +549,7 @@ Timer tm0
                     h5.val=h5.maxval
                 }
                 h5.val+=t5Speed.val
+                ref t5u
             }
         
 Timer tmSerial

HMI/n2t-out/screensaver.txt

@@ -40,7 +40,7 @@ Variable (string) strCommand
     Attributes
         Scope         : local
         Text          : 
-        Max. Text Size: 400
+        Max. Text Size: 600
     
 Variable (string) strTmp
     Attributes
@@ -689,9 +689,7 @@ Timer tmSerial
                                         covx tTmp.txt,t10.bco,0,0
                                         spstr strCommand.txt,tTmp.txt,"~",15
                                         covx tTmp.txt,tMainTextAlt2.pco,0,0
-                                        //spstr strCommand.txt,tTmp.txt,"~",16
+                                        spstr strCommand.txt,tTmp.txt,"~",16
-                                        //covx tTmp.txt,tMR.pco,0,0
-                                        spstr strCommand.txt,tTmp.txt,"~",17
                                         covx tTmp.txt,tTimeAdd.pco,0,0
                                         if(tMainTextAlt2.txt!=""&&p0.w!=320)
                                         {

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

@@ -6904,11 +6904,13 @@ def get_icon_id(ma_name):
         return ma_name.replace("text:","")
     if "ha:" in ma_name:
         return apis.ha_api.render_template(ma_name.replace("ha:",""))
+    if "ha-i:" in ma_name:
+        ma_name = apis.ha_api.render_template(ma_name.replace("ha:",""))
     ma_name = ma_name.replace("mdi:","")
     if ma_name in icons:
         return icons[ma_name]
     else:
         return icons["alert-circle-outline"]
-   
+    
 def get_icon_char(ma_name):
-    return get_icon_id(ma_name)
+    return get_icon_id(ma_name)

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

@@ -288,7 +288,10 @@ class LuiPagesGen(object):
             entityTypePanel = "text"
             device_class = entity.attributes.get("device_class", "")
             unit_of_measurement = entity.attributes.get("unit_of_measurement", "")
-            value = entity.state + " " + unit_of_measurement
+            value = entity.state
+            if device_class != "temperature":
+                value = value + " "
+            value = value + unit_of_measurement
             if entityType == "binary_sensor":
                 value = get_translation(self._locale, f"backend.component.binary_sensor.state.{device_class}.{entity.state}")
             if cardType == "cardGrid" and entityType == "sensor" and icon is None:
@@ -635,7 +638,12 @@ class LuiPagesGen(object):
                     speed = str(item.entity_input_config.get("speed", 1))
                     speed = apis.ha_api.render_template(speed)
                 unit = get_attr_safe(entity, "unit_of_measurement", "")
-                command += f"~{icon_color}~{icon}~{speed}~{entity.state} {unit}"
+                value = f"{entity.state} {unit}"
+                # Overwrite for value
+                ovalue = item.value
+                if ovalue is not None:
+                    value = apis.ha_api.render_template(ovalue)
+                command += f"~{icon_color}~{icon}~{speed}~{value}"
             elif item.entityId == "delete":
                 command += f"~~~~"
             else:
@@ -928,4 +936,4 @@ class LuiPagesGen(object):
     def send_message_page(self, ident, heading, msg, b1, b2):
         self._send_mqtt_msg(f"pageType~popupNotify")
         self._send_mqtt_msg(f"entityUpdateDetail~{ident}~{heading}~65535~{b1}~65535~{b2}~65535~{msg}~65535~0")
-    
+    

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

@@ -7,23 +7,17 @@ default_screensaver_color_mapping = {
     "time":             "65535",
     "timeAMPM":         "65535",
     "date":             "65535",
-    "tMainIcon":        "65535",
     "tMainText":        "65535",
     "tForecast1":       "65535",
     "tForecast2":       "65535",
     "tForecast3":       "65535",
     "tForecast4":       "65535",
-    "tF1Icon":          "65535",
-    "tF2Icon":          "65535",
-    "tF3Icon":          "65535",
-    "tF4Icon":          "65535",
     "tForecast1Val":    "65535",
     "tForecast2Val":    "65535",
     "tForecast3Val":    "65535",
     "tForecast4Val":    "65535",
     "bar":              "65535",
-    "tMRIcon":          "65535",
+    "tMainTextAlt2":    "65535",
-    "tMR":              "65535",
     "tTimeAdd":         "65535"
 }
 

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

@@ -28,7 +28,7 @@ class NsPanelLovelaceUIManager(hass.Hass):
         
         desired_tasmota_driver_version   = 8
         desired_display_firmware_version = 49
-        version     = "v3.9.0"
+        version     = "v3.9.4"
         
         model       = cfg.get("model")
         if model == "us-l":

docs/config-screensaver.md

@@ -52,7 +52,6 @@ key | option | type | default | description
 `time` | True | list | White | `[R, G, B]`
 `timeAMPM` | True | list | White | `[R, G, B]`
 `date` | True | list | White | `[R, G, B]`
-`tMainIcon` | True | list | White | `[R, G, B]`
 `tMainText` | True | list | White | `[R, G, B]`
 `tForecast1` | True | list | White | `[R, G, B]`
 `tForecast2` | True | list | White | `[R, G, B]`
@@ -63,13 +62,9 @@ key | option | type | default | description
 `tForecast3Val` | True | list | White | `[R, G, B]`
 `tForecast4Val` | True | list | White | `[R, G, B]`
 `bar` | True | list | White | `[R, G, B]`
-`tMainIconAlt` | True | list | White | `[R, G, B]`
 `tMainTextAlt` | True | list | White | `[R, G, B]`
-`tMRIcon` | True | list | White | `[R, G, B]`
-`tMR` | True | list | White | `[R, G, B]`
 `tTimeAdd` | True | list | White | `[R, G, B]`
 
-
 Specify colours as red green and blue values from 0-255 e.g. `[255, 0, 0]` for red or `[0, 0, 255]` for blue. These are translated internally to RGB565 (note that this has lower color depth so the colours may not appear the same). Also note that the screen has a low contrast ratio, so colors look sigificantly different at full display brightness and lowest brightness.
 
 Example for the theme config:

docs/entities.md

@@ -73,6 +73,11 @@ There probably not much cases where this is needed, but here is an exmaple to sh
         icon: 'ha:{{ state_attr("climate.wohnzimmer_boden","current_temperature")}}'
 ```
 
+You can use the acual chars for the icon in the above ha: template, however if you want to use the icon names you can use `ha-i` instead. This will be evaluated as HA Template first and then looked up as an icon.
+
+```yaml
+        icon: 'ha-i:{{ iif(is_state('light.kitchen', 'on'), 'mdi:flashlight', 'mdi:flashlight-off') }}'
+```
 
 ## Hide item based on state
 

docs/notifications.md

@@ -26,6 +26,12 @@ Font 4 - Size 80 (Icons and limited chars)
 Font 5 - Size 128 (ascii only)
 ```
 
+You need to use the acual char for the icon instead of the icon name which is used in the configuration. You can get the char of the icon from the cheatsheet.
+
+https://docs.nspanel.pky.eu/icon-cheatsheet.html
+
+
+
 
 It is possible to exit from the page by sending `exitPopup`