From 8bc2b4b1ea15944aa4abe32b6f014eeec12d9f8b Mon Sep 17 00:00:00 2001 From: dietmar63 Date: Wed, 4 Jun 2014 19:27:19 +0000 Subject: [PATCH] Heating_Control, WeekdayTimer - set enable - set disable added and fixed a issue. git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@6057 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/98_Heating_Control.pm | 5 +++-- fhem/FHEM/98_WeekdayTimer.pm | 15 ++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/98_Heating_Control.pm b/fhem/FHEM/98_Heating_Control.pm index 7dafd777d..369710c07 100644 --- a/fhem/FHEM/98_Heating_Control.pm +++ b/fhem/FHEM/98_Heating_Control.pm @@ -51,8 +51,9 @@ sub Heating_Control_Initialize($) ################################################################################ sub Heating_Control_Set($@) { my ($hash, @a) = @_; + return "no set value specified" if(int(@a) < 2); - return "Unknown argument $a[1], choose one of enable/disable refresh" if($a[1] eq "?"); + return "Unknown argument $a[1], choose one of enable disable " if($a[1] eq "?"); my $name = shift @a; my $v = join(" ", @a); @@ -60,7 +61,7 @@ sub Heating_Control_Set($@) { Log3 $hash, 3, "[$name] set $name $v"; if ($v eq "enable") { - fhem("attr $name disable 1"); + fhem("attr $name disable 0"); } elsif ($v eq "disable") { fhem("attr $name disable 1"); } diff --git a/fhem/FHEM/98_WeekdayTimer.pm b/fhem/FHEM/98_WeekdayTimer.pm index 3bb9f7ffd..61bdcc3cc 100644 --- a/fhem/FHEM/98_WeekdayTimer.pm +++ b/fhem/FHEM/98_WeekdayTimer.pm @@ -48,12 +48,21 @@ sub WeekdayTimer_Initialize($) ################################################################################ sub WeekdayTimer_Set($@) { my ($hash, @a) = @_; + return "no set value specified" if(int(@a) < 2); - return "Unknown argument $a[1], choose one of enable/disable refresh" if($a[1] eq "?"); + return "Unknown argument $a[1], choose one of enable disable " if($a[1] eq "?"); - Heating_Control_Set($@); + my $name = shift @a; + my $v = join(" ", @a); + + Log3 $hash, 3, "[$name] set $name $v"; - return undef; + if ($v eq "enable") { + fhem("attr $name disable 0"); + } elsif ($v eq "disable") { + fhem("attr $name disable 1"); + } + return undef; } ######################################################################## sub WeekdayTimer_Get($@) {