Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct VD no statusRequest

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@4025 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-10-09 17:53:43 +00:00
parent 62c7057e71
commit 00f49c49bb
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fhem/FHEM/10_CUL_HM.pm
View File

@ -299,9 +299,11 @@ sub CUL_HM_updateConfig($){
$webCmd = AttrVal($name,"webCmd",undef); $webCmd = AttrVal($name,"webCmd",undef);
if(!defined $webCmd){ if(!defined $webCmd){
if ($st eq "virtual" ){$webCmd="press short:press long"; if ($st eq "virtual" ){$webCmd="press short:press long";
}elsif($hash->{helper}{role}{dev} && }elsif(( $hash->{helper}{role}{dev} &&
!$hash->{helper}{role}{chn} && !$hash->{helper}{role}{chn} &&
$md ne "HM-CC-TC" ){$webCmd="getConfig"; $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 "blindActuator"){$webCmd="toggle:on:off:up:down:stop:statusRequest";
}elsif($st eq "dimmer" ){$webCmd="toggle:on:off:up:down:statusRequest"; }elsif($st eq "dimmer" ){$webCmd="toggle:on:off:up:down:statusRequest";
}elsif($st eq "switch" ){$webCmd="toggle:on:off: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 if (defined($state)){# if state was detected post events
my $txt; my $txt;
if ($lvlStr{md}{$md}){$txt = $lvlStr{md}{$md}{$state}} if ($lvlStr{md}{$md}){$txt = $lvlStr{md}{$md}{$state}}
elsif ($lvlStr{st}{$st}) {$txt = $lvlStr{st}{$st}{$state} } elsif ($lvlStr{st}{$st}){$txt = $lvlStr{st}{$st}{$state}}
else {$txt = "unknown:$state"} else {$txt = "unknown:$state"}
push @event, "state:$txt"; push @event, "state:$txt";
push @event, "contact:$txt$target"; push @event, "contact:$txt$target";

4
fhem/FHEM/HMConfig.pm
View File

@ -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' "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",}, ,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",}, "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",}, "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=>"",}, "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=>"",}, "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{tipTronic} = $culHmSubTypeSets{outputUnit};
$culHmSubTypeSets{motionDetector} = $culHmSubTypeSets{threeStateSensor}; $culHmSubTypeSets{motionDetector} = $culHmSubTypeSets{threeStateSensor};
# sensRain ( no statusrequest)
my %culHmModelSets = (# channels of this subtype------------- my %culHmModelSets = (# channels of this subtype-------------
"HM-CC-VD" =>{ valvePos => "position"}, "HM-CC-VD" =>{ valvePos => "position"},
@ -1023,7 +1022,6 @@ my %culHmModelSets = (# channels of this subtype-------------
,press =>"[long|short] [on|off] ..." ,press =>"[long|short] [on|off] ..."
,inhibit =>"[on|off]"}, ,inhibit =>"[on|off]"},
"HM-CC-TC" =>{ statusRequest =>""}, "HM-CC-TC" =>{ statusRequest =>""},
"HM-CC-VD" =>{ statusRequest =>""},
); );
# clones- - - - - - - - - - - - - - - - - # clones- - - - - - - - - - - - - - - - -
$culHmModelSets{"HM-RC-19-B"} = $culHmModelSets{"HM-RC-19"}; $culHmModelSets{"HM-RC-19-B"} = $culHmModelSets{"HM-RC-19"};