From bcb87872d42f14b86463faf569895c354a12fd4c Mon Sep 17 00:00:00 2001 From: martinp876 Date: Sat, 15 Feb 2014 12:41:35 +0000 Subject: [PATCH] some bugs git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@4939 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 6 ++++++ fhem/FHEM/HMConfig.pm | 22 +++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index e3057613e..d29fbfcb5 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -230,6 +230,10 @@ sub CUL_HM_updateConfig($){ $hash->{helper}{shRegR}{"07"} = "00" if ($chn eq "04");# shadowReg List 7 read from CH 0 $hash->{helper}{shRegW}{"07"} = "04" if ($chn eq "00");# shadowReg List 7 write to CH 4 } + elsif ($md =~ m/HM-TC-IT-WM-W-EU/){ + $hash->{helper}{shRegR}{"07"} = "00" if ($chn eq "02");# shadowReg List 7 read from CH 0 + $hash->{helper}{shRegW}{"07"} = "02" if ($chn eq "00");# shadowReg List 7 write to CH 4 + } elsif ($md =~ m/(HM-CC-VD|ROTO_ZEL-STG-RM-FSA)/){ $hash->{helper}{oldDes} = "0"; } @@ -1842,7 +1846,9 @@ sub CUL_HM_parseCommon(@){##################################################### } if ($subType =~ m/^8/){#NACK + #82 : peer not accepted - list full (VD) #84 : request undefined register + #85 : peer not accepted - why? unknown $success = "no"; CUL_HM_eventP($shash,"Nack"); $reply = "NACK"; diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 807c532b9..b34f5c88e 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -400,7 +400,7 @@ my $K_actDetID = '000000'; # id of actionDetector #remote mainly backlOnTime =>{a=> 5.0,s=>0.6,l=>0,min=>0 ,max=>5 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"Backlight ontime[s]" ,lit=>{0=>0,5=>1,10=>2,15=>3,20=>4,25=>5}}, backlOnMode =>{a=> 5.6,s=>0.2,l=>0,min=>0 ,max=>2 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"Backlight mode" ,lit=>{off=>0,auto=>2}}, - backlOnMode2 =>{a=> 5.6,s=>0.2,l=>0,min=>0 ,max=>2 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"Backlight mode" ,lit=>{off=>0,on=>1}}, + backlOnMode2 =>{a=> 5.6,s=>0.2,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"Backlight mode" ,lit=>{off=>0,on=>1}}, ledMode =>{a=> 5.6,s=>0.2,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>0,t=>"LED mode" ,lit=>{off=>0,on=>1}}, language =>{a=> 7.0,s=>1.0,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"Language" ,lit=>{English=>0,German=>1}}, backAtKey =>{a=> 13.7,s=>0.1,l=>0,min=>0 ,max=>1 ,c=>'lit' ,f=>'' ,u=>'' ,d=>1,t=>"Backlight at keystroke" ,lit=>{off=>0,on=>1}}, @@ -1507,18 +1507,18 @@ $culHmChanSets{"ROTO_ZEL-STG-RM-FWT02"} = $culHmChanSets{"HM-CC-TC02"}; actTemp => '00,4,$val=((hex($val)>>6) /10)', hum => '04,2,$val=(hex($val) & 0x3)',} }, "5E" => { txt => "powerEvntCyc" , params => { - energy => '00,3,$val=((hex($val)) /10)', - power => '00,3,$val=((hex($val)) /100)', - current => '00,3,$val=((hex($val)) /1)', - voltage => '00,3,$val=((hex($val)) /10)', - frequency=> '00,3,$val=((hex($val)) /100+50)', + energy => '00,6,$val=((hex($val)) /10)', + power => '06,6,$val=((hex($val)) /100)', + current => '12,4,$val=((hex($val)) /1)', + voltage => '16,4,$val=((hex($val)) /10)', + frequency=> '20,2,$val=((hex($val)) /100+50)', } }, "5F" => { txt => "powerEvnt" , params => { - energy => '00,3,$val=((hex($val)) /10)', - power => '00,3,$val=((hex($val)) /100)', - current => '00,3,$val=((hex($val)) /1)', - voltage => '00,3,$val=((hex($val)) /10)', - frequency=> '00,3,$val=((hex($val)) /100+50)', + energy => '00,6,$val=((hex($val)) /10)', + power => '06,6,$val=((hex($val)) /100)', + current => '12,4,$val=((hex($val)) /1)', + voltage => '16,4,$val=((hex($val)) /10)', + frequency=> '20,2,$val=((hex($val)) /100+50)', } }, "70" => { txt => "WeatherEvent", params => { TEMP => '00,4,$val=((hex($val)&0x3FFF)/10)*((hex($val)&0x4000)?-1:1)',