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

add SleepPos to Brightness Fn, change roommate Code for roommate only ASC_Down and ASC_Up

Browse Source
This commit is contained in:
Marko Oldenburg 2019-09-16 08:49:58 +02:00
parent 27c75dd3ed
commit 2b5368ef0f
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
73_AutoShuttersControl.pm
View File

@ -1074,11 +1074,11 @@ sub EventProcessingWindowRec($@) {
$shutters->setLastDrive($setLastDrive); $shutters->setLastDrive($setLastDrive);
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
$shutters->setDriveCmd( $shutters->setDriveCmd(
( # (
$shutters->getShuttersPlace eq 'terrace' # $shutters->getShuttersPlace eq 'terrace'
? $shutters->getOpenPos # ? $shutters->getOpenPos
: $posValue $posValue
) # )
); );
} }
} }
@ -1123,7 +1123,8 @@ sub EventProcessingRoommate($@) {
$getRoommatesLastStatus eq 'asleep' $getRoommatesLastStatus eq 'asleep'
or $getRoommatesLastStatus eq 'awoken' or $getRoommatesLastStatus eq 'awoken'
) )
and $shutters->getIsDay and ($shutters->getIsDay
or $shutters->getUp eq 'roommate')
and IsAfterShuttersTimeBlocking($shuttersDev) and IsAfterShuttersTimeBlocking($shuttersDev)
) )
{ {
@ -1154,7 +1155,8 @@ sub EventProcessingRoommate($@) {
) )
{ {
if ( if (
not $shutters->getIsDay (not $shutters->getIsDay
or $shutters->getDown eq 'roommate')
and IsAfterShuttersTimeBlocking($shuttersDev) and IsAfterShuttersTimeBlocking($shuttersDev)
and ( $getModeDown eq 'home' and ( $getModeDown eq 'home'
or $getModeDown eq 'always' ) or $getModeDown eq 'always' )
@ -1176,7 +1178,8 @@ sub EventProcessingRoommate($@) {
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
} }
elsif ( elsif (
$shutters->getIsDay ($shutters->getIsDay
or $shutters->getUp eq 'roommate')
and IsAfterShuttersTimeBlocking($shuttersDev) and IsAfterShuttersTimeBlocking($shuttersDev)
and ( $getModeUp eq 'home' and ( $getModeUp eq 'home'
or $getModeUp eq 'always' ) or $getModeUp eq 'always' )
@ -1238,10 +1241,12 @@ sub EventProcessingRoommate($@) {
elsif ( elsif (
$1 eq 'absent' $1 eq 'absent'
and ( not $shutters->getIsDay and ( not $shutters->getIsDay
or $shutters->getDown eq 'roommate'
or $shutters->getShadingMode eq 'absent' ) or $shutters->getShadingMode eq 'absent' )
) )
{ {
if ( $shutters->getIsDay if ( ($shutters->getIsDay
or $shutters->getUp eq 'roommate')
and $shutters->getIfInShading and $shutters->getIfInShading
and and
not $shutters->getQueryShuttersPos( $shutters->getShadingPos ) not $shutters->getQueryShuttersPos( $shutters->getShadingPos )
@ -1251,7 +1256,8 @@ sub EventProcessingRoommate($@) {
$shutters->setLastDrive('shading in'); $shutters->setLastDrive('shading in');
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
} }
elsif ( not $shutters->getIsDay elsif ( (not $shutters->getIsDay
or $shutters->getDown eq 'roommate')
and $getModeDown eq 'absent' and $getModeDown eq 'absent'
and $getRoommatesStatus eq 'absent' ) and $getRoommatesStatus eq 'absent' )
{ {
@ -1322,8 +1328,6 @@ 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('selfDefense terrace'); $shutters->setLastDrive('selfDefense terrace');
@ -1807,7 +1811,7 @@ sub EventProcessingBrightness($@) {
elsif ( CheckIfShuttersWindowRecOpen($shuttersDev) == 0 elsif ( CheckIfShuttersWindowRecOpen($shuttersDev) == 0
or $shutters->getVentilateOpen eq 'off' ) or $shutters->getVentilateOpen eq 'off' )
{ {
$posValue = $shutters->getClosedPos; $posValue = ($shutters->getSleepPos > 0 ? $shutters->getSleepPos : $shutters->getClosedPos);
} }
else { $posValue = $shutters->getVentilatePos; } else { $posValue = $shutters->getVentilatePos; }
@ -6665,7 +6669,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.32", "version": "v0.6.33",
"x_developmentversion": "v0.6.19.34", "x_developmentversion": "v0.6.19.34",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"