From 00f49c49bbbeda4e1339ba0db2b30cfeb87a5bfe Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Wed, 9 Oct 2013 17:53:43 +0000 Subject: [PATCH] correct VD no statusRequest git-svn-id: https://svn.fhem.de/fhem/trunk@4025 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 12 +++++++----- fhem/FHEM/HMConfig.pm | 4 +--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index c3c18b625..e0514de65 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -299,9 +299,11 @@ sub CUL_HM_updateConfig($){ $webCmd = AttrVal($name,"webCmd",undef); if(!defined $webCmd){ if ($st eq "virtual" ){$webCmd="press short:press long"; - }elsif($hash->{helper}{role}{dev} && - !$hash->{helper}{role}{chn} && - $md ne "HM-CC-TC" ){$webCmd="getConfig"; + }elsif(( $hash->{helper}{role}{dev} && + !$hash->{helper}{role}{chn} && + $md ne "HM-CC-TC") + ||$st eq "repeater" + ||$md eq "HM-CC-VD" ){$webCmd="getConfig"; }elsif($st eq "blindActuator"){$webCmd="toggle:on:off:up:down:stop:statusRequest"; }elsif($st eq "dimmer" ){$webCmd="toggle:on:off:up:down:statusRequest"; }elsif($st eq "switch" ){$webCmd="toggle:on:off:statusRequest"; @@ -1361,8 +1363,8 @@ sub CUL_HM_Parse($$) {############################## if (defined($state)){# if state was detected post events my $txt; if ($lvlStr{md}{$md}){$txt = $lvlStr{md}{$md}{$state}} - elsif ($lvlStr{st}{$st}) {$txt = $lvlStr{st}{$st}{$state} } - else {$txt = "unknown:$state"} + elsif ($lvlStr{st}{$st}){$txt = $lvlStr{st}{$st}{$state}} + else {$txt = "unknown:$state"} push @event, "state:$txt"; push @event, "contact:$txt$target"; diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 35f065edc..15f9e4a7d 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -105,7 +105,7 @@ my %culHmModel=( "0038" => {name=>"HM-RC-19-B" ,st=>'remote' ,cyc=>'' ,rxt=>'c:b' ,lst=>'1,4:1p.2p.3p.4p.5p.6p.7p.8p.9p.10p.11p.12p.13p.14p.15p.16p' ,chn=>"Btn:1:17,Disp:18:18",}, "0039" => {name=>"HM-CC-TC" ,st=>'thermostat' ,cyc=>'00:10' ,rxt=>'c:w:f' ,lst=>'p:2p,5:2.3p,6:2',chn=>"Weather:1:1,Climate:2:2,WindowRec:3:3",}, - "003A" => {name=>"HM-CC-VD" ,st=>'thermostat' ,cyc=>'28:00' ,rxt=>'c:w:f' ,lst=>'p,5' ,chn=>"",}, + "003A" => {name=>"HM-CC-VD" ,st=>'thermostat' ,cyc=>'28:00' ,rxt=>'c:w' ,lst=>'p,5' ,chn=>"",}, "003B" => {name=>"HM-RC-4-B" ,st=>'remote' ,cyc=>'' ,rxt=>'c' ,lst=>'1,4' ,chn=>"Btn:1:4",}, "003C" => {name=>"HM-WDS20-TH-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w:f' ,lst=>'p' ,chn=>"",}, "003D" => {name=>"HM-WDS10-TH-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w:f' ,lst=>'p' ,chn=>"",}, @@ -1003,7 +1003,6 @@ $culHmSubTypeSets{blindActuatorSol}= $culHmSubTypeSets{outputUnit}; $culHmSubTypeSets{tipTronic} = $culHmSubTypeSets{outputUnit}; $culHmSubTypeSets{motionDetector} = $culHmSubTypeSets{threeStateSensor}; -# sensRain ( no statusrequest) my %culHmModelSets = (# channels of this subtype------------- "HM-CC-VD" =>{ valvePos => "position"}, @@ -1023,7 +1022,6 @@ my %culHmModelSets = (# channels of this subtype------------- ,press =>"[long|short] [on|off] ..." ,inhibit =>"[on|off]"}, "HM-CC-TC" =>{ statusRequest =>""}, - "HM-CC-VD" =>{ statusRequest =>""}, ); # clones- - - - - - - - - - - - - - - - - $culHmModelSets{"HM-RC-19-B"} = $culHmModelSets{"HM-RC-19"};