patch(ble): Add patch to fix WiFiProvisiong on ESP32C6 (espressif#197)

P-R-O-C-H-Y · web-flow · commit 248cae46abcf · 2024-07-31T14:15:06.000+03:00
* patch(ble): Add patch to fix WiFiProvisiong on ESP32C6

* fix(): Diff formatting

* fix(): Fix patches dir when IDF is not inside lib_builder
diff --git a/patches/esp32c6_provisioning_bluedroid.diff b/patches/esp32c6_provisioning_bluedroid.diff
@@ -0,0 +1,12 @@
+diff --git a/components/protocomm/src/simple_ble/simple_ble.c b/components/protocomm/src/simple_ble/simple_ble.c
+index 8a4ae0f3d9..cd6421c6e5 100644
+--- a/components/protocomm/src/simple_ble/simple_ble.c
++++ b/components/protocomm/src/simple_ble/simple_ble.c
+@@ -225,7 +225,7 @@ esp_err_t simple_ble_start(simple_ble_cfg_t *cfg)
+ #ifdef CONFIG_BTDM_CTRL_MODE_BTDM
+     ret = esp_bt_controller_enable(ESP_BT_MODE_BTDM);
+-#elif defined CONFIG_BTDM_CTRL_MODE_BLE_ONLY || CONFIG_BT_CTRL_MODE_EFF
++#elif defined CONFIG_BTDM_CTRL_MODE_BLE_ONLY || CONFIG_BT_CTRL_MODE_EFF || CONFIG_IDF_TARGET_ESP32C6
+     ret = esp_bt_controller_enable(ESP_BT_MODE_BLE);
+ #else
+     ESP_LOGE(TAG, "Configuration mismatch. Select BLE Only or BTDM mode from menuconfig");
diff --git a/tools/config.sh b/tools/config.sh
@@ -45,6 +45,7 @@ AR_COMPS="$AR_ROOT/components"
 AR_MANAGED_COMPS="$AR_ROOT/managed_components"
 AR_OUT="$AR_ROOT/out"
 AR_TOOLS="$AR_OUT/tools"
+AR_PATCHES="$AR_ROOT/patches"
 AR_PLATFORM_TXT="$AR_OUT/platform.txt"
 AR_GEN_PART_PY="$AR_TOOLS/gen_esp32part.py"
 AR_SDK="$AR_TOOLS/esp32-arduino-libs/$IDF_TARGET"
diff --git a/tools/install-esp-idf.sh b/tools/install-esp-idf.sh
@@ -37,9 +37,10 @@ if [ ! -x $idf_was_installed ] || [ ! -x $commit_predefined ]; then
 
 	# Temporarily patch the ESP32-S2 I2C LL driver to keep the clock source
 	cd $IDF_PATH
-	patch -p1 -N -i ../patches/esp32s2_i2c_ll_master_init.diff
-	patch -p1 -N -i ../patches/mmu_map.diff
-	patch -p1 -N -i ../patches/lwip_max_tcp_pcb.diff
+	patch -p1 -N -i $AR_PATCHES/esp32s2_i2c_ll_master_init.diff
+	patch -p1 -N -i $AR_PATCHES/mmu_map.diff
+	patch -p1 -N -i $AR_PATCHES/lwip_max_tcp_pcb.diff
+	patch -p1 -N -i $AR_PATCHES/esp32c6_provisioning_bluedroid.diff
 	cd -
 fi
 
