From f901a57dd164751bcf1c8256f5f1025744045c53 Mon Sep 17 00:00:00 2001
From: joBr99 <29555657+joBr99@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:24:40 +0200
Subject: [PATCH] removed additional delimiter for weather

---
 HMI/README.md                                |   2 +-
 HMI/nspanel.HMI                              | Bin 7483127 -> 7483127 bytes
 HMI/nspanel.tft                              | Bin 6307656 -> 6307656 bytes
 apps/nspanel-lovelace-ui/luibackend/pages.py |   4 ++--
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/HMI/README.md b/HMI/README.md
index 06e85daf..3d52fbfa 100644
--- a/HMI/README.md
+++ b/HMI/README.md
@@ -75,7 +75,7 @@ change the page type:
 
 ### screensaver page
 
-`weatherUpdate~? tMainIcon? tMainText? tMRIcon? tMR? tForecast1? tF1Icon? tForecast1Val? tForecast2? tF2Icon? tForecast2Val?tForecast3? tF3Icon? tForecast3Val?tForecast4? tF4Icon? tForecast4Val?optionalLayoutIcon?optionalLayoutText`
+`weatherUpdate~tMainIcon~tMainText~tForecast1~tF1Icon~tForecast1Val~tForecast2~tF2Icon~tForecast2Val~tForecast3~tF3Icon~tForecast3Val~tForecast4~tF4Icon~tForecast4Val~optionalLayoutIcon~optionalLayoutText`
 
 ### cardEntities Page
 
diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI
index a381ede31a48abf6814b95f5a77f7050fbed90f5..78e6b7061e162a47a711da0379d6088d65edea12 100644
GIT binary patch
delta 770
zcmd6hNl%ke6o$V`3q=A6&}zkk6&x4@I!~ggI4cee4ro!qsoINz3l}U<^f8#IQG(%;
z=*EQ!J8?+9jROt~_a<)C1lO(&nwaQqKSKNo-sD-l_dI#enf>~~HmeccqrxltMl0RI
zc#`N4!Wg?P+(JBiB)pD9tg*kx_~#7{r;YNP`s3AO!+7~8w{zlqPB!bW@j_|TISfO*
z*0Zs1`I(Ym`5s|^TGaM&Y-U0DTB=|qRUkAu8k@$h$<^eUsRGBukN@cwiYcKKCoUGU
z2seu<V+kJ0sbDEymQhI+%UQunR#8n2wbZeidKzfNho1mJLWGGBB}SYCYiMFE>u6>@
z8`ww-o7l`2wz7@w>|iImXk|Bh*vmfJXs3ft_H%%P9HNWE93e?JM>)oEdg$c@CppDw
z&XD3P=bonrhwWc%Kd+nbo$^zenz@&>t9MtErE01{eilROR-?ROAF8SksZqDfrRse$
zo{3@gW-?u)?)v2YOpK_KkgQOxerp=F<Og#xmX*f?mK(R+7XiynSZ-lZ#;xsdJ+9hJ
zv0pt5%CtVAC?vab^^!o)QZI+*R1uoL!mnK6tb8RbFJ*f~WPa!~+at2rp6!UL=Ey+1
sc_$IA&M{}2<nLb9;*eA3WL@82-pI65YWg(iH5WAfngMg#c`@es3x9F`ivR!s

delta 722
zcmci5&r8!`90&04vwhXML)bRka_QW%Txt82U)RhmXRfTwEz4;wf0Wj0&vFKN80;Xu
z!9#SgK~KZ-B1We`62GTtn?DK<Ne~1<uuB)abO{d;^?WnxKj?uMJfHXb`LX%wje3(K
zktt#!!j#oW$h@zcka+q&F%sd$9I=#C3NA-tNcgvs6EPw1KoCfNUGS!VXq1EHrDh_k
ze?EVeE|doEMzxbsE#Xw0niIJqu2_z0OCEju-~XWu+o6LV29#q5j4)v*DqzMgRH6zN
zRKp4zcB2M+uotzkV;}aT4)r(y2b^%h4G#{Y0TLSF#Uc36gu`gY5wzeaj-eHPwBb0~
z5x@zYL<dgcG|r$CXVHZqLO6$RoW}+9AdFu0;UX>}g3IW~00uFHE4YebjNlrsBZ?ci
zxe!ZEh~YIyyIh!|BUS9PKOSKBUeXSdVqd=`dgb?R@pmegy%RC8>LsdS6*=nRU1yFi
zh$&lr18X%I{#4dH^(dLdf;nnpqj{Q9#>T%#nv~JI)s8RG41cF=nTC|qx0R-rX{MNu
zZkK_%pT+ddxk9Cf8#+<tu3=+#YGH#xNyGY|N-b=Cg?1?wv#ru;Wh3WS>A3oLWPQT#
zCT68=a%7E$iR_F>jIhUc>SP0TbY^iw_faLkotIu0vBI#_%zBdXMdt9+ko^4vt?ir4
U>M0lJZgHbrf*X^w`rBUfFZE{tg#Z8m

diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft
index ee95638502b58f2d2912019705a7ff49659e122d..2420f76a123bb944d901882b03f445bc0c161233 100644
GIT binary patch
delta 408
zcmY+7IZpyn6h>zRRB%@i#SL*+Tu?#WMa6w*W_a!~@ekN(;e_HO7ACasH`rO2Q1}OE
zZLRF=?KM8p#^T(YeD~aZ`LB#4ugIWNgaaooiYcKKHy+9;r-DkVsHTQm>hR*D9zP8<
z5}=7@T4<$>Ank<cpp!1T>7kcC`WYb1AVUl@LWEJq7$-`M3F1sL#WXX_GRHg%Bv@pL
zWs<D0${Oozu*nwN?6Auo`y7zMz{Dc`BtB9ymJ+q{-W2sRV2EMemK%oXR_n?Tey1G@
zkIP$Abjn9V1XcR-m&WAhzVJ(jDUyv!ihDIpb301)hZ0Q->sgPQAzNOU!mplgOtIFg
ztVqQ7Ps{yk>M$x3mhifMoUz}&W~<OQYl((J94*8-+Y%SLZr{D7h2l_gq&QZbC{7h;
PxwrKB<-0R`{rdb3jzox~

delta 424
zcmY+7xlRIM6h>zR1>6@D7gR*V4MlKQaKsJ7U1o;gJtV$>rG<v#BzDGbp25yS!z<YO
z26py7fbk!wD9*jfcW&<Y`B!v&N{Xn|;J`^Ob+~Zjp`HdBX`-1HT4|%54!m^Ig^zA}
z=%o)o{R}WjfFXhm6Jmrgql_`m1d~LVVwxy3#E3J?9P=!&$P&w}uu6g?YiO*KVuMY#
z*k*?`8FtCC$36!fa>OwwoRUMwz$E`JesfMO7>QXAh6q``x`?WpmDNR9t~*`$Y&lnv
zZ@LJ`^h>5aGF|X0isEs&)mN9IMATn<1~p4HMB3I%)%v-<q6>!b$tU-Q$PC!MvCgV5
zrOKHUaVupCZ>@bZTj}?k<^H58y36r=IW9e#qM)kU(|2A-&LroO3(2MAN^)KL&fnbr
JI6o3E?thy-gQNfe

diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py
index e2281a48..06a2719a 100644
--- a/apps/nspanel-lovelace-ui/luibackend/pages.py
+++ b/apps/nspanel-lovelace-ui/luibackend/pages.py
@@ -98,9 +98,9 @@ class LuiPagesGen(object):
                 icon = get_icon_id_ha("sensor", state=entity.state, device_class=entity.attributes.get("device_class", ""), overwrite=icon)
                 unit_of_measurement = entity.attributes.get("unit_of_measurement", "")
                 down = f"{entity.state} {unit_of_measurement}"
-            weather_res+=f"?{up}?{icon}?{down}"
+            weather_res+=f"~{up}~{icon}~{down}"
 
-        self._send_mqtt_msg(f"weatherUpdate~?{icon_cur}?{text_cur}{weather_res}")
+        self._send_mqtt_msg(f"weatherUpdate~{icon_cur}~{text_cur}{weather_res}")
 
     def generate_entities_item(self, item):
         icon = None