From 42cfb0178a1ac49dd6b8cddbc2e0a3d4ece72ef2 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Mon, 7 Oct 2013 15:29:00 +0000 Subject: [PATCH] ignore ignored and dummy devices,HMinfo bugfixes git-svn-id: https://svn.fhem.de/fhem/trunk@4017 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 6 +++++- fhem/FHEM/HMConfig.pm | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index bbaafd656..448e5bdcc 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -2026,6 +2026,7 @@ sub CUL_HM_Set($@) { my $ret; return "no set value specified" if(@a < 2); my $name = $hash->{NAME}; + return "device ignored due to attr 'ignore'" if (CUL_HM_getAttrInt($name,"ignore")); my $devName = $hash->{device}?$hash->{device}:$name; my $st = AttrVal($devName, "subType", ""); my $md = AttrVal($devName, "model" , ""); @@ -3492,7 +3493,9 @@ sub CUL_HM_SndCmd($$) { my ($hash, $cmd) = @_; $hash = CUL_HM_getDeviceHash($hash); my $io = $hash->{IODev}; - return if(!$io); + return if( !$io + || AttrVal($hash->{NAME},"ignore","") + || AttrVal($hash->{NAME},"dummy","")); my $ioName = $io->{NAME}; if ((hex substr($cmd,2,2) & 0x20) && ( # check for commands with resp-req $io->{STATE} !~ m/^(opened|Initialized)$/ # we need to queue @@ -5559,6 +5562,7 @@ sub CUL_HM_putHash($) {# provide data for HMinfo attr KFM100 unit Liter
  • autoReadReg
    + '0' autoReadReg will be ignored.
    '1' will execute a getConfig for the device automatically after each reboot of FHEM.
    '2' like '1' plus execute after power_on.
    '3' includes '2' plus updates on writes to the device
    diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index add64f875..0c5b69f55 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -192,7 +192,7 @@ my %culHmModel=( "0094" => {name=>"IS-WDS-TH-OD-S-R3" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'p' ,chn=>"",}, # "0095" => {name=>"HM-CC-RT-DN" ,st=>'thermostat' ,cyc=>'00:10' ,rxt=>'c:w:f' ,lst=>'p:1p.2p.5p.6p,3:3p.6p,1,7:4' ,chn=>"Weather:1:1,Climate:2:2,WindowRec:3:3,ClimRT_tr:4:4,ClimaTeam:5:5,remote:6:6"}, # - "0096" => {name=>"WDF-solar" ,st=>'blindActuatorSol' ,cyc=>'' ,rxt=>'b' ,lst=>'1,3' ,chn=>"win:1:1,blind_2:3",}, # + "0096" => {name=>"WDF-solar" ,st=>'blindActuatorSol' ,cyc=>'' ,rxt=>'b' ,lst=>'1,3' ,chn=>"win:1:1,blind:2:3",}, # "009B" => {name=>"Schueco_263-xxx" ,st=>'tipTronic' ,cyc=>'28:00' ,rxt=>'c:w' ,lst=>'1:1.2,3:1p.3p',chn=>"act:1:1,sen:2:2,sec:3:3",}, # "009F" => {name=>"HM-Sen-Wa-Od" ,st=>'sensor' ,cyc=>'28:00' ,rxt=>'c:w' ,lst=>'1,4' ,chn=>"",}, #capacitive filling level sensor "00A0" => {name=>"HM-RC-4-2" ,st=>'remote' ,cyc=>'' ,rxt=>'c:l' ,lst=>'1,4' ,chn=>"Btn:1:4",},