Merge 6.0.x #4003
Closed
Merge 6.0.x #4003
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Get a chunk of data from readinto instead of a single byte. This speeds up the parsing by reducing the number of function calls. Fixes adafruit#3703
Speed up JSON parsing with readinto (adafruit#3728 for 6.0.x)
…to-6.0.x Backport adafruit#3867 (FrequencyIn fix) to 6.0.x
This is the same as I added to mpy-cross at e666e86, see adafruit#3074
ports/unix: Fix parallel build problem
There were conflicts in ports/nrf/common-hal/_bleio/Adapter.c and shared-bindings/_bleio/Adapter.c that I resolved by taking the "main" branch side. "BLE fixes" was applied via cherry pick to both branches, but "Round BLE timing values; fix timeout check" was applied only on the main, which git couldn't resolve on its own. There was a conflict in circuitpython.pot that I resolved by regenerating the file with `make translate`.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There were conflicts in ports/nrf/common-hal/_bleio/Adapter.c and shared-bindings/_bleio/Adapter.c that I resolved by taking the "main" branch side. "BLE fixes" was applied via cherry pick to both branches, but "Round BLE timing values; fix timeout check" was applied only on the main, which git couldn't resolve on its own.
There were conflicts in circuitpython.pot that I resolved by regenerating the file with
make translate.