FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-19 18:56:03 +00:00
Code Issues Releases Wiki Activity

73_AutoShuttersControl: fix AntiFreeze_Fn

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21102 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
LeonGaultier 2020-02-03 08:03:50 +00:00
parent 0e683e4897
commit 62f69cde45
2 changed files with 20 additions and 13 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 AntiFreeze_Fn
- feature 14_SD_UT: new model remote control Novy_840039 - feature 14_SD_UT: new model remote control Novy_840039
- bugfix: 88_Timer: fix2 list "Probably associated with" Forum: #1015549 - bugfix: 88_Timer: fix2 list "Probably associated with" Forum: #1015549
- new: 70_DENON_AVR: initial commit. - new: 70_DENON_AVR: initial commit.

32
fhem/FHEM/73_AutoShuttersControl.pm
View File

@ -296,13 +296,13 @@ sub Initialize($) {
## Da ich mit package arbeite müssen in die Initialize für die jeweiligen hash Fn Funktionen der Funktionsname ## Da ich mit package arbeite müssen in die Initialize für die jeweiligen hash Fn Funktionen der Funktionsname
# und davor mit :: getrennt der eigentliche package Name des Modules # und davor mit :: getrennt der eigentliche package Name des Modules
$hash->{SetFn} = 'FHEM::AutoShuttersControl::Set'; $hash->{SetFn} = 'FHEM::AutoShuttersControl::Set';
$hash->{GetFn} = 'FHEM::AutoShuttersControl::Get'; $hash->{GetFn} = 'FHEM::AutoShuttersControl::Get';
$hash->{DefFn} = 'FHEM::AutoShuttersControl::Define'; $hash->{DefFn} = 'FHEM::AutoShuttersControl::Define';
$hash->{NotifyFn} = 'FHEM::AutoShuttersControl::Notify'; $hash->{NotifyFn} = 'FHEM::AutoShuttersControl::Notify';
$hash->{UndefFn} = 'FHEM::AutoShuttersControl::Undef'; $hash->{UndefFn} = 'FHEM::AutoShuttersControl::Undef';
$hash->{AttrFn} = 'FHEM::AutoShuttersControl::Attr'; $hash->{AttrFn} = 'FHEM::AutoShuttersControl::Attr';
$hash->{AttrList} = $hash->{AttrList} =
'ASC_tempSensor ' 'ASC_tempSensor '
. 'ASC_brightnessDriveUpDown ' . 'ASC_brightnessDriveUpDown '
. 'ASC_autoShuttersControlMorning:on,off ' . 'ASC_autoShuttersControlMorning:on,off '
@ -322,8 +322,8 @@ sub Initialize($) {
. 'ASC_blockAscDrivesAfterManual:0,1 ' . 'ASC_blockAscDrivesAfterManual:0,1 '
. 'ASC_debug:1 ' . 'ASC_debug:1 '
. $readingFnAttributes; . $readingFnAttributes;
$hash->{NotifyOrderPrefix} = '51-'; # Order Nummer für NotifyFn $hash->{NotifyOrderPrefix} = '51-'; # Order Nummer für NotifyFn
$hash->{FW_detailFn} = 'FHEM::AutoShuttersControl::ShuttersInformation'; $hash->{FW_detailFn} = 'FHEM::AutoShuttersControl::ShuttersInformation';
return FHEM::Meta::InitMod( __FILE__, $hash ); return FHEM::Meta::InitMod( __FILE__, $hash );
} }
@ -3193,10 +3193,11 @@ sub CreateNewNotifyDev($) {
sub ShuttersInformation($@) { sub ShuttersInformation($@) {
my ($FW_wname, $d, $room, $pageHash) = @_; my ( $FW_wname, $d, $room, $pageHash ) = @_;
my $hash = $defs{$d}; my $hash = $defs{$d};
my $ret = '<html><table><tr><h3>ASC Configuration and Information Summary</h3><td>'; my $ret =
'<html><table><tr><h3>ASC Configuration and Information Summary</h3><td>';
$ret .= '<table class="block wide">'; $ret .= '<table class="block wide">';
$ret .= '<tr class="even">'; $ret .= '<tr class="even">';
$ret .= "<td><b>Shutters</b></td>"; $ret .= "<td><b>Shutters</b></td>";
@ -4696,8 +4697,13 @@ sub getIsDay {
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() );
$daytime = (
defined($daytime) and $daytime
? $daytime
: ( strftime( "%k", localtime() ) < 12 ? 'pm' : 'am' )
);
my $outTemp = $ascDev->getOutTemp; my $outTemp = $ascDev->getOutTemp;
$outTemp = $shutters->getOutTemp if ( $shutters->getOutTemp != -100 ); $outTemp = $shutters->getOutTemp if ( $shutters->getOutTemp != -100 );
@ -7891,7 +7897,7 @@ sub getblockAscDrivesAfterManual {
], ],
"release_status": "testing", "release_status": "testing",
"license": "GPL_2", "license": "GPL_2",
"version": "v0.8.14", "version": "v0.8.15",
"author": [ "author": [
"Marko Oldenburg <leongaultier@gmail.com>" "Marko Oldenburg <leongaultier@gmail.com>"
], ],