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

add shading deaktivated logic pro shutter

Browse Source
This commit is contained in:
Marko Oldenburg
2020-10-05 12:29:01 +02:00
parent 09fd5cd36b
commit 31e2afe553
3 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controls_AutoShuttersControl.txt
View File

@ -1,10 +1,10 @@
UPD 2020-10-05_10:02:00 97597 FHEM/73_AutoShuttersControl.pm UPD 2020-10-05_10:02:00 97597 FHEM/73_AutoShuttersControl.pm
UPD 2020-10-05_10:37:05 74123 lib/FHEM/Automation/ShuttersControl.pm UPD 2020-10-05_10:47:37 74123 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-08-12_11:00:05 31376 lib/FHEM/Automation/ShuttersControl/Shutters.pm UPD 2020-08-12_11:00:05 31376 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-10-05_10:36:38 25275 lib/FHEM/Automation/ShuttersControl/Shading.pm UPD 2020-10-05_12:25:34 25362 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2020-10-05_10:02:00 109379 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm UPD 2020-10-05_12:25:40 109905 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2020-08-18_08:40:35 45518 lib/FHEM/Automation/ShuttersControl/Helper.pm UPD 2020-08-18_08:40:35 45518 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2020-07-26_17:36:29 11569 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm UPD 2020-07-26_17:36:29 11569 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm

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

@ -209,8 +209,21 @@ m{^(DELETEATTR|ATTR) #global ATTR myASC ASC_tempSensor Cellar
(.*)?}xms (.*)?}xms
) )
{ {
CommandSet( undef, $name . ' controlShading on' ) # ATTR RolloKinZimSteven_F1 ASC_Shading_Mode off
if ( ReadingsVal( $name, 'controlShading', 'off' ) ne 'off' ); if ( $events =~ m{^ATTR\s(.*)\sASC_Shading_Mode\s(off)}xms ) {
my %funcHash = (
hash => $hash,
shuttersdevice => $1,
value => $2,
attrEvent => 1,
);
FHEM::Automation::ShuttersControl::Shading::_CheckShuttersConditionsForShadingFn(\%funcHash);
}
else {
CommandSet( undef, $name . ' controlShading on' )
if ( ReadingsVal( $name, 'controlShading', 'off' ) ne 'off' );
}
} }
} }

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

@ -101,6 +101,7 @@ sub CheckASC_ConditionsForShadingFn {
hash => $hash, hash => $hash,
shuttersdevice => $shuttersDev, shuttersdevice => $shuttersDev,
value => $value, value => $value,
attrEvent => 0,
); );
InternalTimer( InternalTimer(
@ -135,9 +136,10 @@ sub _CheckShuttersConditionsForShadingFn {
if ( $value eq 'off' ) { if ( $value eq 'off' ) {
$FHEM::Automation::ShuttersControl::shutters->setShadingStatus('out'); $FHEM::Automation::ShuttersControl::shutters->setShadingStatus('out');
$infoMessage .= ' shading was deactivated globally'; $infoMessage .= ' shading was deactivated in' . ($funcHash->{attrEvent} ? 'the device' : 'globally');
ShadingProcessingDriveCommand( $hash, $shuttersDev ); ShadingProcessingDriveCommand( $hash, $shuttersDev );
} else { }
else {
$infoMessage .= ( $infoMessage .= (
$FHEM::Automation::ShuttersControl::shutters->getShadingMode ne 'off' $FHEM::Automation::ShuttersControl::shutters->getShadingMode ne 'off'
&& $FHEM::Automation::ShuttersControl::ascDev && $FHEM::Automation::ShuttersControl::ascDev