From ce1f80a696cea5c7997f2c533e39386883e84733 Mon Sep 17 00:00:00 2001
From: grompo <grompo@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Sun, 1 May 2016 18:30:07 +0000
Subject: [PATCH] FRITZBOX: wlan upload speed added

git-svn-id: https://svn.fhem.de/fhem/trunk@11363 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/72_FRITZBOX.pm | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/fhem/FHEM/72_FRITZBOX.pm b/fhem/FHEM/72_FRITZBOX.pm
index 8ed678aed..31144cb38 100644
--- a/fhem/FHEM/72_FRITZBOX.pm
+++ b/fhem/FHEM/72_FRITZBOX.pm
@@ -1252,11 +1252,12 @@ sub FRITZBOX_Readout_Run_Web($)
    my $queryStr = "&radio=configd:settings/WEBRADIO/list(Name)"; # Webradio
    $queryStr .= "&box_dect=dect:settings/enabled"; # DECT Sender
    $queryStr .= "&handset=dect:settings/Handset/list(User,Manufacturer,Model,FWVersion)"; # DECT Handsets
-   $queryStr .= "&wlanList=wlan:settings/wlanlist/list(mac,speed_rx)"; # WLAN devices
-   #wlan:settings/wlanlist/list(hostname,mac,UID,state,quality,cipher,wmm_active,powersave,is_ap,ap_state,flags,flags_set,mode,speed,speed_rx,channel_width,streams)
+   $queryStr .= "&wlanList=wlan:settings/wlanlist/list(mac,speed,speed_rx)"; # WLAN devices
+   #wlan:settings/wlanlist/list(hostname,mac,UID,state,rssi,quality,is_turbo,cipher,wmm_active,powersave,is_ap,ap_state,is_repeater,flags,flags_set,mode,is_guest,speed,speed_rx,channel_width,streams)
    $queryStr .= "&lanDevice=landevice:settings/landevice/list(ip,ethernet,ethernet_port,name,mac,active,online,wlan,speed)"; # LAN devices
    #landevice:settings/landevice/list(name,ip,mac,UID,dhcp,wlan,ethernet,active,static_dhcp,manu_name,wakeup,deleteable,source,online,speed,wlan_UIDs,auto_wakeup,guest,url,wlan_station_type,vendorname)
    #landevice:settings/landevice/list(name,ip,mac,parentname,parentuid,ethernet_port,wlan_show_in_monitor,plc,ipv6_ifid,parental_control_abuse,plc_UIDs)
+   #landevice:settings/landevice/list(name,ip,mac,UID,dhcp,wlan,ethernet,active,static_dhcp,manu_name,wakeup,deleteable,source,online,speed,wlan_UIDs,auto_wakeup,guest,url,wlan_station_type,vendorname,parentname,parentuid,ethernet_port,wlan_show_in_monitor,plc,ipv6_ifid,parental_control_abuse,plc_UIDs)
    $queryStr .= "&init=telcfg:settings/Foncontrol"; # Init
    $queryStr .= "&box_stdDialPort=telcfg:settings/DialPort"; #Dial Port
    $queryStr .= "&dectUser=telcfg:settings/Foncontrol/User/list(Id,Name,Intern,IntRingTone,AlarmRingTone0,RadioRingID,ImagePath,G722RingTone,G722RingToneName)"; # DECT Numbers
@@ -1392,8 +1393,10 @@ sub FRITZBOX_Readout_Run_Web($)
 # Create WLAN-List
    my %wlanList;
    foreach ( @{ $result->{wlanList} } ) {
-      $wlanList{$_->{mac}} = $_->{speed_rx};
-      FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->wlanDevice->".$_->{mac}, $_->{speed_rx};
+      $wlanList{$_->{mac}}{speed} = $_->{speed};
+      $wlanList{$_->{mac}}{speed_rx} = $_->{speed_rx};
+      FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->wlanDevice->".$_->{mac}."->speed", $_->{speed};
+      FRITZBOX_Readout_Add_Reading $hash, \@roReadings, "fhem->wlanDevice->".$_->{mac}."->speed_rx", $_->{speed_rx};
    }
    
 # Create LanDevice list and delete inactive devices
@@ -1415,14 +1418,14 @@ sub FRITZBOX_Readout_Run_Web($)
             $dName .= " (";
             $dName .= "guest"    if $_->{guest};
             $dName .= "WLAN";
-            $dName .= ", " . $wlanList{$_->{mac}} . " Mbit/s"   if defined $wlanList{$_->{mac}};
+            $dName .= ", " . $wlanList{$_->{mac}}{speed} . " / " . $wlanList{$_->{mac}}{speed_rx} . " Mbit/s"   if defined $wlanList{$_->{mac}};
             $dName .= ")";
          }
          if ( $_->{ethernet} == 1 ) {
             $dName .= " (";
-            $dName .= "guest"    if $_->{guest};
+            $dName .= "guest"         if $_->{guest};
             $dName .= "LAN" . $_->{ethernet_port};
-            $dName .= ", 1 Gbit/s"              if $_->{speed} == 1000;
+            $dName .= ", 1 Gbit/s"    if $_->{speed} == 1000;
             $dName .= ", " . $_->{speed} . " Mbit/s"   if $_->{speed} != 1000 && $_->{speed} != 0;
             $dName .= ")";
          }