From 3401340563cbb4458c079de7985c857410861932 Mon Sep 17 00:00:00 2001 From: Marc Brugger Date: Fri, 24 Mar 2023 07:36:56 +0100 Subject: [PATCH 1/3] 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 12f22554d8deb0ddc28879399f3a532b58ec919f Mon Sep 17 00:00:00 2001 From: Albin Medoc Date: Thu, 30 Mar 2023 11:06:29 +0200 Subject: [PATCH 2/3] 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 3/3] 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