Merge branch 'master' into ci/cron_optimization

Author: me-no-dev

build.sh

@@ -1,16 +1,25 @@
 #!/bin/bash
 
 if ! [ -x "$(command -v python3)" ]; then
-    echo "ERROR: python is not installed! Please install python first."
+    echo "ERROR: python is not installed or not in PATH! Please install python first."
     exit 1
 fi
 
 if ! [ -x "$(command -v git)" ]; then
-    echo "ERROR: git is not installed! Please install git first."
+    echo "ERROR: git is not installed or not in PATH! Please install git first."
     exit 1
 fi
 
+if ! [ -x "$(command -v ninja)" ]; then
+    echo "ERROR: ninja is not installed or not in PATH! Please install ninja first."
+    exit 1
+fi
+
+# Fixes building some components. See https://github.com/espressif/arduino-esp32/issues/10167
+export IDF_COMPONENT_OVERWRITE_MANAGED_COMPONENTS=1
+
 CCACHE_ENABLE=1
+
 TARGET="all"
 BUILD_TYPE="all"
 BUILD_DEBUG="default"
@@ -122,10 +131,6 @@ else
     source ./tools/config.sh
 fi
 
-if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
-    rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
-fi
-
 if [ "$BUILD_TYPE" != "all" ]; then
     if [ "$TARGET" = "all" ]; then
         echo "ERROR: You need to specify target for non-default builds"
@@ -216,10 +221,6 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
         idf_libs_configs="$idf_libs_configs;configs/defconfig.$defconf"
     done
 
-    if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
-        rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
-    fi
-
     echo "* Build IDF-Libs: $idf_libs_configs"
     rm -rf build sdkconfig
     idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$idf_libs_configs" idf-libs
@@ -245,10 +246,6 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
             bootloader_configs="$bootloader_configs;configs/defconfig.$defconf";
         done
 
-        if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
-            rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
-        fi
-
         echo "* Build BootLoader: $bootloader_configs"
         rm -rf build sdkconfig
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$bootloader_configs" copy-bootloader
@@ -262,10 +259,6 @@ for target_json in `jq -c '.targets[]' configs/builds.json`; do
             mem_configs="$mem_configs;configs/defconfig.$defconf";
         done
 
-        if [ -f "$AR_MANAGED_COMPS/espressif__esp-sr/.component_hash" ]; then
-            rm -rf $AR_MANAGED_COMPS/espressif__esp-sr/.component_hash
-        fi
-
         echo "* Build Memory Variant: $mem_configs"
         rm -rf build sdkconfig
         idf.py -DIDF_TARGET="$target" -DSDKCONFIG_DEFAULTS="$mem_configs" mem-variant

configs/defconfig.common

@@ -74,10 +74,11 @@ CONFIG_LWIP_HOOK_IP6_ROUTE_DEFAULT=y
 CONFIG_LWIP_HOOK_ND6_GET_GW_DEFAULT=y
 CONFIG_LWIP_HOOK_IP6_SELECT_SRC_ADDR_DEFAULT=y
 CONFIG_LWIP_HOOK_NETCONN_EXT_RESOLVE_DEFAULT=y
-CONFIG_LWIP_HOOK_IP6_INPUT_DEFAULT=y
+CONFIG_LWIP_HOOK_IP6_INPUT_CUSTOM=y
 CONFIG_MBEDTLS_PSK_MODES=y
 CONFIG_MBEDTLS_KEY_EXCHANGE_PSK=y
 CONFIG_MBEDTLS_CAMELLIA_C=y
+CONFIG_MBEDTLS_GCM_SUPPORT_NON_AES_CIPHER=y
 # CONFIG_MBEDTLS_ASYMMETRIC_CONTENT_LEN is not set
 CONFIG_MBEDTLS_SSL_PROTO_DTLS=y
 CONFIG_OPENSSL_ASSERT_DO_NOTHING=y

configs/defconfig.debug_default

@@ -1,2 +1,2 @@
-CONFIG_BOOTLOADER_LOG_LEVEL_NONE=y
+CONFIG_BOOTLOADER_LOG_LEVEL_ERROR=y
 CONFIG_LOG_DEFAULT_LEVEL_ERROR=y

configs/pio_start.txt

@@ -37,4 +37,39 @@ FRAMEWORK_SDK_DIR = env.PioPlatform().get_package_dir(
 
 board_config = env.BoardConfig()
 
+flatten_cppdefines = env.Flatten(env['CPPDEFINES'])
+
+#
+# zigbee libs
+#
+if "ZIGBEE_MODE_ZCZR" in flatten_cppdefines:
+    env.Append(
+        LIBS=[
+            "-lesp_zb_api_zczr",
+            "-lesp_zb_cli_command",
+            "-lzboss_stack.zczr.trace",
+            "-lzboss_stack.zczr",
+            "-lzboss_port"
+        ]
+    )
+if "ZIGBEE_MODE_ED" in flatten_cppdefines:
+    env.Append(
+        LIBS=[
+            "-lesp_zb_api_ed",
+            "-lesp_zb_cli_command",
+            "-lzboss_stack.ed.trace",
+            "-lzboss_stack.ed",
+            "-lzboss_port"
+        ]
+    )
+if "ZIGBEE_MODE_RCP" in flatten_cppdefines:
+    env.Append(
+        LIBS=[
+            "-lesp_zb_api_rcp",
+            "-lesp_zb_cli_command",
+            "-lzboss_stack.rcp",
+            "-lzboss_port"
+        ]
+    )
+
 env.Append(

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");

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"

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