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

change version and code style

Browse Source
This commit is contained in:
Marko Oldenburg
2018-11-28 13:11:32 +01:00
parent 372e11598c
commit 7feef51543
1 changed files with 54 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
73_AutoShuttersControl.pm
View File

@@ -157,16 +157,16 @@ my %userAttrList = (
=> 'none', => 'none',
'ASC_Open_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 0, 100 ], 'ASC_Open_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 0, 100 ],
'ASC_Closed_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 100, 0 ], 'ASC_Closed_Pos:0,10,20,30,40,50,60,70,80,90,100' => [ '', 100, 0 ],
'ASC_Pos_Reading' => [ '', 'position', 'pct' ], 'ASC_Pos_Reading' => [ '', 'position', 'pct' ],
'ASC_Time_Up_Early' => '04:30', 'ASC_Time_Up_Early' => '04:30',
'ASC_Time_Up_Late' => '09:00', 'ASC_Time_Up_Late' => '09:00',
'ASC_Time_Up_WE_Holiday' => '08:30', 'ASC_Time_Up_WE_Holiday' => '08:30',
'ASC_Time_Down_Early' => '15:30', 'ASC_Time_Down_Early' => '15:30',
'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,protection' => 'none', 'ASC_LockOut_Cmd:inhibit,blocked,protection' => 'none',
# 'ASC_Shading_Direction' => 178, # 'ASC_Shading_Direction' => 178,
# 'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 70, 30 ], # 'ASC_Shading_Pos:10,20,30,40,50,60,70,80,90,100' => [ '', 70, 30 ],
@@ -229,7 +229,9 @@ sub Define($$) {
; # es wird geprüft ob bereits eine Instanz unseres Modules existiert,wenn ja wird abgebrochen ; # es wird geprüft ob bereits eine Instanz unseres Modules existiert,wenn ja wird abgebrochen
return 'too few parameters: define <name> ShuttersControl' if ( @a != 2 ); return 'too few parameters: define <name> ShuttersControl' if ( @a != 2 );
return return
'Cannot define ShuttersControl device. Perl modul ' . ${missingModul} . 'is missing.' 'Cannot define ShuttersControl device. Perl modul '
. ${missingModul}
. 'is missing.'
if ($missingModul) if ($missingModul)
; # Abbruch wenn benötigte Hilfsmodule nicht vorhanden sind / vorerst unwichtig ; # Abbruch wenn benötigte Hilfsmodule nicht vorhanden sind / vorerst unwichtig
@@ -621,7 +623,7 @@ sub ShuttersDeviceScan($) {
delFromDevAttrList( $_, 'ASC_LockOut_Cmd:inhibit,blocked' ) delFromDevAttrList( $_, 'ASC_LockOut_Cmd:inhibit,blocked' )
if ( AttrVal( $_, 'ASC_LockOut_Cmd', 'none' ) eq 'none' ) if ( AttrVal( $_, 'ASC_LockOut_Cmd', 'none' ) eq 'none' )
; # temporär muss später gelöscht werden ab Version 0.2.0.10 ; # temporär muss später gelöscht werden ab Version 0.2.0.10
$shuttersList = $shuttersList . ',' . $_; $shuttersList = $shuttersList . ',' . $_;
$shutters->setShuttersDev($_); $shutters->setShuttersDev($_);
@@ -789,8 +791,10 @@ sub EventProcessingWindowRec($@) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
#### Hardware Lock der Rollläden #### Hardware Lock der Rollläden
$shutters->setHardLockOut('off') if ( $1 eq 'closed' and $shutters->getShuttersPlace eq 'terrace' ); $shutters->setHardLockOut('off')
$shutters->setHardLockOut('on') if ( $1 eq 'open' and $shutters->getShuttersPlace eq 'terrace' ); if ( $1 eq 'closed' and $shutters->getShuttersPlace eq 'terrace' );
$shutters->setHardLockOut('on')
if ( $1 eq 'open' and $shutters->getShuttersPlace eq 'terrace' );
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
@@ -806,12 +810,12 @@ sub EventProcessingWindowRec($@) {
); );
if ( $shutters->getDelayCmd ne 'none' and $1 eq 'closed' ) 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
$shutters->setLastDrive('delayed drive - window closed'); $shutters->setLastDrive('delayed drive - window closed');
ShuttersCommandSet( $hash, $shuttersDev, $shutters->getDelayCmd ); ShuttersCommandSet( $hash, $shuttersDev, $shutters->getDelayCmd );
} }
elsif ( $1 eq 'closed' elsif ( $1 eq 'closed'
) # wenn nicht dann wird entsprechend dem Fensterkontakt Event der Rolladen geschlossen ) # wenn nicht dann wird entsprechend dem Fensterkontakt Event der Rolladen geschlossen
{ {
if ( $shutters->getStatus == $shutters->getVentilatePos if ( $shutters->getStatus == $shutters->getVentilatePos
or $shutters->getStatus == $shutters->getComfortOpenPos ) or $shutters->getStatus == $shutters->getComfortOpenPos )
@@ -821,22 +825,25 @@ sub EventProcessingWindowRec($@) {
if ( $homemode eq 'none' ); if ( $homemode eq 'none' );
if ( if (
IsDay( $hash, $shuttersDev ) IsDay( $hash, $shuttersDev )
and $shutters->getStatus != $shutters->getOpenPos and $shutters->getStatus != $shutters->getOpenPos
and ( $homemode ne 'asleep' and ( $homemode ne 'asleep'
or $homemode ne 'gotosleep' or $homemode ne 'gotosleep'
or $homemode eq 'none' ) ) or $homemode eq 'none' )
)
{ {
$shutters->setLastDrive('window day closed'); $shutters->setLastDrive('window day closed');
ShuttersCommandSet( $hash, $shuttersDev,$shutters->getLastPos ); ShuttersCommandSet( $hash, $shuttersDev,
$shutters->getLastPos );
} }
elsif ( not IsDay( $hash, $shuttersDev ) elsif (not IsDay( $hash, $shuttersDev )
or $homemode eq 'asleep' or $homemode eq 'asleep'
or $homemode eq 'gotosleep' ) or $homemode eq 'gotosleep' )
{ {
$shutters->setLastDrive('window night closed'); $shutters->setLastDrive('window night closed');
ShuttersCommandSet( $hash, $shuttersDev,$shutters->getClosedPos ); ShuttersCommandSet( $hash, $shuttersDev,
$shutters->getClosedPos );
} }
} }
} }
@@ -1066,7 +1073,9 @@ sub EventProcessingResidents($@) {
{ {
$shutters->setLastDrive('selfeDefense inactive'); $shutters->setLastDrive('selfeDefense inactive');
$shutters->setDriveCmd( $shutters->getLastPos ); $shutters->setDriveCmd( $shutters->getLastPos );
$shutters->setHardLockOut('on') if ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2 and $shutters->getShuttersPlace eq 'terrace' ); $shutters->setHardLockOut('on')
if ( CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' );
} }
elsif ( elsif (
$shutters->getStatus == $shutters->getClosedPos $shutters->getStatus == $shutters->getClosedPos
@@ -1313,7 +1322,6 @@ sub ShadingProcessing($@) {
) = @_; ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
# Log3( $name, 1, # Log3( $name, 1,
# "AutoShuttersControl ($name) - Shading Processing, Rollladen: " . $shuttersDev . " Azimuth: " . $azimuth . " Elevation: " . $elevation . " Brightness: " . $brightness . " OutTemp: " . $outTemp # "AutoShuttersControl ($name) - Shading Processing, Rollladen: " . $shuttersDev . " Azimuth: " . $azimuth . " Elevation: " . $elevation . " Brightness: " . $brightness . " OutTemp: " . $outTemp
# ); # );
@@ -1331,7 +1339,6 @@ sub ShadingProcessing($@) {
# Log3( $name, 1, # Log3( $name, 1,
# "AutoShuttersControl ($name) - Shading Processing hinter dem return"); # "AutoShuttersControl ($name) - Shading Processing hinter dem return");
} }
sub EventProcessingPartyMode($) { sub EventProcessingPartyMode($) {
@@ -2248,7 +2255,7 @@ sub SetCmdFn($) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
return return
unless ( $shutters->getASC != 0 ); unless ( $shutters->getASC != 0 );
if ( $shutters->getStatus != $posValue ) { if ( $shutters->getStatus != $posValue ) {
$shutters->setLastPos( $shutters->getStatus ); $shutters->setLastPos( $shutters->getStatus );
@@ -2322,17 +2329,19 @@ sub getShuttersDev {
sub setHardLockOut { sub setHardLockOut {
my ( $self, $cmd ) = @_; my ( $self, $cmd ) = @_;
if ( $shutters->getLockOut eq 'hard' if ( $shutters->getLockOut eq 'hard'
and $shutters->getLockOutCmd ne 'none' ) and $shutters->getLockOutCmd ne 'none' )
{ {
CommandSet( undef, $self->{shuttersDev} . ' inhibit ' . $cmd ) CommandSet( undef, $self->{shuttersDev} . ' inhibit ' . $cmd )
if ( $shutters->getLockOutCmd eq 'inhibit' ); if ( $shutters->getLockOutCmd eq 'inhibit' );
CommandSet( undef, CommandSet( undef,
$self->{shuttersDev} . ' ' . ( $cmd eq 'on' ? 'blocked' : 'unblocked' ) ) $self->{shuttersDev} . ' '
if ( $shutters->getLockOutCmd eq 'blocked' ); . ( $cmd eq 'on' ? 'blocked' : 'unblocked' ) )
if ( $shutters->getLockOutCmd eq 'blocked' );
CommandSet( undef, CommandSet( undef,
$self->{shuttersDev} . ' ' . ( $cmd eq 'on' ? 'protectionOn' : 'protectionOff' ) ) $self->{shuttersDev} . ' '
if ( $shutters->getLockOutCmd eq 'protection' ); . ( $cmd eq 'on' ? 'protectionOn' : 'protectionOff' ) )
if ( $shutters->getLockOutCmd eq 'protection' );
} }
return 0; return 0;
} }