FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-08 01:14:19 +00:00
Code Issues Releases Wiki Activity

webCmd use 0 to prevent autoset

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@2874 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
martinp876 2013-03-08 19:56:52 +00:00
parent 7baa7ccb56
commit c8d04a9ab8
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
fhem/FHEM/10_CUL_HM.pm
View File

@ -188,8 +188,8 @@ sub CUL_HM_updateConfig($){
# add default web-commands # add default web-commands
my $webCmd; my $webCmd;
my $st = AttrVal(($hash->{device}?$hash->{device}:$name), "subType", ""); my $st = AttrVal(($hash->{device}?$hash->{device}:$name), "subType", "");
$webCmd = AttrVal($name,"webCmd",""); $webCmd = AttrVal($name,"webCmd",undef);
if (!$webCmd){ if (!defined $webCmd){
if((length (CUL_HM_hash2Id($hash)) == 6)&& if((length (CUL_HM_hash2Id($hash)) == 6)&&
$hash->{channel_01} && $hash->{channel_01} &&
$st ne "virtual" && $st ne "virtual" &&
@ -202,22 +202,16 @@ sub CUL_HM_updateConfig($){
}elsif($st eq "keyMatic" ){$webCmd="lock:inhibit on:inhibit off"; }elsif($st eq "keyMatic" ){$webCmd="lock:inhibit on:inhibit off";
} }
my $eventMap = AttrVal($name,"eventMap",undef); my $eventMap = AttrVal($name,"eventMap",undef);
if (defined $eventMap){
foreach (split " ",$eventMap){ my @wc;
my ($old,$new) = split":",$_; push @wc,ReplaceEventMap($name, $_, 1) foreach (split ":",$webCmd);
my $nW = $webCmd; $webCmd = join ":",@wc;
$nW =~ s/^$old:/$new:/;
$nW =~ s/$old$/$new/;
$nW =~ s/:$old:/:$new:/;
$webCmd = $nW;
}
}
} }
$attr{$name}{webCmd} = $webCmd if ($webCmd); $attr{$name}{webCmd} = $webCmd if ($webCmd);
push @getConfList,$name if (1 == AttrVal($name,"autoReadReg","0")); push @getConfList,$name if (1 == AttrVal($name,"autoReadReg","0"));
} }
$modules{CUL_HM}{helper}{updtCfgLst} = \@getConfList; $modules{CUL_HM}{helper}{updtCfgLst} = \@getConfList;
CUL_HM_autoReadConfig("updateConfig"); #General CUL_HM_autoReadConfig("updateConfig");
} }
sub CUL_HM_Define($$) {############################## sub CUL_HM_Define($$) {##############################
my ($hash, $def) = @_; my ($hash, $def) = @_;

3
fhem/FHEM/HMConfig.pm
View File

@ -791,6 +791,7 @@ my %culHmBits = (
"01;p11=08" => { txt => "CONFIG_WRITE_INDEX", params => { "01;p11=08" => { txt => "CONFIG_WRITE_INDEX", params => {
CHANNEL => "0,2", CHANNEL => "0,2",
DATA => '4,,$val =~ s/(..)(..)/ $1:$2/g', } }, DATA => '4,,$val =~ s/(..)(..)/ $1:$2/g', } },
"01;p11=09" => { txt => "CONFIG_SERIAL_REQ", params => { } },
"01;p11=0A" => { txt => "PAIR_SERIAL", params => { "01;p11=0A" => { txt => "PAIR_SERIAL", params => {
SERIALNO => '04,,$val=pack("H*",$val)', } }, SERIALNO => '04,,$val=pack("H*",$val)', } },
"01;p11=0E" => { txt => "CONFIG_STATUS_REQUEST", params => { "01;p11=0E" => { txt => "CONFIG_STATUS_REQUEST", params => {
@ -820,6 +821,8 @@ my %culHmBits = (
"03" => { txt => "AES reply", params => { "03" => { txt => "AES reply", params => {
DATA => "0," } }, DATA => "0," } },
"10;p01=00" => { txt => "INFO_SERIAL", params => {
SERIALNO => '02,20,$val=pack("H*",$val)'},},
"10;p01=01" => { txt => "INFO_PEER_LIST", params => { "10;p01=01" => { txt => "INFO_PEER_LIST", params => {
PEER1 => '02,8,$val=CUL_HM_id2Name($val)', PEER1 => '02,8,$val=CUL_HM_id2Name($val)',
PEER2 => '10,8,$val=CUL_HM_id2Name($val)', PEER2 => '10,8,$val=CUL_HM_id2Name($val)',