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

Merge pull request 'dev' (#107) from dev into main

Browse Source 
Reviewed-on: #107
This commit is contained in:
Marko Oldenburg
2022-08-29 07:45:43 +02:00
parent 459b8508ec 7cba141447
commit ae86468077
5 changed files with 71 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FHEM/73_AutoShuttersControl.pm
View File

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

10
controls_AutoShuttersControl.txt
View File

@@ -1,11 +1,11 @@
UPD 2022-03-24_09:53:42 116177 FHEM/73_AutoShuttersControl.pm UPD 2022-06-20_15:54:48 116177 FHEM/73_AutoShuttersControl.pm
UPD 2022-04-06_09:20:00 76255 lib/FHEM/Automation/ShuttersControl.pm UPD 2022-06-20_12:59:11 76466 lib/FHEM/Automation/ShuttersControl.pm
UPD 2022-01-14_08:49:13 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2022-01-14_08:49:13 2691 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2022-01-14_08:49:13 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2022-01-14_08:49:13 2677 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2022-03-05_09:12:41 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2022-03-05_09:12:41 32016 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2022-01-14_08:49:13 25452 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2022-01-14_08:49:13 25452 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2022-04-06_09:20:46 112362 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2022-06-20_15:50:59 112421 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2022-03-24_09:53:22 40705 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2022-04-07_21:31:16 40705 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2022-01-14_08:49:13 2209 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2022-01-14_08:49:13 2209 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2022-01-14_08:49:13 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2022-01-14_08:49:13 11857 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2022-01-14_08:49:13 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm UPD 2022-01-14_08:49:13 7265 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
@@ -13,4 +13,4 @@ UPD 2022-03-05_09:12:39 52751 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.
UPD 2022-01-14_08:49:13 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm UPD 2022-01-14_08:49:13 2799 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
UPD 2022-01-14_08:49:13 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm UPD 2022-01-14_08:49:13 3887 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2022-01-14_08:49:13 2200 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm UPD 2022-01-14_08:49:13 2200 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm
UPD 2022-01-14_08:49:13 7113 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm UPD 2022-06-20_15:49:47 7396 lib/FHEM/Automation/ShuttersControl/Rainprotection.pm

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

@@ -1764,7 +1764,11 @@ sub SetCmdFn {
return return
if ( $shutters->getASCenable eq 'off' if ( $shutters->getASCenable eq 'off'
|| $ascDev->getASCenable eq 'off' || $ascDev->getASCenable eq 'off'
|| $idleDetection !~ m{^$idleDetectionValue$}xms ); || $idleDetection !~ m{^$idleDetectionValue$}xms
|| $FHEM::Automation::ShuttersControl::shutters
->getWindProtectionStatus eq 'protected'
|| $FHEM::Automation::ShuttersControl::shutters
->getRaindProtectionStatus eq 'protected' );
if ( $shutters->getStatus != $posValue ) { if ( $shutters->getStatus != $posValue ) {
$shutters->setLastPos( $shutters->getStatus ); $shutters->setLastPos( $shutters->getStatus );

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

@@ -1363,6 +1363,7 @@ sub EventProcessingWind {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev); $FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev);
my $targetPos = $FHEM::Automation::ShuttersControl::shutters->getLastPos;
my $reading = my $reading =
$FHEM::Automation::ShuttersControl::ascDev->getWindSensorReading $FHEM::Automation::ShuttersControl::ascDev->getWindSensorReading
@@ -1414,35 +1415,41 @@ sub EventProcessingWind {
{ {
$FHEM::Automation::ShuttersControl::shutters->setLastDrive( $FHEM::Automation::ShuttersControl::shutters->setLastDrive(
'wind un-protected'); 'wind un-protected');
$FHEM::Automation::ShuttersControl::shutters->setDriveCmd(
( if ( $FHEM::Automation::ShuttersControl::shutters->getIsDay
$FHEM::Automation::ShuttersControl::shutters->getIsDay && !$FHEM::Automation::ShuttersControl::shutters
? $FHEM::Automation::ShuttersControl::shutters ->getIfInShading
->getLastPos && $FHEM::Automation::ShuttersControl::shutters->getLastPos
: ( == $FHEM::Automation::ShuttersControl::shutters
$FHEM::Automation::ShuttersControl::shutters ->getShadingPos )
->getShuttersPlace eq 'awning' {
? $FHEM::Automation::ShuttersControl::shutters $targetPos =
->getOpenPos $FHEM::Automation::ShuttersControl::shutters->getOpenPos;
: ( }
else {
$targetPos =
$FHEM::Automation::ShuttersControl::shutters->getLastPos;
}
if ( !$FHEM::Automation::ShuttersControl::shutters->getIsDay
&& $FHEM::Automation::ShuttersControl::shutters
->getShuttersPlace ne 'awning' )
{
$targetPos = (
$FHEM::Automation::ShuttersControl::shutters $FHEM::Automation::ShuttersControl::shutters
->getPrivacyDownStatus == 2 ->getPrivacyDownStatus == 2
? $FHEM::Automation::ShuttersControl::shutters ? $FHEM::Automation::ShuttersControl::shutters
->getPrivacyDownPos ->getPrivacyDownPos
: (
$FHEM::Automation::ShuttersControl::shutters
->getSleepPos > 0
? $FHEM::Automation::ShuttersControl::shutters
->getSleepPos
: $FHEM::Automation::ShuttersControl::shutters : $FHEM::Automation::ShuttersControl::shutters
->getClosedPos ->getClosedPos
)
)
)
)
); );
}
$FHEM::Automation::ShuttersControl::shutters $FHEM::Automation::ShuttersControl::shutters
->setWindProtectionStatus('unprotected'); ->setWindProtectionStatus('unprotected');
$FHEM::Automation::ShuttersControl::shutters->setDriveCmd(
$targetPos);
} }
FHEM::Automation::ShuttersControl::ASC_Debug( FHEM::Automation::ShuttersControl::ASC_Debug(

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

@@ -154,6 +154,7 @@ sub _RainProtected {
sub _RainUnprotected { sub _RainUnprotected {
my $h = shift; my $h = shift;
my $targetPos = $FHEM::Automation::ShuttersControl::shutters->getLastPos;
my $shuttersDev = $h->{shuttersdevice}; my $shuttersDev = $h->{shuttersdevice};
$FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev); $FHEM::Automation::ShuttersControl::shutters->setShuttersDev($shuttersDev);
@@ -170,29 +171,35 @@ sub _RainUnprotected {
->setRainUnprotectionDelayObj('none'); ->setRainUnprotectionDelayObj('none');
} }
$FHEM::Automation::ShuttersControl::shutters->setDriveCmd( if ( $FHEM::Automation::ShuttersControl::shutters->getIsDay
( && !$FHEM::Automation::ShuttersControl::shutters->getIfInShading
$FHEM::Automation::ShuttersControl::shutters->getIsDay && $FHEM::Automation::ShuttersControl::shutters->getLastPos ==
? $FHEM::Automation::ShuttersControl::shutters->getLastPos $FHEM::Automation::ShuttersControl::shutters->getShadingPos )
: ( {
$FHEM::Automation::ShuttersControl::shutters->getShuttersPlace $targetPos = $FHEM::Automation::ShuttersControl::shutters->getOpenPos;
eq 'awning' }
? $FHEM::Automation::ShuttersControl::shutters->getOpenPos else {
: ( $targetPos = $FHEM::Automation::ShuttersControl::shutters->getLastPos;
$FHEM::Automation::ShuttersControl::shutters }
->getPrivacyDownStatus == 2
? $FHEM::Automation::ShuttersControl::shutters if ( !$FHEM::Automation::ShuttersControl::shutters->getIsDay
->getPrivacyDownPos && $FHEM::Automation::ShuttersControl::shutters->getShuttersPlace ne
: $FHEM::Automation::ShuttersControl::shutters 'awning' )
->getClosedPos {
) $targetPos = (
) $FHEM::Automation::ShuttersControl::shutters->getPrivacyDownStatus
) == 2
) if ( IsAfterShuttersTimeBlocking($shuttersDev) ); ? $FHEM::Automation::ShuttersControl::shutters->getPrivacyDownPos
: $FHEM::Automation::ShuttersControl::shutters->getClosedPos
);
}
$FHEM::Automation::ShuttersControl::shutters->setRainProtectionStatus( $FHEM::Automation::ShuttersControl::shutters->setRainProtectionStatus(
'unprotected'); 'unprotected');
$FHEM::Automation::ShuttersControl::shutters->setDriveCmd($targetPos)
if ( IsAfterShuttersTimeBlocking($shuttersDev) );
return; return;
} }