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

add new function getHomemode

Browse Source
This commit is contained in:
Marko Oldenburg 2020-05-24 09:32:07 +02:00
parent ccbe471931
commit 82a9d2c930
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
73_AutoShuttersControl.pm
View File

@ -2151,7 +2151,10 @@ sub EventProcessingShadingBrightness {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
my $reading = $shutters->getBrightnessReading; my $reading = $shutters->getBrightnessReading;
my $outTemp = ( $shutters->getOutTemp != -100 ? $shutters->getOutTemp : $ascDev->getOutTemp ); my $outTemp =
( $shutters->getOutTemp != -100
? $shutters->getOutTemp
: $ascDev->getOutTemp );
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness" "AutoShuttersControl ($shuttersDev) - EventProcessingShadingBrightness"
@ -2222,16 +2225,16 @@ sub EventProcessingTwilightDevice {
); );
if ( $events =~ m{(azimuth|elevation|SunAz|SunAlt):\s(\d+.\d+)}xms ) { if ( $events =~ m{(azimuth|elevation|SunAz|SunAlt):\s(\d+.\d+)}xms ) {
my $name = $device; my $name = $device;
my ( $azimuth, $elevation ); my ( $azimuth, $elevation );
my $outTemp = $ascDev->getOutTemp; my $outTemp = $ascDev->getOutTemp;
$azimuth = $2 if ( $1 eq 'azimuth' || $1 eq 'SunAz' ); $azimuth = $2 if ( $1 eq 'azimuth' || $1 eq 'SunAz' );
$elevation = $2 if ( $1 eq 'elevation' || $1 eq 'SunAlt' ); $elevation = $2 if ( $1 eq 'elevation' || $1 eq 'SunAlt' );
$azimuth = $ascDev->getAzimuth $azimuth = $ascDev->getAzimuth
if ( !defined($azimuth) && !$azimuth ); if ( !defined($azimuth) && !$azimuth );
$elevation = $ascDev->getElevation $elevation = $ascDev->getElevation
if ( !defined($elevation) && !$elevation ); if ( !defined($elevation) && !$elevation );
ASC_Debug( 'EventProcessingTwilightDevice: ' ASC_Debug( 'EventProcessingTwilightDevice: '
@ -2343,10 +2346,10 @@ sub ShadingProcessing {
. $shuttersDev . $shuttersDev
. " Nach dem return" ); . " Nach dem return" );
my $getShadingPos = $shutters->getShadingPos; my $getShadingPos = $shutters->getShadingPos;
my $getStatus = $shutters->getStatus; my $getStatus = $shutters->getStatus;
my $oldShadingStatus = $shutters->getShadingStatus; my $oldShadingStatus = $shutters->getShadingStatus;
my $homemode = $shutters->getHomemode; my $homemode = $shutters->getHomemode;
ASC_Debug( 'ShadingProcessing: ' ASC_Debug( 'ShadingProcessing: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
@ -2776,9 +2779,11 @@ sub EventProcessingExternalTriggerDevice {
$shutters->setLastDrive('external trigger device inactive'); $shutters->setLastDrive('external trigger device inactive');
$shutters->setNoDelay(1); $shutters->setNoDelay(1);
$shutters->setExternalTriggerState(1); $shutters->setExternalTriggerState(1);
ShuttersCommandSet( $hash, $shuttersDev, ShuttersCommandSet(
$hash,
$shuttersDev,
( (
$shutters->getIsDay $shutters->getIsDay
? $triggerPosInactive ? $triggerPosInactive
: $shutters->getClosedPos : $shutters->getClosedPos
) )
@ -5002,6 +5007,15 @@ sub setAdvDelay {
return; return;
} }
sub getHomemode {
my $self = shift;
my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus
if ( $homemode eq 'none' );
return $homemode;
}
sub getAdvDelay { sub getAdvDelay {
my $self = shift; my $self = shift;
@ -8440,7 +8454,7 @@ sub getBlockAscDrivesAfterManual {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.30", "version": "v0.8.31",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],