Merge 1.16 #4897

jepler · 2021-06-18T15:54:54Z

Notable changes for CircuitPython:

In the Python core, OSError exceptions now support the ".errno" attribute
There has been a minor breaking change to a relative import exception: what was previously a ValueError was changed to ImportError, following the same change in CPython

Signed-off-by: Damien George <damien@micropython.org>

Improvements are: - Default period is 1000ms with callback disabled. - if period is not specified then it's not updated (previously, if period was not specified then it was set to -1 and running the timer callback as fast as possible, making the REPL unresponsive). - Use uint64_t to compute delta_ms, and raise a ValueError if the period is too large. - If callback is not specified then it's not updated. - Specifying None for the callback will disable the timer. Signed-off-by: Damien George <damien@micropython.org>

- unpack-dfu command no longer requies a secret key to be present - pack-dfu command raises an exception if no secret key is found

This commit adds the errno attribute to exceptions, so code can retrieve errno codes from an OSError using exc.errno. The implementation here simply lets `errno` (and the existing `value`) attributes work on any exception instance (they both alias args[0]). This is for efficiency and to keep code size down. The pros and cons of this are: Pros: - more compatible with CPython, less difference to document and learn - OSError().errno will correctly return None, whereas the current way of doing it via OSError().args[0] will raise an IndexError - it reduces code size on most bare-metal ports (because they already have the errno qstr) - for Python code that uses exc.errno the generated bytecode is 2 bytes smaller and more efficient to execute (compared with exc.args[0]); so bytecode loaded to RAM saves 2 bytes RAM for each use of this attribute, and bytecode that is frozen saves 2 bytes flash/ROM for each use - it's easier/shorter to type, and saves 2 bytes of space in .py files that use it (for each use) Cons: - increases code size by 4-8 bytes on minimal ports that don't already have the `errno` qstr - all exceptions now have .errno and .value attributes (a cpydiff test is added to address this) See also adafruit#2407. Signed-off-by: Damien George <damien@micropython.org>

Signed-off-by: Damien George <damien@micropython.org>

This is now the default, but can be overridden with CLI `--no-exclusive`, or constructing `Pyboard(..., exclusive=False)`. Signed-off-by: Damien George <damien@micropython.org>

Because "find_package(Python3 ...)" requires at least this version of CMake. And other features like GREATER_EQUAL and COMMAND_EXPAND_LISTS need at least CMake 3.7 and 3.8 respectively. Signed-off-by: Damien George <damien@micropython.org>

So this driver works on faster MCUs (that run this loop fast) with older, slower SD cards. Fixes issue adafruit#7129. Signed-off-by: Damien George <damien@micropython.org>

It was made obsolete by commit c98c128. Signed-off-by: Damien George <damien@micropython.org>

Signed-off-by: Damien George <damien@micropython.org>

Since version 21.4b0, Black now processes one-line docstrings by stripping leading and trailing spaces, and adding a padding space when needed to break up """"; see psf/black#1740 This commit makes the Python code in this repository conform to this rule.

Signed-off-by: Damien George <damien@micropython.org>

This introduces a new option, MICROPY_ERROR_REPORTING_NONE, which completely disables all error messages. To be used in cases where MicroPython needs to fit in very limited systems. Signed-off-by: Damien George <damien@micropython.org>

Reduces size of this port by about 3300 bytes, and demonstrates how to use this feature. Signed-off-by: Damien George <damien@micropython.org>

Signed-off-by: Damien George <damien@micropython.org>

Previously to this commit, Usart16ClockSelection was overwritten and Usart234578ClockSelection was not set.

This commit re-enables the command-line make option "FROZEN_MANIFEST". The boards/*/mpconfigboard.cmake will now use the command-line FROZEN_MANIFEST value if supplied. Usage: make FROZEN_MANIFEST=~/foo/my-manifest.py

Signed-off-by: Damien George <damien@micropython.org>

This adds support for making static (ie not on the Python GC heap) soft timers. This can be useful for a board to define a custom background handler, or eventually for BLE/network processing to use instead of systick slots; it will be more efficient using soft timer for this. The main issue with using the existing code for static soft timers is that it would combine heap allocated and statically allocated soft_timer_entry_t instances in the same pairing-heap data structure. This would prevent the GC from tracing some of the heap allocated entries (because the GC won't follow pointers outside the heap). This commit makes it so that soft timer entries are explicitly marked, instead of relying on implicit marking by having the root of the pairing heap in the root pointer section. Also, on soft reset only the heap- allocated soft timers are deleted from the pairing heap, leaving the statically allocated ones. Signed-off-by: Damien George <damien@micropython.org>

And use the same boardctrl.h header for both the application and mboot so these constants are consistent. Signed-off-by: Damien George <damien@micropython.org>

Commit 1e297c8 introduced a bug where the very first reset-mode state on the LEDs was not shown, because prior to that commit the first reset-mode state was the same as the initial LED state (green on, others off) and update_reset_mode() was called after setting this initial LED state. This is fixed in this commit by changing the update_reset_mode() loop so that it displays the current reset mode before doing the delay. Signed-off-by: Damien George <damien@micropython.org>

A board can now use BUILDING_MBOOT at the Makefile-level to do things conditional on building mboot, for example add source files to SRC_C. Signed-off-by: Damien George <damien@micropython.org>

Signed-off-by: Damien George <damien@micropython.org>

Commit 0abf6f8 removed _boot.py from the manifest for the GENERIC_512K board because the build does not include a filesystem. But the main code expects _boot.py to be there and prints an error if it's not. So add a custom _boot.py, which just sets the gc.threshold(). Signed-off-by: Damien George <damien@micropython.org>

It's not supported on older GCC versions. Signed-off-by: Damien George <damien@micropython.org>

2.5 can be represented correctly in object representation C, but 2.3 cannot (it is slightly truncated). Signed-off-by: Damien George <damien@micropython.org>

Signed-off-by: Damien George <damien@micropython.org>

jepler · 2021-06-18T15:55:24Z

Unix tests pass locally, I'll let CI chew on the rest and see where we're at.

tannewt

Thanks for taking on this merge!

Please delete ports/zephyr, ports/rp2, ports/esp32 and ports/esp8266. We have our own ports and the extra folders confuse folks.

I delete tests/multi_{net,bluetooth} too since we don't use it.

We may want to delete tools/mpremote as well. I don't think it'll work with CircuitPython and I doubt we want to support it.

tools/pyboard.py

Co-authored-by: Scott Shawcroft <scott@tannewt.org>

jepler · 2021-06-22T00:52:56Z

@tannewt OK, got those all I think. Do you want me to try to "squash" this to a single merge commit, or did your recent experiences lead you to think that's not such a good idea?

tannewt · 2021-06-22T18:52:01Z

No need to squash. It's funny with merge commits.

I see a ports/qemu-arm left that I forgot to list. For reference, I used this script to delete other ports: https://github.com/adafruit/circuitpython/blob/main/tools/merge_micropython.py#L13

tannewt

Looks great! Thank you!

ladyada · 2021-06-23T17:16:55Z

woo hoo!

dpgeorge and others added 30 commits April 20, 2021 21:39

tools/metrics.py: Add rp2 port to table of ports that can be built.

b74dc54

Signed-off-by: Damien George <damien@micropython.org>

stm32/boards/pllvalues.py: Support wider range of PLL values for F413.

6e0f9b9

Signed-off-by: Damien George <damien@micropython.org>

stm32/mboot: Allow unpacking dfu without secret key.

5669a60

- unpack-dfu command no longer requies a secret key to be present - pack-dfu command raises an exception if no secret key is found

tools/upip.py: Use .errno instead of .args[0] for OSError exceptions.

ac1d01d

Signed-off-by: Damien George <damien@micropython.org>

extmod/uasyncio: Use .errno instead of .args[0] for OSError exceptions.

342d555

Signed-off-by: Damien George <damien@micropython.org>

tests: Use .errno instead of .args[0] for OSError exceptions.

3123f69

Signed-off-by: Damien George <damien@micropython.org>

tools/pyboard.py: Support opening serial port in exclusive mode.

178198a

This is now the default, but can be overridden with CLI `--no-exclusive`, or constructing `Pyboard(..., exclusive=False)`. Signed-off-by: Damien George <damien@micropython.org>

windows/mpconfigport.h: Enable features also present in unix port.

bb2007b

drivers/sdcard: Add sleep_ms(1) delay in SDCard.readinto sync loop.

a1bc32d

So this driver works on faster MCUs (that run this loop fast) with older, slower SD cards. Fixes issue adafruit#7129. Signed-off-by: Damien George <damien@micropython.org>

lib/utils: Remove unused PYEXEC_SWITCH_MODE from pyexec.h.

530c76f

It was made obsolete by commit c98c128. Signed-off-by: Damien George <damien@micropython.org>

teensy: Provide own implementation of gc_collect, to not use stm32.

65b90cd

Signed-off-by: Damien George <damien@micropython.org>

top: Update .git-blame-ignore-revs for latest formatting commit.

30d9f77

Signed-off-by: Damien George <damien@micropython.org>

bare-arm: Switch to use MICROPY_ERROR_REPORTING_NONE to reduce size.

43a8c81

Reduces size of this port by about 3300 bytes, and demonstrates how to use this feature. Signed-off-by: Damien George <damien@micropython.org>

py/dynruntime.h: Add mp_obj_get_array() function.

c5cbfd5

Signed-off-by: Damien George <damien@micropython.org>

pic16bit/Makefile: Make the XC compiler version user-configurable.

f452b9c

stm32,teensy: Correct typos in project README files.

4dc8024

stm32/uart: Fix H7 UART clock source configuration.

a708848

Previously to this commit, Usart16ClockSelection was overwritten and Usart234578ClockSelection was not set.

esp32: Restore FROZEN_MANIFEST support with new CMake build system.

21fee92

This commit re-enables the command-line make option "FROZEN_MANIFEST". The boards/*/mpconfigboard.cmake will now use the command-line FROZEN_MANIFEST value if supplied. Usage: make FROZEN_MANIFEST=~/foo/my-manifest.py

tools/makemanifest.py: Show directory name if there is a FreezeError.

326dd7f

stm32/softtimer: Add support for having a C-based callback.

89b6447

Signed-off-by: Damien George <damien@micropython.org>

stm32/boardctrl: Add constants for reset mode values.

a72b844

And use the same boardctrl.h header for both the application and mboot so these constants are consistent. Signed-off-by: Damien George <damien@micropython.org>

stm32/mboot: Allow a board to add source files to the build.

ef2896b

A board can now use BUILDING_MBOOT at the Makefile-level to do things conditional on building mboot, for example add source files to SRC_C. Signed-off-by: Damien George <damien@micropython.org>

stm32/adc: Allow mboot to use basic ADC functions.

fd01b6c

Signed-off-by: Damien George <damien@micropython.org>

dpgeorge and others added 5 commits June 18, 2021 14:13

py/gc: Only use no_sanitize_address attribute for GCC 4.8 and above.

bc89cde

It's not supported on older GCC versions. Signed-off-by: Damien George <damien@micropython.org>

tests/float: Make bytes/bytearray construct tests work with obj repr C.

adf35cb

2.5 can be represented correctly in object representation C, but 2.3 cannot (it is slightly truncated). Signed-off-by: Damien George <damien@micropython.org>

all: Bump version to 1.16.

7c51cb2

Signed-off-by: Damien George <damien@micropython.org>

Merge tag 'v1.16'

87d3740

jepler marked this pull request as draft June 18, 2021 15:55

jepler added 7 commits June 18, 2021 10:58

Fix trailing whitespace

7b46187

remove workflow file from micropython

c50c05a

remove micropython board

8647097

fix keyboard interrupt

e1d7e46

restore a redundant NULL-comparison, it silences compiler diagnostics

fa29be5

remove docs added in merge

a703561

fix compile error on boards with inline asm

a5876f4

jepler mentioned this pull request Jun 18, 2021

nrf seems not to use the micropython math library #4898

Closed

jepler marked this pull request as ready for review June 18, 2021 23:23

jepler requested a review from dhalbert June 18, 2021 23:23

tannewt removed the request for review from dhalbert June 21, 2021 22:59

tannewt requested changes Jun 21, 2021

View reviewed changes

tools/pyboard.py Outdated Show resolved Hide resolved

jepler and others added 3 commits June 21, 2021 19:49

Update tools/pyboard.py

4401d73

Co-authored-by: Scott Shawcroft <scott@tannewt.org>

review suggestion: remove files

680ac93

finish copyright-notice suggestion

b1785eb

another file to remove

4fd9466

jepler force-pushed the merge-1.16 branch from 99d3e9a to 4fd9466 Compare June 22, 2021 19:59

tannewt approved these changes Jun 23, 2021

View reviewed changes

tannewt merged commit a7e353b into adafruit:main Jun 23, 2021

jepler deleted the merge-1.16 branch November 3, 2021 21:10

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge 1.16 #4897

Merge 1.16 #4897

jepler commented Jun 18, 2021 •

edited

jepler commented Jun 18, 2021

tannewt left a comment

jepler commented Jun 22, 2021

tannewt commented Jun 22, 2021

tannewt left a comment

ladyada commented Jun 23, 2021

Merge 1.16 #4897

Merge 1.16 #4897

Conversation

jepler commented Jun 18, 2021 • edited

jepler commented Jun 18, 2021

tannewt left a comment

Choose a reason for hiding this comment

jepler commented Jun 22, 2021

tannewt commented Jun 22, 2021

tannewt left a comment

Choose a reason for hiding this comment

ladyada commented Jun 23, 2021

jepler commented Jun 18, 2021 •

edited