Skip to content

Commit 227eeb1

Browse files
glennrubglennrub
committed
Merge remote-tracking branch 'upstream/master' into nrf5_no_sdk
2 parents d83c4fa + a0dbbbe commit 227eeb1

70 files changed

Lines changed: 222 additions & 270 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎cc3200/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ If `WIPY_IP`, `WIPY_USER` or `WIPY_PWD` are omitted the default values (the ones
138138
## Regarding old revisions of the CC3200-LAUNCHXL
139139

140140
First silicon (pre-release) revisions of the CC3200 had issues with the ram blocks, and MicroPython cannot run
141-
there. Make sure to use a **v4.1 (or higer) LAUNCHXL board** when trying this port, otherwise it won't work.
141+
there. Make sure to use a **v4.1 (or higher) LAUNCHXL board** when trying this port, otherwise it won't work.
142142

143143
### Note regarding FileZilla
144144

‎cc3200/application.mk‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ APP_LIB_SRC_C = $(addprefix lib/,\
151151

152152
APP_STM_SRC_C = $(addprefix stmhal/,\
153153
bufhelper.c \
154-
input.c \
155154
irq.c \
156155
pybstdio.c \
157156
)

‎cc3200/mpconfigport.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
#define MICROPY_VFS_FAT (1)
8181
#define MICROPY_PY_ASYNC_AWAIT (0)
8282
#define MICROPY_PY_ALL_SPECIAL_METHODS (1)
83+
#define MICROPY_PY_BUILTINS_INPUT (1)
8384
#define MICROPY_PY_BUILTINS_HELP (1)
8485
#define MICROPY_PY_BUILTINS_HELP_TEXT cc3200_help_text
8586
#ifndef DEBUG
@@ -142,7 +143,6 @@
142143

143144
// extra built in names to add to the global namespace
144145
#define MICROPY_PORT_BUILTINS \
145-
{ MP_OBJ_NEW_QSTR(MP_QSTR_input), (mp_obj_t)&mp_builtin_input_obj }, \
146146
{ MP_OBJ_NEW_QSTR(MP_QSTR_open), (mp_obj_t)&mp_builtin_open_obj }, \
147147

148148
// extra built in modules to add to the list of known ones

‎docs/esp8266/quickref.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,9 @@ Use the :ref:`machine.Pin <machine.Pin>` class::
107107
from machine import Pin
108108

109109
p0 = Pin(0, Pin.OUT) # create output pin on GPIO0
110-
p0.high() # set pin to high
111-
p0.low() # set pin to low
112-
p0.value(1) # set pin to high
110+
p0.on() # set pin to "on" (high) level
111+
p0.off() # set pin to "off" (low) level
112+
p0.value(1) # set pin to on/high
113113

114114
p2 = Pin(2, Pin.IN) # create input pin on GPIO2
115115
print(p2.value()) # get value, 0 or 1

‎docs/esp8266/tutorial/pins.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Then set its value using::
3535

3636
Or::
3737

38-
>>> pin.low()
39-
>>> pin.high()
38+
>>> pin.off()
39+
>>> pin.on()
4040

4141
External interrupts
4242
-------------------

‎docs/esp8266/tutorial/repl.rst‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,12 @@ turn it on and off using the following code::
101101

102102
>>> import machine
103103
>>> pin = machine.Pin(2, machine.Pin.OUT)
104-
>>> pin.high()
105-
>>> pin.low()
104+
>>> pin.on()
105+
>>> pin.off()
106106

107-
Note that ``high`` might turn the LED off and ``low`` might turn it on (or vice
108-
versa), depending on how the LED is wired on your board.
107+
Note that ``on`` method of a Pin might turn the LED off and ``off`` might
108+
turn it on (or vice versa), depending on how the LED is wired on your board.
109+
To resolve this, machine.Signal class is provided.
109110

110111
Line editing
111112
~~~~~~~~~~~~

‎docs/library/btree.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Functions
6969

7070
Open a database from a random-access `stream` (like an open file). All
7171
other parameters are optional and keyword-only, and allow to tweak advanced
72-
paramters of the database operation (most users will not need them):
72+
parameters of the database operation (most users will not need them):
7373

7474
* `flags` - Currently unused.
7575
* `cachesize` - Suggested maximum memory cache size in bytes. For a

‎docs/library/machine.Pin.rst‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -146,18 +146,20 @@ Methods
146146

147147
When setting the value this method returns ``None``.
148148

149-
.. method:: Pin.out_value()
150-
151-
Return the value stored in the output buffer of a pin, regardless of its mode.
152-
153-
Not all ports implement this method.
154-
155149
.. method:: Pin.__call__([x])
156150

157151
Pin objects are callable. The call method provides a (fast) shortcut to set
158152
and get the value of the pin. It is equivalent to Pin.value([x]).
159153
See :meth:`Pin.value` for more details.
160154

155+
.. method:: Pin.on()
156+
157+
Set pin to "1" output level.
158+
159+
.. method:: Pin.off()
160+
161+
Set pin to "0" output level.
162+
161163
.. method:: Pin.mode([mode])
162164

163165
Get or set the pin mode.

‎docs/library/machine.SD.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Methods
3434

3535
.. method:: SD.init(id=0, pins=('GP10', 'GP11', 'GP15'))
3636

37-
Enable the SD card. In order to initalize the card, give it a 3-tuple:
37+
Enable the SD card. In order to initialize the card, give it a 3-tuple:
3838
``(clk_pin, cmd_pin, dat0_pin)``.
3939

4040
.. method:: SD.deinit()

‎docs/library/machine.UART.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ UART objects can be created and initialised using::
1616
uart = UART(1, 9600) # init with given baudrate
1717
uart.init(9600, bits=8, parity=None, stop=1) # init with given parameters
1818

19-
Supported paramters differ on a board:
19+
Supported parameters differ on a board:
2020

2121
Pyboard: Bits can be 7, 8 or 9. Stop can be 1 or 2. With `parity=None`,
2222
only 8 and 9 bits are supported. With parity enabled, only 7 and 8 bits

0 commit comments

Comments
 (0)