Skip to content

Merge 6.0.x #4003

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 11 commits into from
Closed

Merge 6.0.x #4003

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6fd9c48
BLE fixes
dhalbert Dec 22, 2020
078a799
make translate
dhalbert Dec 22, 2020
3266720
Merge pull request #3861 from dhalbert/ble-fixes-6.0.x
tannewt Dec 22, 2020
ebc765e
Speed up JSON parsing with readinto
tannewt Nov 20, 2020
fc1f47d
Ignore size parameter
tannewt Nov 23, 2020
eb03e4b
FrequencyIn: do not raise in interrupt handler
dhalbert Dec 22, 2020
baa053b
Merge pull request #3870 from dhalbert/speedup_json-6.0.x
tannewt Dec 23, 2020
eda1f81
Merge pull request #3872 from dhalbert/frequencyin-fix-6.0.x-to-6.0.x
dhalbert Dec 23, 2020
b204778
ports/unix: Fix parallel build problem
jepler Jan 13, 2021
aecb8a5
Merge pull request #3990 from jepler/make-dependency-race
dhalbert Jan 14, 2021
13dd914
Merge remote-tracking branch 'origin/6.0.x' into merge-6.0.x
jepler Jan 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ports/unix/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,3 +318,5 @@ $(BUILD)/libaxtls.a: $(TOP)/lib/axtls/README | $(OBJ_DIRS)
$(TOP)/lib/axtls/README:
@echo "You cloned without --recursive, fetching submodules for you."
(cd $(TOP); git submodule update --init --recursive)

$(BUILD)/supervisor/shared/translate.o: $(HEADER_BUILD)/qstrdefs.generated.h