Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

73_AutoShuttersControl: fix ExternalTrigger, fix set rainstate by night

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@25108 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2021-10-24 05:43:05 +00:00
parent e01788352c
commit 580b58908e
6 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # 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 - bugfix: 73_DoorBird: incrementalTim[e]out misspelling corrected
- feature: 48_MieleAtHome: support set targetTemperature and mode - feature: 48_MieleAtHome: support set targetTemperature and mode
- bugfix: 50_Signalbot: Fixed issue with Babble and invite - bugfix: 50_Signalbot: Fixed issue with Babble and invite

2
FHEM/73_AutoShuttersControl.pm
View File

@ -1436,7 +1436,7 @@ __END__
], ],
"release_status": "stable", "release_status": "stable",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.10.16", "version": "v0.10.17",
"author": [ "author": [
"Marko Oldenburg <fhemdevelopment@cooltux.net>" "Marko Oldenburg <fhemdevelopment@cooltux.net>"
], ],

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

@ -246,7 +246,7 @@ our %userAttrList = (
'ASC_WindowRec' => '-', 'ASC_WindowRec' => '-',
'ASC_WindowRec_subType:twostate,threestate' => '-', 'ASC_WindowRec_subType:twostate,threestate' => '-',
'ASC_WindowRec_PosAfterDayClosed:open,lastManual' => '-', '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_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_ComfortOpen_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 20, 80 ],
'ASC_GuestRoom:on,off' => '-', 'ASC_GuestRoom:on,off' => '-',

8
lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
View File

@ -977,8 +977,10 @@ sub EventProcessingResidents {
|| ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 || ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
&& $FHEM::Automation::ShuttersControl::shutters && $FHEM::Automation::ShuttersControl::shutters
->getSelfDefenseMode eq 'gone' ->getSelfDefenseMode eq 'gone'
&& $FHEM::Automation::ShuttersControl::shutters && ( $FHEM::Automation::ShuttersControl::shutters
->getShuttersPlace eq 'terrace' ->getShuttersPlace eq 'terrace'
|| $FHEM::Automation::ShuttersControl::shutters
->getShuttersPlace eq 'EG_window' )
&& $FHEM::Automation::ShuttersControl::shutters && $FHEM::Automation::ShuttersControl::shutters
->getSelfDefenseMode ne 'off' ) ->getSelfDefenseMode ne 'off' )
) )
@ -2440,7 +2442,7 @@ sub EventProcessingExternalTriggerDevice {
'external trigger device inactive'); 'external trigger device inactive');
$FHEM::Automation::ShuttersControl::shutters->setNoDelay(1); $FHEM::Automation::ShuttersControl::shutters->setNoDelay(1);
$FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus( $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(
1); 0);
FHEM::Automation::ShuttersControl::ShuttersCommandSet( FHEM::Automation::ShuttersControl::ShuttersCommandSet(
$hash, $hash,
$shuttersDev, $shuttersDev,

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

@ -108,11 +108,16 @@ sub RainProcessing {
->setRainProtectionStatus('unprotected'); ->setRainProtectionStatus('unprotected');
} }
else { else {
$FHEM::Automation::ShuttersControl::shutters if ( $FHEM::Automation::ShuttersControl::shutters->getStatus != $rainClosedPos
->setRainProtectionStatus('unprotected') && ($val == 0 || $val < $triggerMin) )
if ( $FHEM::Automation::ShuttersControl::shutters->getStatus != {
$rainClosedPos $FHEM::Automation::ShuttersControl::shutters
&& ($val == 0 || $val < $triggerMin) ); ->setRainProtectionStatus('unprotected');
}
elsif ($val > $triggerMax) {
$FHEM::Automation::ShuttersControl::shutters
->setRainProtectionStatus('protected');
}
} }
} }

6
lib/FHEM/Automation/ShuttersControl/Shutters.pm
View File

@ -161,9 +161,9 @@ sub setDriveCmd {
$FHEM::Automation::ShuttersControl::shutters->setDelayCmd($posValue); $FHEM::Automation::ShuttersControl::shutters->setDelayCmd($posValue);
$FHEM::Automation::ShuttersControl::ascDev->setDelayCmdReading; $FHEM::Automation::ShuttersControl::ascDev->setDelayCmdReading;
$FHEM::Automation::ShuttersControl::shutters->setNoDelay(0); $FHEM::Automation::ShuttersControl::shutters->setNoDelay(0);
$FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0) # $FHEM::Automation::ShuttersControl::shutters->setExternalTriggerStatus(0)
if ( $FHEM::Automation::ShuttersControl::shutters # if ( $FHEM::Automation::ShuttersControl::shutters
->getExternalTriggerStatus ); # ->getExternalTriggerStatus );
FHEM::Automation::ShuttersControl::ASC_Debug( 'setDriveCmd: ' FHEM::Automation::ShuttersControl::ASC_Debug( 'setDriveCmd: '
. $FHEM::Automation::ShuttersControl::shutters->getShuttersDev . $FHEM::Automation::ShuttersControl::shutters->getShuttersDev