From 43b0be56250821579c70ecbcf9cdc17be5a1eea4 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sat, 28 Sep 2013 14:50:38 +0000 Subject: [PATCH] add HM-CC-RT-DN git-svn-id: https://svn.fhem.de/fhem/trunk@3969 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/59_HCS.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/fhem/FHEM/59_HCS.pm b/fhem/FHEM/59_HCS.pm index 4aa4df956..9ecde92ef 100644 --- a/fhem/FHEM/59_HCS.pm +++ b/fhem/FHEM/59_HCS.pm @@ -443,15 +443,15 @@ HCS_getValues($$) { my $t = $defs{$d}{TYPE}; # skipping unneeded devices next if($t ne "FHT" && $t ne "CUL_HM"); - next if($t eq "CUL_HM" && !$attr{$d}{model}); - next if($t eq "CUL_HM" && $attr{$d}{model} ne "HM-CC-TC"); - next if($t eq "CUL_HM" && $attr{$d}{model} eq "HM-CC-TC" && ($attr{$d}{device} || $attr{$d}{chanNo})); + + next if($t eq "CUL_HM" &&( !$attr{$d}{model} + ||!( ($attr{$d}{model} eq "HM-CC-TC" && !$defs{$d}{device}) + ||($attr{$d}{model} eq "HM-CC-RT-DN" && !$defs{$d}{device})))); $devs{$d}{actuator} = ReadingsVal($d,"actuator","n/a"); - if ($devs{$d}{actuator} =~ m/^\d+\s*%$/) { - $devs{$d}{actuator} =~ s/(\s+|%)//g; - } else { - $devs{$d}{actuator} = 0; + + if ($devs{$d}{actuator} =~ m/^\d+\s*%$/) { $devs{$d}{actuator} =~ s/(\s+|%)//g; + } else { $devs{$d}{actuator} = 0; } $devs{$d}{excluded} = ($exclude =~ m/$d/) ? 1 : 0; $devs{$d}{ignored} = ($attr{$d}{ignore} && $attr{$d}{ignore} == 1) ? 1 : 0;