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: update FRITZBOX_SetCustomerRingTone

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@7436 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2015-01-04 20:59:58 +00:00
parent 50627d4af5
commit a557cfa316
1 changed files with 62 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
FHEM/72_FRITZBOX.pm
View File

@ -47,6 +47,7 @@ sub FRITZBOX_Init($);
sub FRITZBOX_Cmd_Start($); sub FRITZBOX_Cmd_Start($);
sub FRITZBOX_Exec($$); sub FRITZBOX_Exec($$);
sub FRITZBOX_SendMail($@); sub FRITZBOX_SendMail($@);
sub FRITZBOX_SetCustomerRingTone($@);
sub FRITZBOX_SetMOH($@); sub FRITZBOX_SetMOH($@);
sub FRITZBOX_StartRadio($@); sub FRITZBOX_StartRadio($@);
sub FRITZBOX_Wlan_Run($); sub FRITZBOX_Wlan_Run($);
@ -303,7 +304,7 @@ FRITZBOX_Set($$@)
if (int @val > 0) if (int @val > 0)
{ {
Log3 $name, 3, "FRITZBOX: set $name $cmd ".join(" ", @val); Log3 $name, 3, "FRITZBOX: set $name $cmd ".join(" ", @val);
return FRITZBOX_SetCustomerRingTone $hash, @val; return FRITZBOX_SetCustomerRingTone ($hash, @val);
} }
} elsif ( lc $cmd eq 'dect') { } elsif ( lc $cmd eq 'dect') {
@ -334,12 +335,8 @@ FRITZBOX_Set($$@)
if (int @val == 1 && $val[0] =~ /^(on|off)$/) if (int @val == 1 && $val[0] =~ /^(on|off)$/)
{ {
Log3 $name, 3, "FRITZBOX: set $name $cmd ".join(" ", @val); Log3 $name, 3, "FRITZBOX: set $name $cmd ".join(" ", @val);
my $state = $val[0]; push @cmdBuffer, "guestwlan ".join(" ", @val);
$state =~ s/on/1/; return FRITZBOX_Cmd_Start $hash->{helper}{TimerCmd};
$state =~ s/off/0/;
FRITZBOX_Exec( $hash, "ctlmgr_ctl w wlan settings/guest_ap_enabled $state");
readingsSingleUpdate($hash,"box_guestWlan",$val[0], 1);
return undef;
} }
} }
@ -1055,6 +1052,16 @@ sub FRITZBOX_Cmd_Start($)
$handover = $name . "|" . join( "|", @val ); $handover = $name . "|" . join( "|", @val );
$cmdFunction = "FRITZBOX_Wlan_Run"; $cmdFunction = "FRITZBOX_Wlan_Run";
} }
# Preparing SET guestWLAN
elsif ($val[0] eq "guestwlan")
{
shift @val;
$timeout = 10;
$cmdBufferTimeout = time() + $timeout;
$handover = $name . "|" . join( "|", @val );
$cmdFunction = "FRITZBOX_GuestWlan_Run";
}
# No valid set operation # No valid set operation
else else
{ {
@ -1070,6 +1077,54 @@ sub FRITZBOX_Cmd_Start($)
return undef; return undef;
} # end FRITZBOX_Cmd_Start } # end FRITZBOX_Cmd_Start
##########################################
sub FRITZBOX_GuestWlan_Run($)
{
my ($string) = @_;
my ($name, @val) = split "\\|", $string;
my $hash = $defs{$name};
my $result;
my @readoutArray;
my @readoutReadings;
my $startTime = time();
my $state = $val[0];
$state =~ s/on/1/;
$state =~ s/off/0/;
$result = FRITZBOX_Open_Connection( $hash );
return "$name|0|$result"
if $result;
my $returnStr = "$name|2|";
# Set WLAN on if guestWLAN on
push @readoutArray, [ "", "ctlmgr_ctl w wlan settings/wlan_enable 1"]
if $state == 1;
# Set guestWLAN
push @readoutArray, [ "", "ctlmgr_ctl w wlan settings/guest_ap_enabled $state"];
# Read WLAN
push @readoutArray, [ "box_wlan_2.4GHz", "ctlmgr_ctl r wlan settings/ap_enabled", "onoff" ];
# Read 2nd WLAN
push @readoutArray, [ "box_wlan_5GHz", "ctlmgr_ctl r wlan settings/ap_enabled_scnd", "onoff" ];
# Read Gäste WLAN
push @readoutArray, [ "box_guestWlan", "ctlmgr_ctl r wlan settings/guest_ap_enabled", "onoff" ];
push @readoutArray, [ "box_guestWlanRemain", "ctlmgr_ctl r wlan settings/guest_time_remain", ];
# Execute commands
FRITZBOX_Readout_Query( $hash, \@readoutArray, \@readoutReadings);
$returnStr .= join('|', @readoutReadings );
$returnStr .= "|readoutTime|";
$returnStr .= sprintf "%.2f", time()-$startTime;
FRITZBOX_Close_Connection ( $hash );
FRITZBOX_Log $hash, 5, "Handover: ".$returnStr;
return $returnStr
} # end FRITZBOX_GuestWlan_Run
########################################## ##########################################
sub FRITZBOX_Wlan_Run($) sub FRITZBOX_Wlan_Run($)
{ {
@ -1233,7 +1288,6 @@ sub FRITZBOX_Ring_Run($)
$ttsText =~ s/^\($1\)\s*//i; $ttsText =~ s/^\($1\)\s*//i;
} }
$ttsLink =~ s/\[SPRACHE\]/$ttsLang/; $ttsLink =~ s/\[SPRACHE\]/$ttsLang/;
$ttsText = substr($ttsText,0,70);
$ttsText = uri_escape($ttsText); $ttsText = uri_escape($ttsText);
$ttsLink =~ s/\[TEXT\]/$ttsText/; $ttsLink =~ s/\[TEXT\]/$ttsText/;
FRITZBOX_Log $hash, 5, "Created Text2Speech internet link: $ttsLink"; FRITZBOX_Log $hash, 5, "Created Text2Speech internet link: $ttsLink";