fix #379

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

@@ -76,6 +76,7 @@ class LuiBackendConfig(object):
             'sleepBrightness': 20,
             'screenBrightness': 100,
             'sleepTracking': None,
+            'sleepTrackingZones': ["not_home", "off"],
             'sleepOverride': None,
             'locale': "en_US",
             'timeFormat': "%H:%M",

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

@@ -95,7 +95,7 @@ class LuiController(object):
         sleepBrightness = 0
         brightness = self.calc_current_brightness(self._config.get("screenBrightness"))
 
-        if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in ["not_home", "off"]:
+        if bst is not None and self._ha_api.entity_exists(bst) and self._ha_api.get_entity(bst).state in self._config.get("sleepTrackingZones"):
             self._ha_api.log(f"sleepTracking setting brightness to 0")
             sleepBrightness = 0
 
@@ -137,15 +137,14 @@ class LuiController(object):
             sorted_timesets = sorted(sleep_brightness_config, key=lambda d: self._ha_api.parse_time(d['time']))
             # calc current screensaver brightness
             found_current_dim_value = False
-            for index, timeset in enumerate(sorted_timesets):
+            for i in range(len(sorted_timesets)):
-                self._ha_api.log("Current time %s", self._ha_api.get_now().time())
+                found = self._ha_api.now_is_between(sorted_timesets[i-1]['time'], sorted_timesets[i]['time'])
-                if self._ha_api.parse_time(timeset["time"]) > self._ha_api.get_now().time() and not found_current_dim_value:
+                if found:
-                    # first time after current time, set dim value
-                    current_screensaver_brightness = sorted_timesets[index-1]["value"]
-                    self._ha_api.log("Setting dim value to %s", sorted_timesets[index-1])
                     found_current_dim_value = True
+                    current_screensaver_brightness = sorted_timesets[i-1]['value']
             # still no dim value
             if not found_current_dim_value:
+                self._ha_api.log("Chooseing %s as fallback", sorted_timesets[0])
                 current_screensaver_brightness = sorted_timesets[0]["value"]
         return current_screensaver_brightness
     
@@ -289,6 +288,8 @@ class LuiController(object):
                     self._ha_api.get_entity(entity_id).call_service("lock")
             elif entity_id.startswith('button') or entity_id.startswith('input_button'):
                 self._ha_api.get_entity(entity_id).call_service("press")
+            elif entity_id.startswith('input_select'):
+                self._ha_api.get_entity(entity_id).call_service("select_next")
 
         # for media page
         if button_type == "media-next":

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

@@ -205,7 +205,7 @@ class LuiPagesGen(object):
         if item.condStateNot is not None and item.condState != entity.state:
             return ""
         
-        name = name if name is not None else entity.attributes.friendly_name
+        name = name if name is not None else entity.attributes.get("friendly_name","unknown")
         if entityType == "cover":
 
             device_class = entity.attributes.get("device_class", "window")
@@ -282,15 +282,19 @@ class LuiPagesGen(object):
             icon_color = self.get_entity_color(entity, overwrite=colorOverride)
             text = get_translation(self._locale, "frontend.ui.card.lock.lock") if entity.state == "unlocked" else get_translation(self._locale, "frontend.ui.card.lock.unlock")
             return f"~button~{entityId}~{icon_id}~{icon_color}~{name}~{text}"
-        if entityType == "number":
+        if entityType in ["number", "input_number"]:
-            icon_id = get_icon_id_ha("number", overwrite=icon)
+            icon_id = get_icon_id_ha("number", state=entity.state, overwrite=icon)
             min_v = entity.attributes.get("min", 0)
             max_v = entity.attributes.get("max", 100)
             return f"~number~{entityId}~{icon_id}~17299~{name}~{entity.state}|{min_v}|{max_v}"
         if entityType == "input_text":
-            icon_id = get_icon_id_ha("input_text", overwrite=icon)
+            icon_id = get_icon_id_ha("input_text", state=entity.state, overwrite=icon)
             value = entity.state
             return f"~text~{entityId}~{icon_id}~17299~{name}~{value}"
+        if entityType == "input_select":
+            icon_id = get_icon_id_ha("button", state=entity.state, overwrite=icon)
+            text = entity.state
+            return f"~button~{entityId}~{icon_id}~17299~{name}~{text}"
         return f"~text~{entityId}~{get_icon_id('alert-circle-outline')}~17299~unsupported~"
 
     def generate_entities_page(self, navigation, heading, items, cardType):

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

@@ -24,8 +24,8 @@ class NsPanelLovelaceUIManager(hass.Hass):
 
         controller = LuiController(self, cfg, send_mqtt_msg)
         
-        desired_display_firmware_version = 39
+        desired_display_firmware_version = 38
-        version     = "v3.2.0"
+        version     = "v3.1.0"
         
         model       = cfg.get("model")
         if model == "us-l":

docs/card-entities.md

@@ -31,11 +31,13 @@ List of supported entitiy types for this page:
 - sensor
 - button
 - number
+- input_number
 - scenes
 - script
 - input_button
 - light
 - input_text (read-only)
+- input_select
 - lock
 - fan
 - automation

docs/card-grid.md

@@ -37,11 +37,14 @@ List of supported entitiy types for this page:
 - sensor
 - button
 - number
+- input_number
 - scenes
 - script
 - input_button
 - light
 - input_text (read-only)
+- input_select
 - lock
+- fan
 - automation
 - iText

docs/card-qr.md

@@ -36,6 +36,7 @@ List of supported entitiy types for this page:
 - scenes
 - script
 - input_button
+- input_select
 - light
 - input_text (read-only)
 - lock

docs/config-overview.md

@@ -58,6 +58,7 @@ key | optional | type | default | description
 `sleepBrightness` | True | integer/complex | `20` | Brightness for the screen on the screensaver, see example below for complex/scheduled config.
 `screenBrightness` | True | integer/complex | `100` | Brightness for the screen during usage, config format is the same as sleepBrightness.
 `sleepTracking` | True | string | None | Forces screensaver brightness to 0 in case entity state is not_home or off, can be a group, person or device_tracker entity.
+`sleepTrackingZones` | True | list | `["not_home", "off"]` | Allows you to set your own states for sleepTracking
 `sleepOverride` | True | complex | None | Allows overriding of the sleepBrightness if entity state is on, true or home. Overrides sleepBrightness but sleepTracking takes precedence.
 `locale` | True | string | `en_US` | Used by babel to determinante Date format on screensaver, also used for localization.
 `dateFormatBabel` | True | string | `full` | formatting options on https://babel.pocoo.org/en/latest/dates.html?highlight=name%20of%20day#date-fields

docs/notifications.md

@@ -14,7 +14,7 @@ It is possible to exit from the page by sending `exitPopup`
   
 Send Message to the Panel combined with a buzzer sound:
    
-```
+ ```
 nspanel_popup_notification:
   alias: Popup Notification
   sequence:
@@ -25,11 +25,11 @@ nspanel_popup_notification:
         title }}~65535~~~~~{{ message }}~65535~{{ timeout }}; Buzzer 2,2,2
   mode: single
   icon: mdi:message-badge
-```
+ ```
 
 Send Message to the Panel:
    
-```
+ ```
 nspanel_popup_notification:
   alias: Popup Notification
   sequence:
@@ -40,7 +40,7 @@ nspanel_popup_notification:
         title }}~65535~~~~~{{ message }}~65535~{{ timeout }}
   mode: single
   icon: mdi:message-badge
-```
+ ```
 
 
 ## Notification on screensaver
@@ -50,7 +50,7 @@ The screensaver can display Notifications by sending this command to the CustomS
 
 Send Message to the Screensaver combined with a buzzer sound:
    
-```
+ ```
 nspanel_screensaver_notification:
   alias: Screensaver Notification
   sequence:
@@ -60,11 +60,11 @@ nspanel_screensaver_notification:
       payload: CustomSend notify~{{ heading }}~{{ message }}; Buzzer 2,2,2
   mode: single
   icon: mdi:message-badge
-```
+ ```
 
 Send Message to the Screensaver:
    
-```
+ ```
 nspanel_screensaver_notification:
   alias: Screensaver Notification
   sequence:
@@ -74,5 +74,5 @@ nspanel_screensaver_notification:
       payload: CustomSend notify~{{ heading }}~{{ message }}
   mode: single
   icon: mdi:message-badge
-```
+ ```