From ca3a2a476f8bdeaad360291bab41f42090cf38c1 Mon Sep 17 00:00:00 2001 From: martinp876 <> Date: Sat, 6 Aug 2016 12:10:09 +0000 Subject: [PATCH] CUL_HM:setzen von peerNeedsBurst git-svn-id: https://svn.fhem.de/fhem/trunk@11905 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/00_HMUARTLGW.pm | 4 ++-- fhem/FHEM/10_CUL_HM.pm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fhem/FHEM/00_HMUARTLGW.pm b/fhem/FHEM/00_HMUARTLGW.pm index ac5d3d086..9e9d495fd 100644 --- a/fhem/FHEM/00_HMUARTLGW.pm +++ b/fhem/FHEM/00_HMUARTLGW.pm @@ -1226,7 +1226,7 @@ sub HMUARTLGW_Parse($$$$) my ($type, $status, $info, $rssi, $mNr, $flags, $cmd, $src, $dst, $payload) = ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10); Log3($hash, HMUARTLGW_getVerbLvl($hash, $src, $dst, 5), - "HMUARTLGW ${name} recv: 01 ${type} ${status} ${info} ${rssi} msg: ${mNr} ${flags} ${cmd} ${src} ${dst} ${payload}"); + "HMUARTLGW ${name} recv: 01 ${type} ${status} ${info} ${rssi} msg:${mNr} ${flags}${cmd} ${src} ${dst} ${payload}"); return if (!$hash->{Helper}{Initialized}); @@ -1922,7 +1922,7 @@ sub HMUARTLGW_send($$$) } if ($m =~ m/^(..)(..)(..)(......)(......)(.*)$/) { - $log .= "msg: ${1} ${2} ${3} ${4} ${5} ${6}"; + $log .= " msg:${1} ${2}${3} ${4} ${5} ${6}"; } else { $log .= $m; } diff --git a/fhem/FHEM/10_CUL_HM.pm b/fhem/FHEM/10_CUL_HM.pm index e336426f3..548d1f5b3 100755 --- a/fhem/FHEM/10_CUL_HM.pm +++ b/fhem/FHEM/10_CUL_HM.pm @@ -2186,7 +2186,7 @@ sub CUL_HM_Parse($$) {######################################################### my $vs = $val == 0 ? "off" : "on"; if ($chn == 4){ my %lvlSet = ("00"=>"disarmed","01"=>"armExtSens","02"=>"armAll","03"=>"armBlocked"); - $vs = $lvlSet{$val}; + $vs = defined $lvlSet{$val}?$lvlSet{$val}:$val; } push @evtEt,[$mh{cHash},1,"level:$val"]; push @evtEt,[$mh{cHash},1,"pct:$val"]; # duplicate to level - necessary for "slider" @@ -4332,7 +4332,7 @@ sub CUL_HM_Set($@) {#+++++++++++++++++ set command+++++++++++++++++++++++++++++ $peerId = CUL_HM_peerChId($peerChnIn,$dst); ($peerId,$peerChn) = unpack 'A6A2',$peerId.'01'; if ($list == 4 && - AttrVal($name,"peerIDs",undef)){########################## + !AttrVal($name,"peerIDs",undef)){####check this code################# $peerChn = "00"; } return "Peer not valid" if (length ($peerId) < 6);