diff options
| author | Lucian Copeland <hierophect@gmail.com> | 2020-04-17 13:27:48 -0400 |
|---|---|---|
| committer | Lucian Copeland <hierophect@gmail.com> | 2020-04-17 13:27:48 -0400 |
| commit | 25245bc44204856c6fd834d7d2bc30187a77bc3a (patch) | |
| tree | 61995279880cd0a49b797d0ad3897a38e3312bbc /docs | |
| parent | 3c50098dfc353b0f30f3a743d45dce9de95e060a (diff) | |
| parent | 1a71c8c51577cc7014d5db1c05084778c0b977e9 (diff) | |
Merge remote-tracking branch 'upstream/master' into stm32-docfix
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/design_guide.rst | 4 | ||||
| -rw-r--r-- | docs/library/network.rst | 2 | ||||
| -rw-r--r-- | docs/supported_ports.rst | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/docs/design_guide.rst b/docs/design_guide.rst index 5d965f907..6f87ecf79 100644 --- a/docs/design_guide.rst +++ b/docs/design_guide.rst @@ -476,6 +476,8 @@ properties. +-----------------------+-----------------------+-------------------------------------------------------------------------+ | ``distance`` | float | centimeters | +-----------------------+-----------------------+-------------------------------------------------------------------------+ +| ``proximity`` | int | non-unit-specifc proximity values (monotonic but not actual distance) | ++-----------------------+-----------------------+-------------------------------------------------------------------------+ | ``light`` | float | non-unit-specific light levels (should be monotonic but is not lux) | +-----------------------+-----------------------+-------------------------------------------------------------------------+ | ``lux`` | float | SI lux | @@ -504,6 +506,8 @@ properties. +-----------------------+-----------------------+-------------------------------------------------------------------------+ | ``weight`` | float | grams (g) | +-----------------------+-----------------------+-------------------------------------------------------------------------+ +| ``sound_level`` | float | non-unit-specific sound level (monotonic but not actual decibels) | ++-----------------------+-----------------------+-------------------------------------------------------------------------+ Adding native modules -------------------------------------------------------------------------------- diff --git a/docs/library/network.rst b/docs/library/network.rst index cdcc5f323..bd32267fe 100644 --- a/docs/library/network.rst +++ b/docs/library/network.rst @@ -247,7 +247,7 @@ Methods nic.ifconfig(('192.168.0.4', '255.255.255.0', '192.168.0.1', '8.8.8.8')) .. method:: wlan.config('param') -.. method:: wlan.config(param=value, ...) + wlan.config(param=value, ...) Get or set general network interface parameters. These methods allow to work with additional parameters beyond standard IP configuration (as dealt with by diff --git a/docs/supported_ports.rst b/docs/supported_ports.rst index 9416a9c4f..bd237fb5d 100644 --- a/docs/supported_ports.rst +++ b/docs/supported_ports.rst @@ -10,5 +10,5 @@ and ESP8266. ../ports/atmel-samd/README ../ports/mimxrt10xx/README ../ports/nrf/README - ../ports/stm32f4/README + ../ports/stm/README ../ports/cxd56/README |