From e96b4045b28cb7a121fd6169ccc17e11cc07c6bc Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Tue, 30 Mar 2010 06:45:04 +0000 Subject: [PATCH] FHZ rereadcfg fixes git-svn-id: https://svn.fhem.de/fhem/trunk@608 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_CUL.pm | 2 +- fhem/FHEM/00_FHZ.pm | 4 ++-- fhem/FHEM/00_KM271.pm | 12 ++++++------ fhem/FHEM/18_CUL_HOERMANN.pm | 5 ++--- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm index b237ba993..06927bb16 100755 --- a/fhem/FHEM/00_CUL.pm +++ b/fhem/FHEM/00_CUL.pm @@ -56,7 +56,7 @@ CUL_Initialize($) $hash->{WriteFn} = "CUL_Write"; $hash->{Clients} = ":FS20:FHT:KS300:CUL_EM:CUL_WS:USF1000:HMS:CUL_FHTTK:CUL_RFR:FHT8V". - ":CUL_HOERMANN"; + ":CUL_HOERMANN:"; my %mc = ( "1:USF1000" => "^81..(04|0c)..0101a001a5ceaa00....", "2:FS20" => "^81..(04|0c)..0101a001", diff --git a/fhem/FHEM/00_FHZ.pm b/fhem/FHEM/00_FHZ.pm index 1e60b49f5..a5ca365ef 100755 --- a/fhem/FHEM/00_FHZ.pm +++ b/fhem/FHEM/00_FHZ.pm @@ -560,7 +560,7 @@ FHZ_Write($$$) FHZ_XmitLimitCheck($hash,$bstring); $hash->{QUEUE} = [ $bstring ]; - $hash->{PortObj}->write($bstring); + $hash->{PortObj}->write($bstring) if($hash->{PortObj}); ############## # Write the next buffer not earlier than 0.22 seconds (= 65.6ms + 10ms + @@ -589,7 +589,7 @@ FHZ_HandleWriteQueue($) } my $bstring = $arr->[0]; FHZ_XmitLimitCheck($hash,$bstring); - $hash->{PortObj}->write($bstring); + $hash->{PortObj}->write($bstring) if($hash->{PortObj}); InternalTimer(gettimeofday()+0.25, "FHZ_HandleWriteQueue", $hash, 1); } } diff --git a/fhem/FHEM/00_KM271.pm b/fhem/FHEM/00_KM271.pm index 181e8475b..25e10ba6b 100755 --- a/fhem/FHEM/00_KM271.pm +++ b/fhem/FHEM/00_KM271.pm @@ -106,12 +106,12 @@ my %km271_tr = ( "Brenner_Ansteuerung" => "8832:0,a:0", "Abgastemperatur" => "8833:0", "Brenner_Stellwert" => "8834:0", - "Brenner_Laufzeit1_Minuten2" => "8836:0,ne", - "Brenner_Laufzeit1_Minuten1" => "8837:0,ne", - "Brenner_Laufzeit1_Minuten" => "8838:0,ne,mb:3", - "Brenner_Laufzeit2_Minuten2" => "8839:0,ne", - "Brenner_Laufzeit2_Minuten1" => "883a:0,ne", - "Brenner_Laufzeit2_Minuten" => "883b:0,ne:mb:3", + "Brenner_Laufzeit1_Minuten2" => "8836:0", + "Brenner_Laufzeit1_Minuten1" => "8837:0", + "Brenner_Laufzeit1_Minuten" => "8838:0,mb:3", + "Brenner_Laufzeit2_Minuten2" => "8839:0", + "Brenner_Laufzeit2_Minuten1" => "883a:0", + "Brenner_Laufzeit2_Minuten" => "883b:0,mb:3", "Aussentemperatur" => "893c:0,s", "Aussentemperatur_gedaempft" => "893d:0,s", "Versionsnummer_VK" => "893e:0", diff --git a/fhem/FHEM/18_CUL_HOERMANN.pm b/fhem/FHEM/18_CUL_HOERMANN.pm index 77594fdce..83c10ed97 100755 --- a/fhem/FHEM/18_CUL_HOERMANN.pm +++ b/fhem/FHEM/18_CUL_HOERMANN.pm @@ -40,8 +40,8 @@ CUL_HOERMANN_Parse($$) { my ($hash, $msg) = @_; - # Msg format: RHHHHHHHH - my $cde = substr($msg, 1, 8); + # Msg format: R0123456789 + my $cde = substr($msg, 1, 10); my $def = $modules{CUL_HOERMANN}{defptr}{$cde}; if($def) { @@ -56,7 +56,6 @@ CUL_HOERMANN_Parse($$) Log 3, "CUL_HOERMANN Unknown device $cde, please define it"; return "UNDEFINED CUL_HOERMANN_$cde CUL_HOERMANN $cde"; } - } 1;