FHEM/mod-AutoShuttersControl
1
0
Fork 0
Code Issues 12 Pull Requests Releases 9 Wiki Activity

Merge pull request 'closed: #55 fix ASC_BlockingTime_beforNightClose wird bei Regen(-schutz) ignoriert' (#56) from patch-rainprotection_blockingtime into devel

Browse Source 
Reviewed-on: #56
This commit is contained in:
Marko Oldenburg
2021-10-26 19:31:28 +02:00
parent feba24bf99 9409c60400
commit 54450962ac
4 changed files with 34 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
FHEM/73_AutoShuttersControl.pm
View File

@@ -416,11 +416,11 @@ __END__
after the last manual operation in seconds. Defaults to 1200 (20 minutes). after the last manual operation in seconds. Defaults to 1200 (20 minutes).
</li> </li>
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforDayOpen"></a> <a id="AutoShuttersControl-attr-ASC_BlockingTime_beforDayOpen"></a>
<li><strong>ASC_BlockingTime_beforDayOpen</strong> - Time in which no closing operation is made by <li><strong>ASC_BlockingTime_beforeDayOpen</strong> - Time in which no closing operation is made by
<abbr>ASC</abbr> after opening at the morning in seconds. Defaults to 3600 (one hour). <abbr>ASC</abbr> after opening at the morning in seconds. Defaults to 3600 (one hour).
</li> </li>
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforNightClose"></a> <a id="AutoShuttersControl-attr-ASC_BlockingTime_beforeNightClose"></a>
<li><strong>ASC_BlockingTime_beforNightClose</strong> - Time in which no closing operation is made by <li><strong>ASC_BlockingTime_beforeNightClose</strong> - Time in which no closing operation is made by
<abbr>ASC</abbr> before closing at the evening in seconds. Defaults to 3600 (one hour). <abbr>ASC</abbr> before closing at the evening in seconds. Defaults to 3600 (one hour).
</li> </li>
<a id="AutoShuttersControl-attr-ASC_BrightnessSensor"></a> <a id="AutoShuttersControl-attr-ASC_BrightnessSensor"></a>
@@ -1028,10 +1028,10 @@ __END__
<li><strong>ASC_AutoAstroModeMorningHorizon</strong> - H&ouml;he &uuml;ber Horizont,a wenn beim Attribut ASC_autoAstroModeMorning HORIZON ausgew&auml;hlt (default: none)</li> <li><strong>ASC_AutoAstroModeMorningHorizon</strong> - H&ouml;he &uuml;ber Horizont,a wenn beim Attribut ASC_autoAstroModeMorning HORIZON ausgew&auml;hlt (default: none)</li>
<a id="AutoShuttersControl-attr-ASC_BlockingTime_afterManual"></a> <a id="AutoShuttersControl-attr-ASC_BlockingTime_afterManual"></a>
<li><strong>ASC_BlockingTime_afterManual</strong> - wie viel Sekunden soll die Automatik nach einer manuellen Fahrt aussetzen. (default: 1200)</li> <li><strong>ASC_BlockingTime_afterManual</strong> - wie viel Sekunden soll die Automatik nach einer manuellen Fahrt aussetzen. (default: 1200)</li>
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforDayOpen"></a> <a id="AutoShuttersControl-attr-ASC_BlockingTime_beforeDayOpen"></a>
<li><strong>ASC_BlockingTime_beforDayOpen</strong> - wie viel Sekunden vor dem morgendlichen &ouml;ffnen soll keine schlie&szlig;en Fahrt mehr stattfinden. (default: 3600)</li> <li><strong>ASC_BlockingTime_beforeDayOpen</strong> - wie viel Sekunden vor dem morgendlichen &ouml;ffnen soll keine schlie&szlig;en Fahrt mehr stattfinden. (default: 3600)</li>
<a id="AutoShuttersControl-attr-ASC_BlockingTime_beforNightClose"></a> <a id="AutoShuttersControl-attr-ASC_BlockingTime_beforeNightClose"></a>
<li><strong>ASC_BlockingTime_beforNightClose</strong> - wie viel Sekunden vor dem n&auml;chtlichen schlie&szlig;en soll keine &ouml;ffnen Fahrt mehr stattfinden. (default: 3600)</li> <li><strong>ASC_BlockingTime_beforeNightClose</strong> - wie viel Sekunden vor dem n&auml;chtlichen schlie&szlig;en soll keine &ouml;ffnen Fahrt mehr stattfinden. (default: 3600)</li>
<a id="AutoShuttersControl-attr-ASC_BrightnessSensor"></a> <a id="AutoShuttersControl-attr-ASC_BrightnessSensor"></a>
<li><strong>ASC_BrightnessSensor - DEVICE[:READING] WERT-MORGENS:WERT-ABENDS</strong> / 'Sensorname[:brightness [400:800]]' Angaben zum Helligkeitssensor mit (Readingname, optional) f&uuml;r die Beschattung und dem Fahren der Rollladen nach brightness und den optionalen Brightnesswerten f&uuml;r Sonnenauf- und Sonnenuntergang. (default: none)</li> <li><strong>ASC_BrightnessSensor - DEVICE[:READING] WERT-MORGENS:WERT-ABENDS</strong> / 'Sensorname[:brightness [400:800]]' Angaben zum Helligkeitssensor mit (Readingname, optional) f&uuml;r die Beschattung und dem Fahren der Rollladen nach brightness und den optionalen Brightnesswerten f&uuml;r Sonnenauf- und Sonnenuntergang. (default: none)</li>
<a id="AutoShuttersControl-attr-ASC_Down"></a> <a id="AutoShuttersControl-attr-ASC_Down"></a>

10
controls_AutoShuttersControl.txt
View File

@@ -1,16 +1,16 @@
UPD 2021-10-24_07:33:53 111901 FHEM/73_AutoShuttersControl.pm UPD 2021-10-26_19:29:13 111908 FHEM/73_AutoShuttersControl.pm
UPD 2021-10-24_18:37:41 74468 lib/FHEM/Automation/ShuttersControl.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 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2021-10-09_07:12:54 2494 lib/FHEM/Automation/ShuttersControl/Roommate.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-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-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 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 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 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 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-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 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 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-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-26_18:45:03 6716 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm

22
lib/FHEM/Automation/ShuttersControl.pm
View File

@@ -229,8 +229,8 @@ our %userAttrList = (
'ASC_LockOut:soft,hard,off' => '-', 'ASC_LockOut:soft,hard,off' => '-',
'ASC_LockOut_Cmd:inhibit,blocked,protection' => '-', 'ASC_LockOut_Cmd:inhibit,blocked,protection' => '-',
'ASC_BlockingTime_afterManual' => '-', 'ASC_BlockingTime_afterManual' => '-',
'ASC_BlockingTime_beforNightClose' => '-', 'ASC_BlockingTime_beforeNightClose' => '-',
'ASC_BlockingTime_beforDayOpen' => '-', 'ASC_BlockingTime_beforeDayOpen' => '-',
'ASC_BrightnessSensor' => '-', 'ASC_BrightnessSensor' => '-',
'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 80, 20 ], 'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 80, 20 ],
'ASC_Shading_Mode:absent,always,off,home' => '-', 'ASC_Shading_Mode:absent,always,off,home' => '-',
@@ -1227,15 +1227,15 @@ sub RenewSunRiseSetShuttersTimer {
1, 0 ); 1, 0 );
} }
# $attr{$shuttersDev}{ASC_Drive_Delay} = $attr{$shuttersDev}{ASC_BlockingTime_beforeNightClose} =
# AttrVal( $shuttersDev, 'ASC_Drive_Offset', 'none' ) AttrVal( $shuttersDev, 'ASC_BlockingTime_beforNightClose', 'none' )
# if ( AttrVal( $shuttersDev, 'ASC_Drive_Offset', 'none' ) ne 'none' ); if ( AttrVal( $shuttersDev, 'ASC_BlockingTime_beforNightClose', 'none' ) ne 'none' );
# delFromDevAttrList( $shuttersDev, 'ASC_Drive_Offset' ); delFromDevAttrList( $shuttersDev, 'ASC_BlockingTime_beforNightClose' );
#
# $attr{$shuttersDev}{ASC_Drive_DelayStart} = $attr{$shuttersDev}{ASC_BlockingTime_beforeDayOpen} =
# AttrVal( $shuttersDev, 'ASC_Drive_OffsetStart', 'none' ) AttrVal( $shuttersDev, 'ASC_BlockingTime_beforDayOpen', 'none' )
# if ( AttrVal( $shuttersDev, 'ASC_Drive_OffsetStart', 'none' ) ne 'none' ); if ( AttrVal( $shuttersDev, 'ASC_BlockingTime_beforDayOpen', 'none' ) ne 'none' );
# delFromDevAttrList( $shuttersDev, 'ASC_Drive_OffsetStart' ); delFromDevAttrList( $shuttersDev, 'ASC_BlockingTime_beforDayOpen' );
# #
# $attr{$shuttersDev}{ASC_Shading_StateChange_SunnyCloudy} = # $attr{$shuttersDev}{ASC_Shading_StateChange_SunnyCloudy} =
# AttrVal( $shuttersDev, 'ASC_Shading_StateChange_Sunny', 'none' ) . ':' # AttrVal( $shuttersDev, 'ASC_Shading_StateChange_Sunny', 'none' ) . ':'

5
lib/FHEM/Automation/ShuttersControl/Rainprotection.pm
View File

@@ -133,9 +133,11 @@ sub _RainProtected {
$FHEM::Automation::ShuttersControl::shutters->setLastDrive( $FHEM::Automation::ShuttersControl::shutters->setLastDrive(
'rain protected'); 'rain protected');
$FHEM::Automation::ShuttersControl::shutters->setDriveCmd( $FHEM::Automation::ShuttersControl::shutters->setDriveCmd(
$FHEM::Automation::ShuttersControl::ascDev $FHEM::Automation::ShuttersControl::ascDev
->getRainSensorShuttersClosedPos); ->getRainSensorShuttersClosedPos);
$FHEM::Automation::ShuttersControl::shutters $FHEM::Automation::ShuttersControl::shutters
->setRainProtectionStatus('protected'); ->setRainProtectionStatus('protected');
} }
@@ -168,7 +170,8 @@ sub _RainUnprotected {
->getClosedPos ->getClosedPos
) )
) )
); )
if (IsAfterShuttersTimeBlocking($shuttersDev));
$FHEM::Automation::ShuttersControl::shutters $FHEM::Automation::ShuttersControl::shutters
->setRainProtectionStatus('unprotected'); ->setRainProtectionStatus('unprotected');