From 23d1914669ef8392e7344964719a284825a67aff Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sat, 30 Jul 2016 11:54:29 +0000 Subject: [PATCH] HMConfig:TC-IT hysterese Bugfix2 git-svn-id: https://svn.fhem.de/fhem/trunk@11865 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 20 ++++++++++---------- fhem/FHEM/HMConfig.pm | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index 23495bbfa..3544927e1 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -639,16 +639,16 @@ sub CUL_HM_Attr(@) {################################# else {return "param $_ unknown, use offAtPon or onAtRain";} } } - elsif ($md eq "HM-Dis-EP-WM55" && $chn eq "03"){#reWriteDislay + elsif ($md eq "HM-Dis-EP-WM55" && $chn eq "03"){#reWriteDisplay if ($cmd eq "set"){ - if ($attrVal =~ m/(^reWriteDislay([0-9][0-9])$)/){# no action, just set - my $delay = substr($attrVal,10,2); + if ($attrVal =~ m/^reWriteDisplay([0-9][0-9])$/){# no action, just set + my $delay = $1; if($delay < 1 || $delay >99){ - return "invalid $delay- select between reWriteDislay01 and reWriteDislay99"; + return "invalid $delay- select between reWriteDisplay01 and reWriteDisplay99"; } } else{ - return "attribut param $attrVal not valid for $name. Only reWriteDislayxx allowed"; + return "attribut param $attrVal not valid for $name. Only reWriteDisplayxx allowed"; } } else{ @@ -2138,10 +2138,10 @@ sub CUL_HM_Parse($$) {######################################################### if($mh{md} eq "HM-Dis-EP-WM55"){ my $disName = InternalVal($mh{devN},"channel_03",undef); if (defined $disName ){ - if (AttrVal($disName,"param","") =~ m/reWriteDislay(..)/){ + if (AttrVal($disName,"param","") =~ m/reWriteDisplay(..)/){ my $delay = $1; - RemoveInternalTimer($disName.":reWriteDislay"); - InternalTimer(gettimeofday()+$delay,"CUL_HM_reWriteDislay", $disName.":reWriteDislay", 0); + RemoveInternalTimer($disName.":reWriteDisplay"); + InternalTimer(gettimeofday()+$delay,"CUL_HM_reWriteDisplay", $disName.":reWriteDisplay", 0); } } } @@ -4887,7 +4887,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ } elsif($cmd eq "displayEP" ) { ############################################### $state = "displayEP"; - RemoveInternalTimer($name.":reWriteDislay");# just in case param reWriteDislay used + RemoveInternalTimer($name.":reWriteDisplay");# just in case param reWriteDisplay used my %disp_icons = ( off => '80', on => '81', open => '82', closed => '83' ,error => '84', ok => '85', info => '86', newmsg => '87' @@ -8762,7 +8762,7 @@ sub CUL_HM_motionCheck($){# } } -sub CUL_HM_reWriteDislay($){ +sub CUL_HM_reWriteDisplay($){ my ($name) = split(":",shift);# uncertain:$name:$reading:$value CUL_HM_Set($defs{$name},$name,"displayEP",":::"); } diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 334423dcf..69e50d514 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -815,8 +815,8 @@ foreach my $al (keys %culHmModel){ # duplicate entries for alias devices showWeekday =>{a=> 14.7,s=>0.1,l=>7,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"show weekday" ,lit=>{off=>0,on=>1}}, #hyst2point addr is 15 according to XML - not to my device. add "bug" register justin case - hyst2pointRead =>{a=> 15.0,s=>0.5,l=>7,min=>0 ,max=>2 ,c=>'' ,f=>'10' ,u=>'C' ,d=>1,t=>"hysteresis range",}, - hyst2point =>{a=> 15.0,s=>0.5,l=>7,min=>0 ,max=>2 ,c=>'' ,f=>'10' ,u=>'C' ,d=>1,t=>"hysteresis range",}, + hyst2pointRead =>{a=> 21.0,s=>0.5,l=>7,min=>0 ,max=>2 ,c=>'' ,f=>'10' ,u=>'C' ,d=>1,t=>"hysteresis range",}, + hyst2pointWrite =>{a=> 15.0,s=>1 ,l=>7,min=>0 ,max=>2 ,c=>'' ,f=>'10' ,u=>'C' ,d=>1,t=>"hysteresis range",}, heatCool =>{a=> 15.7,s=>0.1,l=>7,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"select heating or cooling" ,lit=>{heating=>0,cooling=>1}}, weekPrgSel =>{a=> 16.0,s=>1.0,l=>7,min=>0 ,max=>2 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"select week program" ,lit=>{prog1=>0,prog2=>1,prog3=>2}}, @@ -1227,7 +1227,7 @@ $culHmRegModel{"ROTO_ZEL-STG-RM-DWT-10"}= $culHmRegModel{"HM-PB-4DIS-WM"}; ,noMinMax4Manu =>1,daylightSaveTime=>1,sendWeatherData =>1 ,modePrioParty =>1,modePrioManu =>1,weekPrgSel =>1 } - ,"HM-TC-IT-WM-W-EU07"=>{ hyst2point =>1,hyst2pointRead =>1} + ,"HM-TC-IT-WM-W-EU07"=>{ hyst2pointWrite =>1,hyst2pointRead =>1} ,"HM-ES-PMSw1-Pl01" =>{ OnTime =>1,OffTime =>1,OnDly =>1,OffDly =>1 ,SwJtOn =>1,SwJtOff =>1,SwJtDlyOn =>1,SwJtDlyOff =>1 ,CtValLo =>1,CtValHi =>1