diff --git a/HMI/README.md b/HMI/README.md index 164155c8..39763e8e 100644 --- a/HMI/README.md +++ b/HMI/README.md @@ -348,7 +348,7 @@ Example alternative layout: `weatherUpdate~~~A~21130~~-0.7C~~~B~63469~Sat~3.6C~~ -`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` @@ -493,14 +493,6 @@ Example alternative layout: `weatherUpdate~~~A~21130~~-0.7C~~~B~63469~Sat~3.6C~~ - - - - - - - - diff --git a/HMI/US/landscape/nspanel_US_L.HMI b/HMI/US/landscape/nspanel_US_L.HMI index f2e98f11..63b11fd0 100644 Binary files a/HMI/US/landscape/nspanel_US_L.HMI and b/HMI/US/landscape/nspanel_US_L.HMI differ diff --git a/HMI/US/landscape/nspanel_US_L.tft b/HMI/US/landscape/nspanel_US_L.tft index 5edf5db8..8c5be27c 100644 Binary files a/HMI/US/landscape/nspanel_US_L.tft and b/HMI/US/landscape/nspanel_US_L.tft differ diff --git a/HMI/US/portrait/nspanel_US_P.HMI b/HMI/US/portrait/nspanel_US_P.HMI index 0217bc82..66c35039 100644 Binary files a/HMI/US/portrait/nspanel_US_P.HMI and b/HMI/US/portrait/nspanel_US_P.HMI differ diff --git a/HMI/US/portrait/nspanel_US_P.tft b/HMI/US/portrait/nspanel_US_P.tft index 54980fe9..77d3e7a0 100644 Binary files a/HMI/US/portrait/nspanel_US_P.tft and b/HMI/US/portrait/nspanel_US_P.tft differ diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index e2888c8c..603f11bc 100644 Binary files a/HMI/nspanel.HMI and b/HMI/nspanel.HMI differ diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index ac622cc5..dcd12b5a 100644 Binary files a/HMI/nspanel.tft and b/HMI/nspanel.tft differ diff --git a/apps/nspanel-lovelace-ui/luibackend/theme.py b/apps/nspanel-lovelace-ui/luibackend/theme.py index 319b0986..67ced04a 100644 --- a/apps/nspanel-lovelace-ui/luibackend/theme.py +++ b/apps/nspanel-lovelace-ui/luibackend/theme.py @@ -17,8 +17,7 @@ default_screensaver_color_mapping = { "tForecast3Val": "65535", "tForecast4Val": "65535", "bar": "65535", - "tMRIcon": "65535", - "tMR": "65535", + "tMainTextAlt2": "65535", "tTimeAdd": "65535" } diff --git a/docs/config-screensaver.md b/docs/config-screensaver.md index b398b7b3..47b9ba95 100644 --- a/docs/config-screensaver.md +++ b/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:
tMR
17 tTimeAdd