added some icons #120 (add nextion2text)

HMI/README.md

@@ -132,83 +132,83 @@ The following message can be used to update the content on the cardEntities Page
 
 ## Messages from Nextion Display
 
-`event~buttonPress2~pageName~bNext`
+`event,buttonPress2,pageName,bNext`
 
-`event~buttonPress2~pageName~bPrev`
+`event,buttonPress2,pageName,bPrev`
 
-`event~buttonPress2~pageName~bExit~number_of_taps`
+`event,buttonPress2,pageName,bExit,number_of_taps`
 
-`event~buttonPress2~pageName~sleepReached`
+`event,buttonPress2,pageName,sleepReached`
 
 
 ### startup page
 
-`event~startup~version~model`
+`event,startup,version,model`
 
 ### screensaver page
 
-`event~buttonPress2~screensaver~exit` - Touch Event on Screensaver
+`event,buttonPress2,screensaver,exit` - Touch Event on Screensaver
 
-`event~screensaverOpen` - Screensaver has opened
+`event,screensaverOpen` - Screensaver has opened
 
 
 ### cardEntities Page
 
-`event~*eventName*~*entityName*~*actionName*~*optionalValue*`
+`event,*eventName*,*entityName*,*actionName*,*optionalValue*`
 
-`event~buttonPress2~internalNameEntity~up`
+`event,buttonPress2,internalNameEntity,up`
 
-`event~buttonPress2~internalNameEntity~down`
+`event,buttonPress2,internalNameEntity,down`
 
-`event~buttonPress2~internalNameEntity~stop`
+`event,buttonPress2,internalNameEntity,stop`
 
-`event~buttonPress2~internalNameEntity~OnOff~1`
+`event,buttonPress2,internalNameEntity,OnOff,1`
 
-`event~buttonPress2~internalNameEntity~button`
+`event,buttonPress2,internalNameEntity,button`
 
 ### popupLight Page
 
-`event~pageOpenDetail~popupLight~internalNameEntity`
+`event,pageOpenDetail,popupLight,internalNameEntity`
 
-`event~buttonPress2~internalNameEntity~OnOff~1`
+`event,buttonPress2,internalNameEntity,OnOff,1`
 
-`event~buttonPress2~internalNameEntity~brightnessSlider~50`
+`event,buttonPress2,internalNameEntity,brightnessSlider,50`
 
-`event~buttonPress2~internalNameEntity~colorTempSlider~50`
+`event,buttonPress2,internalNameEntity,colorTempSlider,50`
 
-`event~buttonPress2~internalNameEntity~colorWheel~x|y`
+`event,buttonPress2,internalNameEntity,colorWheel,x|y`
 
 ### popupShutter Page
 
-`event~pageOpenDetail~popupShutter~internalNameEntity`
+`event,pageOpenDetail,popupShutter,internalNameEntity`
 
-`event~buttonPress2~internalNameEntity~positionSlider~50`
+`event,buttonPress2,internalNameEntity,positionSlider,50`
 
 ### popupNotify Page
 
-`event~buttonPress2~*internalName*~notifyAction~yes`
+`event,buttonPress2,*internalName*,notifyAction,yes`
 
-`event~buttonPress2~*internalName*~notifyAction~no`
+`event,buttonPress2,*internalName*,notifyAction,no`
 
 ### cardThermo Page
 
-`event~buttonPress2~*entityName*~tempUpd~*temperature*`
+`event,buttonPress2,*entityName*,tempUpd,*temperature*`
 
-`event~buttonPress2~*entityName*~hvac_action~*hvac_action*`
+`event,buttonPress2,*entityName*,hvac_action,*hvac_action*`
 
 ### cardMedia Page
 
-`event~buttonPress2~internalNameEntity~media-back`
+`event,buttonPress2,internalNameEntity,media-back`
 
-`event~buttonPress2~internalNameEntity~media-pause`
+`event,buttonPress2,internalNameEntity,media-pause`
 
-`event~buttonPress2~internalNameEntity~media-next`
+`event,buttonPress2,internalNameEntity,media-next`
 
-`event~buttonPress2~internalNameEntity~volumeSlider~75`
+`event,buttonPress2,internalNameEntity,volumeSlider,75`
 
 ### cardAlarm Page
 
-`event~buttonPress2~internalNameEntity~actionName~code`
+`event,buttonPress2,internalNameEntity,actionName,code`
 
 
 # Icons IDs
@@ -218,7 +218,7 @@ Please see Icon's int the [icons.md file](icons.md)
 # Design Guidelines for Nextion HMI Project
 
 Background Color is 
-- RGB565: 6371 [18e3] (HEX: #1C1C1C~ RGB: 28~28~28)
+- RGB565: 6371 [18e3] (HEX: #1C1C1C, RGB: 28,28,28)
 
-Source for Icons is the Material Design Font~ used by HASPone
+Source for Icons is the Material Design Font, used by HASPone
 https://github.com/HASwitchPlate/HASPone

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

@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-04-03 07:35:47.898571291 +0000
-+++ HMI/US/landscape/n2t-out/Program.s.txt	2022-04-03 07:35:48.646571620 +0000
+--- HMI/n2t-out/Program.s.txt	2022-04-03 16:02:24.464717607 +0000
++++ HMI/US/landscape/n2t-out/Program.s.txt	2022-04-03 16:02:25.284722859 +0000
 @@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/landscape/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/landscape/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-04-03 07:35:47.902571293 +0000
-+++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-04-03 07:35:48.646571620 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-04-03 16:02:24.464717607 +0000
++++ HMI/US/landscape/n2t-out/pageStartup.txt	2022-04-03 16:02:25.288722884 +0000
 @@ -177,7 +177,7 @@
              recmod=1
              bauds=115200

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

@@ -2,6 +2,10 @@ Program.s
 	0    Component(s)
 	10   Line(s) of event code
 	10   Unique line(s) of event code
+pageIcons
+	7    Component(s)
+	0    Line(s) of event code
+	0    Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
@@ -10,10 +14,6 @@ pageSerialTest
 	13   Component(s)
 	48   Line(s) of event code
 	43   Unique line(s) of event code
-pageIcons
-	7    Component(s)
-	0    Line(s) of event code
-	0    Unique line(s) of event code
 popupNotify
 	17   Component(s)
 	178  Line(s) of event code

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

@@ -56,8 +56,8 @@ Text tIcons
         Horizontal Alignment                : left
         Vertical Alignment                  : top
         Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 170
+        Text                                : 
+        Max. Text Size                      : 185
         Word wrap                           : enabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0

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

@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 28
+        Text                                : 29
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0

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

@@ -29,8 +29,8 @@ Text tIcons
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 170
+        Text                                : 
+        Max. Text Size                      : 185
     
 Text tTmp1
     Attributes

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

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 29
         Max. Text Size                      : 10
     
 Picture p0

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

@@ -1,6 +1,6 @@
 diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
---- HMI/n2t-out/Program.s.txt	2022-04-03 07:35:47.898571291 +0000
-+++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-03 07:35:48.266571453 +0000
+--- HMI/n2t-out/Program.s.txt	2022-04-03 16:02:24.464717607 +0000
++++ HMI/US/portrait/n2t-out/Program.s.txt	2022-04-03 16:02:24.872720220 +0000
 @@ -11,6 +11,6 @@
      // dim value
      int dimValue=40
@@ -11,8 +11,8 @@ diff -bur HMI/n2t-out/Program.s.txt HMI/US/portrait/n2t-out/Program.s.txt
 +    //lcd_dev fffb 0002 0000 0020
      page pageStartup
 diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
---- HMI/n2t-out/cardEntities.txt	2022-04-03 07:35:47.902571293 +0000
-+++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-03 07:35:48.266571453 +0000
+--- HMI/n2t-out/cardEntities.txt	2022-04-03 16:02:24.468717633 +0000
++++ HMI/US/portrait/n2t-out/cardEntities.txt	2022-04-03 16:02:24.872720220 +0000
 @@ -62,6 +62,26 @@
              vis bText4,0
              vis hSlider4,0
@@ -781,8 +781,8 @@ diff -bur HMI/n2t-out/cardEntities.txt HMI/US/portrait/n2t-out/cardEntities.txt
                                      if(tInstruction.txt=="pageType")
                                      {
 diff -bur HMI/n2t-out/pageStartup.txt HMI/US/portrait/n2t-out/pageStartup.txt
---- HMI/n2t-out/pageStartup.txt	2022-04-03 07:35:47.902571293 +0000
-+++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-03 07:35:48.266571453 +0000
+--- HMI/n2t-out/pageStartup.txt	2022-04-03 16:02:24.464717607 +0000
++++ HMI/US/portrait/n2t-out/pageStartup.txt	2022-04-03 16:02:24.872720220 +0000
 @@ -142,7 +142,7 @@
          Disable release event after dragging: 0
          Send Component ID                   : disabled

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

@@ -56,8 +56,8 @@ Text tIcons
         Horizontal Alignment                : left
         Vertical Alignment                  : top
         Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 170
+        Text                                : 
+        Max. Text Size                      : 185
         Word wrap                           : enabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0

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

@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 28
+        Text                                : 29
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0

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

@@ -29,8 +29,8 @@ Text tIcons
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 170
+        Text                                : 
+        Max. Text Size                      : 185
     
 Text tTmp1
     Attributes

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

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 29
         Max. Text Size                      : 10
     
 Picture p0

HMI/code_gen/icons/icons.py

@@ -55,7 +55,14 @@ icons = [
     "cast-audio",
     "cast",
     "radio",
-    "fireplace"
+    "fireplace",
+    "arrow-left-bold",
+    "arrow-right-bold",
+    "sofa",
+    "garage-variant",
+    "bed",
+    "soccer",
+    "silverware-variant"
 ]
 
 

HMI/icons.md

@@ -58,3 +58,10 @@ ID | MD Icon Name | Icon
 51 | cast | ![cast](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/cast.svg)
 52 | radio | ![radio](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/radio.svg)
 53 | fireplace | ![fireplace](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/fireplace.svg)
+54 | arrow-left-bold | ![arrow-left-bold](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/arrow-left-bold.svg)
+55 | arrow-right-bold | ![arrow-right-bold](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/arrow-right-bold.svg)
+56 | sofa | ![sofa](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/sofa.svg)
+57 | garage-variant | ![garage-variant](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/garage-variant.svg)
+58 | bed | ![bed](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/bed.svg)
+59 | soccer | ![soccer](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/soccer.svg)
+60 | silverware-variant | ![silverware-variant](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/silverware-variant.svg)

HMI/n2t-out-visual/nspanel_Stats.txt

@@ -2,6 +2,10 @@ Program.s
 	0    Component(s)
 	11   Line(s) of event code
 	11   Unique line(s) of event code
+pageIcons
+	7    Component(s)
+	0    Line(s) of event code
+	0    Unique line(s) of event code
 pageTest
 	13   Component(s)
 	13   Line(s) of event code
@@ -10,10 +14,10 @@ pageSerialTest
 	13   Component(s)
 	48   Line(s) of event code
 	43   Unique line(s) of event code
-pageIcons
-	7    Component(s)
-	0    Line(s) of event code
-	0    Unique line(s) of event code
+pageStartup
+	19   Component(s)
+	150  Line(s) of event code
+	113  Unique line(s) of event code
 popupNotify
 	17   Component(s)
 	178  Line(s) of event code
@@ -26,10 +30,6 @@ popupLight
 	27   Component(s)
 	322  Line(s) of event code
 	173  Unique line(s) of event code
-pageStartup
-	19   Component(s)
-	150  Line(s) of event code
-	113  Unique line(s) of event code
 cardThermo
 	41   Component(s)
 	460  Line(s) of event code

HMI/n2t-out-visual/pageIcons.txt

@@ -56,8 +56,8 @@ Text tIcons
         Horizontal Alignment                : left
         Vertical Alignment                  : top
         Input Type                          : character
-        Text                                : 
-        Max. Text Size                      : 170
+        Text                                : 
+        Max. Text Size                      : 185
         Word wrap                           : enabled
         Horizontal Spacing                  : 0
         Vertical Spacing                    : 0

HMI/n2t-out-visual/pageStartup.txt

@@ -402,7 +402,7 @@ Text tVersion
         Horizontal Alignment                : center
         Vertical Alignment                  : center
         Input Type                          : character
-        Text                                : 28
+        Text                                : 29
         Max. Text Size                      : 10
         Word wrap                           : disabled
         Horizontal Spacing                  : 0

HMI/n2t-out/pageIcons.txt

@@ -29,8 +29,8 @@ Text tIcons
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 
-        Max. Text Size                      : 170
+        Text                                : 
+        Max. Text Size                      : 185
     
 Text tTmp1
     Attributes

HMI/n2t-out/pageStartup.txt

@@ -152,7 +152,7 @@ Text tVersion
         Disable release event after dragging: 0
         Send Component ID                   : disabled
         Associated Keyboard                 : none
-        Text                                : 28
+        Text                                : 29
         Max. Text Size                      : 10
     
 Picture p0

README.md

@@ -371,6 +371,7 @@ key | optional | type | default | description
 `weatherOverrideForecast4` | True | complex | `None` | sensor entity from home assistant here to override the forth weather forecast item on the screensaver
 `doubleTapToUnlock` | True | boolean | `False` | requires to tap screensaver two times
 `alternativeLayout` | True | boolean | `False` | alternative layout with humidity
+`defaultCard` | True | string | `None` | default page after exiting screensaver; only works with top level cards defined in cards; needs to be a navigation item, see subpages (navigate.type_key)
 `key` | True | string | `None` | Used by navigate items
 
 Example for the weatherOverride config options:
@@ -408,7 +409,7 @@ Only the icons listed in the [Icon Table](HMI#icons-ids) are useable.
 
 #### Subpages
 
-You can configure entities with with the prefix `navigate`, that are navigating to cards, in case it's hidden page, the navigation items will change and the arrow is bringing you back to the current page on the top level.
+You can configure entities with with the prefix `navigate`, that are navigating to cards, in case it's hidden card, the navigation items will change and the arrow is bringing you back to the privious page.
 
 ```yaml
           - entity: navigate.cardGrid_testKey

appdaemon/README.md

@@ -0,0 +1,12 @@
+# Example configurations
+
+This folder contains some example configs
+
+## appdaemon.yaml
+
+Example config for appademon itself
+
+## apps.yaml
+
+"Simple" Example Config with all possible entity types
+

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

@@ -84,7 +84,8 @@ class LuiBackendConfig(object):
             'weatherOverrideForecast3': None,
             'weatherOverrideForecast4': None,
             'doubleTapToUnlock': False,
-            'alternativeLayout': False
+            'alternativeLayout': False,
+            'defaultCard': None
         },
         'hiddenCards': []
     }

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

@@ -133,9 +133,16 @@ class LuiController(object):
         LOGGER.info(f"Button Press Event; entity_id: {entity_id}; button_type: {button_type}; value: {value} ")
         # internal buttons
         if entity_id == "screensaver" and button_type == "bExit":
-            if self._config.get("doubleTapToUnlock") and int(value) >= 2:
+            # get default card if there is one
+            if self._config.get("screensaver.defaultCard") is not None:
+                dstCard = self._config.searchCard(self._config.get("screensaver.defaultCard"))
+                if dstCard is not None:
+                    self._previous_cards = []
+                    self._current_card = dstCard
+            # check for duouble tap if configured and render current page
+            if self._config.get("screensaver.doubleTapToUnlock") and int(value) >= 2:
                 self._pages_gen.render_card(self._current_card)
-            elif not self._config.get("doubleTapToUnlock"):
+            elif not self._config.get("screensaver.doubleTapToUnlock"):
                 self._pages_gen.render_card(self._current_card)
             return
             

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

@@ -53,6 +53,13 @@ icons = {
     'cast': 51,
     'radio': 52,
     'fireplace': 53,
+    'arrow-left-bold': 54,
+    'arrow-right-bold': 55,
+    'sofa': 56,
+    'garage-variant': 57,
+    'bed': 58,
+    'soccer': 59,
+    'silverware-variant': 60,
 }
 
 def get_icon_id(ma_name):

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

@@ -1,5 +1,6 @@
 import logging
 import datetime
+import dateutil.parser as dp
 
 from icon_mapping import get_icon_id
 from icons import get_icon_id_ha
@@ -78,7 +79,8 @@ class LuiPagesGen(object):
             wOF = self._config._config_screensaver.raw_config.get(f"weatherOverrideForecast{i}")
             if wOF is None:
                 up = we.attributes.forecast[i-1]['datetime']
-                up   = datetime.datetime.fromisoformat(up)
+                #up   = datetime.datetime.fromisoformat(up)
+                up   = dp.parse(up)
                 if babel_spec is not None:
                     up = babel.dates.format_date(up, "E", locale=self._locale)
                 else:
@@ -116,7 +118,7 @@ class LuiPagesGen(object):
         if entityType == "navigate":
             page_search_res = self._config.searchCard(entityId)
             if page_search_res is not None:
-                name = page_search_res.title
+                name = name if name is not None else page_search_res.title
                 text = get_translation(self._locale,"PRESS")
                 icon_id = get_icon_id(icon) if icon is not None else get_icon_id("gesture-tap-button")
                 return f"~button~{entityId}~{icon_id}~17299~{name}~{text}"

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

@@ -63,8 +63,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
 
         controller = LuiController(self, cfg, send_mqtt_msg)
         
-        desired_display_firmware_version = 28
-        version     = "v2.5.0"
+        desired_display_firmware_version = 29
+        version     = "v2.5.5"
         
         model       = cfg.get("model")
         if model == "us-l":