From ba6bbeb341871eb59e3477d7ede10a673f287145 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Thu, 2 Feb 2023 20:29:08 +0100 Subject: [PATCH] remove unneeded paramters in weather update --- HMI/code_gen/pages/out.txt | 49 +++++++++++++++++++ HMI/code_gen/pages/screensaver.py | 4 +- HMI/code_gen/pages/screensaver2.py | 49 +++++++++++++++++++ HMI/nspanel.HMI | Bin 9475267 -> 9475267 bytes HMI/nspanel.tft | Bin 8202164 -> 8206624 bytes apps/nspanel-lovelace-ui/luibackend/pages.py | 15 ++++-- 6 files changed, 110 insertions(+), 7 deletions(-) diff --git a/HMI/code_gen/pages/out.txt b/HMI/code_gen/pages/out.txt index d0a5f85e..fcffd81e 100644 --- a/HMI/code_gen/pages/out.txt +++ b/HMI/code_gen/pages/out.txt @@ -246,6 +246,55 @@ if(usize>1) covx tTmp.txt,f5Icon.pco,0,0 } + + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") + { + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,tTime.bco,0,0 + if(tTime.bco!=screensaver.bco) + { + for(sys0=0;sys0<60;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) + { + b[sys0].bco=tTime.bco + } + } + } + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,tTime.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",3 + covx tTmp.txt,tAMPM.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",4 + covx tTmp.txt,tDate.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,tMainText.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",6 + //covx tTmp.txt,tForecast1.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",7 + //covx tTmp.txt,tForecast2.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",8 + //covx tTmp.txt,tForecast3.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",9 + //covx tTmp.txt,tForecast4.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",10 + //covx tTmp.txt,tForecast1Val.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",11 + //covx tTmp.txt,tForecast2Val.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",12 + //covx tTmp.txt,tForecast3Val.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",13 + //covx tTmp.txt,tForecast4Val.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",14 + //covx tTmp.txt,t10.bco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",15 + //covx tTmp.txt,tMainTextAlt2.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",16 + //covx tTmp.txt,tTimeAdd.pco,0,0 + } + + + if(tInstruction.txt=="notify") { spstr strCommand.txt,tNotifyHead.txt,"~",1 diff --git a/HMI/code_gen/pages/screensaver.py b/HMI/code_gen/pages/screensaver.py index e8bb24ca..a391792c 100644 --- a/HMI/code_gen/pages/screensaver.py +++ b/HMI/code_gen/pages/screensaver.py @@ -202,9 +202,7 @@ head = head + """ covx tTmp.txt,t10.bco,0,0 spstr strCommand.txt,tTmp.txt,"~",15 covx tTmp.txt,tMainTextAlt2.pco,0,0 - //spstr strCommand.txt,tTmp.txt,"~",16 - //covx tTmp.txt,tMR.pco,0,0 - spstr strCommand.txt,tTmp.txt,"~",17 + spstr strCommand.txt,tTmp.txt,"~",16 covx tTmp.txt,tTimeAdd.pco,0,0 if(tMainTextAlt2.txt!=""&&p0.w!=320) { diff --git a/HMI/code_gen/pages/screensaver2.py b/HMI/code_gen/pages/screensaver2.py index 7b61c929..0bf92912 100644 --- a/HMI/code_gen/pages/screensaver2.py +++ b/HMI/code_gen/pages/screensaver2.py @@ -126,6 +126,55 @@ for i in range(1,6): head = head + """ } + + if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") + { + spstr strCommand.txt,tTmp.txt,"~",1 + covx tTmp.txt,tTime.bco,0,0 + if(tTime.bco!=screensaver.bco) + { + for(sys0=0;sys0<60;sys0++) + { + if(b[sys0].type==98||b[sys0].type==116||b[sys0].type==54) + { + b[sys0].bco=tTime.bco + } + } + } + spstr strCommand.txt,tTmp.txt,"~",2 + covx tTmp.txt,tTime.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",3 + covx tTmp.txt,tAMPM.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",4 + covx tTmp.txt,tDate.pco,0,0 + spstr strCommand.txt,tTmp.txt,"~",5 + covx tTmp.txt,tMainText.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",6 + //covx tTmp.txt,tForecast1.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",7 + //covx tTmp.txt,tForecast2.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",8 + //covx tTmp.txt,tForecast3.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",9 + //covx tTmp.txt,tForecast4.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",10 + //covx tTmp.txt,tForecast1Val.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",11 + //covx tTmp.txt,tForecast2Val.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",12 + //covx tTmp.txt,tForecast3Val.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",13 + //covx tTmp.txt,tForecast4Val.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",14 + //covx tTmp.txt,t10.bco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",15 + //covx tTmp.txt,tMainTextAlt2.pco,0,0 + //spstr strCommand.txt,tTmp.txt,"~",16 + //covx tTmp.txt,tTimeAdd.pco,0,0 + } + + + if(tInstruction.txt=="notify") { spstr strCommand.txt,tNotifyHead.txt,"~",1 diff --git a/HMI/nspanel.HMI b/HMI/nspanel.HMI index 1fc77f71298db1341df728d75cdc765f09674d5e..04dcbeb74a57182010969ad9f047c650081b5e8b 100644 GIT binary patch delta 3459 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 bs89yw;DA-I8lHy=SOYIWrLcFbUGduAv-<9M diff --git a/HMI/nspanel.tft b/HMI/nspanel.tft index 55d7bf5331154c223092b7b1921ef658df1ada5b..324435793a235c3fd2e457944ecffd034bd6c41c 100644 GIT binary patch delta 17366 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 J%wrGS{tx_>{^bAw delta 17242 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 z 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 diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 06c3a56e..954bbcb6 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -141,8 +141,8 @@ class LuiPagesGen(object): item_str = "" for item in entities: - item_str += self.generate_entities_item(item, "cardEntities") - + item_str += self.generate_entities_item(item, "cardEntities", mask=["type", "entityId"]) + self._send_mqtt_msg(f"weatherUpdate{item_str}") # send color if configured in screensaver if theme is not None: @@ -166,7 +166,7 @@ class LuiPagesGen(object): altfont += "~" self._send_mqtt_msg(f"statusUpdate{status_res}{altfont}") - def generate_entities_item(self, item, cardType="cardGrid", temp_unit=""): + def generate_entities_item(self, item, cardType="cardGrid", temp_unit="", mask=None): entityId = item.entityId icon = item.iconOverride colorOverride = item.colorOverride @@ -393,6 +393,12 @@ class LuiPagesGen(object): # use uuid instead for some types and probably expand on this in future if entityType in ["light"]: entityId = uuid + # remove stuff defined in mask + if mask is not None: + if "type" in mask: + entityTypePanel = "" + if "entityId" in mask: + entityId = "" return f"~{entityTypePanel}~{entityId}~{icon_id}~{color}~{name}~{value}" def generate_entities_page(self, navigation, heading, items, cardType, tempUnit): @@ -608,6 +614,7 @@ class LuiPagesGen(object): icon_color = rgb_dec565([243,179,0]) add_btn=f"{iconnav}~{icon_color}~{entity}" + # add padding to arm buttons arm_buttons = "" for b in supported_modes: @@ -723,7 +730,7 @@ class LuiPagesGen(object): item = card.uuid self.generate_unlock_page(navigation, item, card.title, destination, pin) return - if card.cardType == "screensaver": + if card.cardType in ["screensaver", "screensaver2"]: theme = card.raw_config.get("theme") self.update_screensaver_weather(theme) self.update_status_icons()