FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 01:09:47 +00:00
Code Issues Releases Wiki Activity

00_ZWCUL: parse commands

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@10125 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
rudolfkoenig 2015-12-07 18:14:09 +00:00
parent 9592754192
commit 46c95f4d6b
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/00_ZWCUL.pm
View File

@ -293,12 +293,11 @@ ZWCUL_Parse($$$$)
if(length($P)) { if(length($P)) {
$rmsg = sprintf("0004%s%s%02x%s", $S, $S, length($P)/2, $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"}; my $th = $modules{ZWave}{defptr}{"$H $S"};
if(!$ctrlIsTgt && !$th) { if(!($S eq $hash->{nodeIdHex} && $H eq $hash->{homeIdSet}) && !$th) {
DoTrigger("global", "UNDEFINED ZWNode_$1_$2 ZWave $1 ".hex($2)); DoTrigger("global", "UNDEFINED ZWNode_${H}_$S ZWave $H ".hex($S));
$th = $modules{ZWave}{defptr}{"$1 $2"}; $th = $modules{ZWave}{defptr}{"$H $S"};
} }
# Auto-Add classes # Auto-Add classes

9
fhem/FHEM/10_ZWave.pm
View File

@ -310,9 +310,13 @@ my %zwave_class = (
wakeupNoMoreInformation => "08" }, wakeupNoMoreInformation => "08" },
get => { wakeupInterval => "05", get => { wakeupInterval => "05",
wakeupIntervalCapabilities => "09" }, wakeupIntervalCapabilities => "09" },
parse => { "028407" => 'wakeup:notification', parse => { "..8404(.*)"=> '"cmdSet:wakeupInterval $1"',
"..8405" => 'cmdGet:wakeupInterval',
"..8406(......)(..)" => "..8406(......)(..)" =>
'"wakeupReport:interval ".hex($1)." target ".hex($2)', '"wakeupReport:interval ".hex($1)." target ".hex($2)',
"..8407" => 'wakeup:notification',
"..8408" => 'cmdSet:wakeupNoMoreInformation',
"..8409" => 'cmdGet:wakeupIntervalCapabilities',
"..840a(......)(......)(......)(......)" => "..840a(......)(......)(......)(......)" =>
'"wakeupIntervalCapabilitiesReport:min ".hex($1).'. '"wakeupIntervalCapabilitiesReport:min ".hex($1).'.
'" max ".hex($2)." default ".hex($3)." step ".hex($4)' '" max ".hex($2)." default ".hex($3)." step ".hex($4)'
@ -331,7 +335,8 @@ my %zwave_class = (
set => { versionClassRequest => 'ZWave_versionClassRequest($hash,"%s")'}, set => { versionClassRequest => 'ZWave_versionClassRequest($hash,"%s")'},
get => { version => "11", get => { version => "11",
versionClass => 'ZWave_versionClassGet("%s")' }, 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")))', '%d.%d App %d.%d", unpack("C*",pack("H*","$1")))',
"098612(..............)" => 'sprintf("version:Lib %d Prot '. "098612(..............)" => 'sprintf("version:Lib %d Prot '.
'%d.%d App %d.%d HW %d FWCounter %d",'. '%d.%d App %d.%d HW %d FWCounter %d",'.