h3n3/nspanel-lovelace-ui
1
0
Fork 0
mirror of https://github.com/joBr99/nspanel-lovelace-ui.git synced 2025-12-23 16:04:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor

Browse Source
This commit is contained in:
Johannes
2022-05-23 15:35:11 +02:00
parent 20b9c6e2a3
commit 6c97b814a9
2 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/nspanel-lovelace-ui/luibackend/pages.py
View File

@@ -131,9 +131,7 @@ class LuiPagesGen(object):
# send color if configured in screensaver # send color if configured in screensaver
theme = self._config.get("theme") theme = self._config.get("theme")
if theme is not None: if theme is not None:
if "AutoWeather" in theme and theme["AutoWeather"] == "auto": if not ("AutoWeather" in theme and theme["AutoWeather"] == "auto"):
# do nothing
else:
state = None state = None
self._send_mqtt_msg(get_screensaver_color_output(theme=theme, state=state)) self._send_mqtt_msg(get_screensaver_color_output(theme=theme, state=state))

37
apps/nspanel-lovelace-ui/luibackend/theme.py
View File

@@ -2,25 +2,25 @@
from helper import rgb_dec565 from helper import rgb_dec565
default_screensaver_color_mapping = { default_screensaver_color_mapping = {
#"item": "color in decimal RGB565 (1-65535)" #"item": "color in decimal RGB565 (0-65535)"
"background": "0", "background": "0",
"time": "65535", "time": "65535",
"timeAMPM": "65535", "timeAMPM": "65535",
"date": "65535", "date": "65535",
"tMainIcon": "65535", "tMainIcon": "65535",
"tMainText": "65535", "tMainText": "65535",
"tForecast1": "65535", "tForecast1": "65535",
"tForecast2": "65535", "tForecast2": "65535",
"tForecast3": "65535", "tForecast3": "65535",
"tForecast4": "65535", "tForecast4": "65535",
"tF1Icon": "65535", "tF1Icon": "65535",
"tF2Icon": "65535", "tF2Icon": "65535",
"tF3Icon": "65535", "tF3Icon": "65535",
"tF4Icon": "65535", "tF4Icon": "65535",
"tForecast1Val": "65535", "tForecast1Val": "65535",
"tForecast2Val": "65535", "tForecast2Val": "65535",
"tForecast3Val": "65535", "tForecast3Val": "65535",
"tForecast4Val": "65535", "tForecast4Val": "65535",
"bar": "65535", "bar": "65535",
"tMainIconAlt": "65535", "tMainIconAlt": "65535",
"tMainTextAlt": "65535", "tMainTextAlt": "65535",
@@ -29,7 +29,7 @@ default_screensaver_color_mapping = {
} }
default_weather_icon_color_mapping = { default_weather_icon_color_mapping = {
#"item-per HA" "color in decimal RGB 565 (1-65535)" #"item-per HA" "color in decimal RGB 565 (0-65535)"
"clear-night": "35957", #50% grey "clear-night": "35957", #50% grey
"cloudy": "31728", #grey-blue "cloudy": "31728", #grey-blue
"exceptional": "63488", #red "exceptional": "63488", #red
@@ -38,7 +38,7 @@ default_weather_icon_color_mapping = {
"lightning": "65120", #golden-yellow "lightning": "65120", #golden-yellow
"lightning-rainy": "50400", #dark-golden-yellow "lightning-rainy": "50400", #dark-golden-yellow
"partlycloudy": "35957", #50% grey "partlycloudy": "35957", #50% grey
"pouring": "249", #blue "pouring": "249", #blue
"rainy": "33759", #light-blue "rainy": "33759", #light-blue
"snowy": "65535", #white "snowy": "65535", #white
"snowy-rainy": "44479", #light-blue-grey "snowy-rainy": "44479", #light-blue-grey
@@ -60,11 +60,10 @@ def map_color(key, theme, state=None):
config_color = rgb_dec565(theme[key]) config_color = rgb_dec565(theme[key])
# Use Autocolouring for weather # Use Autocolouring for weather
elif state is not None: elif state is not None:
if key == "tMainIcon" or key == "tF1Icon" or key == "tF2Icon" or key == "tF3Icon" or key == "tF4Icon": if key in ["tMainIcon", "tF1Icon", "tF2Icon", "tF3Icon", "tF4Icon"]:
config_color = map_weather_icon_color(key=key, state=state) config_color = map_weather_icon_color(key=key, state=state)
return config_color return config_color
def map_weather_icon_color(key, state): def map_weather_icon_color(key, state):
if state[key] in default_weather_icon_color_mapping: if state[key] in default_weather_icon_color_mapping:
config_color = default_weather_icon_color_mapping[state[key]] config_color = default_weather_icon_color_mapping[state[key]]