FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-22 20:24:36 +00:00
Code Issues Releases Wiki Activity

00_HMUARTLGW.pm: cleanup assigned peer handling, fix XmitOpen on reopen

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12832 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgernoth 2016-12-19 17:51:23 +00:00
parent 0ade8c5d0b
commit 5cae76aadc
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
fhem/FHEM/00_HMUARTLGW.pm
View File

@ -124,6 +124,7 @@ my %sets = (
); );
my %gets = ( my %gets = (
"assignIDs" => "noArg",
); );
sub HMUARTLGW_Initialize($) sub HMUARTLGW_Initialize($)
@ -295,6 +296,7 @@ sub HMUARTLGW_Undefine($$;$)
Log3($hash, 3, "${name} device closed") if (!defined($hash->{FD})); Log3($hash, 3, "${name} device closed") if (!defined($hash->{FD}));
} }
$hash->{DevState} = HMUARTLGW_STATE_NONE; $hash->{DevState} = HMUARTLGW_STATE_NONE;
$hash->{XmitOpen} = 0;
HMUARTLGW_updateCondition($hash); HMUARTLGW_updateCondition($hash);
} }
@ -729,15 +731,13 @@ sub HMUARTLGW_ParsePeer($$) {
#040701010002fffffffffffffff9 #040701010002fffffffffffffff9
$hash->{AssignedPeerCnt} = hex(substr($msg, 8, 4)); $hash->{AssignedPeerCnt} = hex(substr($msg, 8, 4));
if (length($msg) > 12) { if (length($msg) > 12) {
$hash->{Peers}{$hash->{Helper}{UpdatePeer}->{id}} = "assigned"; $hash->{Peers}{$hash->{Helper}{UpdatePeer}->{id}} = $hash->{Helper}{UpdatePeer}->{config};
$hash->{Helper}{AssignedPeers}{$hash->{Helper}{UpdatePeer}->{id}} = substr($msg, 12); $hash->{Helper}{UpdatePeer}{aes} = substr($msg, 12);
$hash->{Helper}{UpdatePeer}{aes} = $hash->{Helper}{AssignedPeers}{$hash->{Helper}{UpdatePeer}->{id}};
Log3($hash, HMUARTLGW_getVerbLvl($hash, $hash->{Helper}{UpdatePeer}->{id}, $hash->{Helper}{UpdatePeer}->{id}, 4), Log3($hash, HMUARTLGW_getVerbLvl($hash, $hash->{Helper}{UpdatePeer}->{id}, $hash->{Helper}{UpdatePeer}->{id}, 4),
"HMUARTLGW $hash->{NAME} added peer: " . $hash->{Helper}{UpdatePeer}->{id} . "HMUARTLGW $hash->{NAME} added peer: " . $hash->{Helper}{UpdatePeer}->{id} .
", aesChannels: " . $hash->{Helper}{AssignedPeers}{$hash->{Helper}{UpdatePeer}->{id}}); ", aesChannels: " . $hash->{Helper}{UpdatePeer}{aes});
} else { } else {
delete($hash->{Peers}{$hash->{Helper}{UpdatePeer}->{id}}); delete($hash->{Peers}{$hash->{Helper}{UpdatePeer}->{id}});
delete($hash->{Helper}{AssignedPeers}{$hash->{Helper}{UpdatePeer}->{id}});
Log3($hash, HMUARTLGW_getVerbLvl($hash, $hash->{Helper}{UpdatePeer}->{id}, $hash->{Helper}{UpdatePeer}->{id}, 4), Log3($hash, HMUARTLGW_getVerbLvl($hash, $hash->{Helper}{UpdatePeer}->{id}, $hash->{Helper}{UpdatePeer}->{id}, 4),
"HMUARTLGW $hash->{NAME} remove peer: ". $hash->{Helper}{UpdatePeer}->{id}); "HMUARTLGW $hash->{NAME} remove peer: ". $hash->{Helper}{UpdatePeer}->{id});
} }
@ -955,7 +955,6 @@ sub HMUARTLGW_GetSetParameters($;$$)
(!$hash->{Helper}{OneParameterOnly})) { (!$hash->{Helper}{OneParameterOnly})) {
#Init sequence over, add known peers #Init sequence over, add known peers
$hash->{AssignedPeerCnt} = 0; $hash->{AssignedPeerCnt} = 0;
%{$hash->{Helper}{AssignedPeers}} = ();
foreach my $peer (keys(%{$hash->{Peers}})) { foreach my $peer (keys(%{$hash->{Peers}})) {
if ($modules{CUL_HM}{defptr}{$peer} && if ($modules{CUL_HM}{defptr}{$peer} &&
@ -967,6 +966,7 @@ sub HMUARTLGW_GetSetParameters($;$$)
flags => $flags, flags => $flags,
kNo => $kNo, kNo => $kNo,
aesChannels => $aesChannels, aesChannels => $aesChannels,
config => $modules{CUL_HM}{defptr}{$peer}{helper}{io}{newChn},
}; };
#enqueue for later #enqueue for later
if ($p->{operation} eq "+") { if ($p->{operation} eq "+") {
@ -1436,6 +1436,7 @@ sub HMUARTLGW_Write($$$)
flags => $flags, flags => $flags,
kNo => $kNo, kNo => $kNo,
aesChannels => $aesChannels, aesChannels => $aesChannels,
config => $modules{CUL_HM}{defptr}{$dst}{helper}{io}{newChn},
}; };
$hash->{Peers}{$peer->{id}} = "pending"; $hash->{Peers}{$peer->{id}} = "pending";
HMUARTLGW_UpdatePeer($hash, $peer); HMUARTLGW_UpdatePeer($hash, $peer);
@ -1456,6 +1457,7 @@ sub HMUARTLGW_Write($$$)
flags => $flags, flags => $flags,
kNo => $kNo, kNo => $kNo,
aesChannels => $aesChannels, aesChannels => $aesChannels,
config => $msg,
}; };
if ($peer->{operation} eq "+") { if ($peer->{operation} eq "+") {
$hash->{Peers}{$peer->{id}} = "pending"; $hash->{Peers}{$peer->{id}} = "pending";
@ -1523,6 +1525,7 @@ sub HMUARTLGW_Write($$$)
operation => "+", operation => "+",
flags => "00", flags => "00",
kNo => "00", kNo => "00",
config => "+${dst}",
}; };
if ($modules{CUL_HM}{defptr}{$dst} && if ($modules{CUL_HM}{defptr}{$dst} &&
$modules{CUL_HM}{defptr}{$dst}{helper}{io}{newChn}) { $modules{CUL_HM}{defptr}{$dst}{helper}{io}{newChn}) {
@ -1530,7 +1533,9 @@ sub HMUARTLGW_Write($$$)
$peer->{flags} = $flags; $peer->{flags} = $flags;
$peer->{kNo} = $kNo; $peer->{kNo} = $kNo;
$peer->{aesChannels} = $aesChannels; $peer->{aesChannels} = $aesChannels;
$peer->{config} = $modules{CUL_HM}{defptr}{$dst}{helper}{io}{newChn};
} }
$hash->{Peers}{$dst} = "pending";
HMUARTLGW_UpdatePeer($hash, $peer); HMUARTLGW_UpdatePeer($hash, $peer);
} }
@ -1654,6 +1659,21 @@ sub HMUARTLGW_CheckCmdResp($)
sub HMUARTLGW_Get($@) sub HMUARTLGW_Get($@)
{ {
my ( $hash, $name, $cmd, @args ) = @_;
my $ret = "";
if ($cmd eq "assignIDs") {
foreach my $peer (keys(%{$hash->{Peers}})) {
next if ($hash->{Peers}{$peer} !~ m/^\+/);
$ret .= "\n${peer} : " . CUL_HM_id2Name($peer);
}
$ret = "assignedIDs: ". ($ret =~ tr/\n//) . $ret;
} else {
$ret = "Unknown argument ${cmd}, choose one of " .
join(" ",map {"$_" . ($gets{$_} ? ":$gets{$_}" : "")} keys %gets);
}
return $ret;
} }
sub HMUARTLGW_RemoveHMPair($) sub HMUARTLGW_RemoveHMPair($)
@ -1889,7 +1909,7 @@ sub HMUARTLGW_updateCondition($)
readingsSingleUpdate($hash, "load", $load, 0); readingsSingleUpdate($hash, "load", $load, 0);
$cond = "ok"; $cond = "ok";
#FIXME: Dynamic ;evels #FIXME: Dynamic levels
if ($load >= 100) { if ($load >= 100) {
$cond = "ERROR-Overload"; $cond = "ERROR-Overload";
$loadLvl = "suspended"; $loadLvl = "suspended";