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

73_AutoShuttersControl: add maxBrighness for morning open

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@18024 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2018-12-21 18:46:47 +00:00
parent a51ad0d419
commit 2973c467b5
2 changed files with 11 additions and 2 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.
- feature: 73_AutoShuttersControl: add maxBrightness for morning open
- feature: 73_AutoShuttersControl: support for shading, fix bugs - feature: 73_AutoShuttersControl: support for shading, fix bugs
- feature: 37_harmony: use websockets if xmpp is not available - feature: 37_harmony: use websockets if xmpp is not available
fixes issues with firmware 4.15.206 fixes issues with firmware 4.15.206

12
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -1172,6 +1172,14 @@ sub EventProcessingBrightness($@) {
else { else {
$brightnessMinVal = $ascDev->getBrightnessMinVal; $brightnessMinVal = $ascDev->getBrightnessMinVal;
} }
my $brightnessMaxVal;
if ( $shutters->getBrightnessMaxVal > -1 ) {
$brightnessMaxVal = $shutters->getBrightnessMaxVal;
}
else {
$brightnessMaxVal = $ascDev->getBrightnessMaxVal;
}
if ( if (
int( gettimeofday() / 86400 ) != int( int( gettimeofday() / 86400 ) != int(
@ -1180,7 +1188,7 @@ sub EventProcessingBrightness($@) {
and int( gettimeofday() / 86400 ) == int( and int( gettimeofday() / 86400 ) == int(
computeAlignTime( '24:00', $shutters->getTimeUpLate ) / 86400 computeAlignTime( '24:00', $shutters->getTimeUpLate ) / 86400
) )
and $1 > $brightnessMinVal and $1 > $brightnessMaxVal
and $shutters->getUp eq 'brightness' and $shutters->getUp eq 'brightness'
) )
{ {
@ -1190,7 +1198,7 @@ sub EventProcessingBrightness($@) {
my $homemode = $shutters->getRoommatesStatus; my $homemode = $shutters->getRoommatesStatus;
$homemode = $ascDev->getResidentsStatus $homemode = $ascDev->getResidentsStatus
if ( $homemode eq 'none' ); if ( $homemode eq 'none' );
$shutters->setLastDrive('minimum brightness threshold exceeded'); $shutters->setLastDrive('maximum brightness threshold exceeded');
if ( $shutters->getModeUp eq $homemode if ( $shutters->getModeUp eq $homemode
or $homemode eq 'none' or $homemode eq 'none'