From 0629f70d30879112fe65af0413c3fa3e31b69bed Mon Sep 17 00:00:00 2001
From: Johannes Braun <johannes@braun-rheingau.de>
Date: Tue, 22 Mar 2022 19:00:22 +0100
Subject: [PATCH] inital support for alternating icons

---
 HMI/code_gen/icons/icons.py                   |   5 +-
 HMI/icons.md                                  |   1 +
 HMI/nspanel.HMI                               | Bin 7356153 -> 7356153 bytes
 HMI/nspanel.tft                               | Bin 6290520 -> 6290520 bytes
 .../{icon_mapper.py => icon_mapping.py}       |   1 +
 apps/nspanel-lovelace-ui/icons.py             |  64 ++++++++++++++
 .../nspanel-lovelace-ui.py                    |  81 ++++++------------
 7 files changed, 96 insertions(+), 56 deletions(-)
 rename apps/nspanel-lovelace-ui/{icon_mapper.py => icon_mapping.py} (97%)
 create mode 100644 apps/nspanel-lovelace-ui/icons.py

diff --git a/HMI/code_gen/icons/icons.py b/HMI/code_gen/icons/icons.py
index 36799533..66b58967 100644
--- a/HMI/code_gen/icons/icons.py
+++ b/HMI/code_gen/icons/icons.py
@@ -39,7 +39,8 @@ icons = [
     "battery-medium",
     "shield-home",
     "door-open",
-    "door-closed"
+    "door-closed",
+    "window-closed"
 ]
 
 
@@ -65,7 +66,7 @@ for icon_name in icons:
         icon_name_list.append(icon_name)
 
 # write mapping lib for python
-with open(os.path.join(__location__, "../../../apps/nspanel-lovelace-ui", "icon_mapper.py"), 'w') as f:
+with open(os.path.join(__location__, "../../../apps/nspanel-lovelace-ui", "icon_mapping.py"), 'w') as f:
     f.write("icons = {\n")
     for idx, val in enumerate(icon_name_list):
         f.write(f"    '{val}': {idx},\n")
diff --git a/HMI/icons.md b/HMI/icons.md
index cf100a2d..6fd39e90 100644
--- a/HMI/icons.md
+++ b/HMI/icons.md
@@ -42,3 +42,4 @@ ID | MD Icon Name | Icon
 35 | shield-home | ![shield-home](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/shield-home.svg)
 36 | door-open | ![door-open](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/door-open.svg)
 37 | door-closed | ![door-closed](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/door-closed.svg)
+38 | window-closed | ![window-closed](https://raw.githubusercontent.com/Templarian/MaterialDesign-SVG/0aeb4d612644d80d9d1fe242f705f362985de5dc/svg/window-closed.svg)
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index f02d81a7bb27ee878f21c53807b626e4b2c0cc29..509f630d2748b27fbd47ce480d138be62b89f36d 100644
GIT binary patch
delta 807
zcmdVWNl#Nz7{>AU_O_6lNW#GaRhgX_D<E^rV5?G8K#{2;*n%=cVaJv!P1rW!hEKqP
zNFb7QMben)4!3Mgj9cT1Fo%C5ZukbA<d^g2eUg(W=jbe^A7SfM)21S4T6(7Jg+zj5
z(@tM&i(H=h?PLj9M6^hm<yV_HXM+Ee_<inFvScSk?Uii7t0c@`;=b}Se(bK>#N4nL
zy-GH%Uj}tgg0&>;`$^=d;aH3r;h3Sp0v%S^kPwX-iSEPe(6Z@ZDS1aNcy0B6J;!0Q
z!KeCC#Tx%A5m%DPivDl@w!Z08H?(DQet$B}Tyd$8{%7^GIXj$Uk0!a*Tw>JGta3GT
zX20rjIN(=E!A;naiZrCdfm^tZJIFvLvXG4&<RTAuaS!+L01uIm0u-VM#VCOjk5Gy-
zlq24y0+pyjHEK|cI=J9QJsQx6COm-$UOdG!JV!HpXu%7-#4EI-4efZ1H|W4ybfOF0
r=s_?1c!xf`M?VJe0RaRth#`E$Ck$f*qZq?DCNPO9Oh*I$(Aw_{lOp{9

delta 824
zcmdVW%T7~K6vpwrds;{%kh8Je1iSzuc&S`$u~HRVF69nZMWkwridF$(z|1rSNopM0
z!HI9+Py)%GXmaoYm@+aU`U*rL0mHuuOnd`Y^2_?NS5~sJclT{$7hm_J6xn@QRxKSu
z%p{Vt-pF9DIIP7LQ^a`}*=EP@p@4TTaWu*Ge_kb)J%pU~s7TvUvGM(bOIV*AOJOCn
zQwW)x{kIp0D3S84P8y*+=g;()&)F?^`Fq=)vE3357;wUcJZ-!4gFDCJ%8ozF=9*dx
zThRia(&-;&m9*wI{jEAauEq?P>>1roS(&h!sQ7E}EmTXP5FZcoH<N6cDPOzxcdGRh
z@}0G~IbCWMji{tGKUM6}g+aBDpV2XeVw{8rB`8H1%29z+s6-X2aT;fE7UxidTGZh@
z>Tv-LXv9Ta!ev~67gy1QX0)Ic*WiO6ZMcpAZlE1O+{7*1MhEU7gfKeMg>Lj9f?o8Y
z9|IV~5QZ^=QQSoo_i!H%FouU1$0JN2hR1k<r-&ngNj$@IyucJ*;uVs3jW?La3}&^C
Iy$$_305{ViHUIzs

diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index 8b559f71d2d593390f550d6721dd3127e7a88471..3f3364025e3441a378bcb9bb82ffe3902357133d 100644
GIT binary patch
delta 248
zcmWN=HBJNp006)o?s~YpySuyla@bcWCZV9A0PYpke1M*o2T(&nLkJ1%B=h$Dm+%(8
z7Lg!Pl4L1TrAe0|Q<iKwa^=ZapioqiVkJtIDOaIVm1;F=)v4E@QIlpZTD57{p;MP`
zJ$m)&H(=0^VIxM388>0llxZ_&&6&4g(UN5=R;^jLVbhjvJ9h2aci_;GV<-2)XX3}>
wQ@lG8EI<4Plkv0LSTugUAEe#fMS}2YI2Jw&pNB8Pm(O>RtCydo*Y~gfe{7mvr2qf`

delta 230
zcmWN=MNUIe006-JQrz8&JH@rQOL3?8Rai{I1)6XauF@m0f-MOPc#}--=P#BEUqxc_
z#N{hcs7SFArOK46P^n6_8nx=wYtX1kvlguq+O+G?sY|yWz54VUFlflIq!FXWjGHiN
z%Cs4?=FCf3uxQD$6|2^)+puZNwjI0n>`Oav=*Y1Xr_P+aaOujm8@Jia_j@wRq~B6e
ZCcF#p!-w!Od<vgGQqfD|H}2~*`wy|SQbzy)

diff --git a/apps/nspanel-lovelace-ui/icon_mapper.py b/apps/nspanel-lovelace-ui/icon_mapping.py
similarity index 97%
rename from apps/nspanel-lovelace-ui/icon_mapper.py
rename to apps/nspanel-lovelace-ui/icon_mapping.py
index 49cfa8cc..808ea06e 100644
--- a/apps/nspanel-lovelace-ui/icon_mapper.py
+++ b/apps/nspanel-lovelace-ui/icon_mapping.py
@@ -37,6 +37,7 @@ icons = {
     'shield-home': 35,
     'door-open': 36,
     'door-closed': 37,
+    'window-closed': 38,
 }
 
 def get_icon_id(ma_name):
diff --git a/apps/nspanel-lovelace-ui/icons.py b/apps/nspanel-lovelace-ui/icons.py
new file mode 100644
index 00000000..d7734d96
--- /dev/null
+++ b/apps/nspanel-lovelace-ui/icons.py
@@ -0,0 +1,64 @@
+from icon_mapping import get_icon_id
+
+weather_mapping = {
+    'clear-night': 'weather-night',
+    'cloudy': 'weather-cloudy',
+    'exceptional': 'alert-circle-outline',
+    'fog': 'weather-fog',
+    'hail': 'weather-hail',
+    'lightning': 'weather-lightning',
+    'lightning-rainy': 'weather-lightning-rainy',
+    'partlycloudy': 'weather-partly-cloudy',
+    'pouring': 'weather-pouring',
+    'rainy': 'weather-rainy',
+    'snowy': 'weather-snowy',
+    'snowy-rainy': 'weather-snowy-rainy',
+    'sunny': 'weather-sunny',
+    'windy': 'weather-windy',
+    'windy-variant': 'weather-windy-variant'
+}
+
+sensor_mapping_on = {
+    "door": "door-open",
+}
+
+sensor_mapping_off = {
+    "door": "door-closed",
+}
+
+sensor_mapping = {
+    "temperature": "thermometer",
+    "power": "flash"    
+}
+
+
+def map_to_mdi_name(ha_type, state=None, device_class=None):
+    if ha_type == "weather":
+        return weather_mapping[state] if state in weather_mapping else "alert-circle-outline"
+    if ha_type == "button":
+        return "gesture-tap-button"
+    if ha_type == "scene":
+        return "palette"
+    if ha_type == "switch":
+        return "flash"
+    if ha_type == "light":
+        return "lightbulb"
+    if ha_type == "input_boolean":
+        return "check-circle-outline" if entity.state == "on" else "close-circle-outline"
+    if ha_type == "cover":
+        return "window-open" if entity.state == "open" else "window-closed"
+
+    elif ha_type == "sensor":
+        if state == "on":
+            return sensor_mapping_on[device_class] if device_class in sensor_mapping_on else "alert-circle-outline"
+        elif state == "off":
+            return sensor_mapping_off[device_class] if device_class in sensor_mapping_off else "alert-circle-outline"
+        else:
+            return sensor_mapping[device_class] if device_class in sensor_mapping else "alert-circle-outline"
+
+    return "alert-circle-outline"
+
+def get_icon_id_ha(ha_name, state=None, device_class=None, overwrite=None):
+    if overwrite is not None:
+        return get_icon_id(overwrite)
+    return get_icon_id(map_to_mdi_name(ha_name, state, device_class))
diff --git a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
index 9d05e121..d8dae95d 100644
--- a/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
+++ b/apps/nspanel-lovelace-ui/nspanel-lovelace-ui.py
@@ -2,8 +2,8 @@ import json
 import datetime
 import hassapi as hass
 from helper import scale, pos_to_color, rgb_dec565, rgb_brightness
-from icon_mapper import get_icon_id
-
+from icon_mapping import get_icon_id
+from icons import get_icon_id_ha
 # check Babel
 import importlib
 babel_spec = importlib.util.find_spec("babel")
@@ -320,43 +320,30 @@ class LovelaceUIPanel:
     we = self.api.get_entity(self.config["weatherEntity"])
     unit = "°C"
 
-    # this maps possible states from ha to material design icon names
-    weathericons = {
-      'clear-night': 'weather-night',
-      'cloudy': 'weather-cloudy',
-      'exceptional': 'alert-circle-outline',
-      'fog': 'weather-fog',
-      'hail': 'weather-hail',
-      'lightning': 'weather-lightning',
-      'lightning-rainy': 'weather-lightning-rainy',
-      'partlycloudy': 'weather-partly-cloudy',
-      'pouring': 'weather-pouring',
-      'rainy': 'weather-rainy',
-      'snowy': 'weather-snowy',
-      'snowy-rainy': 'weather-snowy-rainy',
-      'sunny': 'weather-sunny',
-      'windy': 'weather-windy',
-      'windy-variant': 'weather-windy-variant'
-    }
+    icon_cur        = get_icon_id_ha("weather", state=we.state)
+    text_cur        = f"{we.attributes.temperature}{unit}"
+    icon_cur_detail = get_icon_id("water-percent")
+    text_cur_detail = f"{we.attributes.humidity} %"
 
-    i1 = get_icon_id(weathericons[we.attributes.forecast[0]['condition']])
-    u1 = we.attributes.forecast[0]['temperature']
-    i2 = get_icon_id(weathericons[we.attributes.forecast[1]['condition']])
-    u2 = we.attributes.forecast[1]['temperature']
+    up1   = we.attributes.forecast[0]['datetime']
+    up1   = datetime.datetime.fromisoformat(up1)
+    icon1 = get_icon_id_ha("weather", state=we.attributes.forecast[0]['condition'])
+    down1 = we.attributes.forecast[0]['temperature']
+
+    up2   = we.attributes.forecast[1]['datetime']
+    up2   = datetime.datetime.fromisoformat(up2)
+    icon2 = get_icon_id_ha("weather", state=we.attributes.forecast[1]['condition'])
+    down2 = we.attributes.forecast[1]['temperature']
 
-    o1 = we.attributes.forecast[0]['datetime']
-    o1 = datetime.datetime.fromisoformat(o1)
-    o2 = we.attributes.forecast[1]['datetime']
-    o2 = datetime.datetime.fromisoformat(o2)
     global babel_spec
     if babel_spec is not None:
-      o1 = babel.dates.format_date(o1, "E", locale=self.config["locale"])
-      o2 = babel.dates.format_date(o2, "E", locale=self.config["locale"])
+      up1 = babel.dates.format_date(up1, "E", locale=self.config["locale"])
+      up2 = babel.dates.format_date(up2, "E", locale=self.config["locale"])
     else:
-      o1 = o1.strftime("%a")
-      o2 = o2.strftime("%a")
+      up1 = up1.strftime("%a")
+      up2 = up2.strftime("%a")
 
-    self.send_mqtt_msg(f"weatherUpdate,?{get_icon_id(weathericons[we.state])}?{we.attributes.temperature}{unit}?{26}?{we.attributes.humidity} %?{o1}?{i1}?{u1}?{o2}?{i2}?{u2}")
+    self.send_mqtt_msg(f"weatherUpdate,?{icon_cur}?{text_cur}?{icon_cur_detail}?{text_cur_detail}?{up1}?{icon1}?{down1}?{up2}?{icon2}?{down2}")
 
 
   def handle_button_press(self, entity_id, btype, optVal=None):
@@ -474,48 +461,34 @@ class LovelaceUIPanel:
     name = entity.attributes.friendly_name
 
     if item_type == "cover":
-      icon_id = get_icon_id('window-open') if icon is None else get_icon_id(icon)
+      icon_id = get_icon_id_ha("cover", state=entity.state overwrite=icon)
       return f",shutter,{item},{icon_id},17299,{name},"
 
     if item_type == "light":
       switch_val = 1 if entity.state == "on" else 0
       icon_color = self.getEntityColor(entity)
-      icon_id = get_icon_id('lightbulb') if icon is None else get_icon_id(icon)
+      icon_id = get_icon_id_ha("light", overwrite=icon)
       return f",{item_type},{item},{icon_id},{icon_color},{name},{switch_val}"
 
     if item_type == "switch" or item_type == "input_boolean":
+      icon_id = get_icon_id_ha(item_type, overwrite=icon)
       switch_val = 1 if entity.state == "on" else 0
-      icon_id = get_icon_id('flash') if icon is None else get_icon_id(icon)
       icon_color = self.getEntityColor(entity)
-      if item_type == "input_boolean":
-        icon_id = get_icon_id("check-circle-outline") if switch_val == 1 else get_icon_id("close-circle-outline")
       return f",switch,{item},{icon_id},{icon_color},{name},{switch_val}"
 
     if item_type in ["sensor", "binary_sensor"]:
-      # maps ha device classes to material design icons
-      icon_mapping = {
-        "temperature": "thermometer",
-        "power": "flash"
-      }
-      if "device_class" in entity.attributes:
-        if entity.attributes.device_class in icon_mapping:
-          icon_id = icon_mapping[entity.attributes.device_class]
-        else:
-          self.api.log("No Icon found for device_class: %s. Please open a issue on github to report the missing mapping.", entity.attributes.device_class)
-          icon_id = get_icon_id('alert-circle-outline')
-      else:
-        icon_id = get_icon_id('alert-circle-outline')
-      
+      device_class = self.get_safe_ha_attribute(entity.attributes, "device_class", "")
+      icon_id = get_icon_id_ha("sensor", state=entity.state, device_class=device_class, overwrite=icon)
       unit_of_measurement = self.get_safe_ha_attribute(entity.attributes, "unit_of_measurement", "")
       value = entity.state + " " + unit_of_measurement
       return f",text,{item},{icon_id},17299,{name},{value}"
 
     if item_type in ["button", "input_button"]:
-      icon_id = get_icon_id('gesture-tap-button') if icon is None else get_icon_id(icon)
+      icon_id = get_icon_id_ha("button", overwrite=icon)
       return f",button,{item},{icon_id},17299,{name},PRESS"
     
     if item_type == "scene":
-      icon_id = get_icon_id('palette') if icon is None else get_icon_id(icon)
+      icon_id = get_icon_id_ha("scene", overwrite=icon)
       return f",button,{item},{icon_id},17299,{name},ACTIVATE"
 
   def generate_entities_page(self, items):