Skip to content
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

Fix esp32 IDF version number handling for patch releases #2707

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Fix esp32 IDF version number handling for patch releases #2707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1f3dc8d
Fix esp32 IDF version number handling for minor releases
Jan 11, 2024
bc39c7c
Fix bluetooth build with esp32s3 for latest IDF 5.0
Jan 11, 2024
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: 1 addition & 1 deletion Sming/Arch/Esp32/Components/esp32/component.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ endif
endif

ifeq ($(ENABLE_BLUETOOTH),1)
ifeq (esp32s3-v5.2,$(ESP_VARIANT)-$(IDF_VERSION))
ifeq (esp32s3-1,$(ESP_VARIANT)-$(IDF_VERSION_5x))
ESP_BT_VARIANT := esp32c3
else
ESP_BT_VARIANT := $(ESP_VARIANT)
Expand Down
5 changes: 4 additions & 1 deletion Sming/Arch/Esp32/build.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,12 @@ export IDF_PATH := $(call FixPath,$(IDF_PATH))

# Extract IDF version
ifndef IDF_VER
# e.g. v5.2-beta1-265-g405b8b5512 or v5.0.5-173-g9d6770dfbb
IDF_VER := $(shell (cd $$IDF_PATH && git describe --always --tags --dirty) | cut -c 1-31)
endif
IDF_VERSION := $(firstword $(subst -, ,$(IDF_VER)))
# Now just vmajor.minor
IDF_VERSION := $(subst ., ,$(firstword $(subst -, ,$(IDF_VER))))
IDF_VERSION := $(firstword $(IDF_VERSION)).$(word 2,$(IDF_VERSION))

# By default, downloaded tools will be installed under $HOME/.espressif directory
# (%USERPROFILE%/.espressif on Windows). This path can be modified by setting
Expand Down
Loading