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

set usage now displays the possible temp values

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@1464 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2012-04-18 07:43:29 +00:00
parent 24ac1a3082
commit 5ae7d1b4fb
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
fhem/FHEM/10_CUL_HM.pm
View File

@ -955,8 +955,18 @@ CUL_HM_Set($@)
if($culHmSubTypeSets{$st}); if($culHmSubTypeSets{$st});
$usg .= " ". join(" ",sort keys %{$culHmModelSets{$md}}) $usg .= " ". join(" ",sort keys %{$culHmModelSets{$md}})
if($culHmModelSets{$md}); if($culHmModelSets{$md});
if($usg =~ m/ pct/) {
my $pct = join(" ", (0..100)); my $pct = join(" ", (0..100));
$usg =~ s/ pct/ $pct/; $usg =~ s/ pct/ $pct/;
} elsif($md eq "HM-CC-TC") {
my @list = map { ($_.".0", $_+0.5) } (6..30);
pop @list;
my $list = "on,off," . join(",",@list);
$usg =~ s/-temp/-temp:$list/g;
}
return $usg; return $usg;
} elsif($h eq "" && @a != 2) { } elsif($h eq "" && @a != 2) {
@ -1786,11 +1796,12 @@ CUL_HM_convTemp($)
{ {
my ($val) = @_; my ($val) = @_;
if(!($val eq "on" || $val eq "off" ||
($val =~ m/^\d*\.?\d+$/ && $val >= 6 && $val <= 30))) {
my @list = map { ($_.".0", $_+0.5) } (6..30); my @list = map { ($_.".0", $_+0.5) } (6..30);
pop @list; pop @list;
return "Invalid temperature $val, choose one of on off " . join(" ",@list) return "Invalid temperature $val, choose one of on off " . join(" ",@list);
if(!($val eq "on" || $val eq "off" || }
($val =~ m/^\d*\.?\d+$/ && $val >= 6 && $val <= 30)));
$val = 100 if($val eq "on"); $val = 100 if($val eq "on");
$val = 0 if($val eq "off"); $val = 0 if($val eq "off");
return sprintf("%02X", $val*2); return sprintf("%02X", $val*2);

19
fhem/FHEM/11_FHT.pm
View File

@ -207,8 +207,15 @@ FHT_Set($@)
while(@a) { while(@a) {
$cmd = shift(@a); $cmd = shift(@a);
return "Unknown argument $cmd, choose one of " . join(" ",sort keys %c2bset) if(!defined($c2b{$cmd})) {
if(!defined($c2b{$cmd})); my $cmdList = join(" ",sort keys %c2bset);
my @list = map { ($_.".0", $_+0.5) } (6..30);
pop @list;
my $tmpList="on,off,".join(",",@list);
$cmdList =~ s/-temp/-temp:$tmpList/g;
return "Unknown argument $cmd, choose one of $cmdList";
}
return "Readonly parameter $cmd" return "Readonly parameter $cmd"
if(defined($cantset{$cmd})); if(defined($cantset{$cmd}));
return "\"set $name $cmd\" needs a parameter" return "\"set $name $cmd\" needs a parameter"
@ -219,11 +226,13 @@ FHT_Set($@)
if ($cmd =~ m/-temp/) { if ($cmd =~ m/-temp/) {
if(!($val eq "on" || $val eq "off" ||
($val =~ m/^\d*\.?\d+$/ && $val >= 5.5 && $val <= 30.5))) {
my @list = map { ($_.".0", $_+0.5) } (6..30); my @list = map { ($_.".0", $_+0.5) } (6..30);
pop @list; pop @list;
return "Invalid temperature $val, choose one of on off " . join(" ",@list) return "Invalid temperature $val, choose one of on off "
if(!($val eq "on" || $val eq "off" || . join(" ",@list);
($val =~ m/^\d*\.?\d+$/ && $val >= 5.5 && $val <= 30.5))); }
$val = 30.5 if($val eq "on"); $val = 30.5 if($val eq "on");
$val = 5.5 if($val eq "off"); $val = 5.5 if($val eq "off");