summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--cc3200/mods/modwlan.c1
-rw-r--r--docs/library/network.rst4
2 files changed, 2 insertions, 3 deletions
diff --git a/cc3200/mods/modwlan.c b/cc3200/mods/modwlan.c
index 2997e8d38..a7ee59281 100644
--- a/cc3200/mods/modwlan.c
+++ b/cc3200/mods/modwlan.c
@@ -110,7 +110,6 @@ typedef enum{
#define MODWLAN_SL_SCAN_DISABLE 0
#define MODWLAN_SL_MAX_NETWORKS 20
-#define MODWLAN_TIMEOUT_MS 5000
#define MODWLAN_MAX_NETWORKS 20
#define MODWLAN_SCAN_PERIOD_S 3600 // 1 hour
#define MODWLAN_WAIT_FOR_SCAN_MS 1050
diff --git a/docs/library/network.rst b/docs/library/network.rst
index d4725055a..f60de7da6 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -357,7 +357,7 @@ For example::
# configure as an station
wlan.init(mode=WLAN.STA)
- .. method:: wlan.connect(ssid, \*, auth=None, bssid=None, timeout=5000)
+ .. method:: wlan.connect(ssid, \*, auth=None, bssid=None, timeout=None)
Connect to a wifi access point using the given SSID, and other security
parameters.
@@ -365,7 +365,7 @@ For example::
- ``auth`` is a tuple with (sec, key). Security can be ``None``, ``WLAN.WEP``,
``WLAN.WPA`` or ``WLAN.WPA2``. The key is a string with the network password.
If ``sec`` is ``WLAN.WEP`` the key must be a string representing hexadecimal
- values (e.g. 'ABC1DE45BF'). Only needed when mode is ``WLAN.AP``
+ values (e.g. 'ABC1DE45BF').
- ``bssid`` is the MAC address of the AP to connect to. Useful when there are several
APs with the same ssid.
- ``timeout`` is the maximum time in milliseconds to wait for the connection to succeed.