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

die Dämmerungsphasen lassen sich nun zur Berechnung auch in den Rolladendevices einstellen. Rolladendevice hat Vorrang vor dem globalen Einstellungen im Moduldevice

Browse Source
This commit is contained in:
Marko Oldenburg
2018-09-13 15:21:29 +02:00
parent 12e62b7850
commit 105bf6774e
1 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
73_AutoShuttersControl.pm
View File

@@ -42,7 +42,7 @@ use warnings;
my $version = "0.1.40"; my $version = "0.1.41";
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
@@ -416,8 +416,7 @@ sub ShuttersDeviceScan($) {
my @list; my @list;
@list = devspec2array('AutoShuttersControl=[1-2]'); @list = devspec2array('AutoShuttersControl=[1-2]');
CommandDeleteReading(undef,$name . ' room_.*');
CommandDeleteReading(undef,$name . ' .*_nextAstroTimeEvent'); CommandDeleteReading(undef,$name . ' .*_nextAstroTimeEvent');
CommandDeleteReading(undef,$name . ' .*_lastDelayPosValue'); CommandDeleteReading(undef,$name . ' .*_lastDelayPosValue');
CommandDeleteReading(undef,$name . ' .*_lastPosValue'); CommandDeleteReading(undef,$name . ' .*_lastPosValue');
@@ -470,9 +469,9 @@ sub WriteReadingsShuttersList($) {
foreach (@{$hash->{helper}{shuttersList}}) { foreach (@{$hash->{helper}{shuttersList}}) {
readingsBulkUpdate($hash,'room_' . makeReadingName(AttrVal($_,'room','unsorted')),ReadingsVal($name,'room_' . AttrVal($_,'room','unsorted'),'') . ', ' . $_) if( ReadingsVal($name,'room_' . AttrVal($_,'room','unsorted'),'none') ne 'none' ); readingsBulkUpdate($hash,'room_' . makeReadingName(AttrVal($_,'room','unsorted')),ReadingsVal($name,'room_' . makeReadingName(AttrVal($_,'room','unsorted')),'') . ', ' . $_) if( ReadingsVal($name,'room_' . makeReadingName(AttrVal($_,'room','unsorted')),'none') ne 'none' );
readingsBulkUpdate($hash,'room_' . makeReadingName(AttrVal($_,'room','unsorted')),$_) if( ReadingsVal($name,'room_' . AttrVal($_,'room','unsorted'),'none') eq 'none' ); readingsBulkUpdate($hash,'room_' . makeReadingName(AttrVal($_,'room','unsorted')),$_) if( ReadingsVal($name,'room_' . makeReadingName(AttrVal($_,'room','unsorted')),'none') eq 'none' );
} }
readingsBulkUpdate($hash,'state','active'); readingsBulkUpdate($hash,'state','active');
@@ -864,13 +863,13 @@ sub ShuttersSunrise($$$) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $autoAstroMode; my $autoAstroMode;
# if( AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeMorning','none') ne 'none' ) { if( AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeMorning','none') ne 'none' ) {
# $autoAstroMode = AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeMorning','REAL'); $autoAstroMode = AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeMorning','REAL');
# $autoAstroMode = $autoAstroMode . '=' . AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeMorningHorizon',0) if( $autoAstroMode eq 'HORIZON' ); $autoAstroMode = $autoAstroMode . '=' . AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeMorningHorizon',0) if( $autoAstroMode eq 'HORIZON' );
# } else { } else {
$autoAstroMode = AttrVal($name,'AutoShuttersControl_autoAstroModeMorning','REAL'); $autoAstroMode = AttrVal($name,'AutoShuttersControl_autoAstroModeMorning','REAL');
$autoAstroMode = $autoAstroMode . '=' . AttrVal($name,'AutoShuttersControl_autoAstroModeMorningHorizon',0) if( $autoAstroMode eq 'HORIZON' ); $autoAstroMode = $autoAstroMode . '=' . AttrVal($name,'AutoShuttersControl_autoAstroModeMorningHorizon',0) if( $autoAstroMode eq 'HORIZON' );
# } }
my $oldFuncHash = ReadingsVal($shuttersDev,'.AutoShuttersControl_InternalTimerFuncHash',0); my $oldFuncHash = ReadingsVal($shuttersDev,'.AutoShuttersControl_InternalTimerFuncHash',0);
my $shuttersSunriseUnixtime; my $shuttersSunriseUnixtime;
@@ -906,13 +905,13 @@ sub ShuttersSunset($$$) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $autoAstroMode; my $autoAstroMode;
# if( AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeEvening','none') ne 'none') { if( AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeEvening','none') ne 'none') {
# $autoAstroMode = AttrVal($shuttersDev,'AutoShuttersControl_autoAstroModeEvening','REAL'); $autoAstroMode = AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeEvening','REAL');
# $autoAstroMode = $autoAstroMode . '=' . AttrVal($shuttersDev,'AutoShuttersControl_autoAstroModeEveningHorizon',0) if( $autoAstroMode eq 'HORIZON' ); $autoAstroMode = $autoAstroMode . '=' . AttrVal($shuttersDev,'AutoShuttersControl_AutoAstroModeEveningHorizon',0) if( $autoAstroMode eq 'HORIZON' );
# } else { } else {
$autoAstroMode = AttrVal($name,'AutoShuttersControl_autoAstroModeEvening','REAL'); $autoAstroMode = AttrVal($name,'AutoShuttersControl_autoAstroModeEvening','REAL');
$autoAstroMode = $autoAstroMode . '=' . AttrVal($name,'AutoShuttersControl_autoAstroModeEveningHorizon',0) if( $autoAstroMode eq 'HORIZON' ); $autoAstroMode = $autoAstroMode . '=' . AttrVal($name,'AutoShuttersControl_autoAstroModeEveningHorizon',0) if( $autoAstroMode eq 'HORIZON' );
# } }
my $oldFuncHash = ReadingsVal($shuttersDev,'.AutoShuttersControl_InternalTimerFuncHash',0); my $oldFuncHash = ReadingsVal($shuttersDev,'.AutoShuttersControl_InternalTimerFuncHash',0);
my $shuttersSunsetUnixtime; my $shuttersSunsetUnixtime;