diff --git a/fhem/CHANGED b/fhem/CHANGED index 5ebbb68e9..36af16d22 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,7 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - bugfix: 73_AutoShuttersControl: fix ExternalTrigger, + fix set rainstate by night - bugfix: 73_DoorBird: incrementalTim[e]out misspelling corrected - feature: 48_MieleAtHome: support set targetTemperature and mode - bugfix: 50_Signalbot: Fixed issue with Babble and invite diff --git a/fhem/FHEM/73_AutoShuttersControl.pm b/fhem/FHEM/73_AutoShuttersControl.pm index 62a85a950..8c513d08f 100644 --- a/fhem/FHEM/73_AutoShuttersControl.pm +++ b/fhem/FHEM/73_AutoShuttersControl.pm @@ -1436,7 +1436,7 @@ __END__ ], "release_status": "stable", "license": "GPL_2", - "version": "v0.10.16", + "version": "v0.10.17", "author": [ "Marko Oldenburg " ], diff --git a/fhem/lib/FHEM/Automation/ShuttersControl.pm b/fhem/lib/FHEM/Automation/ShuttersControl.pm index 5c9b399ae..8fbcaba0e 100644 --- a/fhem/lib/FHEM/Automation/ShuttersControl.pm +++ b/fhem/lib/FHEM/Automation/ShuttersControl.pm @@ -246,7 +246,7 @@ our %userAttrList = ( 'ASC_WindowRec' => '-', 'ASC_WindowRec_subType:twostate,threestate' => '-', 'ASC_WindowRec_PosAfterDayClosed:open,lastManual' => '-', - 'ASC_ShuttersPlace:window,terrace,awning' => '-', + 'ASC_ShuttersPlace:window,terrace,awning,EG_window' => '-', 'ASC_Ventilate_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 70, 30 ], 'ASC_ComfortOpen_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 20, 80 ], 'ASC_GuestRoom:on,off' => '-', diff --git a/fhem/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm b/fhem/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm index c0ec75f8a..3bce6024c 100644 --- a/fhem/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm +++ b/fhem/lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm @@ -977,8 +977,10 @@ sub EventProcessingResidents { || ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 && $FHEM::Automation::ShuttersControl::shutters ->getSelfDefenseMode eq 'gone' - && $FHEM::Automation::ShuttersControl::shutters - ->getShuttersPlace eq 'terrace' + && ( $FHEM::Automation::ShuttersControl::shutters + ->getShuttersPlace eq 'terrace' + || $FHEM::Automation::ShuttersControl::shutters + ->getShuttersPlace eq 'EG_window' ) && $FHEM::Automation::ShuttersControl::shutters ->getSelfDefenseMode ne 'off' ) ) @@ -2440,7 +2442,7 @@ sub EventProcessingExternalTriggerDevice { 'external trigger device inactive'); $FHEM::Automation::ShuttersControl::shutters->setNoDelay(1); $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus( - 1); + 0); FHEM::Automation::ShuttersControl::ShuttersCommandSet( $hash, $shuttersDev, diff --git a/fhem/lib/FHEM/Automation/ShuttersControl/Rainprotection.pm b/fhem/lib/FHEM/Automation/ShuttersControl/Rainprotection.pm index 9de670842..542901deb 100644 --- a/fhem/lib/FHEM/Automation/ShuttersControl/Rainprotection.pm +++ b/fhem/lib/FHEM/Automation/ShuttersControl/Rainprotection.pm @@ -108,11 +108,16 @@ sub RainProcessing { ->setRainProtectionStatus('unprotected'); } else { - $FHEM::Automation::ShuttersControl::shutters - ->setRainProtectionStatus('unprotected') - if ( $FHEM::Automation::ShuttersControl::shutters->getStatus != - $rainClosedPos - && ($val == 0 || $val < $triggerMin) ); + if ( $FHEM::Automation::ShuttersControl::shutters->getStatus != $rainClosedPos + && ($val == 0 || $val < $triggerMin) ) + { + $FHEM::Automation::ShuttersControl::shutters + ->setRainProtectionStatus('unprotected'); + } + elsif ($val > $triggerMax) { + $FHEM::Automation::ShuttersControl::shutters + ->setRainProtectionStatus('protected'); + } } } diff --git a/fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm b/fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm index 90663a5f1..ec88ea750 100644 --- a/fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm +++ b/fhem/lib/FHEM/Automation/ShuttersControl/Shutters.pm @@ -161,9 +161,9 @@ sub setDriveCmd { $FHEM::Automation::ShuttersControl::shutters->setDelayCmd($posValue); $FHEM::Automation::ShuttersControl::ascDev->setDelayCmdReading; $FHEM::Automation::ShuttersControl::shutters->setNoDelay(0); - $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0) - if ( $FHEM::Automation::ShuttersControl::shutters - ->getExternalTriggerStatus ); +# $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0) +# if ( $FHEM::Automation::ShuttersControl::shutters +# ->getExternalTriggerStatus ); FHEM::Automation::ShuttersControl::ASC_Debug( 'setDriveCmd: ' . $FHEM::Automation::ShuttersControl::shutters->getShuttersDev