Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

73_AutoShuttersControl: fix little bugs, change control logic

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20076 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2019-08-28 08:16:27 +00:00
parent 977a8968bf
commit d573713d8a
2 changed files with 75 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
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 little bugs, change control logic
- feature: 93_DbRep: devices contained in the selection definition are marked - feature: 93_DbRep: devices contained in the selection definition are marked
as "Probably associated with" if possible as "Probably associated with" if possible
- bugfix: 76_SMAInverter: fix Perl warnings - bugfix: 76_SMAInverter: fix Perl warnings

98
FHEM/73_AutoShuttersControl.pm
View File

@ -60,6 +60,7 @@ use strict;
use warnings; use warnings;
use POSIX; use POSIX;
use utf8; use utf8;
use Encode;
use FHEM::Meta; use FHEM::Meta;
use GPUtils qw(GP_Import GP_Export); use GPUtils qw(GP_Import GP_Export);
use Data::Dumper; #only for Debugging use Data::Dumper; #only for Debugging
@ -262,6 +263,7 @@ my %posSetCmds = (
HM485 => 'level', HM485 => 'level',
SELVECommeo => 'position', SELVECommeo => 'position',
SELVE => 'position', SELVE => 'position',
EnOcean => 'position',
); );
my $shutters = new ASC_Shutters(); my $shutters = new ASC_Shutters();
@ -485,6 +487,10 @@ sub Notify($$) {
} }
} }
elsif ( grep /^($posReading):\s\d+$/, @{$events} ) { elsif ( grep /^($posReading):\s\d+$/, @{$events} ) {
ASC_Debug( 'Notify: '
. ' ASC_Pos_Reading Event vom Rollo wurde erkannt '
. ' - RECEIVED EVENT: '
. Dumper $events);
EventProcessingShutters( $hash, $devname, join( ' ', @{$events} ) ); EventProcessingShutters( $hash, $devname, join( ' ', @{$events} ) );
} }
else { else {
@ -1015,7 +1021,14 @@ sub EventProcessingWindowRec($@) {
{ {
$shutters->setLastDrive('ventilate - window open'); $shutters->setLastDrive('ventilate - window open');
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
$shutters->setDriveCmd( $shutters->getVentilatePos ); $shutters->setDriveCmd(
(
(
$shutters->getShuttersPlace eq 'terrace'
and $shutters->getSubTyp eq 'twostate'
) ? $shutters->getOpenPos : $shutters->getVentilatePos
)
);
} }
elsif ( $match =~ /[Oo]pen/ elsif ( $match =~ /[Oo]pen/
and $shutters->getSubTyp eq 'threestate' ) and $shutters->getSubTyp eq 'threestate' )
@ -1039,7 +1052,13 @@ sub EventProcessingWindowRec($@) {
if ( defined($posValue) and $posValue ) { if ( defined($posValue) and $posValue ) {
$shutters->setLastDrive($setLastDrive); $shutters->setLastDrive($setLastDrive);
$shutters->setNoOffset(1); $shutters->setNoOffset(1);
$shutters->setDriveCmd($posValue); $shutters->setDriveCmd(
(
$shutters->getShuttersPlace eq 'terrace'
? $shutters->getOpenPos
: $posValue
)
);
} }
} }
} }
@ -1063,13 +1082,14 @@ sub EventProcessingRoommate($@) {
my $getModeUp = $shutters->getModeUp; my $getModeUp = $shutters->getModeUp;
my $getModeDown = $shutters->getModeDown; my $getModeDown = $shutters->getModeDown;
my $getRoommatesStatus = $shutters->getRoommatesStatus;
my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus; my $getRoommatesLastStatus = $shutters->getRoommatesLastStatus;
my $posValue; my $posValue;
if ( if (
( $1 eq 'home' or $1 eq 'awoken' ) ( $1 eq 'home' or $1 eq 'awoken' )
and ( $shutters->getRoommatesStatus eq 'home' and ( $getRoommatesStatus eq 'home'
or $shutters->getRoommatesStatus eq 'awoken' ) or $getRoommatesStatus eq 'awoken' )
and $ascDev->getAutoShuttersControlMorning eq 'on' and $ascDev->getAutoShuttersControlMorning eq 'on'
and ( $getModeUp eq 'home' and ( $getModeUp eq 'home'
or $getModeUp eq 'always' or $getModeUp eq 'always'
@ -1115,7 +1135,7 @@ sub EventProcessingRoommate($@) {
$getRoommatesLastStatus eq 'absent' $getRoommatesLastStatus eq 'absent'
or $getRoommatesLastStatus eq 'gone' or $getRoommatesLastStatus eq 'gone'
) )
and $shutters->getRoommatesStatus eq 'home' and $getRoommatesStatus eq 'home'
) )
{ {
if ( if (
@ -1207,8 +1227,7 @@ sub EventProcessingRoommate($@) {
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
} }
elsif ( elsif (
$getModeDown eq 'absent' $1 eq 'absent'
and $1 eq 'absent'
and ( not $shutters->getIsDay and ( not $shutters->getIsDay
or $shutters->getShadingMode eq 'absent' ) or $shutters->getShadingMode eq 'absent' )
) )
@ -1223,7 +1242,10 @@ sub EventProcessingRoommate($@) {
$shutters->setLastDrive('shading in'); $shutters->setLastDrive('shading in');
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
} }
elsif ( not $shutters->getIsDay ) { elsif ( not $shutters->getIsDay
and $getModeDown eq 'absent'
and $getRoommatesStatus eq 'absent' )
{
$posValue = $shutters->getClosedPos; $posValue = $shutters->getClosedPos;
$shutters->setLastDrive('roommate absent'); $shutters->setLastDrive('roommate absent');
ShuttersCommandSet( $hash, $shuttersDev, $posValue ); ShuttersCommandSet( $hash, $shuttersDev, $posValue );
@ -1380,14 +1402,15 @@ sub EventProcessingResidents($@) {
and not $shutters->getSelfDefenseAbsent and not $shutters->getSelfDefenseAbsent
and $shutters->getSelfDefenseAbsentTimerrun ); and $shutters->getSelfDefenseAbsentTimerrun );
if ( $shutters->getStatus == $shutters->getClosedPos ) { if ( $shutters->getStatus == $shutters->getClosedPos
and $shutters->getIsDay )
{
$shutters->setHardLockOut('on') $shutters->setHardLockOut('on')
if ( if (
CheckIfShuttersWindowRecOpen($shuttersDev) == 2 CheckIfShuttersWindowRecOpen($shuttersDev) == 2
and $shutters->getShuttersPlace eq 'terrace' and $shutters->getShuttersPlace eq 'terrace'
and ( $getModeUp eq 'absent' and ( $getModeUp eq 'absent'
or $getModeUp eq 'off' ) or $getModeUp eq 'off' )
and CheckIfShuttersWindowRecOpen($shuttersDev) != 0
); );
$shutters->setLastDrive('selfDefense inactive'); $shutters->setLastDrive('selfDefense inactive');
@ -1906,7 +1929,7 @@ sub EventProcessingTwilightDevice($@) {
ASC_Debug( 'EventProcessingTwilightDevice: ' ASC_Debug( 'EventProcessingTwilightDevice: '
. $name . $name
. ' - Passendes Event wurde erkannt. Verarbeitung über alle Rolllos beginnt' . ' - Passendes Event wurde erkannt. Verarbeitung über alle Rollos beginnt'
); );
foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) { foreach my $shuttersDev ( @{ $hash->{helper}{shuttersList} } ) {
@ -2279,13 +2302,18 @@ sub EventProcessingShutters($@) {
my ( $hash, $shuttersDev, $events ) = @_; my ( $hash, $shuttersDev, $events ) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
ASC_Debug( 'EventProcessingShutters: '
. ' Fn wurde durch Notify aufgerufen da ASC_Pos_Reading Event erkannt wurde '
. ' - RECEIVED EVENT: '
. Dumper $events);
if ( $events =~ m#.*:\s(\d+)# ) { if ( $events =~ m#.*:\s(\d+)# ) {
$shutters->setShuttersDev($shuttersDev); $shutters->setShuttersDev($shuttersDev);
$ascDev->setPosReading; $ascDev->setPosReading;
ASC_Debug( 'EventProcessingShutters: ' ASC_Debug( 'EventProcessingShutters: '
. $shutters->getShuttersDev . $shutters->getShuttersDev
. ' - Event vom Rolllo erkannt. Es wird nun eine etwaige manuelle Fahrt ausgewertet.' . ' - Event vom Rollo erkannt. Es wird nun eine etwaige manuelle Fahrt ausgewertet.'
. ' Int von gettimeofday: ' . ' Int von gettimeofday: '
. int( gettimeofday() ) . int( gettimeofday() )
. ' Last Position Timestamp: ' . ' Last Position Timestamp: '
@ -2323,6 +2351,11 @@ sub EventProcessingShutters($@) {
); );
} }
} }
ASC_Debug( 'EventProcessingShutters: '
. ' Fn wurde durlaufen und es sollten Debugausgaben gekommen sein. '
. ' !!!Wenn nicht!!! wurde der Event nicht korrekt als Nummerisch erkannt. '
);
} }
# Sub für das Zusammensetzen der Rolläden Steuerbefehle # Sub für das Zusammensetzen der Rolläden Steuerbefehle
@ -2598,19 +2631,23 @@ sub SunSetShuttersAfterTimerFn($) {
and $homemode eq 'gone' ) and $homemode eq 'gone' )
or $shutters->getModeDown eq 'always' or $shutters->getModeDown eq 'always'
) )
and (
$ascDev->getSelfDefense eq 'off'
or $shutters->getSelfDefenseExclude eq 'on'
or (
$ascDev->getSelfDefense eq 'on'
and ( $ascDev->getResidentsStatus ne 'absent'
or $ascDev->getResidentsStatus ne 'gone' )
)
)
) )
{ {
if ( $shutters->getPrivacyDownStatus == 1 ) { if ( $shutters->getPrivacyDownStatus == 1 ) {
$shutters->setPrivacyDownStatus(2); $shutters->setPrivacyDownStatus(2);
$shutters->setLastDrive('privacy position'); $shutters->setLastDrive('privacy position');
ShuttersCommandSet( ShuttersCommandSet( $hash, $shuttersDev,
$hash, $shutters->getPrivacyDownPos );
$shuttersDev,
PositionValueWindowRec(
$shuttersDev, $shutters->getPrivacyDownPos
)
);
} }
else { else {
$shutters->setPrivacyDownStatus(0); $shutters->setPrivacyDownStatus(0);
@ -2645,6 +2682,13 @@ sub SunRiseShuttersAfterTimerFn($) {
and $homemode eq 'gone' ) and $homemode eq 'gone' )
or $shutters->getModeUp eq 'always' or $shutters->getModeUp eq 'always'
) )
and (
$ascDev->getSelfDefense eq 'off'
or $shutters->getSelfDefenseExclude eq 'on'
or ( $ascDev->getSelfDefense eq 'on'
and $ascDev->getResidentsStatus ne 'absent'
and $ascDev->getResidentsStatus ne 'gone' )
)
) )
{ {
@ -2660,9 +2704,12 @@ sub SunRiseShuttersAfterTimerFn($) {
$ascDev->getSelfDefense eq 'off' $ascDev->getSelfDefense eq 'off'
or ( $ascDev->getSelfDefense eq 'on' or ( $ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 ) and CheckIfShuttersWindowRecOpen($shuttersDev) == 0 )
or ( $ascDev->getSelfDefense eq 'on' or (
$ascDev->getSelfDefense eq 'on'
and CheckIfShuttersWindowRecOpen($shuttersDev) != 0 and CheckIfShuttersWindowRecOpen($shuttersDev) != 0
and $ascDev->getResidentsStatus eq 'home' ) and ( $ascDev->getResidentsStatus ne 'absent'
or $ascDev->getResidentsStatus ne 'gone' )
)
) )
) )
{ {
@ -3606,7 +3653,7 @@ sub _SetCmdFn($) {
ASC_Debug( 'FnSetCmdFn: ' ASC_Debug( 'FnSetCmdFn: '
. $shuttersDev . $shuttersDev
. ' - Rolllo wird gefahren, aktuelle Position: ' . ' - Rollo wird gefahren, aktuelle Position: '
. $shutters->getStatus . $shutters->getStatus
. ', Zielposition: ' . ', Zielposition: '
. $posValue . $posValue
@ -3644,7 +3691,10 @@ sub ASC_Debug($) {
my $debugTimestamp = strftime( "%Y.%m.%e %T", localtime(time) ); my $debugTimestamp = strftime( "%Y.%m.%e %T", localtime(time) );
print( print(
"\n" . 'ASC_DEBUG!!! ' . $debugTimestamp . ' - ' . $debugMsg . "\n" ); encode_utf8(
"\n" . 'ASC_DEBUG!!! ' . $debugTimestamp . ' - ' . $debugMsg . "\n"
)
);
} }
###################################### ######################################
@ -6495,7 +6545,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "under develop", "release_status": "under develop",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.6.27", "version": "v0.6.30",
"x_developmentversion": "v0.6.19.34", "x_developmentversion": "v0.6.19.34",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"