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

HMCCU: One more device definition bug fixed

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17355 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
zap 2018-09-16 09:34:40 +00:00
parent 53caaa1613
commit bc48439ee6
2 changed files with 23 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fhem/FHEM/88_HMCCUCHN.pm
View File

@ -4,7 +4,7 @@
# #
# $Id$ # $Id$
# #
# Version 4.3.001 # Version 4.3.002
# #
# (c) 2018 zap (zap01 <at> t-online <dot> de) # (c) 2018 zap (zap01 <at> t-online <dot> de)
# #
@ -123,7 +123,9 @@ sub HMCCUCHN_Define ($@)
while (defined ($arg)) { while (defined ($arg)) {
return $usage if ($n == 3); return $usage if ($n == 3);
if ($arg eq 'readonly') { $hash->{statevals} = $arg; } if ($arg eq 'readonly') { $hash->{statevals} = $arg; }
elsif ($arg eq 'defaults' && $init_done) { HMCCU_SetDefaults ($hash); } elsif ($arg eq 'defaults') {
HMCCU_SetDefaults ($hash) if ($init_done);
}
else { return $usage; } else { return $usage; }
$n++; $n++;
$arg = shift @$a; $arg = shift @$a;

23
fhem/FHEM/88_HMCCUDEV.pm
View File

@ -4,7 +4,7 @@
# #
# $Id$ # $Id$
# #
# Version 4.3.001 # Version 4.3.002
# #
# (c) 2018 zap (zap01 <at> t-online <dot> de) # (c) 2018 zap (zap01 <at> t-online <dot> de)
# #
@ -126,7 +126,9 @@ sub HMCCUDEV_Define ($@)
# Parse optional command line parameters # Parse optional command line parameters
foreach my $arg (@$a) { foreach my $arg (@$a) {
if ($arg eq 'readonly') { $hash->{statevals} = $arg; } if ($arg eq 'readonly') { $hash->{statevals} = $arg; }
elsif ($arg eq 'defaults' && $init_done) { HMCCU_SetDefaults ($hash); } elsif ($arg eq 'defaults') {
HMCCU_SetDefaults ($hash) if ($init_done);
}
elsif ($arg =~ /^[0-9]+$/) { $attr{$name}{statechannel} = $arg; } elsif ($arg =~ /^[0-9]+$/) { $attr{$name}{statechannel} = $arg; }
else { return $usage; } else { return $usage; }
} }
@ -466,9 +468,17 @@ sub HMCCUDEV_Set ($@)
return HMCCU_SetState ($hash, "OK"); return HMCCU_SetState ($hash, "OK");
} }
elsif ($opt eq 'pct') { elsif ($opt eq 'pct') {
return HMCCU_SetError ($hash, -11) if ($sc eq ''); return HMCCU_SetError ($hash, -11) if ($sc eq '' && $cc eq '');
my $dp;
if (HMCCU_IsValidDatapoint ($hash, $ccutype, $cc, "LEVEL", 2)) {
$dp = "$cc.LEVEL";
}
elsif (HMCCU_IsValidDatapoint ($hash, $ccutype, $sc, "LEVEL", 2)) {
$dp = "$sc.LEVEL";
}
else {
return HMCCU_SetError ($hash, "Can't find LEVEL datapoint for device type $ccutype") return HMCCU_SetError ($hash, "Can't find LEVEL datapoint for device type $ccutype")
if (!HMCCU_IsValidDatapoint ($hash, $ccutype, $sc, "LEVEL", 2)); }
my $objname = ''; my $objname = '';
my $objvalue = shift @$a; my $objvalue = shift @$a;
@ -503,7 +513,7 @@ sub HMCCUDEV_Set ($@)
} }
# Set level # Set level
$objname = $ccuif.'.'.$ccuaddr.':'.$sc.'.LEVEL'; $objname = $ccuif.'.'.$ccuaddr.':'.$dp;
$rc = HMCCU_SetDatapoint ($hash, $objname, $objvalue); $rc = HMCCU_SetDatapoint ($hash, $objname, $objvalue);
return HMCCU_SetError ($hash, $rc) if ($rc < 0); return HMCCU_SetError ($hash, $rc) if ($rc < 0);
@ -588,7 +598,8 @@ sub HMCCUDEV_Set ($@)
$retmsg .= " on-for-timer on-till" $retmsg .= " on-for-timer on-till"
if (HMCCU_IsValidDatapoint ($hash, $hash->{ccutype}, $sc, "ON_TIME", 2)); if (HMCCU_IsValidDatapoint ($hash, $hash->{ccutype}, $sc, "ON_TIME", 2));
$retmsg .= " pct" $retmsg .= " pct"
if (HMCCU_IsValidDatapoint ($hash, $hash->{ccutype}, $sc, "LEVEL", 2)); if (HMCCU_IsValidDatapoint ($hash, $hash->{ccutype}, $sc, "LEVEL", 2) ||
HMCCU_IsValidDatapoint ($hash, $hash->{ccutype}, $cc, "LEVEL", 2));
} }
} }