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

FRITZBOX: small changes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@7148 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2014-12-06 19:30:26 +00:00
parent 44ffadeaf8
commit 07f12ed61c
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
fhem/FHEM/72_FRITZBOX.pm
View File

@ -51,8 +51,8 @@ my %fonModel = (
'0x01' => "MT-D" '0x01' => "MT-D"
, '0x03' => "MT-F" , '0x03' => "MT-F"
, '0x04' => "C3" , '0x04' => "C3"
, '0x05' => "C4" , '0x05' => "M2"
, '0x08' => "M2" , '0x08' => "C4"
); );
my %ringTone = ( my %ringTone = (
@ -408,6 +408,7 @@ FRITZBOX_Readout_Run($)
my $resultArray; my $resultArray;
my @readoutReadings; my @readoutReadings;
my $i; my $i;
my $startTime = time();
my $slowRun = 0; my $slowRun = 0;
if ( int(time/3600) != $hash->{fhem}{lastHour} || $hash->{fhem}{LOCAL} == 1) if ( int(time/3600) != $hash->{fhem}{lastHour} || $hash->{fhem}{LOCAL} == 1)
@ -614,7 +615,10 @@ FRITZBOX_Readout_Run($)
} }
$resultArray = FRITZBOX_Readout_Query( $hash, \@readoutArray, \@readoutReadings ); $resultArray = FRITZBOX_Readout_Query( $hash, \@readoutArray, \@readoutReadings );
$returnStr .= join('|', @readoutReadings ); $returnStr .= join('|', @readoutReadings );
$returnStr .= "|readoutTime|";
$returnStr .= sprintf "%.2f", time()-$startTime;
FRITZBOX_Telnet_Close ( $hash ); FRITZBOX_Telnet_Close ( $hash );
@ -658,13 +662,15 @@ FRITZBOX_Readout_Done($)
$hash->{$rName1}{$rName2} = $rValue; $hash->{$rName1}{$rName2} = $rValue;
} }
} }
else elsif ($rName ne "readoutTime")
{ {
readingsBulkUpdate( $hash, $rName, $rValue ); readingsBulkUpdate( $hash, $rName, $rValue );
} }
} }
readingsBulkUpdate( $hash, "lastReadout", keys( %values )." values captured" ); my $msg = keys( %values )." values captured in ".$values{readoutTime}." s";
readingsBulkUpdate( $hash, "lastReadout", $msg );
FRITZBOX_Log $hash, 4, $msg;
my $newState = "WLAN: "; my $newState = "WLAN: ";
if ($values{box_wlan_2GHz} eq "on" || $values{box_wlan_5GHz} eq "on") if ($values{box_wlan_2GHz} eq "on" || $values{box_wlan_5GHz} eq "on")
{ {
@ -676,7 +682,6 @@ FRITZBOX_Readout_Done($)
} }
$newState .=" gWLAN: ".$values{box_guestWlan} ; $newState .=" gWLAN: ".$values{box_guestWlan} ;
readingsBulkUpdate( $hash, "state", $newState); readingsBulkUpdate( $hash, "state", $newState);
FRITZBOX_Log $hash, 4, keys( %values )." values captured";
} }
readingsEndUpdate( $hash, 1 ); readingsEndUpdate( $hash, 1 );
@ -893,6 +898,8 @@ FRITZBOX_Ring_Run($)
} }
FRITZBOX_Telnet_Open($hash);
#Preparing 1st command array #Preparing 1st command array
@cmdArray = (); @cmdArray = ();
# Change ring tone of Fritz!Fons # Change ring tone of Fritz!Fons
@ -935,6 +942,8 @@ FRITZBOX_Ring_Run($)
} }
FRITZBOX_Exec( $hash, \@cmdArray ); FRITZBOX_Exec( $hash, \@cmdArray );
FRITZBOX_Telnet_Close( $hash );
return $name."|1|Ringing done"; return $name."|1|Ringing done";
} }
@ -1162,23 +1171,31 @@ FRITZBOX_Exec_Remote($$)
my @resultArray; my @resultArray;
FRITZBOX_Log $hash, 4, "Execute " . int ( @{$cmd} ) . " command(s)"; FRITZBOX_Log $hash, 4, "Execute " . int ( @{$cmd} ) . " command(s)";
# my $cmdStr = join "\necho ' |#|'\n", @{$cmd}; # my $cmdStr = join "\n", @{$cmd};
# $cmdStr .= "\n#|#|#|#\n"; # $cmdStr .= "\necho Ende1 Ende2\n";
# $telnet->put( $cmdStr ); # $telnet->put( $cmdStr );
# my ( $result,$match ) = $telnet->waitfor('/#|#|#|#/'); # my ( $result,$match ) = $telnet->waitfor('/Ende1\sEnde2/');
# FRITZBOX_Log $hash, 1, "debug: ". $result; # my @test = split( /\n/, "# ".$result );
# $result =~ s/\n|\r//g; # my $lastValue = "";
# @resultArray = split /\|#\|/, $result; # foreach (@test)
# foreach (keys @resultArray)
# { # {
# $resultArray[$_] =~ s/\s$//; # if ($_ =~ /^# /)
# {
# push @resultArray, $lastValue;
# $lastValue = "";
# }
# else
# {
# $lastValue = $_;
# }
# } # }
# shift @resultArray;
# $telnet->buffer_empty; # $telnet->buffer_empty;
foreach (@{$cmd}) foreach (@{$cmd})
{ {
FRITZBOX_Log $hash, 5, "Execute '".$_."'"; FRITZBOX_Log $hash, 5, "Execute '".$_."'";
if ($_ !~ /^sleep/) unless ($_ =~ /^sleep/)
{ {
@output=$telnet->cmd($_); @output=$telnet->cmd($_);
$result = $output[0];; $result = $output[0];;
@ -1273,7 +1290,7 @@ FRITZBOX_Exec_Local($$)
<br> <br>
For remote access the password must be stored in the file 'fb_pwd.txt' in the root directory of FHEM. For remote access the password must be stored in the file 'fb_pwd.txt' in the root directory of FHEM.
<br> <br>
<i>So fare, the module has been tested on Fritz!Box 7390 and Fritz!Fon MT-F only.</i> <i>So fare, the module has been tested on Fritz!Box 7390 and 7490 and Fritz!Fon MT-F and C4.</i>
<br> <br>
Check also the other Fritz!Box moduls: <a href="#SYSMON">SYSMON</a> and <a href="#FB_CALLMONITOR">FB_CALLMONITOR</a>. Check also the other Fritz!Box moduls: <a href="#SYSMON">SYSMON</a> and <a href="#FB_CALLMONITOR">FB_CALLMONITOR</a>.
<br> <br>