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

00_HMUARTLGW.pm: fix errors on rename, add model

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14875 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgernoth 2017-08-11 09:53:02 +00:00
parent c849d5d47b
commit 1056285f4c
1 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
fhem/FHEM/00_HMUARTLGW.pm
View File

@ -146,6 +146,7 @@ sub HMUARTLGW_Initialize($)
$hash->{SetFn} = "HMUARTLGW_Set"; $hash->{SetFn} = "HMUARTLGW_Set";
$hash->{GetFn} = "HMUARTLGW_Get"; $hash->{GetFn} = "HMUARTLGW_Get";
$hash->{AttrFn} = "HMUARTLGW_Attr"; $hash->{AttrFn} = "HMUARTLGW_Attr";
$hash->{RenameFn} = "HMUARTLGW_Rename";
$hash->{ShutdownFn}= "HMUARTLGW_Shutdown"; $hash->{ShutdownFn}= "HMUARTLGW_Shutdown";
@ -171,6 +172,7 @@ sub HMUARTLGW_GetSetParameterReq($);
sub HMUARTLGW_getAesKeys($); sub HMUARTLGW_getAesKeys($);
sub HMUARTLGW_updateMsgLoad($$); sub HMUARTLGW_updateMsgLoad($$);
sub HMUARTLGW_Read($); sub HMUARTLGW_Read($);
sub HMUARTLGW_RemoveHMPair($);
sub HMUARTLGW_send($$$;$); sub HMUARTLGW_send($$$;$);
sub HMUARTLGW_send_frame($$); sub HMUARTLGW_send_frame($$);
sub HMUARTLGW_crc16($;$); sub HMUARTLGW_crc16($;$);
@ -265,9 +267,10 @@ sub HMUARTLGW_Define($$)
$dev .= "\@115200"; $dev .= "\@115200";
} }
$hash->{DevType} = "UART"; $hash->{DevType} = "UART";
$hash->{model} = "HM-MOD-UART";
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
delete($hash->{READINGS}{"D-LANfirmware"}); delete($hash->{READINGS}{"D-LANfirmware"});
readingsBulkUpdate($hash, "D-type", "HM-MOD-UART"); readingsBulkUpdate($hash, "D-type", $hash->{model});
readingsEndUpdate($hash, 1); readingsEndUpdate($hash, 1);
} }
@ -288,6 +291,7 @@ sub HMUARTLGW_Undefine($$;$)
RemoveInternalTimer($hash); RemoveInternalTimer($hash);
RemoveInternalTimer("HMUARTLGW_CheckCredits:$name"); RemoveInternalTimer("HMUARTLGW_CheckCredits:$name");
RemoveInternalTimer("hmPairForSec:$name");
if ($hash->{keepAlive}) { if ($hash->{keepAlive}) {
RemoveInternalTimer($hash->{keepAlive}); RemoveInternalTimer($hash->{keepAlive});
DevIo_CloseDev($hash->{keepAlive}); DevIo_CloseDev($hash->{keepAlive});
@ -339,6 +343,21 @@ sub HMUARTLGW_Ready($)
return 0; return 0;
} }
sub HMUARTLGW_Rename($$)
{
my ($name, $old_name) = @_;
my $hash = $defs{$name};
if (defined($hash->{Helper}{Initialized})) {
RemoveInternalTimer("HMUARTLGW_CheckCredits:${old_name}");
InternalTimer(gettimeofday()+1, "HMUARTLGW_CheckCredits", "HMUARTLGW_CheckCredits:${name}", 1);
}
if ($hash->{hmPair}) {
HMUARTLGW_RemoveHMPair("hmPairForSec:${old_name}");
}
}
sub HMUARTLGW_Shutdown($) sub HMUARTLGW_Shutdown($)
{ {
my ($hash) = @_; my ($hash) = @_;
@ -374,6 +393,7 @@ sub HMUARTLGW_LGW_Init($)
$hash->{CNT} = hex($1); $hash->{CNT} = hex($1);
if ($hash->{DevType} eq "LGW") { if ($hash->{DevType} eq "LGW") {
$hash->{model} = $2;
readingsBeginUpdate($hash); readingsBeginUpdate($hash);
readingsBulkUpdate($hash, "D-type", $2); readingsBulkUpdate($hash, "D-type", $2);
readingsBulkUpdate($hash, "D-serialNr", $4); readingsBulkUpdate($hash, "D-serialNr", $4);