FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: fix many bugs, change window event logic

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17784 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2018-11-19 11:34:45 +00:00
parent 223d298c18
commit 4521fd4ad8
2 changed files with 306 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -1,5 +1,6 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
# Do not insert empty lines here, update check depends on it. # Do not insert empty lines here, update check depends on it.
- bugfix: 73_AutoShuttersControl: fix many bugs, change window event logic
- change: 93_DbRep: fix warnings and minor changes - change: 93_DbRep: fix warnings and minor changes
- change: 93_DbLog: V3.13.0, addLog considers DbLogInclude (Forum:#92854), - change: 93_DbLog: V3.13.0, addLog considers DbLogInclude (Forum:#92854),
new attributes traceFlag, traceLevel (only for support !) new attributes traceFlag, traceLevel (only for support !)

434
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -41,7 +41,7 @@ package main;
use strict; use strict;
use warnings; use warnings;
my $version = "0.2.0.6"; my $version = "0.2.0.7";
sub AutoShuttersControl_Initialize($) { sub AutoShuttersControl_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -165,7 +165,7 @@ my %userAttrList = (
'ASC_Time_Down_Late' => '22:30', 'ASC_Time_Down_Late' => '22:30',
'ASC_WindowRec' => 'none', 'ASC_WindowRec' => 'none',
'ASC_Ventilate_Window_Open:on,off' => 'on', 'ASC_Ventilate_Window_Open:on,off' => 'on',
'ASC_LockOut:soft,hard,off' => 'off', 'ASC_LockOut:soft,hard,off' => 'off',
'ASC_LockOut_Cmd:inhibit,blocked' => 'none', 'ASC_LockOut_Cmd:inhibit,blocked' => 'none',
# 'ASC_Shading_Direction' => 178, # 'ASC_Shading_Direction' => 178,
@ -175,27 +175,27 @@ my %userAttrList = (
# => 85, # => 85,
# 'ASC_Shading_Angle_Right:0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90' # 'ASC_Shading_Angle_Right:0,5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90'
# => 85, # => 85,
# 'ASC_Shading_Brightness_Sensor' => 'none', 'ASC_Shading_Brightness_Sensor' => 'none',
# 'ASC_Shading_Brightness_Reading' => 'brightness', 'ASC_Shading_Brightness_Reading' => 'brightness',
# #
# 'ASC_Shading_StateChange_Sunny' => '6000', # 'ASC_Shading_StateChange_Sunny' => '6000',
# 'ASC_Shading_StateChange_Cloudy' => '4000', # 'ASC_Shading_StateChange_Cloudy' => '4000',
# 'ASC_Shading_WaitingPeriod' => 20, # 'ASC_Shading_WaitingPeriod' => 20,
# 'ASC_Shading_Min_Elevation' => 'none', # 'ASC_Shading_Min_Elevation' => 'none',
# 'ASC_Shading_Min_OutsideTemperature' => 18, # 'ASC_Shading_Min_OutsideTemperature' => 18,
# 'ASC_Shading_BlockingTime_After_Manual' => 20, # 'ASC_Shading_BlockingTime_After_Manual' => 20,
# 'ASC_Shading_BlockingTime_Twilight' => 45, # 'ASC_Shading_BlockingTime_Twilight' => 45,
# 'ASC_Shading_Fast_Open:on,off' => 'none', # 'ASC_Shading_Fast_Open:on,off' => 'none',
# 'ASC_Shading_Fast_Close:on,off' => 'none', # 'ASC_Shading_Fast_Close:on,off' => 'none',
'ASC_Drive_Offset' => -1, 'ASC_Drive_Offset' => -1,
'ASC_WindowRec_subType:twostate,threestate' => 'twostate', 'ASC_WindowRec_subType:twostate,threestate' => 'twostate',
'ASC_ShuttersPlace:window,terrace' => 'window', 'ASC_ShuttersPlace:window,terrace' => 'window',
'ASC_Ventilate_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 70, 30 ], 'ASC_Ventilate_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 70, 30 ],
'ASC_ComfortOpen_Pos:0,10,20,30,40,50,60,70,80,90,100' => 'ASC_ComfortOpen_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 20, 80 ],
[ '', 20, 80 ], 'ASC_GuestRoom:on,off' => 'none',
'ASC_GuestRoom:on,off' => 'none', 'ASC_Antifreeze:off,soft,hard,am,pm' => 'off',
'ASC_Antifreeze:off,soft,hard,am,pm' => 'off', 'ASC_Antifreeze_Pos:5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100'
'ASC_AntifreezePos:5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100' => [ '', 85, 15 ], => [ '', 85, 15 ],
'ASC_Partymode:on,off' => 'off', 'ASC_Partymode:on,off' => 'off',
'ASC_Roommate_Device' => 'none', 'ASC_Roommate_Device' => 'none',
'ASC_Roommate_Reading' => 'state', 'ASC_Roommate_Reading' => 'state',
@ -266,7 +266,7 @@ sub Define($$) {
if ( $ascDev->getFreezeTemp eq 'none' ); if ( $ascDev->getFreezeTemp 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' . ' 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'
) if ( AttrVal( $name, 'devStateIcon', 'none' ) eq 'none' ); ) if ( AttrVal( $name, 'devStateIcon', 'none' ) eq 'none' );
addToAttrList('ASC:0,1,2'); addToAttrList('ASC:0,1,2');
@ -384,8 +384,7 @@ sub Notify($$) {
'AutoShuttersControl::RenewSunRiseSetShuttersTimer', 'AutoShuttersControl::RenewSunRiseSetShuttersTimer',
$hash ); $hash );
InternalTimer( gettimeofday() + 5, InternalTimer( gettimeofday() + 5,
'AutoShuttersControl::AutoSearchTwilightDev', 'AutoShuttersControl::AutoSearchTwilightDev', $hash );
$hash );
} }
} }
elsif ( grep /^partyMode:.off$/, @{$events} ) { elsif ( grep /^partyMode:.off$/, @{$events} ) {
@ -450,10 +449,11 @@ sub EventProcessingGeneral($$$) {
if ( $deviceAttr eq 'ASC_Shading_Brightness_Sensor' ); if ( $deviceAttr eq 'ASC_Shading_Brightness_Sensor' );
if ( if (
$deviceAttr eq 'ASC_Shading_Brightness_Sensor' $deviceAttr eq 'ASC_Shading_Brightness_Sensor'
and ( $shutters->getDown eq 'brightness' and ( $shutters->getDown eq 'brightness'
or $shutters->getUp eq 'brightness' ) or $shutters->getUp eq 'brightness' )
) { )
{
EventProcessingBrightness( $hash, $device, $events ); EventProcessingBrightness( $hash, $device, $events );
} }
elsif ( $deviceAttr eq 'ASC_Shading_Brightness_Sensor' ) { elsif ( $deviceAttr eq 'ASC_Shading_Brightness_Sensor' ) {
@ -643,15 +643,19 @@ sub ShuttersDeviceScan($) {
; # temporär muss später gelöscht werden ab Version 0.2.0.6 ; # temporär muss später gelöscht werden ab Version 0.2.0.6
delFromDevAttrList( $_, 'ASC_lock-outCmd:inhibit,blocked' ) delFromDevAttrList( $_, 'ASC_lock-outCmd:inhibit,blocked' )
; # temporär muss später gelöscht werden ab Version 0.2.0.6 ; # temporär muss später gelöscht werden ab Version 0.2.0.6
delFromDevAttrList( $_, 'ASC_Pos_after_ComfortOpen:0,10,20,30,40,50,60,70,80,90,100' ) delFromDevAttrList( $_,
'ASC_Pos_after_ComfortOpen:0,10,20,30,40,50,60,70,80,90,100' )
; # temporär muss später gelöscht werden ab Version 0.2.0.6 ; # temporär muss später gelöscht werden ab Version 0.2.0.6
delFromDevAttrList( $_, 'ASC_Antifreeze:off,on' ) delFromDevAttrList( $_, 'ASC_Antifreeze:off,on' )
if ( AttrVal( $_, 'ASC_Antifreeze', 'on' ) eq 'on' if ( AttrVal( $_, 'ASC_Antifreeze', 'on' ) eq 'on'
or AttrVal( $_, 'ASC_Antifreeze', 'on' ) eq 'off' or AttrVal( $_, 'ASC_Antifreeze', 'on' ) eq 'off' )
)
; # temporär muss später gelöscht werden ab Version 0.2.0.6 ; # temporär muss später gelöscht werden ab Version 0.2.0.6
delFromDevAttrList( $_,
'ASC_AntifreezePos:5,10,15,20,25,30,35,40,45,50,55,60,65,70,75,80,85,90,95,100'
); # temporär muss später gelöscht werden ab Version 0.2.0.7
$shuttersList = $shuttersList . ',' . $_; $shuttersList = $shuttersList . ',' . $_;
$shutters->setShuttersDev($_); $shutters->setShuttersDev($_);
$shutters->setLastManPos( $shutters->getStatus ); $shutters->setLastManPos( $shutters->getStatus );
@ -660,9 +664,9 @@ sub ShuttersDeviceScan($) {
$shutters->setNoOffset(0); $shutters->setNoOffset(0);
$shutters->setPosSetCmd( $posSetCmds{ $defs{$_}->{TYPE} } ); $shutters->setPosSetCmd( $posSetCmds{ $defs{$_}->{TYPE} } );
} }
# $hash->{NOTIFYDEV} = $hash->{NOTIFYDEV} . $shuttersList;
$hash->{NOTIFYDEV} = "global," . $name . $shuttersList;
# $hash->{NOTIFYDEV} = $hash->{NOTIFYDEV} . $shuttersList;
$hash->{NOTIFYDEV} = "global," . $name . $shuttersList;
if ( $ascDev->getMonitoredDevs ne 'none' ) { if ( $ascDev->getMonitoredDevs ne 'none' ) {
$hash->{monitoredDevs} = $hash->{monitoredDevs} =
@ -829,34 +833,52 @@ sub EventProcessingWindowRec($@) {
: $shutters->getStatus < $shutters->getComfortOpenPos : $shutters->getStatus < $shutters->getComfortOpenPos
); );
if ( $shutters->getDelayCmd ne 'none' ) if ( $shutters->getDelayCmd ne 'none' and $1 eq 'closed' )
{ # Es wird geschaut ob wärend der Fenster offen Phase ein Fahrbefehl über das Modul kam,wenn ja wird dieser aus geführt { # Es wird geschaut ob wärend der Fenster offen Phase ein Fahrbefehl über das Modul kam,wenn ja wird dieser aus geführt
if ( $1 eq 'closed' ) {
$shutters->setLastDrive('delayed closed'); # if ( $1 eq 'closed' ) {
ShuttersCommandSet( $hash, $shuttersDev, $shutters->setLastDrive('delayed drive - window closed');
$shutters->getClosedPos ); ShuttersCommandSet( $hash, $shuttersDev, $shutters->getDelayCmd );
}
elsif ( # }
( # elsif (
$1 eq 'tilted' # (
or ( $1 eq 'open' and $shutters->getSubTyp eq 'twostate' ) # $1 eq 'tilted'
) # or ( $1 eq 'open' and $shutters->getSubTyp eq 'twostate' )
and $shutters->getVentilateOpen eq 'on' # )
and $queryShuttersPosWinRecTilted # and $shutters->getVentilateOpen eq 'on'
) # and $queryShuttersPosWinRecTilted
{ # )
$shutters->setLastDrive('delayed ventilate open'); # {
ShuttersCommandSet( $hash, $shuttersDev, # $shutters->setLastDrive('delayed ventilate open');
$shutters->getVentilatePos ); # ShuttersCommandSet( $hash, $shuttersDev,
} # $shutters->getVentilatePos );
# }
} }
elsif ( $1 eq 'closed' elsif ( $1 eq 'closed'
) # wenn nicht dann wird entsprechend dem Fensterkontakt Event der Rolladen geschlossen oder zum lüften geöffnet ) # wenn nicht dann wird entsprechend dem Fensterkontakt Event der Rolladen geschlossen oder zum lüften geöffnet
{ {
$shutters->setLastDrive('window closed'); if ( $shutters->getStatus == $shutters->getVentilatePos
ShuttersCommandSet( $hash, $shuttersDev, $shutters->getClosedPos ) or $shutters->getStatus == $shutters->getComfortOpenPos )
if ( $shutters->getStatus == $shutters->getVentilatePos {
or $shutters->getStatus == $shutters->getComfortOpenPos ); my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus
if ( $homemode eq 'none' );
$shutters->setLastDrive('window closed');
ShuttersCommandSet( $hash, $shuttersDev, $shutters->getLastPos )
if (
IsDay( $hash, $shuttersDev )
and ( $homemode ne 'asleep'
or $homemode ne 'gotosleep'
or $homemode eq 'none' )
);
ShuttersCommandSet( $hash, $shuttersDev,
$shutters->getClosedPos )
if ( not IsDay( $hash, $shuttersDev )
or $homemode eq 'asleep'
or $homemode eq 'gotosleep' );
}
} }
elsif ( elsif (
( (
@ -867,7 +889,7 @@ sub EventProcessingWindowRec($@) {
and $queryShuttersPosWinRecTilted and $queryShuttersPosWinRecTilted
) )
{ {
$shutters->setLastDrive('ventilate open'); $shutters->setLastDrive('ventilate - window open');
ShuttersCommandSet( $hash, $shuttersDev, ShuttersCommandSet( $hash, $shuttersDev,
$shutters->getVentilatePos ); $shutters->getVentilatePos );
} }
@ -876,7 +898,7 @@ sub EventProcessingWindowRec($@) {
and $ascDev->getAutoShuttersControlComfort eq 'on' and $ascDev->getAutoShuttersControlComfort eq 'on'
and $queryShuttersPosWinRecComfort ) and $queryShuttersPosWinRecComfort )
{ {
$shutters->setLastDrive('comfort open'); $shutters->setLastDrive('comfort - window open');
ShuttersCommandSet( $hash, $shuttersDev, ShuttersCommandSet( $hash, $shuttersDev,
$shutters->getComfortOpenPos ); $shutters->getComfortOpenPos );
} }
@ -893,10 +915,10 @@ sub EventProcessingRoommate($@) {
if ( $events =~ m#$reading:\s(absent|gotosleep|asleep|awoken|home)# ) { if ( $events =~ m#$reading:\s(absent|gotosleep|asleep|awoken|home)# ) {
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - EventProcessingRoommate: " . $shutters->getRoommatesReading "AutoShuttersControl ($name) - EventProcessingRoommate: "
); . $shutters->getRoommatesReading );
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - EventProcessingRoommate: $shuttersDev und Events $events" "AutoShuttersControl ($name) - EventProcessingRoommate: $shuttersDev und Events $events"
); );
if ( if (
@ -910,8 +932,8 @@ sub EventProcessingRoommate($@) {
) )
{ {
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - EventProcessingRoommate_1: $shuttersDev und Events $events" "AutoShuttersControl ($name) - EventProcessingRoommate_1: $shuttersDev und Events $events"
); );
if ( if (
( (
$shutters->getRoommatesLastStatus eq 'asleep' $shutters->getRoommatesLastStatus eq 'asleep'
@ -921,8 +943,8 @@ sub EventProcessingRoommate($@) {
) )
{ {
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - EventProcessingRoommate_2: $shuttersDev und Events $events" "AutoShuttersControl ($name) - EventProcessingRoommate_2: $shuttersDev und Events $events"
); );
$shutters->setLastDrive('roommate awoken'); $shutters->setLastDrive('roommate awoken');
ShuttersCommandSet( $hash, $shuttersDev, ShuttersCommandSet( $hash, $shuttersDev,
$shutters->getOpenPos ); $shutters->getOpenPos );
@ -952,7 +974,8 @@ sub EventProcessingRoommate($@) {
} }
else { else {
$position = $shutters->getVentilatePos; $position = $shutters->getVentilatePos;
$shutters->setLastDrive($shutters->getLastDrive . ' - ventilate mode'); $shutters->setLastDrive(
$shutters->getLastDrive . ' - ventilate mode' );
} }
ShuttersCommandSet( $hash, $shuttersDev, $position ); ShuttersCommandSet( $hash, $shuttersDev, $position );
@ -985,7 +1008,8 @@ sub EventProcessingRoommate($@) {
} }
else { else {
$position = $shutters->getVentilatePos; $position = $shutters->getVentilatePos;
$shutters->setLastDrive($shutters->getLastDrive . ' - ventilate mode'); $shutters->setLastDrive(
$shutters->getLastDrive . ' - ventilate mode' );
} }
ShuttersCommandSet( $hash, $shuttersDev, $position ); ShuttersCommandSet( $hash, $shuttersDev, $position );
@ -1140,17 +1164,17 @@ sub EventProcessingBrightness($@) {
my $name = $hash->{NAME}; my $name = $hash->{NAME};
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
return EventProcessingShadingBrightness($hash, $shuttersDev, $events) return EventProcessingShadingBrightness( $hash, $shuttersDev, $events )
unless ( unless (
int( gettimeofday() / 86400 ) != int( gettimeofday() / 86400 ) !=
int( computeAlignTime( '24:00', $shutters->getTimeUpEarly ) / 86400 ) int( computeAlignTime( '24:00', $shutters->getTimeUpEarly ) / 86400 )
and int( gettimeofday() / 86400 ) == and int( gettimeofday() / 86400 ) ==
int( computeAlignTime( '24:00', $shutters->getTimeUpLate ) / 86400 ) int( computeAlignTime( '24:00', $shutters->getTimeUpLate ) / 86400 )
or int( gettimeofday() / 86400 ) != or int( gettimeofday() / 86400 ) !=
int( computeAlignTime( '24:00', $shutters->getTimeDownEarly ) / 86400 ) int( computeAlignTime( '24:00', $shutters->getTimeDownEarly ) / 86400 )
and int( gettimeofday() / 86400 ) == and int( gettimeofday() / 86400 ) ==
int( computeAlignTime( '24:00', $shutters->getTimeDownLate ) / 86400 ) int( computeAlignTime( '24:00', $shutters->getTimeDownLate ) / 86400 )
); );
my $reading = $shutters->getShadingBrightnessReading; my $reading = $shutters->getShadingBrightnessReading;
if ( $events =~ m#$reading:\s(\d+)# ) { if ( $events =~ m#$reading:\s(\d+)# ) {
@ -1196,9 +1220,15 @@ sub EventProcessingBrightness($@) {
and $ascDev->getSelfDefense eq 'off' and $ascDev->getSelfDefense eq 'off'
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 )
) { )
ShuttersCommandSet( $hash, $shuttersDev, $shutters->getOpenPos ); {
} else { EventProcessingShadingBrightness($hash, $shuttersDev, $events); } ShuttersCommandSet( $hash, $shuttersDev,
$shutters->getOpenPos );
}
else {
EventProcessingShadingBrightness( $hash, $shuttersDev,
$events );
}
} }
} }
elsif ( elsif (
@ -1229,14 +1259,20 @@ sub EventProcessingBrightness($@) {
if ( $homemode eq 'none' ); if ( $homemode eq 'none' );
$shutters->setLastDrive('minimum brightness threshold fell below'); $shutters->setLastDrive('minimum brightness threshold fell below');
if ( $shutters->getModeDown eq $homemode if ( $shutters->getModeDown eq $homemode
or $homemode eq 'none' or $homemode eq 'none'
or $shutters->getModeDown eq 'always' or $shutters->getModeDown eq 'always' )
) { {
ShuttersCommandSet( $hash, $shuttersDev, $shutters->getClosedPos ); ShuttersCommandSet( $hash, $shuttersDev,
} else { EventProcessingShadingBrightness($hash, $shuttersDev, $events); } $shutters->getClosedPos );
}
else {
EventProcessingShadingBrightness( $hash, $shuttersDev,
$events );
}
} }
} else { EventProcessingShadingBrightness($hash, $shuttersDev, $events); } }
else { EventProcessingShadingBrightness( $hash, $shuttersDev, $events ); }
} }
sub EventProcessingShadingBrightness($@) { sub EventProcessingShadingBrightness($@) {
@ -1246,42 +1282,74 @@ sub EventProcessingShadingBrightness($@) {
my $reading = $shutters->getShadingBrightnessReading; my $reading = $shutters->getShadingBrightnessReading;
if ( $events =~ m#$reading:\s(\d+)# ) { if ( $events =~ m#$reading:\s(\d+)# ) {
ShadingProcessing($hash,$shuttersDev,$ascDev->getAzimuth,$ascDev->getElevation,$1,$ascDev->getOutTemp,$shutters->getDirection,$shutters->getShadingAngleLeft,$shutters->getShadingAngleRight) ShadingProcessing(
if ( $shutters->getShadingMode eq 'on' or $shutters->getShadingMode eq $ascDev->getResidentsStatus and IsDay( $hash, $shuttersDev ) ); $hash, $shuttersDev,
$ascDev->getAzimuth, $ascDev->getElevation,
$1, $ascDev->getOutTemp,
$shutters->getDirection, $shutters->getShadingAngleLeft,
$shutters->getShadingAngleRight
)
if ( $shutters->getShadingMode eq 'on'
or $shutters->getShadingMode eq $ascDev->getResidentsStatus
and IsDay( $hash, $shuttersDev ) );
} }
} }
sub EventProcessingTwilightDevice($@) { sub EventProcessingTwilightDevice($@) {
my ( $hash, $device, $events ) = @_; my ( $hash, $device, $events ) = @_;
# Twilight # Twilight
# azimuth = azimuth = Sonnenwinkel # azimuth = azimuth = Sonnenwinkel
# elevation = elevation = Sonnenhöhe # elevation = elevation = Sonnenhöhe
# #
# Astro # Astro
# SunAz = azimuth = Sonnenwinkel # SunAz = azimuth = Sonnenwinkel
# SunAlt = evaluation = Sonnenhöhe # SunAlt = evaluation = Sonnenhöhe
if ( $events =~ m#(azimuth|evaluation|SunAz|SunAlt):\s(\d+.\d+)# ) { if ( $events =~ m#(azimuth|evaluation|SunAz|SunAlt):\s(\d+.\d+)# ) {
my $name = $device; my $name = $device;
my ($azimuth,$elevation, $outTemp, $brightness); my ( $azimuth, $elevation, $outTemp, $brightness );
$azimuth = $2 if ( $1 eq 'azimuth' or $1 eq 'SunAz' ); $azimuth = $2 if ( $1 eq 'azimuth' or $1 eq 'SunAz' );
$elevation = $2 if ( $1 eq 'evaluation' or $1 eq 'SunAlt' ); $elevation = $2 if ( $1 eq 'evaluation' or $1 eq 'SunAlt' );
$azimuth = $ascDev->getAzimuth if (not defined($azimuth) and not $azimuth ); $azimuth = $ascDev->getAzimuth
$elevation = $ascDev->getElevation if (not defined($elevation) and not $elevation ); if ( not defined($azimuth) and not $azimuth );
$elevation = $ascDev->getElevation
if ( not defined($elevation) and not $elevation );
foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
ShadingProcessing($hash,$shuttersDev,$azimuth,$elevation,$shutters->getBrightness,$ascDev->getOutTemp,$shutters->getDirection,$shutters->getShadingAngleLeft,$shutters->getShadingAngleRight) ShadingProcessing(
if ( ($shutters->getShadingMode eq 'on' or $shutters->getShadingMode eq $ascDev->getResidentsStatus) and IsDay( $hash, $shuttersDev ) ); $hash,
$shuttersDev,
$azimuth,
$elevation,
$shutters->getBrightness,
$ascDev->getOutTemp,
$shutters->getDirection,
$shutters->getShadingAngleLeft,
$shutters->getShadingAngleRight
)
if (
(
$shutters->getShadingMode eq 'on'
or $shutters->getShadingMode eq $ascDev->getResidentsStatus
)
and IsDay( $hash, $shuttersDev )
);
} }
} }
} }
sub ShadingProcessing($@) { sub ShadingProcessing($@) {
my ($hash,$shuttersDev,$azimuth,$elevation,$brightness,$outTemp,$shuttersDirection,$shuttersShadingAngleLeft,$shuttersShadingAngleRight) = @_; my (
$hash, $shuttersDev,
$azimuth, $elevation,
$brightness, $outTemp,
$shuttersDirection, $shuttersShadingAngleLeft,
$shuttersShadingAngleRight
) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
# Log3( $name, 1, # Log3( $name, 1,
@ -1392,7 +1460,7 @@ sub ShuttersCommandSet($$$) {
$shutters->setDelayCmd($posValue); $shutters->setDelayCmd($posValue);
$ascDev->setDelayCmdReading; $ascDev->setDelayCmdReading;
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - ShuttersCommandSet in Delay"); "AutoShuttersControl ($name) - ShuttersCommandSet in Delay" );
} }
else { else {
$shutters->setDriveCmd($posValue); $shutters->setDriveCmd($posValue);
@ -1401,7 +1469,8 @@ sub ShuttersCommandSet($$$) {
; # setzt den Wert auf none da der Rolladen nun gesteuert werden kann. ; # setzt den Wert auf none da der Rolladen nun gesteuert werden kann.
$ascDev->setLastPosReading; $ascDev->setLastPosReading;
Log3( $name, 4, Log3( $name, 4,
"AutoShuttersControl ($name) - ShuttersCommandSet setDriveCmd wird aufgerufen"); "AutoShuttersControl ($name) - ShuttersCommandSet setDriveCmd wird aufgerufen"
);
} }
} }
@ -1539,15 +1608,23 @@ sub wiggle($$) {
if ( $shutters->getShuttersPosCmdValueNegate ) { if ( $shutters->getShuttersPosCmdValueNegate ) {
if ( $shutters->getStatus >= $shutters->getOpenPos / 2 ) { if ( $shutters->getStatus >= $shutters->getOpenPos / 2 ) {
$shutters->setDriveCmd( $shutters->getStatus + $shutters->getWiggleValue ); $shutters->setDriveCmd(
$shutters->getStatus + $shutters->getWiggleValue );
}
else {
$shutters->setDriveCmd(
$shutters->getStatus - $shutters->getWiggleValue );
} }
else { $shutters->setDriveCmd( $shutters->getStatus - $shutters->getWiggleValue ); }
} }
else { else {
if ( $shutters->getStatus >= $shutters->getOpenPos / 2 ) { if ( $shutters->getStatus >= $shutters->getOpenPos / 2 ) {
$shutters->setDriveCmd( $shutters->getStatus - $shutters->getWiggleValue ); $shutters->setDriveCmd(
$shutters->getStatus - $shutters->getWiggleValue );
}
else {
$shutters->setDriveCmd(
$shutters->getStatus + $shutters->getWiggleValue );
} }
else { $shutters->setDriveCmd( $shutters->getStatus + $shutters->getWiggleValue ); }
} }
InternalTimer( gettimeofday() + 60, 'AutoShuttersControl::SetCmdFn', \%h ); InternalTimer( gettimeofday() + 60, 'AutoShuttersControl::SetCmdFn', \%h );
@ -1572,9 +1649,12 @@ sub SunSetShuttersAfterTimerFn($) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' ); $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
if ( $shutters->getModeDown eq $homemode if (
or $homemode eq 'none' $shutters->getModeDown eq $homemode
or $shutters->getModeDown eq 'always' )
# or $homemode eq 'none'
or $shutters->getModeDown eq 'always'
)
{ {
$shutters->setLastDrive('night close'); $shutters->setLastDrive('night close');
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
@ -1593,9 +1673,12 @@ sub SunRiseShuttersAfterTimerFn($) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' ); $homemode = $ascDev->getResidentsStatus if ( $homemode eq 'none' );
if ( $shutters->getModeUp eq $homemode if (
or $homemode eq 'none' $shutters->getModeUp eq $homemode
or $shutters->getModeUp eq 'always' )
# or $homemode eq 'none'
or $shutters->getModeUp eq 'always'
)
{ {
if ( if (
( (
@ -1795,9 +1878,9 @@ sub AutoSearchTwilightDev($) {
if ( devspec2array('TYPE=(Astro|Twilight)') > 0 ) { if ( devspec2array('TYPE=(Astro|Twilight)') > 0 ) {
CommandAttr( undef, CommandAttr( undef,
$name $name
. ' ASC_twilightDevice ' . ' ASC_twilightDevice '
. ( devspec2array('TYPE=(Astro|Twilight)') )[0] ) . ( devspec2array('TYPE=(Astro|Twilight)') )[0] )
if ( AttrVal( $name, 'ASC_twilightDevice', 'none' ) eq 'none' ); if ( AttrVal( $name, 'ASC_twilightDevice', 'none' ) eq 'none' );
} }
} }
@ -1993,8 +2076,49 @@ sub ShuttersSunrise($$$) {
} }
} }
elsif ( $shutters->getUp eq 'time' ) { elsif ( $shutters->getUp eq 'time' ) {
$shuttersSunriseUnixtime = if ( ( IsWe() or IsWeTomorrow() )
computeAlignTime( '24:00', $shutters->getTimeUpEarly ); and $ascDev->getSunriseTimeWeHoliday eq 'on' )
{
if ( not IsWeTomorrow() ) {
if (
IsWe()
and int( gettimeofday() / 86400 ) == int(
computeAlignTime( '24:00',
$shutters->getTimeUpWeHoliday ) / 86400
)
)
{
$shuttersSunriseUnixtime =
computeAlignTime( '24:00',
$shutters->getTimeUpWeHoliday );
}
elsif (
int( gettimeofday() / 86400 ) == int(
computeAlignTime( '24:00',
$shutters->getTimeUpEarly ) / 86400
)
)
{
$shuttersSunriseUnixtime =
computeAlignTime( '24:00',
$shutters->getTimeUpWeHoliday );
}
else {
$shuttersSunriseUnixtime =
computeAlignTime( '24:00',
$shutters->getTimeUpEarly );
}
}
else {
$shuttersSunriseUnixtime =
computeAlignTime( '24:00',
$shutters->getTimeUpWeHoliday );
}
}
else {
$shuttersSunriseUnixtime =
computeAlignTime( '24:00', $shutters->getTimeUpEarly );
}
} }
elsif ( $shutters->getUp eq 'brightness' ) { elsif ( $shutters->getUp eq 'brightness' ) {
$shuttersSunriseUnixtime = $shuttersSunriseUnixtime =
@ -2259,11 +2383,12 @@ sub setDriveCmd {
} }
elsif ( $posValue == $shutters->getClosedPos ) { elsif ( $posValue == $shutters->getClosedPos ) {
$posValue = $shutters->getAntiFreezePos; $posValue = $shutters->getAntiFreezePos;
$shutters->setLastDrive($shutters->getLastDrive . ' - antifreeze mode'); $shutters->setLastDrive(
$shutters->getLastDrive . ' - antifreeze mode' );
} }
} }
my %h = ( my %h = (
shuttersDev => $self->{shuttersDev}, shuttersDev => $self->{shuttersDev},
posValue => $posValue, posValue => $posValue,
); );
@ -2336,8 +2461,7 @@ sub setLastPos
return 0; return 0;
} }
sub setLastManPos sub setLastManPos {
{ # letzte ermittelte Position bevor die Position des Rolladen manuell (nicht über ASC) geändert wurde
my ( $self, $position ) = @_; my ( $self, $position ) = @_;
$self->{ $self->{shuttersDev} }{lastManPos}{VAL} = $position $self->{ $self->{shuttersDev} }{lastManPos}{VAL} = $position
@ -2372,16 +2496,17 @@ sub setInTimerFuncHash {
sub getFreezeStatus { sub getFreezeStatus {
use POSIX qw(strftime); use POSIX qw(strftime);
my $self = shift; my $self = shift;
my $daytime = strftime("%P", localtime()); my $daytime = strftime( "%P", localtime() );
if ( $shutters->getAntiFreeze ne 'off' if ( $shutters->getAntiFreeze ne 'off'
and $ascDev->getOutTemp <= $ascDev->getFreezeTemp ) { and $ascDev->getOutTemp <= $ascDev->getFreezeTemp )
{
if ( $shutters->getAntiFreeze eq 'soft') { if ( $shutters->getAntiFreeze eq 'soft' ) {
return 1; return 1;
} }
elsif ( $shutters->getAntiFreeze eq $daytime elsif ($shutters->getAntiFreeze eq $daytime
or $shutters->getAntiFreeze eq $daytime ) or $shutters->getAntiFreeze eq $daytime )
{ {
return 2; return 2;
} }
@ -2547,7 +2672,7 @@ BEGIN {
sub getAntiFreezePos { sub getAntiFreezePos {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_AntifreezePos', 50 ); return AttrVal( $self->{shuttersDev}, 'ASC_Antifreeze_Pos', 50 );
} }
sub getShuttersPlace { sub getShuttersPlace {
@ -2569,7 +2694,7 @@ sub getWiggleValue {
} }
sub getShadingPos { sub getShadingPos {
my $self = shift; my $self = shift;
my $default = $self->{defaultarg}; my $default = $self->{defaultarg};
$default = 10 if ( not defined($default) ); $default = 10 if ( not defined($default) );
@ -2577,7 +2702,7 @@ sub getShadingPos {
} }
sub getShadingMode { sub getShadingMode {
my $self = shift; my $self = shift;
my $default = $self->{defaultarg}; my $default = $self->{defaultarg};
$default = 'off' if ( not defined($default) ); $default = 'off' if ( not defined($default) );
@ -2603,19 +2728,19 @@ sub getShadingBrightnessReading {
} }
sub getDirection { sub getDirection {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_Shading_Direction', -1 ); return AttrVal( $self->{shuttersDev}, 'ASC_Shading_Direction', -1 );
} }
sub getShadingAngleLeft { sub getShadingAngleLeft {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_Shading_Angle_Left', -1 ); return AttrVal( $self->{shuttersDev}, 'ASC_Shading_Angle_Left', -1 );
} }
sub getShadingAngleRight { sub getShadingAngleRight {
my $self = shift; my $self = shift;
return AttrVal( $self->{shuttersDev}, 'ASC_Shading_Angle_Right', -1 ); return AttrVal( $self->{shuttersDev}, 'ASC_Shading_Angle_Right', -1 );
} }
@ -3058,7 +3183,8 @@ sub getMonitoredDevs {
sub getOutTemp { sub getOutTemp {
my $self = shift; my $self = shift;
return ReadingsVal( $ascDev->_getTempSensor, $ascDev->getTempReading, -100 ); return ReadingsVal( $ascDev->_getTempSensor, $ascDev->getTempReading,
-100 );
} }
sub getResidentsStatus { sub getResidentsStatus {
@ -3085,8 +3211,10 @@ sub getAzimuth {
my $self = shift; my $self = shift;
my $azimuth; my $azimuth;
$azimuth = ReadingsVal( $ascDev->_getTwilightDevice, 'azimuth', -1 ) if ( $defs{$ascDev->_getTwilightDevice}->{TYPE} eq 'Twilight' ); $azimuth = ReadingsVal( $ascDev->_getTwilightDevice, 'azimuth', -1 )
$azimuth = ReadingsVal( $ascDev->_getTwilightDevice, 'SunAz', -1 ) if ( $defs{$ascDev->_getTwilightDevice}->{TYPE} eq 'Astro' ); if ( $defs{ $ascDev->_getTwilightDevice }->{TYPE} eq 'Twilight' );
$azimuth = ReadingsVal( $ascDev->_getTwilightDevice, 'SunAz', -1 )
if ( $defs{ $ascDev->_getTwilightDevice }->{TYPE} eq 'Astro' );
return $azimuth; return $azimuth;
} }
@ -3095,8 +3223,10 @@ sub getElevation {
my $self = shift; my $self = shift;
my $elevation; my $elevation;
$elevation = ReadingsVal( $ascDev->_getTwilightDevice, 'elevation', -1 ) if ( $defs{$ascDev->_getTwilightDevice}->{TYPE} eq 'Twilight' ); $elevation = ReadingsVal( $ascDev->_getTwilightDevice, 'elevation', -1 )
$elevation = ReadingsVal( $ascDev->_getTwilightDevice, 'SunAlt', -1 ) if ( $defs{$ascDev->_getTwilightDevice}->{TYPE} eq 'Astro' ); if ( $defs{ $ascDev->_getTwilightDevice }->{TYPE} eq 'Twilight' );
$elevation = ReadingsVal( $ascDev->_getTwilightDevice, 'SunAlt', -1 )
if ( $defs{ $ascDev->_getTwilightDevice }->{TYPE} eq 'Astro' );
return $elevation; return $elevation;
} }
@ -3143,8 +3273,8 @@ sub getBrightnessMaxVal {
} }
sub _getTwilightDevice { sub _getTwilightDevice {
my $self = shift; my $self = shift;
my $name = $self->{name}; my $name = $self->{name};
return AttrVal( $name, 'ASC_twilightDevice', 'none' ); return AttrVal( $name, 'ASC_twilightDevice', 'none' );
} }
@ -3381,8 +3511,8 @@ sub getRainSensorShuttersClosedPos {
In the shutter devices In the shutter devices
<ul> <ul>
<li>AutoShuttersControl - 0/1/2 1 = "Inverse or shutter e.g.: shutter upn 0,shutter down 100 and the command to travel is position",2 = "Homematic Style e.g.: shutter up 100,shutter down 0 and the command to travel is pct</li> <li>AutoShuttersControl - 0/1/2 1 = "Inverse or shutter e.g.: shutter upn 0,shutter down 100 and the command to travel is position",2 = "Homematic Style e.g.: shutter up 100,shutter down 0 and the command to travel is pct</li>
<li>ASC_Antifreeze - soft/hard/off antifreeze if soft the shutters frive into the ASC_AntifreezePos and if hard / am / pm is not driven or not driven within the appropriate time of day</li> <li>ASC_Antifreeze - soft/hard/off antifreeze if soft the shutters frive into the ASC_Antifreeze_Pos and if hard / am / pm is not driven or not driven within the appropriate time of day</li>
<li>ASC_AntifreezePos - Position to be approached when the move command closes completely, but the frost protection is active</li> <li>ASC_Antifreeze_Pos - Position to be approached when the move command closes completely, but the frost protection is active</li>
<li>ASC_AutoAstroModeEvening - actual REAL,CIVIL,NAUTIC,ASTRONOMIC</li> <li>ASC_AutoAstroModeEvening - actual REAL,CIVIL,NAUTIC,ASTRONOMIC</li>
<li>ASC_AutoAstroModeEveningHorizon - heighth above horizon if HORIZON is selected at attribute ASC_autoAstroModeEvening.</li> <li>ASC_AutoAstroModeEveningHorizon - heighth above horizon if HORIZON is selected at attribute ASC_autoAstroModeEvening.</li>
<li>ASC_AutoAstroModeMorning - actual REAL,CIVIL,NAUTIC,ASTRONOMIC</li> <li>ASC_AutoAstroModeMorning - actual REAL,CIVIL,NAUTIC,ASTRONOMIC</li>
@ -3521,8 +3651,8 @@ sub getRainSensorShuttersClosedPos {
In den Rolll&auml;den Devices In den Rolll&auml;den Devices
<ul> <ul>
<li>ASC - 0/1/2 1 = "Inverse oder Rollo - Bsp.: Rollo Oben 0, Rollo Unten 100 und der Befehl zum prozentualen Fahren ist position",2 = "Homematic Style - Bsp.: Rollo Oben 100, Rollo Unten 0 und der Befehl zum prozentualen Fahren ist pct</li> <li>ASC - 0/1/2 1 = "Inverse oder Rollo - Bsp.: Rollo Oben 0, Rollo Unten 100 und der Befehl zum prozentualen Fahren ist position",2 = "Homematic Style - Bsp.: Rollo Oben 100, Rollo Unten 0 und der Befehl zum prozentualen Fahren ist pct</li>
<li>ASC_Antifreeze - soft/am/pm/hard/off - Frostschutz, wenn soft f&auml;hrt der Rollladen in die ASC_AntifreezePos und wenn hard/am/pm wird gar nicht oder innerhalb der entsprechenden Tageszeit nicht gefahren</li> <li>ASC_Antifreeze - soft/am/pm/hard/off - Frostschutz, wenn soft f&auml;hrt der Rollladen in die ASC_Antifreeze_Pos und wenn hard/am/pm wird gar nicht oder innerhalb der entsprechenden Tageszeit nicht gefahren</li>
<li>ASC_AntifreezePos - Position die angefahren werden soll wenn der Fahrbefehl komplett schlie&szlig;en lautet, aber der Frostschutz aktiv ist</li> <li>ASC_Antifreeze_Pos - Position die angefahren werden soll wenn der Fahrbefehl komplett schlie&szlig;en lautet, aber der Frostschutz aktiv ist</li>
<li>ASC_AutoAstroModeEvening - aktuell REAL,CIVIL,NAUTIC,ASTRONOMIC</li> <li>ASC_AutoAstroModeEvening - aktuell REAL,CIVIL,NAUTIC,ASTRONOMIC</li>
<li>ASC_AutoAstroModeEveningHorizon - H&ouml;he &uuml;ber Horizont wenn beim Attribut ASC_autoAstroModeEvening HORIZON ausgew&auml;hlt</li> <li>ASC_AutoAstroModeEveningHorizon - H&ouml;he &uuml;ber Horizont wenn beim Attribut ASC_autoAstroModeEvening HORIZON ausgew&auml;hlt</li>
<li>ASC_AutoAstroModeMorning - aktuell REAL,CIVIL,NAUTIC,ASTRONOMIC</li> <li>ASC_AutoAstroModeMorning - aktuell REAL,CIVIL,NAUTIC,ASTRONOMIC</li>