Skip to content

Commit 334a9c8

Browse files
jeplerjepler
committed
Merge remote-tracking branch 'origin/main' into gifio
2 parents e733876 + a084124 commit 334a9c8

File tree

37 files changed

+655
-228
lines changed

37 files changed

+655
-228
lines changed

‎docs/design_guide.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ For example, a user can then use ``deinit()```::
9999
import board
100100
import time
101101

102-
led = digitalio.DigitalInOut(board.D13)
102+
led = digitalio.DigitalInOut(board.LED)
103103
led.direction = digitalio.Direction.OUTPUT
104104

105105
for i in range(10):
@@ -119,7 +119,7 @@ Alternatively, using a ``with`` statement ensures that the hardware is deinitial
119119
import board
120120
import time
121121

122-
with digitalio.DigitalInOut(board.D13) as led:
122+
with digitalio.DigitalInOut(board.LED) as led:
123123
led.direction = digitalio.Direction.OUTPUT
124124

125125
for i in range(10):

‎docs/troubleshooting.rst‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,32 +11,35 @@ If your host computer starts complaining that your ``CIRCUITPY`` drive is corrup
1111
or files cannot be overwritten or deleted, then you will have to erase it completely.
1212
When CircuitPython restarts it will create a fresh empty ``CIRCUITPY`` filesystem.
1313

14-
This often happens on Windows when the ``CIRCUITPY`` disk is not safely ejected
14+
Corruption often happens on Windows when the ``CIRCUITPY`` disk is not safely ejected
1515
before being reset by the button or being disconnected from USB. This can also
1616
happen on Linux and Mac OSX but it's less likely.
1717

1818
.. caution:: To erase and re-create ``CIRCUITPY`` (for example, to correct a corrupted filesystem),
1919
follow one of the procedures below. It's important to note that **any files stored on the**
20-
``CIRCUITPY`` **drive will be erased**.
20+
``CIRCUITPY`` **drive will be erased. Back up your code if possible before continuing!**
2121

22-
**For boards with** ``CIRCUITPY`` **stored on a separate SPI flash chip,
23-
such as Feather M0 Express, Metro M0 Express and Circuit Playground Express:**
22+
REPL Erase Method
23+
^^^^^^^^^^^^^^^^^
24+
This is the recommended method of erasing your board. If you are having trouble accessing the
25+
``CIRCUITPY`` drive or the REPL, consider first putting your board into
26+
`safe mode <https://learn.adafruit.com/welcome-to-circuitpython/troubleshooting#safe-mode-3105351-22>`_.
2427

28+
**To erase any board if you have access to the REPL:**
2529

26-
#. Download the appropriate flash .erase uf2 from `the Adafruit_SPIFlash repo <https://github.com/adafruit/Adafruit_SPIFlash/tree/master/examples/flash_erase_express>`_.
27-
#. Double-click the reset button.
28-
#. Copy the appropriate .uf2 to the xxxBOOT drive.
29-
#. The on-board NeoPixel will turn blue, indicating the erase has started.
30-
#. After about 15 seconds, the NexoPixel will start flashing green. If it flashes red, the erase failed.
31-
#. Double-click again and load the appropriate `CircuitPython .uf2 <https://github.com/adafruit/circuitpython/releases/latest>`_.
30+
#. Connect to the CircuitPython REPL using a terminal program.
31+
#. Type ``import storage`` into the REPL.
32+
#. Then, type ``storage.erase_filesystem()`` into the REPL.
33+
#. The ``CIRCUITPY`` drive will be erased and the board will restart with an empty ``CIRCUITPY`` drive.
3234

33-
**For boards without SPI flash, such as Feather M0 Proto, Gemma M0 and, Trinket M0:**
35+
Erase File Method
36+
^^^^^^^^^^^^^^^^^
37+
**If you do not have access to the REPL, you may still have options to erase your board.**
3438

35-
#. Download the appropriate erase .uf2 from `the Learn repo <https://github.com/adafruit/Adafruit_Learning_System_Guides/tree/master/uf2_flash_erasers>`_.
36-
#. Double-click the reset button.
37-
#. Copy the appropriate .uf2 to the xxxBOOT drive.
38-
#. The boot LED will start pulsing again, and the xxxBOOT drive will appear again.
39-
#. Load the appropriate `CircuitPython .uf2 <https://github.com/adafruit/circuitpython/releases/latest>`_.
39+
The `Erase CIRCUITPY Without Access to the REPL <https://learn.adafruit.com/welcome-to-circuitpython/troubleshooting#erase-circuitpy-without-access-to-the-repl-3105309-32>`_
40+
section of the Troubleshooting page in the Welcome to CircuitPython guide covers the non-REPL
41+
erase process for various boards. Visit the guide, find the process that applies to your board,
42+
and follow the instructions to erase your board.
4043

4144
ValueError: Incompatible ``.mpy`` file.
4245
---------------------------------------

‎locale/circuitpython.pot‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,7 @@ msgstr ""
347347
msgid "64 bit types"
348348
msgstr ""
349349

350+
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
350351
#: ports/atmel-samd/common-hal/countio/Counter.c
351352
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
352353
msgid "A hardware interrupt channel is already in use"
@@ -625,6 +626,10 @@ msgstr ""
625626
msgid "Buffer too short by %d bytes"
626627
msgstr ""
627628

629+
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
630+
msgid "Buffers must be same size"
631+
msgstr ""
632+
628633
#: ports/atmel-samd/common-hal/paralleldisplay/ParallelBus.c
629634
#: ports/espressif/common-hal/paralleldisplay/ParallelBus.c
630635
#: ports/nrf/common-hal/paralleldisplay/ParallelBus.c
@@ -1587,6 +1592,10 @@ msgstr ""
15871592
msgid "No available clocks"
15881593
msgstr ""
15891594

1595+
#: ports/espressif/common-hal/imagecapture/ParallelImageCapture.c
1596+
msgid "No capture in progress"
1597+
msgstr ""
1598+
15901599
#: shared-bindings/_bleio/PacketBuffer.c
15911600
msgid "No connection: length cannot be determined"
15921601
msgstr ""
@@ -1607,6 +1616,7 @@ msgstr ""
16071616
msgid "No hardware support on clk pin"
16081617
msgstr ""
16091618

1619+
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
16101620
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
16111621
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
16121622
msgid "No hardware support on pin"
@@ -1727,7 +1737,6 @@ msgstr ""
17271737
msgid "Only connectable advertisements can be directed"
17281738
msgstr ""
17291739

1730-
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
17311740
#: ports/stm/common-hal/alarm/pin/PinAlarm.c
17321741
msgid "Only edge detection is available on this hardware"
17331742
msgstr ""
@@ -1822,6 +1831,7 @@ msgstr ""
18221831
msgid "Permission denied"
18231832
msgstr ""
18241833

1834+
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
18251835
#: ports/stm/common-hal/alarm/pin/PinAlarm.c
18261836
msgid "Pin cannot wake from Deep Sleep"
18271837
msgstr ""
@@ -2175,6 +2185,10 @@ msgstr ""
21752185
msgid "The sample's signedness does not match the mixer's"
21762186
msgstr ""
21772187

2188+
#: shared-module/imagecapture/ParallelImageCapture.c
2189+
msgid "This microcontroller does not support continuous capture."
2190+
msgstr ""
2191+
21782192
#: shared-module/paralleldisplay/ParallelBus.c
21792193
msgid ""
21802194
"This microcontroller only supports data0=, not data_pins=, because it "
@@ -3881,6 +3895,7 @@ msgstr ""
38813895
msgid "pow() with 3 arguments requires integers"
38823896
msgstr ""
38833897

3898+
#: ports/espressif/boards/adafruit_feather_esp32s2/mpconfigboard.h
38843899
#: ports/espressif/boards/adafruit_feather_esp32s2_nopsram/mpconfigboard.h
38853900
#: ports/espressif/boards/adafruit_feather_esp32s2_tftback_nopsram/mpconfigboard.h
38863901
#: ports/espressif/boards/adafruit_funhouse/mpconfigboard.h

0 commit comments

Comments
 (0)