Merge branch 'release/v6.0.0'

Author: valeros

boards/adafruit_feather_esp32s3.json

@@ -2,7 +2,7 @@
   "build": {
     "arduino":{
       "ldscript": "esp32s3_out.ld",
-      "partitions": "partitions.csv"
+      "partitions": "partitions-4MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [

boards/adafruit_feather_esp32s3_nopsram.json

@@ -2,6 +2,7 @@
   "build": {
     "arduino":{
       "ldscript": "esp32s3_out.ld",
+      "partitions": "partitions-4MB-tinyuf2.csv",
       "memory_type": "qio_qspi"
     },
     "core": "esp32",

boards/adafruit_feather_esp32s3_tft.json

@@ -2,7 +2,7 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "partitions": "partitions.csv"
+      "partitions": "partitions-4MB-tinyuf2.csv"
     },
     "core": "esp32",
     "extra_flags": [

boards/deneyapminiv2.json

@@ -4,7 +4,6 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-",
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_DYMv2",

builder/frameworks/espidf.py

@@ -25,6 +25,7 @@
 import subprocess
 import sys
 import os
+import pkg_resources
 
 import click
 import semantic_version
@@ -49,6 +50,9 @@
 mcu = board.get("build.mcu", "esp32")
 idf_variant = mcu.lower()
 
+# Required until Arduino switches to v5
+IDF5 = platform.get_package_version(
+    "framework-espidf").split(".")[1].startswith("5")
 FRAMEWORK_DIR = platform.get_package_dir("framework-espidf")
 TOOLCHAIN_DIR = platform.get_package_dir(
     "toolchain-%s" % ("riscv32-esp" if mcu == "esp32c3" else ("xtensa-%s" % mcu))
@@ -576,6 +580,16 @@ def generate_project_ld_script(sdk_config, ignore_targets=None):
     )
 
 
+# A temporary workaround to avoid modifying CMake mainly for the "heap" library.
+# The "tlsf.c" source file in this library has an include flag relative
+# to CMAKE_CURRENT_SOURCE_DIR which breaks PlatformIO builds that have a
+# different working directory
+def _fix_component_relative_include(config, build_flags, source_index):
+    source_file_path = config["sources"][source_index]["path"]
+    build_flags = build_flags.replace("..", os.path.dirname(source_file_path) + "/..")
+    return build_flags
+
+
 def prepare_build_envs(config, default_env, debug_allowed=True):
     build_envs = []
     target_compile_groups = config.get("compileGroups")
@@ -597,6 +611,10 @@ def prepare_build_envs(config, default_env, debug_allowed=True):
         for cc in compile_commands:
             build_flags = cc.get("fragment")
             if not build_flags.startswith("-D"):
+                if build_flags.startswith("-include") and ".." in build_flags:
+                    source_index = cg.get("sourceIndexes")[0]
+                    build_flags = _fix_component_relative_include(
+                        config, build_flags, source_index)
                 build_env.AppendUnique(**build_env.ParseFlags(build_flags))
         build_env.AppendUnique(CPPDEFINES=defines, CPPPATH=includes)
         if sys_includes:
@@ -639,9 +657,17 @@ def compile_source_files(
                 else:
                     obj_path = os.path.join(obj_path, os.path.basename(src_path))
 
+            preserve_source_file_extension = board.get(
+                "build.esp-idf.preserve_source_file_extension", False
+            )
+
             objects.append(
                 build_envs[compile_group_idx].StaticObject(
-                    target=os.path.splitext(obj_path)[0] + ".o",
+                    target=(
+                        obj_path
+                        if preserve_source_file_extension
+                        else os.path.splitext(obj_path)[0]
+                    ) + ".o",
                     source=os.path.realpath(src_path),
                 )
             )
@@ -1029,7 +1055,14 @@ def _get_installed_pip_packages():
         result = {}
         packages = {}
         pip_output = subprocess.check_output(
-            [env.subst("$PYTHONEXE"), "-m", "pip", "list", "--format=json"]
+            [
+                env.subst("$PYTHONEXE"),
+                "-m",
+                "pip",
+                "list",
+                "--format=json",
+                "--disable-pip-version-check",
+            ]
         )
         try:
             packages = json.loads(pip_output)
@@ -1047,15 +1080,19 @@ def _get_installed_pip_packages():
         "future": ">=0.15.2",
         "pyparsing": ">=2.0.3,<2.4.0",
         "kconfiglib": "==13.7.1",
-        "idf-component-manager": "~=1.0"
+        "idf-component-manager": "~=1.0",
     }
 
+    if IDF5:
+        # Remove specific versions for IDF5 as not required
+        deps = {dep: "" for dep in deps}
+
     installed_packages = _get_installed_pip_packages()
     packages_to_install = []
     for package, spec in deps.items():
         if package not in installed_packages:
             packages_to_install.append(package)
-        else:
+        elif spec:
             version_spec = semantic_version.Spec(spec)
             if not version_spec.match(installed_packages[package]):
                 packages_to_install.append(package)
@@ -1064,21 +1101,34 @@ def _get_installed_pip_packages():
         env.Execute(
             env.VerboseAction(
                 (
-                    '"$PYTHONEXE" -m pip install -U --force-reinstall '
-                    + " ".join(['"%s%s"' % (p, deps[p]) for p in packages_to_install])
+                    '"$PYTHONEXE" -m pip install -U '
+                    + " ".join(
+                        [
+                            '"%s%s"' % (p, deps[p])
+                            for p in packages_to_install
+                        ]
+                    )
                 ),
                 "Installing ESP-IDF's Python dependencies",
             )
         )
 
-    # a special "esp-windows-curses" python package is required on Windows for Menuconfig
-    if "windows" in get_systype():
-        import pkg_resources
+    if "windows" in get_systype() and "windows-curses" not in installed_packages:
+        env.Execute(
+            env.VerboseAction(
+                "$PYTHONEXE -m pip install windows-curses",
+                "Installing windows-curses package",
+            )
+        )
 
-        if "esp-windows-curses" not in {pkg.key for pkg in pkg_resources.working_set}:
+        # A special "esp-windows-curses" python package is required on Windows
+        # for Menuconfig on IDF <5
+        if not IDF5 and "esp-windows-curses" not in {
+            pkg.key for pkg in pkg_resources.working_set
+        }:
             env.Execute(
                 env.VerboseAction(
-                    '$PYTHONEXE -m pip install "file://%s/tools/kconfig_new/esp-windows-curses" windows-curses'
+                    '$PYTHONEXE -m pip install "file://%s/tools/kconfig_new/esp-windows-curses"'
                     % FRAMEWORK_DIR,
                     "Installing windows-curses package",
                 )
@@ -1471,4 +1521,6 @@ def _skip_prj_source_files(node):
 )
 
 # Propagate application offset to debug configurations
-env["INTEGRATION_EXTRA_DATA"].update({"application_offset": env.subst("$ESP32_APP_OFFSET")})
+env["INTEGRATION_EXTRA_DATA"].update(
+    {"application_offset": env.subst("$ESP32_APP_OFFSET")}
+)

builder/frameworks/ulp.py

@@ -77,9 +77,10 @@ def get_component_includes(target_config):
 
 
 def generate_ulp_config(target_config):
-    riscv_ulp_enabled = sdk_config.get("ESP32S2_ULP_COPROC_RISCV", False)
+    riscv_ulp_enabled = sdk_config.get("ULP_COPROC_TYPE_RISCV", False)
 
     ulp_sources = collect_ulp_sources()
+    ulp_sources.sort()
     cmd = (
         os.path.join(platform.get_package_dir("tool-cmake"), "bin", "cmake"),
         "-DCMAKE_GENERATOR=Ninja",
@@ -89,8 +90,8 @@ def generate_ulp_config(target_config):
             "components",
             "ulp",
             "cmake",
-            "toolchain-%s-ulp%s.cmake"
-            % (idf_variant, "-riscv" if riscv_ulp_enabled else ""),
+            "toolchain-%sulp%s.cmake"
+            % ("" if riscv_ulp_enabled else idf_variant + "-", "-riscv" if riscv_ulp_enabled else ""),
         ),
         '-DULP_S_SOURCES="%s"' % ";".join(ulp_sources),
         "-DULP_APP_NAME=ulp_main",

builder/main.py

@@ -261,7 +261,7 @@ def __fetch_fs_size(target, source, env):
             action=env.VerboseAction(" ".join([
                 '"$PYTHONEXE" "$OBJCOPY"',
                 "--chip", mcu, "elf2image",
-                "--flash_mode", "$BOARD_FLASH_MODE",
+                "--flash_mode", "${__get_board_flash_mode(__env__)}",
                 "--flash_freq", "${__get_board_f_flash(__env__)}",
                 "--flash_size", board.get("upload.flash_size", "4MB"),
                 "-o", "$TARGET", "$SOURCES"

examples/espidf-aws-iot/platformio.ini

@@ -18,3 +18,9 @@ board_build.embed_txtfiles =
   src/certs/private.pem.key
   src/certs/certificate.pem.crt
   src/certs/aws-root-ca.pem
+
+# IDF v5 is not supported by ASW-IoT SDK
+# https://github.com/espressif/esp-aws-iot/blob/bbaf03d7d1fbf8a3f91dc18489d7bd27d5b9e9df/README.md?plain=1#L21
+platform_packages =
+  framework-espidf @ ~3.40403.0
+  toolchain-xtensa-esp32 @ 8.4.0+2021r2-patch5

examples/espidf-ble-eddystone/src/CMakeLists.txt

@@ -1,3 +1,4 @@
 idf_component_register(SRCS "esp_eddystone_api.c"
                             "esp_eddystone_demo.c"
-                        INCLUDE_DIRS "")
+                        INCLUDE_DIRS "")
+target_compile_options(${COMPONENT_LIB} PRIVATE "-Wno-format")

examples/espidf-ble-eddystone/src/esp_eddystone_api.c

@@ -1,10 +1,8 @@
 /*
-   This example code is in the Public Domain (or CC0 licensed, at your option.)
-
-   Unless required by applicable law or agreed to in writing, this
-   software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-   CONDITIONS OF ANY KIND, either express or implied.
-*/
+ * SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
 
 
 /****************************************************************************
@@ -62,21 +60,21 @@ Byte offset	    Field	       Description
    0	      Frame Type	   Value = 0x00
    1	     Ranging Data	   Calibrated Tx power at 0 m
    2	       NID[0]	       10-byte Namespace
-   3	       NID[1]	
-   4	       NID[2]	
-   5	       NID[3]	
-   6	       NID[4]	
-   7	       NID[5]	
-   8	       NID[6]	
-   9	       NID[7]	
-   10	       NID[8]	
-   11	       NID[9]	
+   3	       NID[1]
+   4	       NID[2]
+   5	       NID[3]
+   6	       NID[4]
+   7	       NID[5]
+   8	       NID[6]
+   9	       NID[7]
+   10	       NID[8]
+   11	       NID[9]
    12	       BID[0]	       6-byte Instance
-   13	       BID[1]	
-   14	       BID[2]	
-   15	       BID[3]	
-   16	       BID[4]	
-   17	       BID[5]	
+   13	       BID[1]
+   14	       BID[2]
+   15	       BID[3]
+   16	       BID[4]
+   17	       BID[5]
    18	        RFU	           Reserved for future use, must be0x00
    19	        RFU	           Reserved for future use, must be0x00
 *********************************************/
@@ -135,7 +133,7 @@ static esp_err_t esp_eddystone_url_received(const uint8_t* buf, uint8_t len, esp
         //ERROR:too long url
         return -1;
     }
-    res->inform.url.tx_power = buf[pos++];   
+    res->inform.url.tx_power = buf[pos++];
     url_res = esp_eddystone_resolve_url_scheme(buf+pos, buf+len-1);
     memcpy(&res->inform.url.url, url_res, strlen(url_res));
     res->inform.url.url[strlen(url_res)] = '\0';
@@ -148,17 +146,17 @@ Byte offset	       Field	     Description
     0	          Frame Type	 Value = 0x20
     1	           Version	     TLM version, value = 0x00
     2	           VBATT[0]	     Battery voltage, 1 mV/bit
-    3	           VBATT[1]	
+    3	           VBATT[1]
     4	           TEMP[0]	     Beacon temperature
-    5	           TEMP[1]	
+    5	           TEMP[1]
     6	          ADV_CNT[0]	 Advertising PDU count
-    7	          ADV_CNT[1]	
-    8	          ADV_CNT[2]	
-    9	          ADV_CNT[3]	
+    7	          ADV_CNT[1]
+    8	          ADV_CNT[2]
+    9	          ADV_CNT[3]
     10	          SEC_CNT[0]	 Time since power-on or reboot
-    11	          SEC_CNT[1]	
-    12	          SEC_CNT[2]	
-    13	          SEC_CNT[3]	
+    11	          SEC_CNT[1]
+    12	          SEC_CNT[2]
+    13	          SEC_CNT[3]
 ************************************************/
 /* decode and store received TLM */
 static esp_err_t esp_eddystone_tlm_received(const uint8_t* buf, uint8_t len, esp_eddystone_result_t* res)
@@ -211,14 +209,14 @@ esp_err_t esp_eddystone_decode(const uint8_t* buf, uint8_t len, esp_eddystone_re
         return -1;
     }
     uint8_t pos=0;
-    while(res->common.srv_data_type != EDDYSTONE_SERVICE_UUID) 
+    while(res->common.srv_data_type != EDDYSTONE_SERVICE_UUID)
     {
         pos++;
-        if(pos >= len ) { 
+        if(pos >= len ) {
             return -1;
         }
         uint8_t ad_type = buf[pos++];
-        switch(ad_type) 
+        switch(ad_type)
         {
             case ESP_BLE_AD_TYPE_FLAG: {
                 res->common.flags = buf[pos++];
@@ -227,7 +225,7 @@ esp_err_t esp_eddystone_decode(const uint8_t* buf, uint8_t len, esp_eddystone_re
             case ESP_BLE_AD_TYPE_16SRV_CMPL: {
                 uint16_t uuid = little_endian_read_16(buf, pos);
                 if(uuid != EDDYSTONE_SERVICE_UUID) {
-                    return -1; 
+                    return -1;
                 }
                 res->common.srv_uuid = uuid;
                 pos += 2;
@@ -237,7 +235,7 @@ esp_err_t esp_eddystone_decode(const uint8_t* buf, uint8_t len, esp_eddystone_re
                 uint16_t type = little_endian_read_16(buf, pos);
                 pos += 2;
                 uint8_t frame_type = buf[pos++];
-                if(type != EDDYSTONE_SERVICE_UUID || !(frame_type == EDDYSTONE_FRAME_TYPE_UID || frame_type == EDDYSTONE_FRAME_TYPE_URL || 
+                if(type != EDDYSTONE_SERVICE_UUID || !(frame_type == EDDYSTONE_FRAME_TYPE_UID || frame_type == EDDYSTONE_FRAME_TYPE_URL ||
                    frame_type == EDDYSTONE_FRAME_TYPE_TLM)) {
                     return -1;
                 }
@@ -251,4 +249,3 @@ esp_err_t esp_eddystone_decode(const uint8_t* buf, uint8_t len, esp_eddystone_re
     }
     return esp_eddystone_get_inform(buf+pos, len-pos, res);
 }
-