diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index fc2f4bbfb..5ec5275cb 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -134,7 +134,7 @@ sub CUL_HM_Initialize($) { $hash->{AttrFn} = "CUL_HM_Attr"; $hash->{AttrList} = "IODev do_not_notify:1,0 ignore:1,0 dummy:1,0 " ."showtime:1,0 " - ."serialNr firmware " + ."serialNr firmware .stc .devInfo " ."rawToReadable unit "#"KFM-Sensor" only ."peerIDs repPeers " ."actCycle actStatus " @@ -142,9 +142,8 @@ sub CUL_HM_Initialize($) { ."expert:0_off,1_on,2_full " ."burstAccess:0_off,1_auto " ."param msgRepeat " - .".stc .devInfo " ."levelRange " - ."aesCommReq:1,0 " + ."aesCommReq:1,0 " # IO will request AES if ."rssiLog:1,0 " # enable writing RSSI to Readings (device only) .$readingFnAttributes; #autoReadReg: @@ -6210,7 +6209,7 @@ sub CUL_HM_autoReadReady($){# capacity for autoread available? if ( !$ioName || ReadingsVal($ioName,"cond","init") !~ m /^(ok|Overload-released|init)$/#default init for CUL || ( defined $defs{$ioName}{helper}{q} - && ($defs{$ioName}{helper}{q}{cap}{sum}/16.8)> + && ($defs{$ioName}{helper}{q}{cap}{sum}/450)> AttrVal($ioName,"hmMsgLowLimit",40))){ return 0; } diff --git a/fhem/FHEM/98_HMinfo.pm b/fhem/FHEM/98_HMinfo.pm index 0c104a429..39753dc2f 100644 --- a/fhem/FHEM/98_HMinfo.pm +++ b/fhem/FHEM/98_HMinfo.pm @@ -380,10 +380,10 @@ sub HMinfo_peerCheck(@) { ##################################################### foreach (split",",$peerIDs){ next if ($_ eq "00000000" ||$_ =~m /$devId/); my $cId = $id; - if ($md eq "HM-CC-RT-DN" && $id =~ m/05$/){ # special RT climate + if ($md eq "HM-CC-RT-DN" && $id =~ m/0[45]$/){ # special RT climate # special removed due to observations of user - RT should peer team2team - korrekt? - # $_ =~ s/04$/05/; # have to compare with clima_team, not clima - # $cId =~ s/05$/04/;# will find 04 in peerlist, not 05 + $_ =~ s/05$/04/; # have to compare with clima_team, not clima + $cId =~ s/04$/05/;# will find 05 in peerlist, not 04 } my $pDid = substr($_,0,6); if (!$modules{CUL_HM}{defptr}{$_} && diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 1fd43fab0..db414b030 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -217,7 +217,7 @@ my $K_actDetID = '000000'; # id of actionDetector "0092" => {name=>"Schueco_263-144" ,st=>'switch' ,cyc=>'' ,rxt=>'c' ,lst=>'1,3' ,chn=>"",}, # HM Switch Interface 3 switches "0093" => {name=>"Schueco_263-158" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w:f' ,lst=>'p' ,chn=>"",}, # "0094" => {name=>"IS-WDS-TH-OD-S-R3" ,st=>'THSensor' ,cyc=>'00:10' ,rxt=>'c:w' ,lst=>'p' ,chn=>"",}, # - "0095" => {name=>"HM-CC-RT-DN" ,st=>'thermostat' ,cyc=>'00:10' ,rxt=>'c:w:f' ,lst=>'p:1p.2p.5p.6p,3:3p.6p,1,7:3p.4' + "0095" => {name=>"HM-CC-RT-DN" ,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"}, # "0096" => {name=>"WDF-solar" ,st=>'blindActuatorSol' ,cyc=>'' ,rxt=>'b' ,lst=>'1,3' ,chn=>"win:1:1,blind:2:3",}, # "009B" => {name=>"Schueco_263-xxx" ,st=>'tipTronic' ,cyc=>'28:00' ,rxt=>'c:w' ,lst=>'1:1.2,3:1p.3p',chn=>"act:1:1,sen:2:2,sec:3:3",}, # @@ -249,7 +249,7 @@ my $K_actDetID = '000000'; # id of actionDetector "00B9" => {name=>"HM-LC-Dim1T-CV-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Sw:1:1,Sw1_V:2:3",}, "00BA" => {name=>"HM-LC-Dim1T-FM-2" ,st=>'dimmer' ,cyc=>'' ,rxt=>'' ,lst=>'1,3' ,chn=>"Sw:1:1,Sw1_V:2:3",}, "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.5p.6p,3:3p.6p,1,7:3p.4' + "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",}, "00BF" => {name=>"HM-PB-2-FM" ,st=>'pushButton' ,cyc=>'' ,rxt=>'c' ,lst=>'1,4' ,chn=>"Btn:1:2",},