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

Merge branch 'master' into patch-splitdevreading

Browse Source
This commit is contained in:
Marko Oldenburg 2019-03-04 10:41:02 +01:00
commit 9c86df457e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
73_AutoShuttersControl.pm
View File

@ -858,7 +858,7 @@ sub EventProcessingRoommate($@) {
my $getModeUp = $shutters->getModeUp; my $getModeUp = $shutters->getModeUp;
my $getModeDown = $shutters->getModeDown; my $getModeDown = $shutters->getModeDown;
my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus;
if ( if (
( $1 eq 'home' or $1 eq 'awoken' ) ( $1 eq 'home' or $1 eq 'awoken' )
@ -976,14 +976,13 @@ sub EventProcessingResidents($@) {
my $name = $device; my $name = $device;
my $reading = $ascDev->getResidentsReading; my $reading = $ascDev->getResidentsReading;
my $getModeUp = $shutters->getModeUp;
my $getModeDow = $getModeDown;
my $getResidentsLastStatus = $ascDev->getResidentsLastStatus; my $getResidentsLastStatus = $ascDev->getResidentsLastStatus;
if ( $events =~ m#$reading:\s(absent)# ) { if ( $events =~ m#$reading:\s(absent)# ) {
foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
my $getModeUp = $shutters->getModeUp;
my $getModeDown = $shutters->getModeDown;
$shutters->setHardLockOut('off'); $shutters->setHardLockOut('off');
if ( if (
CheckIfShuttersWindowRecOpen($shuttersDev) != 0 CheckIfShuttersWindowRecOpen($shuttersDev) != 0
@ -1016,6 +1015,8 @@ sub EventProcessingResidents($@) {
{ {
foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
my $getModeUp = $shutters->getModeUp;
my $getModeDown = $shutters->getModeDown;
$shutters->setHardLockOut('off'); $shutters->setHardLockOut('off');
if ( $shutters->getShuttersPlace eq 'terrace' ) { if ( $shutters->getShuttersPlace eq 'terrace' ) {
$shutters->setLastDrive('selfeDefense terrace'); $shutters->setLastDrive('selfeDefense terrace');
@ -1033,6 +1034,8 @@ sub EventProcessingResidents($@) {
{ {
foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
my $getModeUp = $shutters->getModeUp;
my $getModeDown = $shutters->getModeDown;
if ( if (
$shutters->getStatus != $shutters->getClosedPos $shutters->getStatus != $shutters->getClosedPos