FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-01 07:19:24 +00:00
Code Issues Releases Wiki Activity

FRITZBOX: set wlan2.4, wlan5

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9476 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tpoitzsch 2015-10-17 11:00:57 +00:00
parent dbcb8e06bb
commit 86f65afc55
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
fhem/FHEM/72_FRITZBOX.pm
View File

@ -288,6 +288,9 @@ sub FRITZBOX_Set($$@)
. " tam" . " tam"
. " update:noArg" . " update:noArg"
. " wlan:on,off"; . " wlan:on,off";
$list .= " wlan2.4:on,off"
. " wlan5:on,off"
if $hash->{fhem}->{is_double_wlan} == 1;
$list .= " alarm" $list .= " alarm"
. " dect:on,off" . " dect:on,off"
. " diversity" . " diversity"
@ -482,6 +485,13 @@ sub FRITZBOX_Set($$@)
return FRITZBOX_Set_Cmd_Start $hash->{helper}{TimerCmd}; return FRITZBOX_Set_Cmd_Start $hash->{helper}{TimerCmd};
} }
} }
elsif ( lc $cmd =~ /^wlan(2\.4|5)$/ && $hash->{fhem}->{is_double_wlan} == 1 ) {
if ( int @val == 1 && $val[0] =~ /^(on|off)$/ ) {
Log3 $name, 3, "FRITZBOX: set $name $cmd ".join(" ", @val);
push @cmdBuffer, lc ($cmd) . " " . join(" ", @val);
return FRITZBOX_Set_Cmd_Start $hash->{helper}{TimerCmd};
}
}
return "Unknown argument $cmd or wrong parameter(s), choose one of $list"; return "Unknown argument $cmd or wrong parameter(s), choose one of $list";
@ -1742,13 +1752,19 @@ sub FRITZBOX_Set_Cmd_Start($)
} }
# Preparing SET WLAN # Preparing SET WLAN
elsif ($val[0] eq "wlan") { elsif ($val[0] eq "wlan") {
shift @val;
$timeout = 10; $timeout = 10;
$cmdBufferTimeout = time() + $timeout; $cmdBufferTimeout = time() + $timeout;
$handover = $name . "|" . join( "|", @val ); $handover = $name . "|" . join( "|", @val );
$cmdFunction = "FRITZBOX_Wlan_Run_Web"; $cmdFunction = "FRITZBOX_Wlan_Run_Web";
$cmdFunction = "FRITZBOX_Wlan_Run_Shell" if $forceShell; $cmdFunction = "FRITZBOX_Wlan_Run_Shell" if $forceShell;
} }
# Preparing SET WLAN2.4
elsif ( $val[0] =~ /^wlan(2\.4|5)$/ ) {
$timeout = 10;
$cmdBufferTimeout = time() + $timeout;
$handover = $name . "|" . join( "|", @val );
$cmdFunction = "FRITZBOX_Wlan_Run_Web";
}
# No valid set operation # No valid set operation
else { else {
my $msg = "Unknown command '".join( " ", @val )."'"; my $msg = "Unknown command '".join( " ", @val )."'";
@ -2267,7 +2283,7 @@ sub FRITZBOX_GuestWlan_Run_Web($)
sub FRITZBOX_Wlan_Run_Shell($) sub FRITZBOX_Wlan_Run_Shell($)
{ {
my ($string) = @_; my ($string) = @_;
my ($name, @val) = split "\\|", $string; my ($name, $cmd, @val) = split "\\|", $string;
my $hash = $defs{$name}; my $hash = $defs{$name};
my $result; my $result;
my @readoutCmdArray; my @readoutCmdArray;
@ -2310,7 +2326,7 @@ sub FRITZBOX_Wlan_Run_Shell($)
sub FRITZBOX_Wlan_Run_Web($) sub FRITZBOX_Wlan_Run_Web($)
{ {
my ($string) = @_; my ($string) = @_;
my ($name, @val) = split "\\|", $string; my ($name, $cmd, @val) = split "\\|", $string;
my $hash = $defs{$name}; my $hash = $defs{$name};
my $result; my $result;
my @webCmdArray; my @webCmdArray;
@ -2324,15 +2340,18 @@ sub FRITZBOX_Wlan_Run_Web($)
# Set WLAN # Set WLAN
if ($hash->{WEBCM}) { #webcm if ($hash->{WEBCM}) { #webcm
push @webCmdArray, "wlan:settings/wlan_enable" => $state; push @webCmdArray, "wlan:settings/wlan_enable" => $state if $cmd eq "wlan";
push @webCmdArray, "wlan:settings/ap_enabled" => $state if $cmd eq "wlan2.4";
push @webCmdArray, "wlan:settings/ap_enabled_scnd" => $state if $cmd eq "wlan5";
FRITZBOX_Web_CmdPost ($hash, \@webCmdArray); FRITZBOX_Web_CmdPost ($hash, \@webCmdArray);
# push @webCmdArray, "active" => "on" if $val[0] eq "on"; # push @webCmdArray, "active" => "on" if $val[0] eq "on";
# FRITZBOX_Web_CmdPost ($hash, \@webCmdArray, '/wlan/wlan_settings.lua'); # FRITZBOX_Web_CmdPost ($hash, \@webCmdArray, '/wlan/wlan_settings.lua');
} }
elsif ($hash->{SECPORT}) { #TR-064 elsif ($hash->{SECPORT}) { #TR-064
push @tr064CmdArray, ["WLANConfiguration:1", "wlanconfig1", "SetEnable", "NewEnable", $state]; push @tr064CmdArray, ["WLANConfiguration:1", "wlanconfig1", "SetEnable", "NewEnable", $state]
if $cmd =~ /^(wlan|wlan2\.4)$/;
push @tr064CmdArray, ["WLANConfiguration:2", "wlanconfig2", "SetEnable", "NewEnable", $state] push @tr064CmdArray, ["WLANConfiguration:2", "wlanconfig2", "SetEnable", "NewEnable", $state]
if $hash->{fhem}->{is_double_wlan} == 1; if $hash->{fhem}->{is_double_wlan} == 1 && $cmd ne "wlan2.4";
$result = FRITZBOX_TR064_Cmd( $hash, 0, \@tr064CmdArray ); $result = FRITZBOX_TR064_Cmd( $hash, 0, \@tr064CmdArray );
} }
else { #no API else { #no API