Merge remote-tracking branch 'upstream/main' into esp-analog-hang

Author: hierophect

.github/workflows/build.yml

@@ -35,6 +35,7 @@ jobs:
         python-version: 3.8
     - name: Install deps
       run: |
+        sudo apt-get update
         sudo apt-get install -y eatmydata
         sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 latexmk texlive-fonts-recommended texlive-latex-recommended texlive-latex-extra
         pip install requests sh click setuptools cpp-coveralls "Sphinx<4" sphinx-rtd-theme recommonmark sphinx-autoapi sphinxcontrib-svg2pdfconverter polib pyyaml astroid isort black awscli mypy

Makefile

@@ -265,7 +265,7 @@ update-frozen-libraries:
 	@echo "Updating all frozen libraries to latest tagged version."
 	cd frozen; for library in *; do cd $$library; ../../tools/git-checkout-latest-tag.sh; cd ..; done
 
-one-of-each: samd21 samd51 esp32s2 litex mimxrt10xx nrf stm
+one-of-each: samd21 litex mimxrt10xx nrf stm
 
 samd21:
 	$(MAKE) -C ports/atmel-samd BOARD=trinket_m0

docs/design_guide.rst

@@ -421,7 +421,7 @@ SPI Example
           """Widget's one register."""
           with self.spi_device as spi:
               spi.write(b'0x00')
-              i2c.readinto(self.buf)
+              spi.readinto(self.buf)
           return self.buf[0]
 
 Use composition
@@ -462,7 +462,7 @@ like properties for state even if it sacrifices a bit of speed.
 Avoid allocations in drivers
 --------------------------------------------------------------------------------
 
-Although Python doesn't require managing memory, its still a good practice for
+Although Python doesn't require managing memory, it's still a good practice for
 library writers to think about memory allocations. Avoid them in drivers if
 you can because you never know how much something will be called. Fewer
 allocations means less time spent cleaning up. So, where you can, prefer
@@ -471,7 +471,7 @@ object with methods that read or write into the buffer instead of creating new
 objects. Unified hardware API classes such as `busio.SPI` are design to read and
 write to subsections of buffers.
 
-Its ok to allocate an object to return to the user. Just beware of causing more
+It's ok to allocate an object to return to the user. Just beware of causing more
 than one allocation per call due to internal logic.
 
 **However**, this is a memory tradeoff so do not do it for large or rarely used
@@ -580,4 +580,4 @@ MicroPython compatibility
 --------------------------------------------------------------------------------
 
 Keeping compatibility with MicroPython isn't a high priority. It should be done
-when its not in conflict with any of the above goals.
+when it's not in conflict with any of the above goals.

docs/drivers.rst

@@ -12,7 +12,7 @@ Adafruit CircuitPython Library Bundle
 We provide a bundle of all our libraries to ease installation of drivers and
 their dependencies. The bundle is primarily geared to the Adafruit Express line
 of boards which feature a relatively large external flash. With Express boards,
-its easy to copy them all onto the filesystem. However, if you don't have
+it's easy to copy them all onto the filesystem. However, if you don't have
 enough space simply copy things over as they are needed.
 
 - The Adafruit bundles are available on GitHub: <https://github.com/adafruit/Adafruit_CircuitPython_Bundle/releases>.

docs/library/hashlib.rst

@@ -20,10 +20,10 @@ be implemented:
 * SHA1 - A previous generation algorithm. Not recommended for new usages,
   but SHA1 is a part of number of Internet standards and existing
   applications, so boards targeting network connectivity and
-  interoperatiability will try to provide this.
+  interoperability will try to provide this.
 
 * MD5 - A legacy algorithm, not considered cryptographically secure. Only
-  selected boards, targeting interoperatibility with legacy applications,
+  selected boards, targeting interoperability with legacy applications,
   will offer this.
 
 Constructors

docs/library/index.rst

@@ -21,7 +21,7 @@ standard Python library.
    You may need to change your code later if you rely
    on any non-standard functionality they currently provide.
 
-CircuitPython's goal long-term goalis that code written in CircuitPython
+CircuitPython's long-term goal is that code written in CircuitPython
 using Python standard libraries will be runnable on CPython without changes.
 
 Some libraries below are not enabled on CircuitPython builds with
@@ -69,7 +69,7 @@ CircuitPython/MicroPython-specific libraries
 --------------------------------------------
 
 Functionality specific to the CircuitPython/MicroPython implementation is available in
-the following libraries. These libraries may change signficantly or be removed in future
+the following libraries. These libraries may change significantly or be removed in future
 versions of CircuitPython.
 
 .. toctree::

docs/library/network.rst

@@ -71,7 +71,7 @@ parameter should be `id`.
        (password) required to access said service. There can be further
        arbitrary keyword-only parameters, depending on the networking medium
        type and/or particular device. Parameters can be used to: a)
-       specify alternative service identifer types; b) provide additional
+       specify alternative service identifier types; b) provide additional
        connection parameters. For various medium types, there are different
        sets of predefined/recommended parameters, among them:
 

docs/porting.rst

@@ -106,7 +106,7 @@ request a safe mode state which prevents the supervisor from running user code
 while still allowing access to the REPL and other resources.
 
 The core port initialization and reset methods are defined in
-``supervisor/port.c`` and should be the first to be implemented. Its required
+``supervisor/port.c`` and should be the first to be implemented. It's required
 that they be implemented in the ``supervisor`` directory within the port
 directory. That way, they are always in the expected place.
 

docs/troubleshooting.rst

@@ -13,7 +13,7 @@ When CircuitPython restarts it will create a fresh empty ``CIRCUITPY`` filesyste
 
 This often happens on Windows when the ``CIRCUITPY`` disk is not safely ejected
 before being reset by the button or being disconnected from USB. This can also
-happen on Linux and Mac OSX but its less likely.
+happen on Linux and Mac OSX but it's less likely.
 
 .. caution:: To erase and re-create ``CIRCUITPY`` (for example, to correct a corrupted filesystem),
     follow one of the procedures below. It's important to note that **any files stored on the**
@@ -43,7 +43,7 @@ ValueError: Incompatible ``.mpy`` file.
 
 This error occurs when importing a module that is stored as a ``mpy`` binary file
 (rather than a ``py`` text file) that was generated by a different version of
-CircuitPython than the one its being loaded into. Most versions are compatible
+CircuitPython than the one it's being loaded into. Most versions are compatible
 but, rarely they aren't. In particular, the ``mpy`` binary format changed between
 CircuitPython versions 1.x and 2.x, and will change again between 2.x and 3.x.
 

locale/circuitpython.pot

@@ -1560,7 +1560,11 @@ msgid "Prefix buffer must be on the heap"
 msgstr ""
 
 #: main.c
-msgid "Press any key to enter the REPL. Use CTRL-D to reload."
+msgid "Press any key to enter the REPL. Use CTRL-D to reload.\n"
+msgstr ""
+
+#: main.c
+msgid "Pretending to deep sleep until alarm, any key or file write.\n"
 msgstr ""
 
 #: shared-bindings/digitalio/DigitalInOut.c
@@ -2031,6 +2035,10 @@ msgstr ""
 msgid "WiFi password must be between 8 and 63 characters"
 msgstr ""
 
+#: main.c
+msgid "Woken up by alarm.\n"
+msgstr ""
+
 #: ports/nrf/common-hal/_bleio/PacketBuffer.c
 msgid "Writes not supported on Characteristic"
 msgstr ""