From 1f3dc8dd1ec5a642f595edd582bc2ee63943aeae Mon Sep 17 00:00:00 2001 From: mikee47 Date: Thu, 11 Jan 2024 09:26:56 +0000 Subject: [PATCH 1/2] Fix esp32 IDF version number handling for minor releases For example where branch is tagged 'v5.0.5-173-g9d6770dfbb' we require just 'v5.0' to identify toolsets, python, etc. --- Sming/Arch/Esp32/build.mk | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Sming/Arch/Esp32/build.mk b/Sming/Arch/Esp32/build.mk index 4db95bf8c7..c1b1fee5a1 100644 --- a/Sming/Arch/Esp32/build.mk +++ b/Sming/Arch/Esp32/build.mk @@ -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 From bc39c7c0f62741fed0c754e4ebcccae7d270f4fb Mon Sep 17 00:00:00 2001 From: mikee47 Date: Thu, 11 Jan 2024 11:23:24 +0000 Subject: [PATCH 2/2] Fix bluetooth build with esp32s3 for latest IDF 5.0 --- Sming/Arch/Esp32/Components/esp32/component.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Sming/Arch/Esp32/Components/esp32/component.mk b/Sming/Arch/Esp32/Components/esp32/component.mk index 80a45453de..bab9ebc984 100644 --- a/Sming/Arch/Esp32/Components/esp32/component.mk +++ b/Sming/Arch/Esp32/Components/esp32/component.mk @@ -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)