mhop/fhem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

00_HMUARTLGW.pm: improve logging a bit

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12605 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgernoth
2016-11-20 10:30:41 +00:00
parent 22bf68646d
commit bc034dc548
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fhem/FHEM/00_HMUARTLGW.pm
View File

@@ -164,7 +164,7 @@ sub HMUARTLGW_GetSetParameterReq($);
sub HMUARTLGW_getAesKeys($); sub HMUARTLGW_getAesKeys($);
sub HMUARTLGW_updateMsgLoad($$); sub HMUARTLGW_updateMsgLoad($$);
sub HMUARTLGW_Read($); sub HMUARTLGW_Read($);
sub HMUARTLGW_send($$$); sub HMUARTLGW_send($$$;$);
sub HMUARTLGW_send_frame($$); sub HMUARTLGW_send_frame($$);
sub HMUARTLGW_crc16($;$); sub HMUARTLGW_crc16($;$);
sub HMUARTLGW_encrypt($$); sub HMUARTLGW_encrypt($$);
@@ -695,7 +695,7 @@ sub HMUARTLGW_UpdatePeerReq($;$) {
} }
if ($msg) { if ($msg) {
HMUARTLGW_send($hash, $msg, HMUARTLGW_DST_APP); HMUARTLGW_send($hash, $msg, HMUARTLGW_DST_APP, $peer->{id});
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
InternalTimer(gettimeofday()+HMUARTLGW_CMD_TIMEOUT, "HMUARTLGW_CheckCmdResp", $hash, 0); InternalTimer(gettimeofday()+HMUARTLGW_CMD_TIMEOUT, "HMUARTLGW_CheckCmdResp", $hash, 0);
} }
@@ -1102,7 +1102,7 @@ sub HMUARTLGW_Parse($$$$)
my $running = pack("H*", substr($msg, 2)); my $running = pack("H*", substr($msg, 2));
if ($hash->{DevState} <= HMUARTLGW_STATE_ENTER_APP) { if ($hash->{DevState} <= HMUARTLGW_STATE_ENTER_APP) {
Log3($hash, 3, "HMUARTLGW ${name} currently running ${running}"); Log3($hash, HMUARTLGW_getVerbLvl($hash, undef, undef, 4), "HMUARTLGW ${name} currently running ${running}");
if ($running eq "Co_CPU_App") { if ($running eq "Co_CPU_App") {
$hash->{DevState} = HMUARTLGW_STATE_GETSET_PARAMETERS; $hash->{DevState} = HMUARTLGW_STATE_GETSET_PARAMETERS;
@@ -1135,7 +1135,7 @@ sub HMUARTLGW_Parse($$$$)
if ($ack eq HMUARTLGW_ACK_INFO && $hash->{DevState} == HMUARTLGW_STATE_QUERY_APP) { if ($ack eq HMUARTLGW_ACK_INFO && $hash->{DevState} == HMUARTLGW_STATE_QUERY_APP) {
my $running = pack("H*", substr($msg, 4)); my $running = pack("H*", substr($msg, 4));
Log3($hash, 3, "HMUARTLGW ${name} currently running ${running}"); Log3($hash, HMUARTLGW_getVerbLvl($hash, undef, undef, 4), "HMUARTLGW ${name} currently running ${running}");
if ($running eq "Co_CPU_App") { if ($running eq "Co_CPU_App") {
#Reset module #Reset module
@@ -1966,9 +1966,9 @@ sub HMUARTLGW_updateMsgLoad($$) {
} }
} }
sub HMUARTLGW_send($$$) sub HMUARTLGW_send($$$;$)
{ {
my ($hash, $msg, $dst) = @_; my ($hash, $msg, $dst, $peer) = @_;
my $name = $hash->{NAME}; my $name = $hash->{NAME};
my $log; my $log;
@@ -1997,7 +1997,7 @@ sub HMUARTLGW_send($$$)
$v = HMUARTLGW_getVerbLvl($hash, undef, undef, 5); $v = HMUARTLGW_getVerbLvl($hash, undef, undef, 5);
} else { } else {
$log = sprintf("%02X", $dst). " ".uc($msg); $log = sprintf("%02X", $dst). " ".uc($msg);
$v = HMUARTLGW_getVerbLvl($hash, undef, undef, 5); $v = HMUARTLGW_getVerbLvl($hash, $peer, $peer, 5);
} }
Log3($hash, $v, "HMUARTLGW ${name} send: ${log}"); Log3($hash, $v, "HMUARTLGW ${name} send: ${log}");