From a9a47f9e7020a83791d309a947cee3fa26dea6e6 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Mon, 25 Oct 2021 19:25:13 +0200 Subject: [PATCH 1/2] fix ASC_BlockingTime_beforNightClose wird bei Regen(-schutz) ignoriert --- controls_AutoShuttersControl.txt | 10 +++++----- .../ShuttersControl/Rainprotection.pm | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 14a5fc4..8b7c62f 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,16 +1,16 @@ -UPD 2021-10-24_07:33:53 111901 FHEM/73_AutoShuttersControl.pm -UPD 2021-10-24_18:37:41 74468 lib/FHEM/Automation/ShuttersControl.pm +UPD 2021-10-25_19:20:36 111901 FHEM/73_AutoShuttersControl.pm +UPD 2021-10-25_19:20:36 74468 lib/FHEM/Automation/ShuttersControl.pm UPD 2021-10-09_07:12:54 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2021-10-24_07:33:53 31900 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2021-10-09_07:12:54 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm -UPD 2021-10-25_09:47:08 110681 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +UPD 2021-10-25_10:08:13 110681 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2021-10-09_07:12:54 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2021-10-09_07:12:54 2173 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2021-10-09_07:12:54 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2021-10-09_07:12:54 7249 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm -UPD 2021-10-09_07:12:54 52523 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm +UPD 2021-10-25_19:20:36 52523 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm UPD 2021-10-09_07:12:54 2901 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm UPD 2021-10-09_07:12:54 3978 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm UPD 2021-10-09_07:12:54 2286 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm -UPD 2021-10-24_07:33:53 6693 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm +UPD 2021-10-25_19:24:27 6716 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm diff --git a/lib/FHEM/Automation/ShuttersControl/Rainprotection.pm b/lib/FHEM/Automation/ShuttersControl/Rainprotection.pm index 542901d..d6dab57 100644 --- a/lib/FHEM/Automation/ShuttersControl/Rainprotection.pm +++ b/lib/FHEM/Automation/ShuttersControl/Rainprotection.pm @@ -133,11 +133,13 @@ sub _RainProtected { $FHEM::Automation::ShuttersControl::shutters->setLastDrive( 'rain protected'); - $FHEM::Automation::ShuttersControl::shutters->setDriveCmd( - $FHEM::Automation::ShuttersControl::ascDev - ->getRainSensorShuttersClosedPos); - $FHEM::Automation::ShuttersControl::shutters - ->setRainProtectionStatus('protected'); + + $FHEM::Automation::ShuttersControl::shutters->setDriveCmd( + $FHEM::Automation::ShuttersControl::ascDev + ->getRainSensorShuttersClosedPos); + + $FHEM::Automation::ShuttersControl::shutters + ->setRainProtectionStatus('protected'); } sub _RainUnprotected { @@ -168,10 +170,11 @@ sub _RainUnprotected { ->getClosedPos ) ) - ); + ) + if (IsAfterShuttersTimeBlocking($shuttersDev)); - $FHEM::Automation::ShuttersControl::shutters - ->setRainProtectionStatus('unprotected'); + $FHEM::Automation::ShuttersControl::shutters + ->setRainProtectionStatus('unprotected'); } From 9409c60400a517e770d38cd1476597c258aa93e9 Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Tue, 26 Oct 2021 19:29:29 +0200 Subject: [PATCH 2/2] change ASC_BlockingTime_beforNightClose and ASC_BlockingTime_beforDayOpen Attributs --- FHEM/73_AutoShuttersControl.pm | 14 +++++++------- controls_AutoShuttersControl.txt | 8 ++++---- lib/FHEM/Automation/ShuttersControl.pm | 22 +++++++++++----------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/FHEM/73_AutoShuttersControl.pm b/FHEM/73_AutoShuttersControl.pm index 8c513d0..aa0173a 100644 --- a/FHEM/73_AutoShuttersControl.pm +++ b/FHEM/73_AutoShuttersControl.pm @@ -416,11 +416,11 @@ __END__ after the last manual operation in seconds. Defaults to 1200 (20 minutes). -
  • ASC_BlockingTime_beforDayOpen - Time in which no closing operation is made by +
  • ASC_BlockingTime_beforeDayOpen - Time in which no closing operation is made by ASC after opening at the morning in seconds. Defaults to 3600 (one hour).
    • - -
  • ASC_BlockingTime_beforNightClose - Time in which no closing operation is made by + +
  • ASC_BlockingTime_beforeNightClose - Time in which no closing operation is made by ASC before closing at the evening in seconds. Defaults to 3600 (one hour).
    • @@ -1028,10 +1028,10 @@ __END__
  • ASC_AutoAstroModeMorningHorizon - Höhe über Horizont,a wenn beim Attribut ASC_autoAstroModeMorning HORIZON ausgewählt (default: none)
  • ASC_BlockingTime_afterManual - wie viel Sekunden soll die Automatik nach einer manuellen Fahrt aussetzen. (default: 1200)
    • - -
  • ASC_BlockingTime_beforDayOpen - wie viel Sekunden vor dem morgendlichen öffnen soll keine schließen Fahrt mehr stattfinden. (default: 3600)
    • - -
  • ASC_BlockingTime_beforNightClose - wie viel Sekunden vor dem nächtlichen schließen soll keine öffnen Fahrt mehr stattfinden. (default: 3600)
    • + +
  • ASC_BlockingTime_beforeDayOpen - wie viel Sekunden vor dem morgendlichen öffnen soll keine schließen Fahrt mehr stattfinden. (default: 3600)
    • + +
  • ASC_BlockingTime_beforeNightClose - wie viel Sekunden vor dem nächtlichen schließen soll keine öffnen Fahrt mehr stattfinden. (default: 3600)
  • ASC_BrightnessSensor - DEVICE[:READING] WERT-MORGENS:WERT-ABENDS / 'Sensorname[:brightness [400:800]]' Angaben zum Helligkeitssensor mit (Readingname, optional) für die Beschattung und dem Fahren der Rollladen nach brightness und den optionalen Brightnesswerten für Sonnenauf- und Sonnenuntergang. (default: none)
    • diff --git a/controls_AutoShuttersControl.txt b/controls_AutoShuttersControl.txt index 8b7c62f..1fde362 100644 --- a/controls_AutoShuttersControl.txt +++ b/controls_AutoShuttersControl.txt @@ -1,5 +1,5 @@ -UPD 2021-10-25_19:20:36 111901 FHEM/73_AutoShuttersControl.pm -UPD 2021-10-25_19:20:36 74468 lib/FHEM/Automation/ShuttersControl.pm +UPD 2021-10-26_19:29:13 111908 FHEM/73_AutoShuttersControl.pm +UPD 2021-10-26_19:27:16 74553 lib/FHEM/Automation/ShuttersControl.pm UPD 2021-10-09_07:12:54 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2021-10-24_07:33:53 31900 lib/FHEM/Automation/ShuttersControl/Shutters.pm @@ -9,8 +9,8 @@ UPD 2021-10-09_07:12:54 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2021-10-09_07:12:54 2173 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2021-10-09_07:12:54 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2021-10-09_07:12:54 7249 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm -UPD 2021-10-25_19:20:36 52523 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm +UPD 2021-10-26_18:45:03 52523 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm UPD 2021-10-09_07:12:54 2901 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm UPD 2021-10-09_07:12:54 3978 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm UPD 2021-10-09_07:12:54 2286 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm -UPD 2021-10-25_19:24:27 6716 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm +UPD 2021-10-26_18:45:03 6716 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm diff --git a/lib/FHEM/Automation/ShuttersControl.pm b/lib/FHEM/Automation/ShuttersControl.pm index 6306833..5b055e2 100644 --- a/lib/FHEM/Automation/ShuttersControl.pm +++ b/lib/FHEM/Automation/ShuttersControl.pm @@ -229,8 +229,8 @@ our %userAttrList = ( 'ASC_LockOut:soft,hard,off' => '-', 'ASC_LockOut_Cmd:inhibit,blocked,protection' => '-', 'ASC_BlockingTime_afterManual' => '-', - 'ASC_BlockingTime_beforNightClose' => '-', - 'ASC_BlockingTime_beforDayOpen' => '-', + 'ASC_BlockingTime_beforeNightClose' => '-', + 'ASC_BlockingTime_beforeDayOpen' => '-', 'ASC_BrightnessSensor' => '-', 'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 80, 20 ], 'ASC_Shading_Mode:absent,always,off,home' => '-', @@ -1227,15 +1227,15 @@ sub RenewSunRiseSetShuttersTimer { 1, 0 ); } -# $attr{$shuttersDev}{ASC_Drive_Delay} = -# AttrVal( $shuttersDev, 'ASC_Drive_Offset', 'none' ) -# if ( AttrVal( $shuttersDev, 'ASC_Drive_Offset', 'none' ) ne 'none' ); -# delFromDevAttrList( $shuttersDev, 'ASC_Drive_Offset' ); -# -# $attr{$shuttersDev}{ASC_Drive_DelayStart} = -# AttrVal( $shuttersDev, 'ASC_Drive_OffsetStart', 'none' ) -# if ( AttrVal( $shuttersDev, 'ASC_Drive_OffsetStart', 'none' ) ne 'none' ); -# delFromDevAttrList( $shuttersDev, 'ASC_Drive_OffsetStart' ); + $attr{$shuttersDev}{ASC_BlockingTime_beforeNightClose} = + AttrVal( $shuttersDev, 'ASC_BlockingTime_beforNightClose', 'none' ) + if ( AttrVal( $shuttersDev, 'ASC_BlockingTime_beforNightClose', 'none' ) ne 'none' ); + delFromDevAttrList( $shuttersDev, 'ASC_BlockingTime_beforNightClose' ); + + $attr{$shuttersDev}{ASC_BlockingTime_beforeDayOpen} = + AttrVal( $shuttersDev, 'ASC_BlockingTime_beforDayOpen', 'none' ) + if ( AttrVal( $shuttersDev, 'ASC_BlockingTime_beforDayOpen', 'none' ) ne 'none' ); + delFromDevAttrList( $shuttersDev, 'ASC_BlockingTime_beforDayOpen' ); # # $attr{$shuttersDev}{ASC_Shading_StateChange_SunnyCloudy} = # AttrVal( $shuttersDev, 'ASC_Shading_StateChange_Sunny', 'none' ) . ':'