From fe0aff335e63fa59a027aac1d911d3ad91404ba1 Mon Sep 17 00:00:00 2001
From: rudolfkoenig <rudolfkoenig@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Mon, 7 Dec 2015 18:14:09 +0000
Subject: [PATCH] 00_ZWCUL: parse commands

git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@10125 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/00_ZWCUL.pm | 7 +++----
 fhem/FHEM/10_ZWave.pm | 9 +++++++--
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/fhem/FHEM/00_ZWCUL.pm b/fhem/FHEM/00_ZWCUL.pm
index e880f3819..d173cfefe 100755
--- a/fhem/FHEM/00_ZWCUL.pm
+++ b/fhem/FHEM/00_ZWCUL.pm
@@ -293,12 +293,11 @@ ZWCUL_Parse($$$$)
 
     if(length($P)) {
       $rmsg = sprintf("0004%s%s%02x%s", $S, $S, length($P)/2, $P);
-      my $ctrlIsTgt = ($T eq $hash->{nodeIdHex});
       my $th = $modules{ZWave}{defptr}{"$H $S"};
 
-      if(!$ctrlIsTgt && !$th) {
-        DoTrigger("global", "UNDEFINED ZWNode_$1_$2 ZWave $1 ".hex($2));
-        $th = $modules{ZWave}{defptr}{"$1 $2"};
+      if(!($S eq $hash->{nodeIdHex} && $H eq $hash->{homeIdSet}) && !$th) {
+        DoTrigger("global", "UNDEFINED ZWNode_${H}_$S ZWave $H ".hex($S));
+        $th = $modules{ZWave}{defptr}{"$H $S"};
       }
 
       # Auto-Add classes
diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index 1ad47890e..7093571ca 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -310,9 +310,13 @@ my %zwave_class = (
                wakeupNoMoreInformation => "08" },
     get   => { wakeupInterval => "05",
                wakeupIntervalCapabilities => "09" },
-    parse => { "028407"    => 'wakeup:notification',
+    parse => { "..8404(.*)"=> '"cmdSet:wakeupInterval $1"',
+               "..8405"    => 'cmdGet:wakeupInterval',
                "..8406(......)(..)" =>
                          '"wakeupReport:interval ".hex($1)." target ".hex($2)',
+               "..8407"    => 'wakeup:notification',
+               "..8408"    => 'cmdSet:wakeupNoMoreInformation',
+               "..8409"    => 'cmdGet:wakeupIntervalCapabilities',
                "..840a(......)(......)(......)(......)" =>
                          '"wakeupIntervalCapabilitiesReport:min ".hex($1).'.
                          '" max ".hex($2)." default ".hex($3)." step ".hex($4)'
@@ -331,7 +335,8 @@ my %zwave_class = (
     set   => { versionClassRequest => 'ZWave_versionClassRequest($hash,"%s")'},
     get   => { version      => "11",
                versionClass => 'ZWave_versionClassGet("%s")' },
-    parse => { "078612(..........)" => 'sprintf("version:Lib %d Prot '.
+    parse => { "028611"             => "cmdGet:version",
+               "078612(..........)" => 'sprintf("version:Lib %d Prot '.
                 '%d.%d App %d.%d", unpack("C*",pack("H*","$1")))',
                "098612(..............)" => 'sprintf("version:Lib %d Prot '.
                  '%d.%d App %d.%d HW %d FWCounter %d",'.