From 29b88e655c6e0f7df349d30316db6e891f5a9af5 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Fri, 5 Apr 2013 17:24:41 +0000 Subject: [PATCH] TC correct Register Naming git-svn-id: https://svn.fhem.de/fhem/trunk@3036 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 21 +++++++++------------ fhem/FHEM/HMConfig.pm | 14 +++++++------- 2 files changed, 16 insertions(+), 19 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index d134f59e3..45e1e596b 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -33,7 +33,6 @@ my %culHmBits =HMConfig::HMConfig_getHash("culHmBits"); my @culHmCmdFlags =HMConfig::HMConfig_getHash("culHmCmdFlags"); my $K_actDetID =HMConfig::HMConfig_getHash("K_actDetID"); - ############################################################ sub CUL_HM_Initialize($); @@ -553,7 +552,6 @@ sub CUL_HM_Parse($$) {############################## ($msgType eq '10' &&$sType eq '06')){ # infoStatus $chn = substr($p,2,2); - my $temp = substr($p,4,2); my $dTemp = ($temp eq '00')?'off': (($temp eq 'C8')?'on' : @@ -561,12 +559,12 @@ sub CUL_HM_Parse($$) {############################## my $chnHash = $modules{CUL_HM}{defptr}{$src.$chn}; if($chnHash){ my $chnName = $chnHash->{NAME}; - my $mode = ReadingsVal($chnName,"R-MdTempReg",""); + my $mode = ReadingsVal($chnName,"R-controlMode",""); push @entities,CUL_HM_UpdtReadSingle($chnHash,"desired-temp",$dTemp,1); - CUL_HM_UpdtReadSingle($chnHash,"desired-temp-manu",$dTemp,1) if($mode eq 'manual ' && $msgType eq '10'); -# readingsSingleUpdate($chnHash,"desired-temp-cent",$dTemp,1) if($mode eq 'central ' && $msgType eq '02'); + CUL_HM_UpdtReadSingle($chnHash,"desired-temp-manu",$dTemp,1) if($mode =~ m /manual/ && $msgType eq '10'); +# readingsSingleUpdate($chnHash,"desired-temp-cent",$dTemp,1) if($mode =~ m /central/ && $msgType eq '02'); # removed - shall not be changed automatically - change is only temporary -# CUL_HM_Set($chnHash,$chnName,"desired-temp",$dTemp) if($mode eq 'central ' && $msgType eq '10'); +# CUL_HM_Set($chnHash,$chnName,"desired-temp",$dTemp) if($mode =~ m /central/ && $msgType eq '10'); } push @event, "desired-temp:" .$dTemp; } @@ -644,11 +642,11 @@ sub CUL_HM_Parse($$) {############################## my $dTemp; if($chnHash){ my $chnName = $chnHash->{NAME}; - my $mode = ReadingsVal($chnName,"R-MdTempReg",""); + my $mode = ReadingsVal($chnName,"R-controlMode",""); $dTemp = ReadingsVal($chnName,"desired-temp","21.0"); if (!$chnHash->{helper}{oldMode} || $chnHash->{helper}{oldMode} ne $mode){ - $dTemp = ReadingsVal($chnName,"desired-temp-manu",$dTemp)if ($mode eq 'manual '); - $dTemp = ReadingsVal($chnName,"desired-temp-cent",$dTemp)if ($mode eq 'central '); + $dTemp = ReadingsVal($chnName,"desired-temp-manu",$dTemp)if ($mode =~ m /manual/); + $dTemp = ReadingsVal($chnName,"desired-temp-cent",$dTemp)if ($mode =~ m /central/); $chnHash->{helper}{oldMode} = $mode; } push @entities,CUL_HM_UpdtReadSingle($chnHash,"desired-temp",$dTemp,1); @@ -1527,7 +1525,6 @@ sub CUL_HM_queueAutoRead($){ my @arr; @arr = CUL_HM_noDup((@{$modules{CUL_HM}{helper}{updtCfgLst}}, $name)); $modules{CUL_HM}{helper}{updtCfgLst} =\@arr; - Log 1,"General queued $name :".join "-",$modules{CUL_HM}{helper}{updtCfgLst}; RemoveInternalTimer("updateConfig"); InternalTimer(gettimeofday()+5,"CUL_HM_autoReadConfig", "updateConfig", 0); } @@ -2284,10 +2281,10 @@ sub CUL_HM_Set($@) { CUL_HM_PushCmdStack($hash,'++'.$flag.'11'.$id.$dst.'0202'. CUL_HM_convTemp($a[2])); my $chnHash = CUL_HM_id2Hash($dst."02"); - my $mode = ReadingsVal($chnHash->{NAME},"R-MdTempReg",""); + my $mode = ReadingsVal($chnHash->{NAME},"R-controlMode",""); $mode =~ s/set_//;#consider set as given readingsSingleUpdate($chnHash,"desired-temp-cent",$a[2],1) - if($mode eq 'central '); + if($mode =~ m/central/); } elsif($cmd =~ m/^tempList(...)/) { ###################################### reg my %day2off = ( "Sat"=>"5 0B", "Sun"=>"5 3B", "Mon"=>"5 6B", diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index a679ca068..29c7bd21e 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -553,7 +553,6 @@ my %culHmRegModel = ( "HM-LC-Bl1PBU-FM" =>{transmitTryMax =>1,statusInfoMinDly=>1,statusInfoRandom=>1,localResDis =>1,}, - "HM-LC-Dim1L-P" =>{loadAppearBehav =>1,loadErrCalib =>1}, "HM-LC-Dim1L-Pl-2"=>{confBtnTime =>1,loadAppearBehav =>1,loadErrCalib =>1, }, "HM-LC-Dim1L-CV" =>{confBtnTime =>1,loadAppearBehav =>1,loadErrCalib =>1, @@ -579,6 +578,9 @@ my %culHmRegModel = ( DimElsJtOn =>1,DimElsJtOff =>1,DimElsJtDlyOn =>1, DimElsJtDlyOff =>1,DimElsJtRampOn =>1,DimElsJtRampOff =>1, }, + "HM-LC-Dim1T-Pl-2"=>{confBtnTime =>1,ovrTempLvl =>1,redTempLvl =>1,redLvl =>1, + fuseDelay =>1, + }, "HM-LC-Dim1TPBU-FM"=>{ ovrTempLvl =>1,redTempLvl =>1,redLvl =>1, fuseDelay =>1, logicCombination=>1, @@ -643,17 +645,15 @@ $culHmRegModel{"HM-RC-12-SW"} = $culHmRegModel{"HM-RC-12"}; $culHmRegModel{"HM-RC-19-B"} = $culHmRegModel{"HM-RC-19"}; $culHmRegModel{"HM-RC-19-SW"} = $culHmRegModel{"HM-RC-19"}; -$culHmRegModel{"HM-LC-Dim1L-CV"} = $culHmRegModel{"HM-LC-Dim1L-P"}; -$culHmRegModel{"HM-LC-Dim1L-SM"} = $culHmRegModel{"HM-LC-Dim1L-P"}; +$culHmRegModel{"HM-LC-Dim1L-Pl"} = $culHmRegModel{"HM-LC-Dim1L-CV"}; +$culHmRegModel{"HM-LC-Dim2L-SM"} = $culHmRegModel{"HM-LC-Dim1L-CV"}; $culHmRegModel{"HM-LC-Dim2L-CV"} = $culHmRegModel{"HM-LC-Dim1L-Pl-2"}; $culHmRegModel{"Schueco-263-132"} = $culHmRegModel{"HM-LC-Dim1L-Pl-2"}; -$culHmRegModel{"HM-LC-Dim2L-SM"} = $culHmRegModel{"HM-LC-Dim1L-CV"}; -$culHmRegModel{"HM-LC-Dim1L-Pl"} = $culHmRegModel{"HM-LC-Dim1L-CV"}; $culHmRegModel{"HM-LC-Dim1T-CV"} = $culHmRegModel{"HM-LC-Dim1T-Pl"}; -$culHmRegModel{"HM-LC-Dim1T-Pl-2"} = $culHmRegModel{"HM-LC-Dim1T-Pl"}; $culHmRegModel{"HM-LC-Dim1T-FM"} = $culHmRegModel{"HM-LC-Dim1T-Pl"}; $culHmRegModel{"HM-LC-Dim2T-SM"} = $culHmRegModel{"HM-LC-Dim1T-Pl"}; -$culHmRegModel{"Schueco-263-134"} = $culHmRegModel{"HM-LC-Dim1T-Pl"}; +$culHmRegModel{"Schueco-263-133"} = $culHmRegModel{"HM-LC-Dim1TPBU-FM"}; +$culHmRegModel{"Schueco-263-134"} = $culHmRegModel{"HM-LC-Dim1T-Pl-2"}; $culHmRegModel{"ASH550I"} = $culHmRegModel{"HM-WDS10-TH-O"}; $culHmRegModel{"ASH550"} = $culHmRegModel{"HM-WDS10-TH-O"};