From 3401340563cbb4458c079de7985c857410861932 Mon Sep 17 00:00:00 2001 From: Marc Brugger Date: Fri, 24 Mar 2023 07:36:56 +0100 Subject: [PATCH 1/5] Ignore IntelliJ IDEA project directory --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7bf2894..92f2840 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ # Ignore Mac DS_Store files .DS_Store **/.DS_Store + +# Ignore IntelliJ IDEA project directory +.idea From ecd806b1c5367cae432f05959a6ac8c5a42eab43 Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Sun, 26 Mar 2023 22:26:55 +0200 Subject: [PATCH 2/5] Update clock at the beginning of each minute As it is now, using `minutes: "/1"`, the time will update every minute, but that could happen when lots of seconds has passed on that minute, making possible the displayed time to be up to 59s late. By changing that to `seconds: 0` if forces the update in the same rate, but always in the first second of a minute, keeping the displayed time always updated. --- nspanel_blueprint.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index a83caae..2471c99 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -3651,7 +3651,7 @@ trigger: ##### Time - Trigger "time_state" ##### - platform: time_pattern - minutes: "/1" + seconds: 0 id: time_state #### Weather state changed ####### From 12f22554d8deb0ddc28879399f3a532b58ec919f Mon Sep 17 00:00:00 2001 From: Albin Medoc Date: Thu, 30 Mar 2023 11:06:29 +0200 Subject: [PATCH 3/5] fix: corrects date_format --- nspanel_blueprint.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nspanel_blueprint.yaml b/nspanel_blueprint.yaml index 13de5f3..4a3b266 100644 --- a/nspanel_blueprint.yaml +++ b/nspanel_blueprint.yaml @@ -129,8 +129,10 @@ The goal was to create a version that allows everyone to use the NSpanel fully l value: '%d.%m' - label: 'DD/MM (ex. 22/03)' value: '%d/%m' - - label: 'D/M (ex. 3/22)' + - label: 'M/D (ex. 3/22)' value: '%-m/%-d' + - label: 'D/M (ex. 22/3)' + value: '%-d/%-m' time_format: name: Time Format From b0ea3ef63df289d61c3a0d1c6ed6053dce490990 Mon Sep 17 00:00:00 2001 From: doron1 <4199618+doron1@users.noreply.github.com> Date: Wed, 12 Apr 2023 20:49:57 +0300 Subject: [PATCH 4/5] Correct Nextion variable for sleep modus Code was updating the wrong (probably old) variable name on the panel, when the "sleep" button is pressed in settings page --- nspanel_esphome.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index 72e636c..2889fdf 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -867,13 +867,13 @@ switch: - globals.set: id: sleep_modus_global value: '0' - - lambda: id(disp1).set_component_value("settings.a02",0); + - lambda: id(disp1).set_component_value("settings.bt1",0); on_turn_on: - lambda: id(disp1).send_command_printf("home.sleepmodus.val=1"); - globals.set: id: sleep_modus_global value: '1' - - lambda: id(disp1).set_component_value("settings.a02",1); + - lambda: id(disp1).set_component_value("settings.bt1",1); ##### Relay Local control Fallback ##### - platform: template From 496392a382472220e5de4183f3902bbf3e00ca5f Mon Sep 17 00:00:00 2001 From: Edward Firmo <94725493+edwardtfn@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:54:54 +0200 Subject: [PATCH 5/5] Fix issue with `restore_state` and ESPHome v2023.7.0 (#941) Solves #939 --- nspanel_esphome.yaml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/nspanel_esphome.yaml b/nspanel_esphome.yaml index 2cb337e..25070ef 100644 --- a/nspanel_esphome.yaml +++ b/nspanel_esphome.yaml @@ -736,7 +736,7 @@ switch: platform: template id: notification_unread entity_category: config - restore_state: true + restore_mode: RESTORE_DEFAULT_OFF optimistic: true ##### Notification sound ##### @@ -744,7 +744,6 @@ switch: platform: template id: notification_sound entity_category: config - restore_state: true optimistic: true restore_mode: RESTORE_DEFAULT_OFF @@ -753,7 +752,7 @@ switch: platform: template id: confirmation_message entity_category: config - restore_state: false + restore_mode: RESTORE_DEFAULT_OFF optimistic: true ##### PHYSICAL SWITCH 1 ##### @@ -790,7 +789,6 @@ switch: id: sleep_mode entity_category: config restore_mode: RESTORE_DEFAULT_OFF - restore_state: true optimistic: false turn_on_action: &sleep_mode-turn_on - logger.log: "Sleep mode - Turn on" @@ -812,7 +810,6 @@ switch: platform: template id: relay1_fallback entity_category: config - restore_state: true optimistic: true restore_mode: RESTORE_DEFAULT_OFF @@ -820,7 +817,6 @@ switch: platform: template id: relay2_fallback entity_category: config - restore_state: true optimistic: true restore_mode: RESTORE_DEFAULT_OFF @@ -904,7 +900,7 @@ display: - logger.log: "Nextion start - Jump to page 8" - lambda: id(disp1).send_command_printf("page 8"); - logger.log: "Nextion start - Publish ESPHome version" - - lambda: id(disp1).set_component_text_printf("boot.esph_version", "%s", "3.4"); ### esphome-version ### + - lambda: id(disp1).set_component_text_printf("boot.esph_version", "%s", "3.4.1"); ### esphome-version ### - logger.log: "Nextion start - Wait for Home Assistant API" - wait_until: api.connected