Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

FRITZBOX: priority webcm for tr064

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11006 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
grompo 2016-03-06 12:13:40 +00:00
parent 0bf6461358
commit 97f7f181a8
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/FHEM/72_FRITZBOX.pm
View File

@ -2268,7 +2268,7 @@ sub FRITZBOX_Call_Run_Web($)
} }
} }
elsif ( $hash->{TELNET} != 1 && $ttsLink ) { elsif ( $hash->{TELNET} != 1 && $ttsLink ) {
FRITZBOX_Log $hash, 3, "play or say ignored"; FRITZBOX_Log $hash, 3, "Your Fritz!OS version has limited interfaces. Parameter 'play:' and 'say:' ignored.";
} }
# Preparing 4th command array to switch to (dial port 1-3) to avoid ringing of internal phone # Preparing 4th command array to switch to (dial port 1-3) to avoid ringing of internal phone
@ -2288,6 +2288,9 @@ sub FRITZBOX_Call_Run_Web($)
push @tr064CmdArray, ["X_VoIP:1", "x_voip", "X_AVM-DE_DialNumber", "NewX_AVM-DE_PhoneNumber", $extNo."#"]; push @tr064CmdArray, ["X_VoIP:1", "x_voip", "X_AVM-DE_DialNumber", "NewX_AVM-DE_PhoneNumber", $extNo."#"];
$result = FRITZBOX_TR064_Cmd( $hash, 0, \@tr064CmdArray ); $result = FRITZBOX_TR064_Cmd( $hash, 0, \@tr064CmdArray );
} }
else {
FRITZBOX_Log $hash, 3, "Your Fritz!OS version has limited interfaces. You cannot use call.";
}
sleep $duration; #+1; # 1s added because it takes sometime until it starts ringing sleep $duration; #+1; # 1s added because it takes sometime until it starts ringing
@ -3087,14 +3090,17 @@ sub FRITZBOX_Ring_Run_Web($)
#Preparing 3rd command array to ring #Preparing 3rd command array to ring
FRITZBOX_Log $hash, 4, "Ringing $intNo for $duration seconds"; FRITZBOX_Log $hash, 4, "Ringing $intNo for $duration seconds";
if ($hash->{SECPORT}) { if ( $hash->{WEBCM}==1 ) {
push @webCmdArray, "telcfg:command/Dial" => "**".$intNo."#";
$result = FRITZBOX_Web_CmdPost( $hash, \@webCmdArray );
}
elsif ($hash->{SECPORT}) {
push @tr064CmdArray, ["X_VoIP:1", "x_voip", "X_AVM-DE_DialNumber", "NewX_AVM-DE_PhoneNumber", "**".$intNo."#"]; push @tr064CmdArray, ["X_VoIP:1", "x_voip", "X_AVM-DE_DialNumber", "NewX_AVM-DE_PhoneNumber", "**".$intNo."#"];
@tr064Result = FRITZBOX_TR064_Cmd( $hash, 0, \@tr064CmdArray ); @tr064Result = FRITZBOX_TR064_Cmd( $hash, 0, \@tr064CmdArray );
return $name."|0|Error (set ring): ".$tr064Result[0]->{Error} if $tr064Result[0]->{Error}; return $name."|0|Error (set ring): ".$tr064Result[0]->{Error} if $tr064Result[0]->{Error};
} }
else { else {
push @webCmdArray, "telcfg:command/Dial" => "**".$intNo."#"; FRITZBOX_Log $hash, 3, "Your Fritz!OS version has limited interfaces. You cannot ring.";
$result = FRITZBOX_Web_CmdPost( $hash, \@webCmdArray );
} }
sleep 5 if $duration <= 0; # always wait before reseting everything sleep 5 if $duration <= 0; # always wait before reseting everything
@ -3103,8 +3109,8 @@ sub FRITZBOX_Ring_Run_Web($)
#Preparing 4th command array to stop ringing (but not when duration is 0 or play: and say: is used without duration) #Preparing 4th command array to stop ringing (but not when duration is 0 or play: and say: is used without duration)
unless ( $duration == 0 || $duration == -1 && $ttsLink ) { unless ( $duration == 0 || $duration == -1 && $ttsLink ) {
push @tr064CmdArray, ["X_VoIP:1", "x_voip", "X_AVM-DE_DialHangup"]; push @tr064CmdArray, ["X_VoIP:1", "x_voip", "X_AVM-DE_DialHangup"];
$result = FRITZBOX_TR064_Cmd( $hash, 0, \@tr064CmdArray ) if $hash->{SECPORT}; $result = FRITZBOX_TR064_Cmd( $hash, 0, \@tr064CmdArray ) if $hash->{SECPORT} && $hash->{WEBCM} != 1;
push( @webCmdArray, "telcfg:command/Hangup" => "" ) unless $hash->{SECPORT}; push( @webCmdArray, "telcfg:command/Hangup" => "" ) if $hash->{WEBCM}==1;
} }
#Preparing 5th command array to reset everything #Preparing 5th command array to reset everything