FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-08 05:15:10 +00:00
Code Issues Releases Wiki Activity

MAX: add attr keepAuto

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2910 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre 2013-03-13 22:42:48 +00:00
parent ff61db176e
commit 4aafcccb0e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fhem/FHEM/10_MAX.pm
View File

@ -73,7 +73,7 @@ MAX_Initialize($)
$hash->{ParseFn} = "MAX_Parse"; $hash->{ParseFn} = "MAX_Parse";
$hash->{SetFn} = "MAX_Set"; $hash->{SetFn} = "MAX_Set";
$hash->{AttrList} = "IODev do_not_notify:1,0 ignore:0,1 dummy:0,1 " . $hash->{AttrList} = "IODev do_not_notify:1,0 ignore:0,1 dummy:0,1 " .
"showtime:1,0 loglevel:0,1,2,3,4,5,6 ". "showtime:1,0 loglevel:0,1,2,3,4,5,6 keepAuto ".
$readingFnAttributes; $readingFnAttributes;
return undef; return undef;
} }
@ -244,6 +244,12 @@ MAX_Set($@)
my $until = undef; my $until = undef;
my $ctrlmode = 1; #0=auto, 1=manual; 2=temporary my $ctrlmode = 1; #0=auto, 1=manual; 2=temporary
if(AttrVal($hash->{NAME},"keepAuto","0") ne "0"
&& MAX_ReadingsVal($hash,"mode") eq "auto") {
Log 5, "MAX_Set: staying in auto mode";
$ctrlmode = 0; #auto
}
if($args[0] eq "auto") { if($args[0] eq "auto") {
#This enables the automatic/schedule mode where the thermostat follows the weekly program #This enables the automatic/schedule mode where the thermostat follows the weekly program
$temperature = @args > 1 ? MAX_ParseTemperature($args[1]) : 0; $temperature = @args > 1 ? MAX_ParseTemperature($args[1]) : 0;
@ -892,6 +898,7 @@ MAX_Parse($$)
<li><a href="#do_not_notify">do_not_notify</a></li> <li><a href="#do_not_notify">do_not_notify</a></li>
<li><a href="#ignore">ignore</a></li> <li><a href="#ignore">ignore</a></li>
<li><a href="#readingFnAttributes">readingFnAttributes</a></li> <li><a href="#readingFnAttributes">readingFnAttributes</a></li>
<li>keepAuto<br>Default: 0. If set to 1, it will stay in the auto mode when you set a desiredTemperature while the auto (=weekly program) mode is active.</li>
</ul> </ul>
<br> <br>