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

fix problem with brightness and weekend function

Browse Source
This commit is contained in:
Marko Oldenburg
2021-02-03 11:34:33 +01:00
parent a0c08bdfc0
commit 4f2af22628
3 changed files with 12 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FHEM/73_AutoShuttersControl.pm
View File

@@ -1265,7 +1265,7 @@ sub Initialize {
],
"release_status": "testing",
"license": "GPL_2",
"version": "v0.10.11",
"version": "v0.10.12",
"author": [
"Marko Oldenburg <leongaultier@gmail.com>"
],

16
controls_AutoShuttersControl.txt
View File

@@ -1,15 +1,15 @@
UPD 2020-11-20_11:27:18 97970 FHEM/73_AutoShuttersControl.pm
UPD 2020-11-20_11:21:11 74314 lib/FHEM/Automation/ShuttersControl.pm
UPD 2021-02-03_11:19:43 97970 FHEM/73_AutoShuttersControl.pm
UPD 2021-01-29_10:06:33 74314 lib/FHEM/Automation/ShuttersControl.pm
UPD 2020-06-22_09:41:40 2657 lib/FHEM/Automation/ShuttersControl/Dev.pm
UPD 2020-07-26_17:36:29 2496 lib/FHEM/Automation/ShuttersControl/Roommate.pm
UPD 2020-08-12_11:00:05 31376 lib/FHEM/Automation/ShuttersControl/Shutters.pm
UPD 2020-11-09_06:58:59 25599 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-01-04_08:25:14 110380 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-01-04_08:11:06 46060 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2021-01-29_10:06:33 25599 lib/FHEM/Automation/ShuttersControl/Shading.pm
UPD 2021-01-29_10:06:33 110380 lib/FHEM/Automation/ShuttersControl/EventProcessingFunctions.pm
UPD 2021-02-03_11:27:27 40628 lib/FHEM/Automation/ShuttersControl/Helper.pm
UPD 2020-06-22_09:41:40 2175 lib/FHEM/Automation/ShuttersControl/Window.pm
UPD 2020-11-20_11:21:11 11742 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2021-01-29_10:06:33 11742 lib/FHEM/Automation/ShuttersControl/Dev/Attr.pm
UPD 2020-07-03_11:29:10 7251 lib/FHEM/Automation/ShuttersControl/Dev/Readings.pm
UPD 2020-11-09_06:58:59 52525 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2021-01-29_10:06:33 52525 lib/FHEM/Automation/ShuttersControl/Shutters/Attr.pm
UPD 2020-06-22_09:41:40 2903 lib/FHEM/Automation/ShuttersControl/Shutters/Readings.pm
UPD 2020-11-09_06:58:59 3980 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2021-01-29_10:06:33 3980 lib/FHEM/Automation/ShuttersControl/Window/Attr.pm
UPD 2020-06-22_09:41:40 2288 lib/FHEM/Automation/ShuttersControl/Window/Readings.pm

129
lib/FHEM/Automation/ShuttersControl/Helper.pm
View File

@@ -806,132 +806,9 @@ sub ShuttersSunrise {
elsif ( $FHEM::Automation::ShuttersControl::shutters->getUp eq
'brightness' )
{
if ( ( IsWe() || IsWe('tomorrow') )
&& $FHEM::Automation::ShuttersControl::ascDev
->getSunriseTimeWeHoliday eq 'on'
&& $FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday ne '01:25' )
{
if ( !IsWe('tomorrow') ) {
if (
IsWe()
&& int( gettimeofday() / 86400 ) == int(
(
computeAlignTime(
'24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday
)
) / 86400
)
)
{
$shuttersSunriseUnixtime = computeAlignTime( '24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday );
}
elsif (
int( gettimeofday() / 86400 ) == int(
(
computeAlignTime(
'24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpLate
)
) / 86400
)
)
{
$shuttersSunriseUnixtime = computeAlignTime( '24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday );
}
else {
$shuttersSunriseUnixtime = computeAlignTime( '24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpLate );
}
}
else {
if (
IsWe()
&& (
int( gettimeofday() / 86400 ) == int(
(
computeAlignTime(
'24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday
)
) / 86400
)
|| int( gettimeofday() / 86400 ) != int(
(
computeAlignTime(
'24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday
)
) / 86400
)
)
)
{
$shuttersSunriseUnixtime = computeAlignTime( '24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday );
}
elsif (
int( gettimeofday() / 86400 ) == int(
(
computeAlignTime(
'24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpLate
)
) / 86400
)
)
{
$shuttersSunriseUnixtime = computeAlignTime( '24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpLate );
}
else {
if (
int( gettimeofday() / 86400 ) == int(
(
computeAlignTime(
'24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday
)
) / 86400
)
)
{
$shuttersSunriseUnixtime = computeAlignTime(
'24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday
);
}
else {
$shuttersSunriseUnixtime = computeAlignTime(
'24:00',
$FHEM::Automation::ShuttersControl::shutters
->getTimeUpWeHoliday
);
}
}
}
}
else {
$shuttersSunriseUnixtime = computeAlignTime( '24:00',
$FHEM::Automation::ShuttersControl::shutters->getTimeUpLate
);
}
$shuttersSunriseUnixtime = computeAlignTime( '24:00',
$FHEM::Automation::ShuttersControl::shutters->getTimeUpLate
);
}
return $shuttersSunriseUnixtime;