diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 473518c23..5cde2a0fe 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -1287,13 +1287,6 @@ sub CUL_HM_Parse($$) {######################################################### push @evtEt,[$wHash,1,"measured-temp:$actTemp"]; push @evtEt,[$wHash,1,"state:$actTemp"]; } -# if($devH->{helper}{getBatState}){ -# CUL_HM_Set(CUL_HM_name2Hash($devH->{channel_04}), -# $devH->{channel_04}, -# "desired-temp",ReadingsVal($devH->{channel_04} -# ,"desired-temp" -# ,"")); -# } } else{ $chn = $mI[1]; @@ -4831,11 +4824,11 @@ sub CUL_HM_getConfig($){ delete $cHash->{READINGS}{$_} foreach (grep /^[\.]?(RegL_)/,keys %{$cHash->{READINGS}}); my $lstAr = $culHmModel->{CUL_HM_getMId($cHash)}{lst}; - if($lstAr){ - my @list = split(",",$lstAr); #get valid lists e.g."1, 5:2.3p ,6:2" + if($lstAr){ my $pReq = 0; # Peer request not issued, do only once for channel $cHash->{helper}{getCfgListNo}= ""; - foreach my $listEntry (@list){# each list that is define for this channel + foreach my $listEntry (split(",",$lstAr)){#lists define for this channel + # e.g."1, 5:2.3p ,6:2" my ($peerReq,$chnValid)= (0,0); my ($listNo,$chnLst1) = split(":",$listEntry); if (!$chnLst1){ @@ -7304,15 +7297,6 @@ sub CUL_HM_tempListTmpl(@) { ################################################## my ($fName,$tmpl) = split":",$template; $tmpl = $name if(!$fName); ($fName,$tmpl) = ("tempList.cfg",$fName) if(!defined $tmpl && defined $fName); -# if (!$tmpl){ -# if(defined $tmpl){ -# $tmpl = $name; -# } -# else{#only template was given -# $tmpl = $fName; -# $fName = "tempList.cfg"; -# } -# } return "file: $fName for $name does not exist" if (!(-e $fName)); open(aSave, "$fName") || return("Can't open $fName: $!"); my $found = 0; diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index bf675a724..dbfaacf85 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -138,7 +138,8 @@ my $K_actDetID = '000000'; # id of actionDetector ,"003D" => {name=>"HM-WDS10-TH-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:f' ,lst=>'p' ,chn=>"",} #:w todo should be wakeup, does not react ,"003E" => {name=>"HM-WDS30-T-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'p' ,chn=>"",} #:w remark: this device behaves on wakeup ,"003F" => {name=>"HM-WDS40-TH-I" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:f' ,lst=>'p' ,chn=>"",} #:w todo should be wakeup, does not react - ,"0040" => {name=>"HM-WDS100-C6-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'p,1' ,chn=>"",} #:w todo should be wakeup, does not react +#,"0040" => {name=>"HM-WDS100-C6-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'p,1' ,chn=>"",} #:w todo should be wakeup, does not react + ,"0040" => {name=>"HM-WDS100-C6-O" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'p,1,1:1p' ,chn=>"",} #:w todo should be wakeup, does not react ,"0041" => {name=>"HM-WDC7000" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'' ,lst=>'1,4' ,chn=>"",} ,"0042" => {name=>"HM-SEC-SD" ,st=>'smokeDetector' ,cyc=>'99:00' ,rxt=>'b' ,lst=>'p' ,chn=>"",} ,"0043" => {name=>"HM-SEC-TIS" ,st=>'threeStateSensor' ,cyc=>'28:00' ,rxt=>'c:w' ,lst=>'1,4' ,chn=>"",}