15 Commits

Author SHA1 Message Date
a66daa7d5a Merge pull request 'close: #50 expand regex to detect position event with dot's' (#51) from patch-driveDetection into devel
Reviewed-on: #51
2021-10-24 18:33:45 +02:00
617b7a7531 expand regex to detect position event with dot's 2021-10-24 17:16:11 +02:00
f498829347 fix set rainstate by night 2021-10-23 10:08:37 +02:00
4cc3ecc40a Merge branch 'patch-shadingOut_externalTrigger' into devel 2021-10-21 09:33:11 +02:00
95446cc91e change code for ExternlTriggerStatus. 2021-10-09 08:10:09 +02:00
63393b4cd4 add EG_window to ShuttersPlace and expand ProcessingResidents Fn for
close Shutter by open window then gone
2021-10-09 07:53:53 +02:00
6a62226a39 Merge branch 'testing' 2021-10-09 07:12:54 +02:00
cbd058773d Merge branch 'devel' into testing 2021-10-09 07:12:37 +02:00
649d21f19b Merge branch 'devel' into testing 2021-10-08 11:44:44 +02:00
62a4a249b4 Merge pull request 'devel' (#48) from devel into testing
Reviewed-on: #48
2021-10-08 10:02:12 +02:00
a2c878e333 Merge branch 'devel' into testing 2021-10-01 08:09:29 +02:00
4c1d6c7885 Merge branch 'devel' into testing 2021-09-14 09:51:23 +02:00
6babb451c9 Merge branch 'devel' into testing 2021-09-14 09:20:52 +02:00
bd6e901ca1 Merge pull request 'testing' (#39) from testing into master
Reviewed-on: #39
2021-06-02 11:53:51 +02:00
f36101f48a Merge pull request 'devel' (#38) from devel into testing
Reviewed-on: #38
2021-05-27 09:03:30 +02:00
6 changed files with 37 additions and 30 deletions

View File

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

View File

@ -1,16 +1,16 @@
UPD 2021-10-09_07:07:29 111901 FHEM/73_AutoShuttersControl.pm
UPD 2021-09-14_09:51:23 74456 lib/FHEM/Automation/ShuttersControl.pm
UPD 2021-09-14_09:51:23 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2021-10-09_07:08:59 2494 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2021-10-09_07:09:33 31894 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2021-10-09_07:09:29 25333 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-10-01_08:09:29 109370 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-09-14_09:51:23 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2021-10-09_07:09:47 2173 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2021-10-09_07:10:04 11739 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2021-10-09_07:10:16 7249 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
UPD 2021-10-09_07:10:38 52523 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2021-10-09_07:10:47 2901 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
UPD 2021-10-09_07:11:04 3978 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2021-10-09_07:11:27 2286 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
UPD 2021-10-08_11:44:44 6506 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm
UPD 2021-10-24_07:33:53 111901 FHEM/73_AutoShuttersControl.pm
UPD 2021-10-24_17:15:09 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-24_07:33:53 109522 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-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

View File

@ -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' => '-',
@ -515,7 +515,7 @@ m{^(ATTR|DELETEATTR)\s(.*ASC_Time_Up_WE_Holiday|.*ASC_Up|.*ASC_Down|.*ASC_AutoAs
EventProcessingGeneral( $hash, undef, join( ' ', @{$events} ) );
}
}
elsif ( grep m{^($posReading):\s\d{1,3}$}xms, @{$events} ) {
elsif ( grep m{^($posReading):\s\d{1,3}(\.\d{1,3})?$}xms, @{$events} ) {
ASC_Debug( 'Notify: '
. ' ASC_Pos_Reading Event vom Rollo '
. $devname

View File

@ -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,

View File

@ -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');
}
}
}

View File

@ -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