From 6e4b004ca97ae1ca88702bbd15be3243cdf78b35 Mon Sep 17 00:00:00 2001
From: martinp876 <>
Date: Fri, 30 Oct 2015 06:36:47 +0000
Subject: [PATCH] HMLAN: check avoiding traces, statusrequest removed for some
 OUs

git-svn-id: https://svn.fhem.de/fhem/trunk@9721 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/00_HMLAN.pm |  5 ++++-
 fhem/FHEM/HMConfig.pm | 26 ++++++++++++++------------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/fhem/FHEM/00_HMLAN.pm b/fhem/FHEM/00_HMLAN.pm
index 3aedbf106..31155ef64 100755
--- a/fhem/FHEM/00_HMLAN.pm
+++ b/fhem/FHEM/00_HMLAN.pm
@@ -477,7 +477,7 @@ sub HMLAN_Write($$$) {#########################################################
     HMLAN_SimpleWrite($hash,$msg);
     return;
   }
-  elsif (length($msg)>21){
+  if (length($msg)>21){
     my ($mtype,$src,$dst) = (substr($msg, 8, 2),
                              substr($msg, 10, 6),
                              substr($msg, 16, 6));
@@ -508,6 +508,9 @@ sub HMLAN_Write($$$) {#########################################################
               ;
     }
   }
+  elsif(length($msg)<5){
+    Log3 $hash, 2, "HMLAN_Send:  cmd too short:".($fn?$fn:"noFn").":".($msg?$msg:"no_msg");
+  }
   elsif($msg =~ m /init:(......)/){
     my $dst = $1;
     if ($modules{CUL_HM}{defptr}{$dst} &&
diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm
index ca5aab083..413d2339e 100644
--- a/fhem/FHEM/HMConfig.pm
+++ b/fhem/FHEM/HMConfig.pm
@@ -1433,7 +1433,6 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
                      ,repeater         =>{ statusRequest => ""
                                           ,getSerial     => ""
                                          }
-                     ,outputUnit       =>{ statusRequest => ""}
 );
 $culHmSubTypeDevSets{dimmer}         = $culHmSubTypeDevSets{switch};
 $culHmSubTypeDevSets{blindActuator}  = $culHmSubTypeDevSets{switch};
@@ -1499,15 +1498,14 @@ $culHmSubTypeDevSets{blindActuator}  = $culHmSubTypeDevSets{switch};
                                           ,inhibit        => "[on|off]"
                                           ,statusRequest  =>""
                                          }
-                     ,outputUnit       =>{ statusRequest  =>""}
+                     ,KFM100           =>{ statusRequest  =>""}
 );
 # clones- - - - - - - - - - - - - - - - -
 $culHmSubTypeSets{pushButton}      = $culHmSubTypeSets{remote};
 $culHmSubTypeSets{swi}             = $culHmSubTypeSets{remote};
  
-$culHmSubTypeSets{KFM100}          = $culHmSubTypeSets{outputUnit};
-$culHmSubTypeSets{blindActuatorSol}= $culHmSubTypeSets{outputUnit};
-$culHmSubTypeSets{tipTronic}       = $culHmSubTypeSets{outputUnit};
+$culHmSubTypeSets{blindActuatorSol}= $culHmSubTypeSets{KFM100};
+$culHmSubTypeSets{tipTronic}       = $culHmSubTypeSets{KFM100};
 
 $culHmSubTypeSets{motionDetector}  = $culHmSubTypeSets{threeStateSensor};
 $culHmSubTypeSets{motionAndBtn}    = $culHmSubTypeSets{threeStateSensor};
@@ -1544,14 +1542,18 @@ $culHmSubTypeSets{motionAndBtn}    = $culHmSubTypeSets{threeStateSensor};
 );
 # clones- - - - - - - - - - - - - - - - -
 
-$culHmModelSets{"HM-OU-CM-PCB"}        = $culHmModelSets{"HM-OU-CFM-PL"};
-$culHmModelSets{"HM-OU-CF-PL"}         = $culHmModelSets{"HM-OU-CFM-PL"};
-$culHmModelSets{"ROTO_ZEL-STG-RM-FWT"} = $culHmModelSets{"HM-CC-TC"};
-$culHmModelSets{"HM-Sen-Wa-Od"}        = $culHmModelSets{"HM-SEC-SD"};
-$culHmModelSets{"HM-PB-4DIS-WM-2"}     = $culHmModelSets{"HM-PB-4DIS-WM"};
-$culHmModelSets{"HM-Dis-WM55"}         = $culHmModelSets{"HM-PB-4DIS-WM"};
-$culHmModelSets{"HM-RC-Dis-H-x-EU"}    = $culHmModelSets{"HM-PB-4DIS-WM"};
+$culHmModelSets{"HM-OU-CM-PCB"}          = $culHmModelSets{"HM-OU-CFM-PL"};
+$culHmModelSets{"HM-OU-CF-PL"}           = $culHmModelSets{"HM-OU-CFM-PL"};
+$culHmModelSets{"ROTO_ZEL-STG-RM-FWT"}   = $culHmModelSets{"HM-CC-TC"};
+$culHmModelSets{"HM-Sen-Wa-Od"}          = $culHmModelSets{"HM-SEC-SD"};
+$culHmModelSets{"HM-PB-4DIS-WM-2"}       = $culHmModelSets{"HM-PB-4DIS-WM"};
+$culHmModelSets{"HM-Dis-WM55"}           = $culHmModelSets{"HM-PB-4DIS-WM"};
+$culHmModelSets{"HM-RC-Dis-H-x-EU"}      = $culHmModelSets{"HM-PB-4DIS-WM"};
 $culHmModelSets{"ROTO_ZEL-STG-RM-DWT-10"}= $culHmModelSets{"HM-PB-4DIS-WM"};
+$culHmModelSets{"HM-OU-CF-PL"}           = $culHmModelSets{"HM-SEC-SD"};
+$culHmModelSets{"HM-OU-LED16"}           = $culHmModelSets{"HM-SEC-SD"};
+#$culHmModelSets{"HM-OU-CFM-PL"}          = $culHmModelSets{"HM-SEC-SD"};# no statusrequest possible
+$culHmModelSets{"HM-OU-CM-PCB"}          = $culHmModelSets{"HM-SEC-SD"};