From 6a60ff2f0566ae10e67a0a9acec0117745b4e18b Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Wed, 14 Dec 2022 23:02:30 +0000 Subject: [PATCH 01/12] fix status icon2 alt font (add nextion2text) --- HMI/US/landscape/diff-eu-version.txt | 26 ----------------- .../n2t-out-visual/nspanel_US_L_Stats.txt | 10 +++---- .../landscape/n2t-out-visual/screensaver.txt | 2 +- HMI/US/landscape/n2t-out/screensaver.txt | 2 +- HMI/US/portrait/diff-eu-version.txt | 26 ----------------- HMI/US/portrait/diff-filtered.txt | 28 +------------------ .../n2t-out-visual/nspanel_US_P_Stats.txt | 10 +++---- .../portrait/n2t-out-visual/screensaver.txt | 2 +- HMI/US/portrait/n2t-out/screensaver.txt | 2 +- HMI/n2t-out-visual/nspanel_Stats.txt | 8 +++--- HMI/n2t-out-visual/screensaver.txt | 21 ++++++++++---- HMI/n2t-out/screensaver.txt | 11 +++++++- 12 files changed, 44 insertions(+), 104 deletions(-) diff --git a/HMI/US/landscape/diff-eu-version.txt b/HMI/US/landscape/diff-eu-version.txt index 5e24bbc9..c05232ca 100644 --- a/HMI/US/landscape/diff-eu-version.txt +++ b/HMI/US/landscape/diff-eu-version.txt @@ -416,29 +416,3 @@ │ Scope : local │ Dragging : 0 │ Disable release event after dragging: 0 -│ @@ -592,15 +563,24 @@ -│ spstr strCommand.txt,tIcon1.txt,"~",17 -│ spstr strCommand.txt,tTmp.txt,"~",18 -│ covx tTmp.txt,tIcon1.pco,0,0 -│ //statusIcon2 -│ spstr strCommand.txt,tIcon2.txt,"~",19 -│ spstr strCommand.txt,tTmp.txt,"~",20 -│ covx tTmp.txt,tIcon2.pco,0,0 -│ - click m0,1 -│ + spstr strCommand.txt,tTmp.txt,"~",21 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ + spstr strCommand.txt,tTmp.txt,"~",22 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ } -│ 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) -│ { diff --git a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt index 15317c5c..8abef057 100644 --- a/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt +++ b/HMI/US/landscape/n2t-out-visual/nspanel_US_L_Stats.txt @@ -22,6 +22,10 @@ popupNotify 19 Component(s) 257 Line(s) of event code 166 Unique line(s) of event code +screensaver + 45 Component(s) + 410 Line(s) of event code + 298 Unique line(s) of event code popupLight 28 Component(s) 408 Line(s) of event code @@ -70,13 +74,9 @@ cardGrid 42 Component(s) 514 Line(s) of event code 293 Unique line(s) of event code -screensaver - 45 Component(s) - 410 Line(s) of event code - 297 Unique line(s) of event code Total 18 Page(s) 626 Component(s) 7881 Line(s) of event code - 1987 Unique line(s) of event code + 1988 Unique line(s) of event code diff --git a/HMI/US/landscape/n2t-out-visual/screensaver.txt b/HMI/US/landscape/n2t-out-visual/screensaver.txt index 1537fc84..5d62206d 100644 --- a/HMI/US/landscape/n2t-out-visual/screensaver.txt +++ b/HMI/US/landscape/n2t-out-visual/screensaver.txt @@ -1147,7 +1147,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt!="") { - tIcon1.font=3 + tIcon2.font=3 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/US/landscape/n2t-out/screensaver.txt b/HMI/US/landscape/n2t-out/screensaver.txt index 84d24e64..97498d07 100644 --- a/HMI/US/landscape/n2t-out/screensaver.txt +++ b/HMI/US/landscape/n2t-out/screensaver.txt @@ -575,7 +575,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt!="") { - tIcon1.font=3 + tIcon2.font=3 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/US/portrait/diff-eu-version.txt b/HMI/US/portrait/diff-eu-version.txt index 5e407aae..a4d3ad3b 100644 --- a/HMI/US/portrait/diff-eu-version.txt +++ b/HMI/US/portrait/diff-eu-version.txt @@ -1197,29 +1197,3 @@ │ Disable release event after dragging: 0 │ Send Component ID : disabled │ Associated Keyboard : none -│ @@ -592,15 +563,24 @@ -│ spstr strCommand.txt,tIcon1.txt,"~",17 -│ spstr strCommand.txt,tTmp.txt,"~",18 -│ covx tTmp.txt,tIcon1.pco,0,0 -│ //statusIcon2 -│ spstr strCommand.txt,tIcon2.txt,"~",19 -│ spstr strCommand.txt,tTmp.txt,"~",20 -│ covx tTmp.txt,tIcon2.pco,0,0 -│ - click m0,1 -│ + spstr strCommand.txt,tTmp.txt,"~",21 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ + spstr strCommand.txt,tTmp.txt,"~",22 -│ + if(tTmp.txt!="") -│ + { -│ + tIcon1.font=3 -│ + } -│ } -│ 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) -│ { diff --git a/HMI/US/portrait/diff-filtered.txt b/HMI/US/portrait/diff-filtered.txt index 0acd9224..27ed50bb 100644 --- a/HMI/US/portrait/diff-filtered.txt +++ b/HMI/US/portrait/diff-filtered.txt @@ -1,4 +1,4 @@ -+++ /dev/fd/62 2022-12-14 22:34:40.980601919 +0000 ++++ /dev/fd/62 2022-12-14 23:02:23.381717287 +0000 +I/n2t-out/Program.s.txt ++ HMI/US/portrait/n2t-out/Program.s.txt +I/n2t-out/cardChart.txt @@ -553,29 +553,3 @@ + Disable release event after dragging: 0 + Send Component ID : disabled + Associated Keyboard : none -+15 +563,24 @@ -+ spstr strCommand.txt,tIcon1.txt,"~",17 -+ spstr strCommand.txt,tTmp.txt,"~",18 -+ covx tTmp.txt,tIcon1.pco,0,0 -+ //statusIcon2 -+ spstr strCommand.txt,tIcon2.txt,"~",19 -+ spstr strCommand.txt,tTmp.txt,"~",20 -+ covx tTmp.txt,tIcon2.pco,0,0 -+ click m0,1 -+ spstr strCommand.txt,tTmp.txt,"~",21 -+ if(tTmp.txt!="") -+ { -+ tIcon1.font=3 -+ } -+ spstr strCommand.txt,tTmp.txt,"~",22 -+ if(tTmp.txt!="") -+ { -+ tIcon1.font=3 -+ } -+ } -+ 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) -+ { diff --git a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt index 71eb75a5..d7ca4b15 100644 --- a/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt +++ b/HMI/US/portrait/n2t-out-visual/nspanel_US_P_Stats.txt @@ -62,6 +62,10 @@ cardMedia 57 Component(s) 660 Line(s) of event code 325 Unique line(s) of event code +screensaver + 45 Component(s) + 410 Line(s) of event code + 298 Unique line(s) of event code cardQR 32 Component(s) 425 Line(s) of event code @@ -70,13 +74,9 @@ cardEntities 77 Component(s) 1395 Line(s) of event code 619 Unique line(s) of event code -screensaver - 45 Component(s) - 410 Line(s) of event code - 297 Unique line(s) of event code Total 18 Page(s) 638 Component(s) 8028 Line(s) of event code - 2024 Unique line(s) of event code + 2025 Unique line(s) of event code diff --git a/HMI/US/portrait/n2t-out-visual/screensaver.txt b/HMI/US/portrait/n2t-out-visual/screensaver.txt index 99aacb6a..58ab401d 100644 --- a/HMI/US/portrait/n2t-out-visual/screensaver.txt +++ b/HMI/US/portrait/n2t-out-visual/screensaver.txt @@ -1147,7 +1147,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt!="") { - tIcon1.font=3 + tIcon2.font=3 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/US/portrait/n2t-out/screensaver.txt b/HMI/US/portrait/n2t-out/screensaver.txt index 1c965b2c..f83c8107 100644 --- a/HMI/US/portrait/n2t-out/screensaver.txt +++ b/HMI/US/portrait/n2t-out/screensaver.txt @@ -575,7 +575,7 @@ Timer tmSerial spstr strCommand.txt,tTmp.txt,"~",22 if(tTmp.txt!="") { - tIcon1.font=3 + tIcon2.font=3 } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") diff --git a/HMI/n2t-out-visual/nspanel_Stats.txt b/HMI/n2t-out-visual/nspanel_Stats.txt index 492ff369..5c582642 100644 --- a/HMI/n2t-out-visual/nspanel_Stats.txt +++ b/HMI/n2t-out-visual/nspanel_Stats.txt @@ -52,8 +52,8 @@ cardPower 299 Unique line(s) of event code screensaver 47 Component(s) - 409 Line(s) of event code - 301 Unique line(s) of event code + 418 Line(s) of event code + 302 Unique line(s) of event code cardQR 32 Component(s) 425 Line(s) of event code @@ -78,5 +78,5 @@ cardEntities Total 18 Page(s) 635 Component(s) - 7875 Line(s) of event code - 2008 Unique line(s) of event code + 7884 Line(s) of event code + 2009 Unique line(s) of event code diff --git a/HMI/n2t-out-visual/screensaver.txt b/HMI/n2t-out-visual/screensaver.txt index 48646c2d..95be178d 100644 --- a/HMI/n2t-out-visual/screensaver.txt +++ b/HMI/n2t-out-visual/screensaver.txt @@ -626,10 +626,10 @@ Text tIcon1 Disable release event after dragging: 0 Send Component ID : disabled Opacity : 127 - x coordinate : 3 + x coordinate : 1 y coordinate : 0 Width : 85 - Height : 40 + Height : 48 Effect : load Effect Priority : 0 Effect Time : 300 @@ -640,7 +640,7 @@ Text tIcon1 Back. Color : 0 Font Color : 17299 Horizontal Alignment : left - Vertical Alignment : center + Vertical Alignment : top Input Type : character Text : Max. Text Size : 10 @@ -659,7 +659,7 @@ Text tIcon2 x coordinate : 365 y coordinate : 0 Width : 85 - Height : 40 + Height : 48 Effect : load Effect Priority : 0 Effect Time : 300 @@ -670,7 +670,7 @@ Text tIcon2 Back. Color : 0 Font Color : 17299 Horizontal Alignment : right - Vertical Alignment : center + Vertical Alignment : top Input Type : character Text : Max. Text Size : 10 @@ -1189,7 +1189,16 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - click m0,1 + spstr strCommand.txt,tTmp.txt,"~",21 + if(tTmp.txt!="") + { + tIcon1.font=3 + } + spstr strCommand.txt,tTmp.txt,"~",22 + if(tTmp.txt!="") + { + tIcon2.font=3 + } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { diff --git a/HMI/n2t-out/screensaver.txt b/HMI/n2t-out/screensaver.txt index 60665bdb..330151d4 100644 --- a/HMI/n2t-out/screensaver.txt +++ b/HMI/n2t-out/screensaver.txt @@ -596,7 +596,16 @@ Timer tmSerial spstr strCommand.txt,tIcon2.txt,"~",19 spstr strCommand.txt,tTmp.txt,"~",20 covx tTmp.txt,tIcon2.pco,0,0 - click m0,1 + spstr strCommand.txt,tTmp.txt,"~",21 + if(tTmp.txt!="") + { + tIcon1.font=3 + } + spstr strCommand.txt,tTmp.txt,"~",22 + if(tTmp.txt!="") + { + tIcon2.font=3 + } } if(tInstruction.txt=="color"&&tNotifyHead.txt==""&&tNotifyText.txt=="") { From 8d370f542c5a03013dd8c4b8e6ff640ca044aa46 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Thu, 15 Dec 2022 00:09:28 +0100 Subject: [PATCH 02/12] fix icon on screensaver --- apps/nspanel-lovelace-ui/luibackend/pages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/pages.py b/apps/nspanel-lovelace-ui/luibackend/pages.py index 31f609eb..3b0583eb 100644 --- a/apps/nspanel-lovelace-ui/luibackend/pages.py +++ b/apps/nspanel-lovelace-ui/luibackend/pages.py @@ -186,7 +186,7 @@ class LuiPagesGen(object): icon = statusIcon.get("icon") entity = apis.ha_api.get_entity(statusIcon.get("entity")) entityType = statusIcon.get("entity").split(".")[0] - icon = get_icon(entityType, state=entity.state, device_class=entity.attributes.get("device_class", ""), overwrite=icon) + icon = get_icon_ha(statusIcon.get("entity"), overwrite=icon) color = self.get_entity_color(entity, ha_type=entityType, overwrite=statusIcon.get("color", None)) status_res += f"~{icon}~{color}" altfont += f'~{statusIcon.get("altFont", "")}' From 0b0f81ae6e55ef010bac52f3c421caee9e68b453 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 17 Dec 2022 22:41:33 +0100 Subject: [PATCH 03/12] Update prepare_nspanel.md --- docs/prepare_nspanel.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/prepare_nspanel.md b/docs/prepare_nspanel.md index 5e0bf40a..b7a3e114 100644 --- a/docs/prepare_nspanel.md +++ b/docs/prepare_nspanel.md @@ -44,6 +44,8 @@ US Version Landscape: `FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft` After sending the command, the screen should show a progress bar. The flashing progress takes around 5 minutes. +> ⚠️: **If you are getting an error message with `[bytes('8080808080808080808080000` please try to downgrade tasmota to 12.2.0 (http://ota.tasmota.com/tasmota32/release-12.2.0/tasmota32-nspanel.bin) and leave a comment on https://github.com/joBr99/nspanel-lovelace-ui/issues/601** + Note: For the US Version Users - keep in mind that you need to add the model config option to your apps.yaml later, more details on config overview page From a5791abd664f493fec06869c498c8b159893d76e Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 17 Dec 2022 23:06:27 +0100 Subject: [PATCH 04/12] Update prepare_nspanel.md --- docs/prepare_nspanel.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docs/prepare_nspanel.md b/docs/prepare_nspanel.md index b7a3e114..c6b5c6fd 100644 --- a/docs/prepare_nspanel.md +++ b/docs/prepare_nspanel.md @@ -44,7 +44,9 @@ US Version Landscape: `FlashNextion http://nspanel.pky.eu/lui-us-l-release.tft` After sending the command, the screen should show a progress bar. The flashing progress takes around 5 minutes. -> ⚠️: **If you are getting an error message with `[bytes('8080808080808080808080000` please try to downgrade tasmota to 12.2.0 (http://ota.tasmota.com/tasmota32/release-12.2.0/tasmota32-nspanel.bin) and leave a comment on https://github.com/joBr99/nspanel-lovelace-ui/issues/601** +> ⚠️: **If you are getting an error message with `[bytes('8080808080808080808080000` please try to downgrade tasmota to 12.2.0 (http://ota.tasmota.com/tasmota32/release-12.2.0/tasmota32-nspanel.bin). +> +> Please leave a comment on the following issue in both cases (working or not), since this isn't reproducable at the moment :/ https://github.com/joBr99/nspanel-lovelace-ui/issues/601** Note: For the US Version Users - keep in mind that you need to add the model config option to your apps.yaml later, more details on config overview page From 0017052a6fa1d5a1441845bff1083d1456654752 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 17 Dec 2022 23:34:52 +0100 Subject: [PATCH 05/12] Add Adv Flash with Start Baud on 9600 --- tasmota/autoexec.be | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tasmota/autoexec.be b/tasmota/autoexec.be index 1ac9b0ef..0312675e 100644 --- a/tasmota/autoexec.be +++ b/tasmota/autoexec.be @@ -389,8 +389,13 @@ def flash_nextion_adv(cmd, idx, payload, payload_json) elif idx==5 nextion.flash_proto_version = 0 nextion.flash_proto_baud = 256000 + elif idx==6 + nextion.ser.deinit() + nextion.ser = serial(17, 16, 9600, serial.SERIAL_8N1) + nextion.flash_proto_version = 0 + nextion.flash_proto_baud = 921600 else - nextion.flash_proto_version = 0 + nextion.flash_proto_version = 0 nextion.flash_proto_baud = 115200 end From f7ac14679755ff48f66307f489997d0467aa2743 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 17 Dec 2022 23:39:25 +0100 Subject: [PATCH 06/12] Update README.md --- tasmota/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasmota/README.md b/tasmota/README.md index 304ec946..02386deb 100644 --- a/tasmota/README.md +++ b/tasmota/README.md @@ -46,6 +46,8 @@ Nextion Upload Proto 1.2 with 256000 Baud: `FlashNextionAdv4 http://nspanel.pky. Nextion Upload Proto 1.1 with 256000 Baud: `FlashNextionAdv5 http://nspanel.pky.eu/lui.tft` +Nextion Upload Proto 1.1 with 921600 Baud and communication init on 9600 Baud: `FlashNextionAdv6 http://nspanel.pky.eu/lui.tft` + Besides the commands, serial input will be published on 'RESULT' Topic, depending on the input in one of the following formats: - `{"CustomRecv":%s}` From 602983b1d40db8218da3d5c8090d4b8e2f817e7f Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sat, 17 Dec 2022 23:56:47 +0100 Subject: [PATCH 07/12] fixes #622 --- apps/nspanel-lovelace-ui/luibackend/icons.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/icons.py b/apps/nspanel-lovelace-ui/luibackend/icons.py index 85854d60..3e76902f 100644 --- a/apps/nspanel-lovelace-ui/luibackend/icons.py +++ b/apps/nspanel-lovelace-ui/luibackend/icons.py @@ -209,6 +209,12 @@ def get_action_icon(ha_type, action, device_class=None, overwrite=None): return get_icon_char(actionicon) def get_icon_ha(entity_id, overwrite=None, stateOverwrite=None): + + ha_type = entity_id.split(".")[0] + if (apis.ha_api.entity_exists(entity_id)): + entity = apis.ha_api.get_entity(entity_id) + state = entity.state if stateOverwrite is None else stateOverwrite + if overwrite is not None: if type(overwrite) is str: return get_icon_char(overwrite) @@ -219,10 +225,6 @@ def get_icon_ha(entity_id, overwrite=None, stateOverwrite=None): result_icon = "alert-circle-outline" - ha_type = entity_id.split(".")[0] - if (apis.ha_api.entity_exists(entity_id)): - entity = apis.ha_api.get_entity(entity_id) - state = entity.state if stateOverwrite is None else stateOverwrite # icons only based on state if ha_type in simple_type_mapping: result_icon = simple_type_mapping[ha_type] @@ -267,4 +269,4 @@ def get_icon_ha(entity_id, overwrite=None, stateOverwrite=None): if entity.attributes.media_content_type in media_content_type_mapping: result_icon = media_content_type_mapping[entity.attributes.media_content_type] - return get_icon_char(result_icon) \ No newline at end of file + return get_icon_char(result_icon) From 525d5e97a948cd17aa60c50d34e60f4665337565 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 18 Dec 2022 01:07:00 +0100 Subject: [PATCH 08/12] Change default to slower 115200 1.2 flashing for now --- tasmota/autoexec.be | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tasmota/autoexec.be b/tasmota/autoexec.be index 0312675e..1cd8855f 100644 --- a/tasmota/autoexec.be +++ b/tasmota/autoexec.be @@ -361,8 +361,10 @@ tasmota.add_cmd('UpdateDriverVersion', update_berry_driver) def flash_nextion(cmd, idx, payload, payload_json) def task() - nextion.flash_proto_version = 1 - nextion.flash_proto_baud = 921600 + #nextion.flash_proto_version = 1 + #nextion.flash_proto_baud = 921600 + nextion.flash_proto_version = 1 + nextion.flash_proto_baud = 115200 nextion.flash_nextion(payload) end tasmota.set_timer(0,task) From fb80bffd56d2996508a8aaf26d25591828c650ea Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 18 Dec 2022 10:10:32 +0100 Subject: [PATCH 09/12] Update autoexec.be --- tasmota/autoexec.be | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tasmota/autoexec.be b/tasmota/autoexec.be index 1cd8855f..be624f67 100644 --- a/tasmota/autoexec.be +++ b/tasmota/autoexec.be @@ -361,10 +361,10 @@ tasmota.add_cmd('UpdateDriverVersion', update_berry_driver) def flash_nextion(cmd, idx, payload, payload_json) def task() - #nextion.flash_proto_version = 1 - #nextion.flash_proto_baud = 921600 nextion.flash_proto_version = 1 - nextion.flash_proto_baud = 115200 + nextion.flash_proto_baud = 921600 + #nextion.flash_proto_version = 1 + #nextion.flash_proto_baud = 115200 nextion.flash_nextion(payload) end tasmota.set_timer(0,task) From 132d6f8b20490c160619eaf69c9cff9e33ac5293 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 18 Dec 2022 12:52:56 +0100 Subject: [PATCH 10/12] Update autoexec.be --- tasmota/autoexec.be | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasmota/autoexec.be b/tasmota/autoexec.be index be624f67..48d73a31 100644 --- a/tasmota/autoexec.be +++ b/tasmota/autoexec.be @@ -361,9 +361,9 @@ tasmota.add_cmd('UpdateDriverVersion', update_berry_driver) def flash_nextion(cmd, idx, payload, payload_json) def task() - nextion.flash_proto_version = 1 - nextion.flash_proto_baud = 921600 #nextion.flash_proto_version = 1 + nextion.flash_proto_baud = 921600 + nextion.flash_proto_version = 0 #nextion.flash_proto_baud = 115200 nextion.flash_nextion(payload) end From e99ac6c1a5206ef25658dadd795cc003f2598ae9 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 18 Dec 2022 13:47:15 +0100 Subject: [PATCH 11/12] Update autoexec.be --- tasmota/autoexec.be | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tasmota/autoexec.be b/tasmota/autoexec.be index 48d73a31..79522060 100644 --- a/tasmota/autoexec.be +++ b/tasmota/autoexec.be @@ -361,10 +361,8 @@ tasmota.add_cmd('UpdateDriverVersion', update_berry_driver) def flash_nextion(cmd, idx, payload, payload_json) def task() - #nextion.flash_proto_version = 1 + nextion.flash_proto_version = 1 nextion.flash_proto_baud = 921600 - nextion.flash_proto_version = 0 - #nextion.flash_proto_baud = 115200 nextion.flash_nextion(payload) end tasmota.set_timer(0,task) From 26157dd11be2c2fa65cd40782a38293617097f99 Mon Sep 17 00:00:00 2001 From: joBr99 <29555657+joBr99@users.noreply.github.com> Date: Sun, 18 Dec 2022 19:55:13 +0100 Subject: [PATCH 12/12] fixes #621 --- apps/nspanel-lovelace-ui/luibackend/icons.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/apps/nspanel-lovelace-ui/luibackend/icons.py b/apps/nspanel-lovelace-ui/luibackend/icons.py index 3e76902f..42f83049 100644 --- a/apps/nspanel-lovelace-ui/luibackend/icons.py +++ b/apps/nspanel-lovelace-ui/luibackend/icons.py @@ -116,16 +116,16 @@ sensor_mapping = { cover_mapping = { #"device_class": ("icon-open", "icon-closed", "icon-cover-open", "icon-cover-stop", "icon-cover-close") - "awning": ("window-open", "window-closed", "arrow-up", "stop", "arrow-down"), - "blind": ("blinds-open", "blinds", "arrow-up", "stop", "arrow-down"), - "curtain": ("curtains-closed", "curtains", "arrow-expand-horizontal", "stop", "arrow-collapse-horizontal"), - "damper": ("checkbox-blank-circle", "circle-slice-8", "arrow-up", "stop", "arrow-down"), - "door": ("door-open", "door-closed", "arrow-expand-horizontal", "stop", "arrow-collapse-horizontal"), - "garage": ("garage-open", "garage", "arrow-up", "stop", "arrow-down"), - "gate": ("gate-open", "gate", "arrow-expand-horizontal", "stop", "arrow-collapse-horizontal"), - "shade": ("blinds-open", "blinds", "arrow-up", "stop", "arrow-down"), - "shutter": ("window-shutter-open", "window-shutter", "arrow-up", "stop", "arrow-down"), - "window": ("window-open", "window-closed", "arrow-up", "stop", "arrow-down"), + "awning": ("window-open", "window-closed", "arrow-up", "stop", "arrow-down"), + "blind": ("blinds-open", "blinds", "arrow-up", "stop", "arrow-down"), + "curtain": ("curtains", "curtains-closed", "arrow-expand-horizontal", "stop", "arrow-collapse-horizontal"), + "damper": ("checkbox-blank-circle", "circle-slice-8", "arrow-up", "stop", "arrow-down"), + "door": ("door-open", "door-closed", "arrow-expand-horizontal", "stop", "arrow-collapse-horizontal"), + "garage": ("garage-open", "garage", "arrow-up", "stop", "arrow-down"), + "gate": ("gate-open", "gate", "arrow-expand-horizontal", "stop", "arrow-collapse-horizontal"), + "shade": ("blinds-open", "blinds", "arrow-up", "stop", "arrow-down"), + "shutter": ("window-shutter-open", "window-shutter", "arrow-up", "stop", "arrow-down"), + "window": ("window-open", "window-closed", "arrow-up", "stop", "arrow-down"), } simple_type_mapping = {