From c8d04a9ab8bb82d45837e0d99b46d1779fcaf217 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Fri, 8 Mar 2013 19:56:52 +0000 Subject: [PATCH] webCmd use 0 to prevent autoset git-svn-id: https://svn.fhem.de/fhem/trunk@2874 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/10_CUL_HM.pm | 20 +++++++------------- fhem/FHEM/HMConfig.pm | 3 +++ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index c169f59a6..67aee8755 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -188,8 +188,8 @@ sub CUL_HM_updateConfig($){ # add default web-commands my $webCmd; my $st = AttrVal(($hash->{device}?$hash->{device}:$name), "subType", ""); - $webCmd = AttrVal($name,"webCmd",""); - if (!$webCmd){ + $webCmd = AttrVal($name,"webCmd",undef); + if (!defined $webCmd){ if((length (CUL_HM_hash2Id($hash)) == 6)&& $hash->{channel_01} && $st ne "virtual" && @@ -202,22 +202,16 @@ sub CUL_HM_updateConfig($){ }elsif($st eq "keyMatic" ){$webCmd="lock:inhibit on:inhibit off"; } my $eventMap = AttrVal($name,"eventMap",undef); - if (defined $eventMap){ - foreach (split " ",$eventMap){ - my ($old,$new) = split":",$_; - my $nW = $webCmd; - $nW =~ s/^$old:/$new:/; - $nW =~ s/$old$/$new/; - $nW =~ s/:$old:/:$new:/; - $webCmd = $nW; - } - } + + my @wc; + push @wc,ReplaceEventMap($name, $_, 1) foreach (split ":",$webCmd); + $webCmd = join ":",@wc; } $attr{$name}{webCmd} = $webCmd if ($webCmd); push @getConfList,$name if (1 == AttrVal($name,"autoReadReg","0")); } $modules{CUL_HM}{helper}{updtCfgLst} = \@getConfList; - CUL_HM_autoReadConfig("updateConfig"); +#General CUL_HM_autoReadConfig("updateConfig"); } sub CUL_HM_Define($$) {############################## my ($hash, $def) = @_; diff --git a/fhem/FHEM/HMConfig.pm b/fhem/FHEM/HMConfig.pm index 6643a2878..c2f7f9cbc 100644 --- a/fhem/FHEM/HMConfig.pm +++ b/fhem/FHEM/HMConfig.pm @@ -791,6 +791,7 @@ my %culHmBits = ( "01;p11=08" => { txt => "CONFIG_WRITE_INDEX", params => { CHANNEL => "0,2", DATA => '4,,$val =~ s/(..)(..)/ $1:$2/g', } }, + "01;p11=09" => { txt => "CONFIG_SERIAL_REQ", params => { } }, "01;p11=0A" => { txt => "PAIR_SERIAL", params => { SERIALNO => '04,,$val=pack("H*",$val)', } }, "01;p11=0E" => { txt => "CONFIG_STATUS_REQUEST", params => { @@ -820,6 +821,8 @@ my %culHmBits = ( "03" => { txt => "AES reply", params => { DATA => "0," } }, + "10;p01=00" => { txt => "INFO_SERIAL", params => { + SERIALNO => '02,20,$val=pack("H*",$val)'},}, "10;p01=01" => { txt => "INFO_PEER_LIST", params => { PEER1 => '02,8,$val=CUL_HM_id2Name($val)', PEER2 => '10,8,$val=CUL_HM_id2Name($val)',