Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: micropython/micropython
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: micropython/micropython
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.26-release
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 7 commits
  • 17 files changed
  • 2 contributors

Commits on Sep 11, 2025

  1. esp32: Update esp_tinyusb component to v1.7.6. 

    Reported to fix issues reported with serial corruption when interacting
with MicroPython from macOS hosts.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <[email protected]>
    @projectgus @dpgeorge
    projectgus authored and dpgeorge committed Sep 11, 2025
    Configuration menu
    Copy the full SHA
    02b5d42 View commit details
    Browse the repository at this point in the history

  2. tools: Add an environment variable MICROPY_MAINTAINER_BUILD. 

    This allows us to have some things which are fatal errors in CI or nightly
builds, but warnings in normal developer builds.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <[email protected]>
    @projectgus @dpgeorge
    projectgus authored and dpgeorge committed Sep 11, 2025
    Configuration menu
    Copy the full SHA
    ad22089 View commit details
    Browse the repository at this point in the history

  3. esp32: Add IDF Component Lockfiles to git repo. 

    This is recommended by Espressif, and it's the only way to ensure
everyone builds the same set of component versions.

The awkward part is that updating the ESP-IDF version will churn a line
in each of these files (and possibly other changes).

Adds a build-time check for lock file changes, which is either a warning or
a hard error depending on the value of MICROPY_MAINTAINER_BUILD
flag (introduced in previous commit).

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <[email protected]>
    @projectgus @dpgeorge
    projectgus authored and dpgeorge committed Sep 11, 2025
    Configuration menu
    Copy the full SHA
    1abbdba View commit details
    Browse the repository at this point in the history

  4. shared/tinyusb: Fix hang from new tx_overwritabe_if_not_connected flag. 

    This flag is in the main branch of TinyUSB, included in Espressif since
their v0.18.0~3 component release (but it's not actually in TinyUSB v0.18.0
release).

Setting the flag is needed for the USB device not to block waiting for
space in the FIFO if the host is disconnected.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <[email protected]>
    @projectgus @dpgeorge
    projectgus authored and dpgeorge committed Sep 11, 2025
    Configuration menu
    Copy the full SHA
    7512ad6 View commit details
    Browse the repository at this point in the history

  5. shared/tinyusb/mp_usbd_cdc: Rewrite USB CDC TX loop. 

    This is related to the previous commit (where due to the new config flag
this loop could end up stuck indefinitely if the USB host was
disconnected). The previous loop could maybe still get stuck if the
low-level USB state and the high-level USB state got out of sync. (Not
clearly possible, but hard to say definitely not possible.)

To be "belts and braces" careful:

- Always run mp_usbd_task() each time around the loop to progress the
  state.
- Always evaluate the timeout if we fail to write anything to the FIFO.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <[email protected]>
    @projectgus @dpgeorge
    projectgus authored and dpgeorge committed Sep 11, 2025
    Configuration menu
    Copy the full SHA
    6940845 View commit details
    Browse the repository at this point in the history

  6. tools/mpremote: Don't apply Espressif DTR/RTS quirk to TinyUSB CDC dev. 

    The DTR quirk workaround from dea949e is needed for the Espressif
Serial/JTAG device, but not for TinyUSB - in fact DTR must be set for
TinyUSB to correctly determine if the serial port is open (and leads to
issues with lost bytes otherwise).

See discussion in PR #17999.

This work was funded through GitHub Sponsors.

Signed-off-by: Angus Gratton <[email protected]>
    @projectgus @dpgeorge
    projectgus authored and dpgeorge committed Sep 11, 2025
    Configuration menu
    Copy the full SHA
    0edead4 View commit details
    Browse the repository at this point in the history

  7. all: Bump version to 1.26.1. 

    Signed-off-by: Damien George <[email protected]>
    @dpgeorge
    dpgeorge committed Sep 11, 2025
    Configuration menu
    Copy the full SHA
    647c8b9 View commit details
    Browse the repository at this point in the history
Loading