From c25c395a5bf052b8515bfd4664da0b2728803371 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Mon, 24 May 2021 11:15:08 +0200 Subject: [PATCH 1/4] fix #36 --- controls_AutoShuttersControl.txt | 30 +++++++++---------- .../EventProcessingFunctions.pm | 2 +- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 0f616ee..af31c63 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,15 +1,15 @@ -UPD 2021-04-29_12:20:23 97974 FHEM/73_AutoShuttersControl.pm -UPD 2021-04-21_13:16:51 74314 lib/FHEM/Automation/ShuttersControl.pm -UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm -UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm -UPD 2021-02-26_14:36:10 31487 lib/FHEM/Automation/ShuttersControl/Shutters.pm -UPD 2021-04-29_11:34:37 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm -UPD 2021-04-29_12:18:42 110757 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm -UPD 2021-02-26_14:36:10 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm -UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm -UPD 2021-04-27_07:52:31 11742 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm -UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm -UPD 2021-01-29_10:06:33 52525 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm -UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm -UPD 2021-01-29_10:06:33 3980 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm -UPD 2020-06-22_09:41:40 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm +UPD 2021-04-30_18:20:51 97974 FHEM/73_AutoShuttersControl.pm +UPD 2021-04-17_14:54:52 74314 lib/FHEM/Automation/ShuttersControl.pm +UPD 2021-02-18_11:11:24 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm +UPD 2021-02-18_11:11:24 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm +UPD 2021-03-25_07:52:48 31487 lib/FHEM/Automation/ShuttersControl/Shutters.pm +UPD 2021-04-30_18:20:51 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm +UPD 2021-05-24_11:14:48 110757 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +UPD 2021-02-18_11:11:24 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm +UPD 2021-02-18_11:11:24 2175 lib/FHEM/Automation/ShuttersControl/Window.pm +UPD 2021-02-18_11:11:24 11742 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm +UPD 2021-02-18_11:11:24 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm +UPD 2021-02-18_11:11:24 52525 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm +UPD 2021-02-18_11:11:24 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm +UPD 2021-02-18_11:11:24 3980 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm +UPD 2021-02-18_11:11:24 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm diff --git a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm index f72cd09..c10f312 100644 --- a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +++ b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm @@ -312,7 +312,7 @@ sub EventProcessingWindowRec { $FHEM::Automation::ShuttersControl::shutters ->getPrivacyDownPos && $FHEM::Automation::ShuttersControl::shutters - ->getPrivacyDownStatus == 1 + ->getPrivacyDownStatus != 2 && !$FHEM::Automation::ShuttersControl::shutters->getIsDay ) ) && ( $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen -- 2.47.2 From 78821283363f12fa93a49b9e1b898bf1075f6b2d Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Mon, 24 May 2021 11:32:09 +0200 Subject: [PATCH 2/4] add condition for hardLock ne off and window closed at night --- controls_AutoShuttersControl.txt | 2 +- .../ShuttersControl/EventProcessingFunctions.pm | 16 +++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index af31c63..3b87971 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -4,7 +4,7 @@ UPD 2021-02-18_11:11:24 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2021-02-18_11:11:24 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2021-03-25_07:52:48 31487 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2021-04-30_18:20:51 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm -UPD 2021-05-24_11:14:48 110757 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +UPD 2021-05-24_11:31:28 111147 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-02-18_11:11:24 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2021-02-18_11:11:24 2175 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2021-02-18_11:11:24 11742 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm diff --git a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm index c10f312..3922f24 100644 --- a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +++ b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm @@ -282,12 +282,12 @@ sub EventProcessingWindowRec { . $homemode . ' QueryShuttersPosWinRecTilted:' . $FHEM::Automation::ShuttersControl::shutters - ->getQueryShuttersPos( + ->getQueryShuttersPos( $FHEM::Automation::ShuttersControl::shutters->getVentilatePos ) . ' QueryShuttersPosWinRecComfort: ' . $FHEM::Automation::ShuttersControl::shutters - ->getQueryShuttersPos( + ->getQueryShuttersPos( $FHEM::Automation::ShuttersControl::shutters->getComfortOpenPos ) ); @@ -310,15 +310,21 @@ sub EventProcessingWindowRec { eq 'on' ) || ( $FHEM::Automation::ShuttersControl::shutters->getStatus == $FHEM::Automation::ShuttersControl::shutters - ->getPrivacyDownPos + ->getPrivacyDownPos && $FHEM::Automation::ShuttersControl::shutters - ->getPrivacyDownStatus != 2 + ->getPrivacyDownStatus != 2 + && !$FHEM::Automation::ShuttersControl::shutters->getIsDay ) + || ( $FHEM::Automation::ShuttersControl::shutters->getStatus == + $FHEM::Automation::ShuttersControl::shutters + ->getOpenPos + && $FHEM::Automation::ShuttersControl::shutters + ->getLockOut ne 'off' && !$FHEM::Automation::ShuttersControl::shutters->getIsDay ) ) && ( $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen eq 'on' || $FHEM::Automation::ShuttersControl::ascDev - ->getAutoShuttersControlComfort eq 'on' ) + ->getAutoShuttersControlComfort eq 'on' ) ) { FHEM::Automation::ShuttersControl::ASC_Debug( -- 2.47.2 From 697cdd1089e8213fa709057f19097e4c1c705708 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Tue, 25 May 2021 07:58:53 +0200 Subject: [PATCH 3/4] add condition for window closed and status open and shuttersPlace terrace --- controls_AutoShuttersControl.txt | 2 +- .../ShuttersControl/EventProcessingFunctions.pm | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 963366b..b176c8a 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -4,7 +4,7 @@ UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2021-05-18_10:37:51 31896 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2021-05-17_14:30:37 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm -UPD 2021-05-25_07:52:14 108862 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +UPD 2021-05-25_07:58:08 109039 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-02-26_14:36:10 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2021-05-18_10:37:51 11741 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm diff --git a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm index 2c64dd5..a5572b1 100644 --- a/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +++ b/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm @@ -313,13 +313,16 @@ sub EventProcessingWindowRec { $FHEM::Automation::ShuttersControl::shutters ->getPrivacyDownPos && $FHEM::Automation::ShuttersControl::shutters - ->getPrivacyDownStatus != 2 + ->getPrivacyDownStatus != 2 && !$FHEM::Automation::ShuttersControl::shutters->getIsDay ) || ( $FHEM::Automation::ShuttersControl::shutters->getStatus == - $FHEM::Automation::ShuttersControl::shutters - ->getOpenPos - && $FHEM::Automation::ShuttersControl::shutters - ->getLockOut ne 'off' + $FHEM::Automation::ShuttersControl::shutters + ->getOpenPos + && ( $FHEM::Automation::ShuttersControl::shutters + ->getLockOut ne 'off' + || $FHEM::Automation::ShuttersControl::shutters + ->getShuttersPlace eq 'terrace' + ) && !$FHEM::Automation::ShuttersControl::shutters->getIsDay ) ) && ( $FHEM::Automation::ShuttersControl::shutters->getVentilateOpen -- 2.47.2 From 2c68ae84060d7280345b40e6c038f89d020af663 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Thu, 27 May 2021 08:55:48 +0200 Subject: [PATCH 4/4] change version to v0.10.15 --- FHEM/73_AutoShuttersControl.pm | 2 +- controls_AutoShuttersControl.txt | 31 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/FHEM/73_AutoShuttersControl.pm b/FHEM/73_AutoShuttersControl.pm index 2cd2115..7d75f0d 100644 --- a/FHEM/73_AutoShuttersControl.pm +++ b/FHEM/73_AutoShuttersControl.pm @@ -1265,7 +1265,7 @@ sub Initialize { ], "release_status": "stable", "license": "GPL_2", - "version": "v0.10.14", + "version": "v0.10.15", "author": [ "Marko Oldenburg " ], diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index b176c8a..99b78c7 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,16 +1,15 @@ -UPD 2021-05-18_11:02:07 97974 FHEM/73_AutoShuttersControl.pm -UPD 2021-05-17_14:34:49 74350 lib/FHEM/Automation/ShuttersControl.pm -UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm -UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm -UPD 2021-05-18_10:37:51 31896 lib/FHEM/Automation/ShuttersControl/Shutters.pm -UPD 2021-05-17_14:30:37 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm -UPD 2021-05-25_07:58:08 109039 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm -UPD 2021-02-26_14:36:10 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm -UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm -UPD 2021-05-18_10:37:51 11741 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm -UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm -UPD 2021-01-29_10:06:33 52525 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm -UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm -UPD 2021-01-29_10:06:33 3980 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm -UPD 2020-06-22_09:41:40 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm -UPD 2021-05-18_10:37:51 6195 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm +UPD 2021-05-27_08:55:22 97974 FHEM/73_AutoShuttersControl.pm +UPD 2021-05-27_08:51:20 74350 lib/FHEM/Automation/ShuttersControl.pm +UPD 2021-02-18_11:11:24 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm +UPD 2021-02-18_11:11:24 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm +UPD 2021-05-27_08:51:20 31896 lib/FHEM/Automation/ShuttersControl/Shutters.pm +UPD 2021-04-30_18:20:51 25329 lib/FHEM/Automation/ShuttersControl/Shading.pm +UPD 2021-05-27_08:51:20 109039 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +UPD 2021-02-18_11:11:24 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm +UPD 2021-02-18_11:11:24 2175 lib/FHEM/Automation/ShuttersControl/Window.pm +UPD 2021-05-27_08:51:20 11741 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm +UPD 2021-02-18_11:11:24 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm +UPD 2021-02-18_11:11:24 52525 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm +UPD 2021-02-18_11:11:24 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm +UPD 2021-02-18_11:11:24 3980 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm +UPD 2021-02-18_11:11:24 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm -- 2.47.2