FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-20 13:26:02 +00:00
Code Issues Releases Wiki Activity

minor fix

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@6330 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2014-07-30 09:13:32 +00:00
parent 127e9bbe2a
commit 2a1a071ec3
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fhem/FHEM/10_CUL_HM.pm
View File

@ -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");

5
fhem/FHEM/HMConfig.pm
View File

@ -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