From f24b46a92f69c6977b7c82e10919d1df7baf35ea Mon Sep 17 00:00:00 2001 From: zap Date: Fri, 13 Jan 2017 18:45:13 +0000 Subject: [PATCH] HMCCU: Fixed bugs in HMCCUCHN and HMCCUDEV git-svn-id: https://svn.fhem.de/fhem/trunk@13060 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/88_HMCCUCHN.pm | 2 +- fhem/FHEM/88_HMCCUDEV.pm | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/88_HMCCUCHN.pm b/fhem/FHEM/88_HMCCUCHN.pm index c5c70fa51..0fe61bcaa 100644 --- a/fhem/FHEM/88_HMCCUCHN.pm +++ b/fhem/FHEM/88_HMCCUCHN.pm @@ -407,7 +407,7 @@ sub HMCCUCHN_Set ($@) } elsif ($opt eq 'config') { return HMCCU_SetError ($hash, "Usage: set $name config {parameter}={value} [...]") - if (scalar (keys %{$h}) < 1); + if ((scalar keys %{$h}) < 1); my $rc = HMCCU_RPCSetConfig ($hash, $ccuaddr, $h); return HMCCU_SetError ($hash, $rc) if ($rc < 0); diff --git a/fhem/FHEM/88_HMCCUDEV.pm b/fhem/FHEM/88_HMCCUDEV.pm index 47d63f50f..8f7fd9553 100644 --- a/fhem/FHEM/88_HMCCUDEV.pm +++ b/fhem/FHEM/88_HMCCUDEV.pm @@ -475,12 +475,11 @@ sub HMCCUDEV_Set ($@) } } elsif ($opt eq 'config') { - return HMCCU_SetError ($hash, "Usage: set $name config [{channel-number}] {parameter}={value} [...]") - if (scalar (keys %{$h}) < 1); + return HMCCU_SetError ($hash, "Usage: set $name config [{channel-number}] {parameter}={value} [...]") if ((scalar keys %{$h}) < 1); my $objname = $ccuaddr; # Channel number is optional because parameter can be related to device or channel - if (scalar (@$a) > 0) && $$a[0] =~ /^([0-9]{1,2})$/) { + if ((scalar @$a) > 0 && $$a[0] =~ /^([0-9]{1,2})$/) { return HMCCU_SetError ($hash, -7) if ($1 >= $hash->{channels}); $objname .= ':'.$1; }