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

MAXLAN: refactoring

Browse Source 
git-svn-id: https://fhem.svn.sourceforge.net/svnroot/fhem/trunk/fhem@2188 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
mgehre
2012-11-25 09:51:14 +00:00
parent 9a85f4980d
commit e9234de378
1 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
FHEM/00_MAXLAN.pm
View File

@@ -104,7 +104,15 @@ MAXLAN_Connect($)
{ {
my $hash = shift; my $hash = shift;
#Close connection (if there is a previous one)
DevIo_CloseDev($hash);
RemoveInternalTimer($hash);
$hash->{gothello} = 0;
delete($hash->{NEXT_OPEN}); #work around the connection rate limiter in DevIo delete($hash->{NEXT_OPEN}); #work around the connection rate limiter in DevIo
my $ret = DevIo_OpenDev($hash, 0, "MAXLAN_DoInit"); my $ret = DevIo_OpenDev($hash, 0, "MAXLAN_DoInit");
if($hash->{STATE} ne "opened"){ if($hash->{STATE} ne "opened"){
Log 3, "Scheduling reconnect attempt in $reconnect_interval seconds"; Log 3, "Scheduling reconnect attempt in $reconnect_interval seconds";
@@ -173,8 +181,6 @@ MAXLAN_Set($@)
MAXLAN_RequestReset($hash); MAXLAN_RequestReset($hash);
}elsif($setting eq "reconnect") { }elsif($setting eq "reconnect") {
DevIo_CloseDev($hash);
RemoveInternalTimer($hash);
MAXLAN_Connect($hash); MAXLAN_Connect($hash);
}else{ }else{
return "Unknown argument $setting, choose one of pairmode raw clock factoryReset reconnect"; return "Unknown argument $setting, choose one of pairmode raw clock factoryReset reconnect";
@@ -318,6 +324,19 @@ MAXLAN_SendMetadata($)
} }
} }
sub
MAXLAN_FinishConnect($)
{
my ($hash) = @_;
#Handle deferred setting of time (L: is the last response after connection before the cube starts to idle)
if(defined($hash->{setTimeOnHello})) {
MAXLAN_Set($hash,$hash->{NAME},"clock");
delete $hash->{setTimeOnHello};
}
#Enable polling timer
InternalTimer(gettimeofday()+$hash->{INTERVAL}, "MAXLAN_Poll", $hash, 0)
}
sub sub
MAXLAN_Parse($$) MAXLAN_Parse($$)
{ {
@@ -516,13 +535,7 @@ MAXLAN_Parse($$)
if(!$hash->{gothello}) { if(!$hash->{gothello}) {
# "L:..." is the last response after connection before the cube starts to idle # "L:..." is the last response after connection before the cube starts to idle
$hash->{gothello} = 1; $hash->{gothello} = 1;
#Handle deferred setting of time (L: is the last response after connection before the cube starts to idle) MAXLAN_FinishConnect($hash);
if(defined($hash->{setTimeOnHello})) {
MAXLAN_Set($hash,$hash->{NAME},"clock");
delete $hash->{setTimeOnHello};
}
#Enable polling timer
InternalTimer(gettimeofday()+$hash->{INTERVAL}, "MAXLAN_Poll", $hash, 0)
} }
}elsif($cmd eq "N"){#New device paired }elsif($cmd eq "N"){#New device paired
if(@args==0){ if(@args==0){
@@ -571,8 +584,6 @@ MAXLAN_SimpleWrite(@)
#TODO: none of those conditions detect if the connection is actually lost! #TODO: none of those conditions detect if the connection is actually lost!
if(!$hash->{TCPDev} || !defined($ret) || !$hash->{TCPDev}->connected) { if(!$hash->{TCPDev} || !defined($ret) || !$hash->{TCPDev}->connected) {
Log GetLogLevel($name,1), 'MAXLAN_SimpleWrite failed'; Log GetLogLevel($name,1), 'MAXLAN_SimpleWrite failed';
DevIo_CloseDev($hash);
RemoveInternalTimer($hash);
MAXLAN_Connect($hash); MAXLAN_Connect($hash);
} }
} }