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

remove Attribut ASC_autoControlShading and add reading / set command controlShading

Browse Source
This commit is contained in:
Marko Oldenburg 2019-05-04 23:01:57 +02:00
parent 02d8ab2745
commit da6fd56674
1 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
73_AutoShuttersControl.pm
View File

@ -44,7 +44,7 @@ use strict;
use warnings; use warnings;
use FHEM::Meta; use FHEM::Meta;
my $version = '0.6.6'; my $version = '0.6.7';
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -74,7 +74,6 @@ sub AutoShuttersControl_Initialize($) {
. 'ASC_brightnessDriveUpDown ' . 'ASC_brightnessDriveUpDown '
. 'ASC_autoShuttersControlMorning:on,off ' . 'ASC_autoShuttersControlMorning:on,off '
. 'ASC_autoShuttersControlEvening:on,off ' . 'ASC_autoShuttersControlEvening:on,off '
. 'ASC_autoShuttersControlShading:on,off '
. 'ASC_autoShuttersControlComfort:on,off ' . 'ASC_autoShuttersControlComfort:on,off '
. 'ASC_residentsDev ' . 'ASC_residentsDev '
. 'ASC_rainSensor ' . 'ASC_rainSensor '
@ -261,14 +260,15 @@ sub Define($$) {
if ( AttrVal( $name, 'room', 'none' ) eq 'none' ); if ( AttrVal( $name, 'room', 'none' ) eq 'none' );
CommandAttr( undef, $name . ' icon fts_shutter_automatic' ) CommandAttr( undef, $name . ' icon fts_shutter_automatic' )
if ( AttrVal( $name, 'icon', 'none' ) eq 'none' ); if ( AttrVal( $name, 'icon', 'none' ) eq 'none' );
CommandAttr( undef, $name . ' ASC_autoAstroModeEvening REAL' )
if ( $ascDev->getAutoAstroModeEvening eq 'none' ); # CommandAttr( undef, $name . ' ASC_autoAstroModeEvening REAL' )
CommandAttr( undef, $name . ' ASC_autoAstroModeMorning REAL' ) # if ( $ascDev->getAutoAstroModeEvening eq 'none' );
if ( $ascDev->getAutoAstroModeMorning eq 'none' ); # CommandAttr( undef, $name . ' ASC_autoAstroModeMorning REAL' )
CommandAttr( undef, $name . ' ASC_autoShuttersControlMorning on' ) # if ( $ascDev->getAutoAstroModeMorning eq 'none' );
if ( $ascDev->getAutoShuttersControlMorning eq 'none' ); # CommandAttr( undef, $name . ' ASC_autoShuttersControlMorning on' )
CommandAttr( undef, $name . ' ASC_autoShuttersControlEvening on' ) # if ( $ascDev->getAutoShuttersControlMorning eq 'none' );
if ( $ascDev->getAutoShuttersControlEvening eq 'none' ); # CommandAttr( undef, $name . ' ASC_autoShuttersControlEvening on' )
# if ( $ascDev->getAutoShuttersControlEvening eq 'none' );
CommandAttr( undef, CommandAttr( undef,
$name $name
. ' devStateIcon selfeDefense.terrace:fts_door_tilt created.new.drive.timer:clock .*asleep:scene_sleeping roommate.(awoken|home):user_available residents.(home|awoken):status_available manual:fts_shutter_manual selfeDefense.active:status_locked selfeDefense.inactive:status_open day.open:scene_day night.close:scene_night shading.in:weather_sun shading.out:weather_cloudy' . ' devStateIcon selfeDefense.terrace:fts_door_tilt created.new.drive.timer:clock .*asleep:scene_sleeping roommate.(awoken|home):user_available residents.(home|awoken):status_available manual:fts_shutter_manual selfeDefense.active:status_locked selfeDefense.inactive:status_open day.open:scene_day night.close:scene_night shading.in:weather_sun shading.out:weather_cloudy'
@ -344,6 +344,8 @@ sub Notify($$) {
if ( $ascDev->getSunriseTimeWeHoliday eq 'none' ); if ( $ascDev->getSunriseTimeWeHoliday eq 'none' );
readingsSingleUpdate( $hash, 'selfDefense', 'off', 0 ) readingsSingleUpdate( $hash, 'selfDefense', 'off', 0 )
if ( $ascDev->getSelfDefense eq 'none' ); if ( $ascDev->getSelfDefense eq 'none' );
readingsSingleUpdate( $hash, 'controlShading', 'off', 0 )
if ( $ascDev->getAutoShuttersControlShading eq 'none' );
# Ist der Event ein globaler und passt zum Rest der Abfrage oben wird nach neuen Rolläden Devices gescannt und eine Liste im Rolladenmodul sortiert nach Raum generiert # Ist der Event ein globaler und passt zum Rest der Abfrage oben wird nach neuen Rolläden Devices gescannt und eine Liste im Rolladenmodul sortiert nach Raum generiert
ShuttersDeviceScan($hash) ShuttersDeviceScan($hash)
@ -502,6 +504,10 @@ sub Set($$@) {
return "usage: $cmd" if ( @args > 1 ); return "usage: $cmd" if ( @args > 1 );
readingsSingleUpdate( $hash, $cmd, join( ' ', @args ), 1 ); readingsSingleUpdate( $hash, $cmd, join( ' ', @args ), 1 );
} }
elsif ( lc $cmd eq 'controlshading' ) {
return "usage: $cmd" if ( @args > 1 );
readingsSingleUpdate( $hash, $cmd, join( ' ', @args ), 1 );
}
elsif ( lc $cmd eq 'selfdefense' ) { elsif ( lc $cmd eq 'selfdefense' ) {
return "usage: $cmd" if ( @args > 1 ); return "usage: $cmd" if ( @args > 1 );
readingsSingleUpdate( $hash, $cmd, join( ' ', @args ), 1 ); readingsSingleUpdate( $hash, $cmd, join( ' ', @args ), 1 );
@ -514,7 +520,7 @@ sub Set($$@) {
else { else {
my $list = "scanForShutters:noArg"; my $list = "scanForShutters:noArg";
$list .= $list .=
" renewSetSunriseSunsetTimer:noArg partyMode:on,off hardLockOut:on,off sunriseTimeWeHoliday:on,off selfDefense:on,off wiggle:all," " renewSetSunriseSunsetTimer:noArg partyMode:on,off hardLockOut:on,off sunriseTimeWeHoliday:on,off controlShading:on,off selfDefense:on,off wiggle:all,"
. join( ',', @{ $hash->{helper}{shuttersList} } ) . join( ',', @{ $hash->{helper}{shuttersList} } )
if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' ); if ( ReadingsVal( $name, 'userAttrList', 'none' ) eq 'rolled out' );
$list .= " createNewNotifyDev:noArg" $list .= " createNewNotifyDev:noArg"
@ -4545,6 +4551,13 @@ sub getResidentsLastStatus {
return ReadingsVal( $ascDev->_getResidentsDev, 'lastState', 'none' ); return ReadingsVal( $ascDev->_getResidentsDev, 'lastState', 'none' );
} }
sub getAutoShuttersControlShading {
my $self = shift;
my $name = $self->{name};
return ReadingsVal( $name, 'controlShading', 'none' );
}
sub getSelfDefense { sub getSelfDefense {
my $self = shift; my $self = shift;
my $name = $self->{name}; my $name = $self->{name};
@ -4645,7 +4658,7 @@ sub getAutoAstroModeEvening {
my $self = shift; my $self = shift;
my $name = $self->{name}; my $name = $self->{name};
return AttrVal( $name, 'ASC_autoAstroModeEvening', 'none' ); return AttrVal( $name, 'ASC_autoAstroModeEvening', 'REAL' );
} }
sub getAutoAstroModeEveningHorizon { sub getAutoAstroModeEveningHorizon {
@ -4659,7 +4672,7 @@ sub getAutoAstroModeMorning {
my $self = shift; my $self = shift;
my $name = $self->{name}; my $name = $self->{name};
return AttrVal( $name, 'ASC_autoAstroModeMorning', 'none' ); return AttrVal( $name, 'ASC_autoAstroModeMorning', 'REAL' );
} }
sub getAutoAstroModeMorningHorizon { sub getAutoAstroModeMorningHorizon {
@ -4673,14 +4686,14 @@ sub getAutoShuttersControlMorning {
my $self = shift; my $self = shift;
my $name = $self->{name}; my $name = $self->{name};
return AttrVal( $name, 'ASC_autoShuttersControlMorning', 'none' ); return AttrVal( $name, 'ASC_autoShuttersControlMorning', 'on' );
} }
sub getAutoShuttersControlEvening { sub getAutoShuttersControlEvening {
my $self = shift; my $self = shift;
my $name = $self->{name}; my $name = $self->{name};
return AttrVal( $name, 'ASC_autoShuttersControlEvening', 'none' ); return AttrVal( $name, 'ASC_autoShuttersControlEvening', 'on' );
} }
sub getAutoShuttersControlComfort { sub getAutoShuttersControlComfort {
@ -4690,13 +4703,6 @@ sub getAutoShuttersControlComfort {
return AttrVal( $name, 'ASC_autoShuttersControlComfort', 'off' ); return AttrVal( $name, 'ASC_autoShuttersControlComfort', 'off' );
} }
sub getAutoShuttersControlShading {
my $self = shift;
my $name = $self->{name};
return AttrVal( $name, 'ASC_autoShuttersControlShading', 'off' );
}
sub getFreezeTemp { sub getFreezeTemp {
my $self = shift; my $self = shift;
my $name = $self->{name}; my $name = $self->{name};