From c2a2c8b21d4d00992d39a8b7b773d50accbeffe9 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Thu, 25 Jun 2009 07:59:43 +0000
Subject: [PATCH] USF1000 with CUL

git-svn-id: https://svn.fhem.de/fhem/trunk@398 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/00_CUL.pm     | 15 ++++++++-------
 fhem/FHEM/09_USF1000.pm |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/fhem/FHEM/00_CUL.pm b/fhem/FHEM/00_CUL.pm
index 19a46595c..d53b229d5 100755
--- a/fhem/FHEM/00_CUL.pm
+++ b/fhem/FHEM/00_CUL.pm
@@ -48,13 +48,14 @@ CUL_Initialize($)
 # Provider
   $hash->{ReadFn}  = "CUL_Read";
   $hash->{WriteFn} = "CUL_Write";
-  $hash->{Clients} = ":FS20:FHT:KS300:CUL_EM:CUL_WS:";
+  $hash->{Clients} = ":FS20:FHT:KS300:CUL_EM:CUL_WS:USF1000:";
   my %mc = (
-    "1:FS20"  => "^81..(04|0c)..0101a001",
-    "2:FHT"   => "^81..(04|09|0d)..(0909a001|83098301|c409c401)..",
-    "3:KS300" => "^810d04..4027a001",
-    "4:CUL_WS" => "^K.....",
-    "5:CUL_EM" => "^E0.................\$"
+    "1:USF1000" => "^81..(04|0c)..0101a001a5ceaa00....",
+    "2:FS20"    => "^81..(04|0c)..0101a001",
+    "3:FHT"     => "^81..(04|09|0d)..(0909a001|83098301|c409c401)..",
+    "4:KS300"   => "^810d04..4027a001",
+    "5:CUL_WS"  => "^K.....",
+    "6:CUL_EM"  => "^E0.................\$"
   );
   $hash->{MatchList} = \%mc;
   $hash->{ReadyFn} = "CUL_Ready";
@@ -473,7 +474,7 @@ CUL_DoInit($)
   $fhtid =~ s/[\r\n]//g;
   Log 5, "GOT CUL fhtid: $fhtid";
   if(!defined($fhtid) || $fhtid ne $hash->{FHTID}) {
-    Log 2, "Setting CUL fhtid to " . $hash->{FHTID};
+    Log 2, "Setting CUL fhtid from $fhtid to " . $hash->{FHTID};
     CUL_SimpleWrite($hash, "T01" . $hash->{FHTID});
   }
 
diff --git a/fhem/FHEM/09_USF1000.pm b/fhem/FHEM/09_USF1000.pm
index 312e81b2f..fdc22ff9b 100644
--- a/fhem/FHEM/09_USF1000.pm
+++ b/fhem/FHEM/09_USF1000.pm
@@ -21,7 +21,7 @@ USF1000_Initialize($)
 {
   my ($hash) = @_;
 
-  $hash->{Match}     = "^810c04..0101a001a5ceaa00....";
+  $hash->{Match}     = "^81..(04|0c)..0101a001a5ceaa00....";
   $hash->{DefFn}     = "USF1000_Define";
   $hash->{UndefFn}   = "USF1000_Undef";
   $hash->{ParseFn}   = "USF1000_Parse";