From 2a1a071ec3873db4b6097eb6f5485a607cd1eb52 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Wed, 30 Jul 2014 09:13:32 +0000 Subject: [PATCH] minor fix git-svn-id: https://svn.fhem.de/fhem/trunk@6330 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 8 ++------ fhem/FHEM/HMConfig.pm | 5 +++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 0d5de1071..543af1ec2 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -4081,11 +4081,6 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ elsif($a[2] eq "short"){ splice @a,2,1; } - ############################## - #if ($a[2] =~ m/^(long|short)$/){ - # $mode = $a[2] eq "long"?64:0; #value for longPress - # splice @a,2,1; - #} } my $vChn = $a[2]?$a[2]:""; @@ -5694,7 +5689,8 @@ sub CUL_HM_name2Id(@) { #in: name or HMid ==>out: HMid, "" if no match sub CUL_HM_id2Name($) { #in: name or HMid out: name my ($p) = @_; $p = "" if (!defined $p); - return $p if($defs{$p}||$p =~ m/_chn:/); + return $p if($defs{$p}||$p =~ m/_chn:/ + || $p !~ m/^[A-F0-9]{6,8}$/i); my $devId= substr($p, 0, 6); return "broadcast" if($devId eq "000000"); diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index e638a4f23..81695c9e0 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -252,7 +252,7 @@ my $K_actDetID = '000000'; # id of actionDetector "00BB" => {name=>"HM-LC-Dim2T-SM-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Sw:1:2,Sw1_V:3:4,Sw2_V:5:6",},# "00BD" => {name=>"HM-CC-RT-DN-BoM" ,st=>'thermostat' ,cyc=>'00:10' ,rxt=>'c:w:f' ,lst=>'p:1p.2p.4p.5p.6p,3:3p.6p,1,7:3p.4' ,chn=>"Weather:1:1,Climate:2:2,WindowRec:3:3,Clima:4:4,ClimaTeam:5:5,remote:6:6"}, # - "00BE" => {name=>"HM-MOD-RC-8" ,st=>'switch' ,cyc=>'' ,rxt=>'b' ,lst=>'3' ,chn=>"Sw:1:8",}, + "00BE" => {name=>"HM-MOD-Re-8" ,st=>'switch' ,cyc=>'' ,rxt=>'b' ,lst=>'3' ,chn=>"Sw:1:8",}, "00BF" => {name=>"HM-PB-2-FM" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c' ,lst=>'1,4' ,chn=>"Btn:1:2",}, "004A" => {name=>"HM-SEC-MDIR" ,st=>'motionDetector' ,cyc=>'00:20' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"",}, "00C0" => {name=>"HM-SEC-MDIR-2" ,st=>'motionDetector' ,cyc=>'00:20' ,rxt=>'c:w:l' ,lst=>'1,4' ,chn=>"",}, @@ -451,6 +451,7 @@ my $K_actDetID = '000000'; # id of actionDetector # Blind 9:00 10:00 20:00 # BL1TPBU 02:01 21:FF # Dim1TPBU 02:01 21:FF 22:00 +# HM-MOD-RC-8 30:49 #Keymatic 3.3 unknown, seen 1 here #--- list 1, Channel level------------------ @@ -810,7 +811,7 @@ $culHmRegType{pushButton} = $culHmRegType{remote}; }, "HM-CC-VD" =>{ valveOffset =>1,valveErrorPos =>1}, - "HM-MOD-RC-8" =>{ localResDis =>1,lowBatLimitBA2 =>1,backlOnMode2 =>1}, + "HM-MOD-RC-8" =>{ lowBatLimitBA2 =>1,backlOnMode2 =>1}, "HM-CC-TC" =>{ burstRx =>1,backlOnTime =>1,backlOnMode =>1,btnLock =>1}, "HM-CC-RT-DN" =>{ btnLock =>1,localResDis =>1,globalBtnLock =>1,modusBtnLock =>1 ,cyclicInfoMsg =>1,cyclicInfoMsgDis=>1