summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-03-27 06:59:29 +0300
committerPaul Sokolovsky <pfalcon@users.sourceforge.net>2016-03-27 06:59:39 +0300
commit87c783b45487fba24615838ad297bf755cb344d3 (patch)
tree689cdaaf8aa66c899b27deec7533c916fe3a194b
parent679fe0abae92c6dc503b9ebc4a3b594a8b1f6aeb (diff)
downloadmicropython-87c783b45487fba24615838ad297bf755cb344d3.tar.gz
micropython-87c783b45487fba24615838ad297bf755cb344d3.zip
docs/esp8266: esp.mac() replaced with network.WLAN.mac().
-rw-r--r--docs/library/esp.rst7
-rw-r--r--docs/library/network.rst8
2 files changed, 8 insertions, 7 deletions
diff --git a/docs/library/esp.rst b/docs/library/esp.rst
index 0e7c65f5d2..d1fbe9f259 100644
--- a/docs/library/esp.rst
+++ b/docs/library/esp.rst
@@ -10,13 +10,6 @@ The ``esp`` module contains specific functions related to the ESP8266 module.
Functions
---------
-.. function:: mac([address])
-
- Get or set the network interface's MAC address.
-
- If the ``address`` parameter is provided, sets the address to its value. If
- the function is called wihout parameters, returns the current address.
-
.. function:: sleep_type([sleep_type])
Get or set the sleep type.
diff --git a/docs/library/network.rst b/docs/library/network.rst
index 9a37caf1a8..98b5b307ee 100644
--- a/docs/library/network.rst
+++ b/docs/library/network.rst
@@ -283,6 +283,14 @@ For example::
Disconnect from the currently connected wireless network.
+ .. method:: wlan.mac([address])
+
+ Get or set the network interface MAC address.
+
+ If the ``address`` parameter is provided, sets the address to its
+ value, which should be bytes object of length 6. If the function
+ is called wihout parameters, returns the current address.
+
.. method:: wlan.scan(cb)
Initiate scanning for the available wireless networks.