From d6a2393e9dc5ac8eff3554128719e3135678ef0f Mon Sep 17 00:00:00 2001
From: martinp876 <>
Date: Tue, 25 Mar 2014 06:37:56 +0000
Subject: [PATCH] finish EP implementation

git-svn-id: https://svn.fhem.de/fhem/trunk@5318 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/10_CUL_HM.pm | 16 +++++++++-------
 fhem/FHEM/HMConfig.pm  |  3 +--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm
index fbc650ddf..34c8df563 100755
--- a/fhem/FHEM/10_CUL_HM.pm
+++ b/fhem/FHEM/10_CUL_HM.pm
@@ -1211,10 +1211,12 @@ sub CUL_HM_Parse($$) {#########################################################
   }
   elsif($md eq "HM-SEN-EP") { #################################################
     if ($mTp eq "40"){
-      my (undef,$counter) = unpack 'A2A2',$p;
-      $counter = hex($counter);
+      my ($chn,$counter) = unpack 'A2A2',$p;
+      $shash = $modules{CUL_HM}{defptr}{$src.$chn}
+                             if($modules{CUL_HM}{defptr}{$src.$chn});
+#      $counter = hex($counter);
       push @evtEt,[$shash,1,"state:".$counter];
-      push @evtEt,[$shash,1,"counter:".$counter];
+      push @evtEt,[$shash,1,"trigger:Short_$counter"];
     }
   }
   elsif($st eq "THSensor") { ##################################################
@@ -5244,7 +5246,7 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data
   }
   else{
     return "invalid:regname or address"
-	      if($addr<1 ||$addr>255);
+            if($addr<1 ||$addr>255);
   }
   my $dst = substr(CUL_HM_name2Id($name),0,6);
   if(!$regLN){
@@ -5279,8 +5281,8 @@ sub CUL_HM_getRegFromStore($$$$@) {#read a register from backup data
       $dRead = $dReadS;
     }
     else{
-	  if (grep /$regLN../,keys %{$hash->{READINGS}} &&
-	       !$peerId){
+      if (grep /$regLN../,keys %{$hash->{READINGS}} &&
+           !$peerId){
         return "invalid:peer missing";
       }
       return "invalid" if (!defined($dRead) || $dRead eq "");
@@ -5545,7 +5547,7 @@ sub CUL_HM_time2min($) { # minutes -> time
   return $m;
 }
 
-sub CUL_HM_getRegN($$$){
+sub CUL_HM_getRegN($$$){ # get list of register for a model
   my ($st,$md,$chn) = @_;
   my @regArr = keys %{$culHmRegGeneral};
   push @regArr, keys %{$culHmRegType->{$st}}      if($culHmRegType->{$st});
diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm
index d9927d208..fc05b1487 100644
--- a/fhem/FHEM/HMConfig.pm
+++ b/fhem/FHEM/HMConfig.pm
@@ -1344,7 +1344,6 @@ $culHmRegChan{"ROTO_ZEL-STG-RM-FWT03"}= $culHmRegChan{"HM-CC-TC03"};
 $culHmSubTypeSets{pushButton}      = $culHmSubTypeSets{remote};
 $culHmSubTypeSets{swi}             = $culHmSubTypeSets{remote};
 
-$culHmSubTypeSets{sensor}          = $culHmSubTypeSets{outputUnit};
 $culHmSubTypeSets{KFM100}          = $culHmSubTypeSets{outputUnit};
 $culHmSubTypeSets{blindActuatorSol}= $culHmSubTypeSets{outputUnit};
 $culHmSubTypeSets{tipTronic}       = $culHmSubTypeSets{outputUnit};
@@ -1383,7 +1382,7 @@ $culHmModelSets{"HM-RC-19-SW"}         = $culHmModelSets{"HM-RC-19"};
 
 $culHmModelSets{"HM-OU-CM-PCB"}        = $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-RC-19-SW"}} = %{$culHmModelSets{"HM-RC-19"}}; copy