Merge branch 'release/v4.4.0'

Author: valeros

.github/workflows/examples.yml

@@ -8,7 +8,6 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
-        python-version: [3.7]
         example:
           - "examples/arduino-ble5-advertising"
           - "examples/arduino-blink"
@@ -31,16 +30,15 @@ jobs:
           - "examples/espidf-ulp-pulse"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           submodules: "recursive"
-      - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v1
+      - name: Set up Python
+        uses: actions/setup-python@v3
         with:
-          python-version: ${{ matrix.python-version }}
+          python-version: "3.9"
       - name: Install dependencies
         run: |
-          python -m pip install --upgrade pip
           pip install -U https://github.com/platformio/platformio/archive/develop.zip
           pio pkg install --global --platform symlink://.
       - name: Build examples

README.md

@@ -1,4 +1,4 @@
-# Espressif 32: development platform for [PlatformIO](http://platformio.org)
+# Espressif 32: development platform for [PlatformIO](https://platformio.org)
 
 [![Build Status](https://github.com/platformio/platform-espressif32/workflows/Examples/badge.svg)](https://github.com/platformio/platform-espressif32/actions)
 
@@ -9,7 +9,7 @@ Espressif Systems is a privately held fabless semiconductor company. They provid
 
 # Usage
 
-1. [Install PlatformIO](http://platformio.org)
+1. [Install PlatformIO](https://platformio.org)
 2. Create PlatformIO project and configure a platform option in [platformio.ini](https://docs.platformio.org/page/projectconf.html) file:
 
 ## Stable version

builder/compat.py

@@ -21,7 +21,12 @@
 Import("env")
 
 env.Append(
-    ASFLAGS=["-x", "assembler-with-cpp"],
+    ASFLAGS=[
+        "-mlongcalls",
+    ],
+    ASPPFLAGS=[
+        "-x", "assembler-with-cpp",
+    ],
 
     CFLAGS=["-std=gnu99"],
 
@@ -60,6 +65,3 @@
         "-Wl,--gc-sections"
     ]
 )
-
-# copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-env.Append(ASFLAGS=env.get("CCFLAGS", [])[:])

builder/frameworks/_bare.py

@@ -617,7 +617,6 @@ def prepare_build_envs(config, default_env, debug_allowed=True):
         build_env.AppendUnique(CPPDEFINES=defines, CPPPATH=includes)
         if sys_includes:
             build_env.Append(CCFLAGS=[("-isystem", inc) for inc in sys_includes])
-        build_env.Append(ASFLAGS=build_env.get("CCFLAGS", [])[:])
         build_env.ProcessUnFlags(default_env.get("BUILD_UNFLAGS"))
         if is_build_type_debug:
             build_env.ConfigureDebugFlags()
@@ -885,7 +884,13 @@ def find_default_component(target_configs):
     for config in target_configs:
         if "__pio_env" in config:
             return config
-    return ""
+    sys.stderr.write(
+        "Error! Failed to find the default IDF component with build information for "
+        "generic files.\nCheck that the `EXTRA_COMPONENT_DIRS` option is not overridden "
+        "in your CMakeLists.txt.\nSee an example with an extra component here "
+        "https://docs.platformio.org/en/latest/frameworks/espidf.html#esp-idf-components\n"
+    )
+    env.Exit(1)
 
 
 def create_version_file():

builder/frameworks/espidf.py

@@ -161,7 +161,6 @@ def __fetch_fs_size(target, source, env):
 
 
 env = DefaultEnvironment()
-env.SConscript("compat.py", exports="env")
 platform = env.PioPlatform()
 board = env.BoardConfig()
 mcu = board.get("build.mcu", "esp32")
@@ -228,9 +227,6 @@ def __fetch_fs_size(target, source, env):
     env.Replace(PROGNAME="firmware")
 
 env.Append(
-    # copy CCFLAGS to ASFLAGS (-x assembler-with-cpp mode)
-    ASFLAGS=env.get("CCFLAGS", [])[:],
-
     BUILDERS=dict(
         ElfToBin=Builder(
             action=env.VerboseAction(" ".join([

builder/main.py

@@ -17,16 +17,19 @@
 import subprocess
 import sys
 
-from platformio.compat import path_to_unicode, WINDOWS
 from platformio.project.exception import PlatformioException
-from platformio.project.helpers import load_project_ide_data
-from platformio.commands.device import DeviceMonitorFilter
+from platformio.public import (
+    DeviceMonitorFilterBase,
+    load_build_metadata,
+)
 
 # By design, __init__ is called inside miniterm and we can't pass context to it.
 # pylint: disable=attribute-defined-outside-init
 
+IS_WINDOWS = sys.platform.startswith("win")
 
-class Esp32ExceptionDecoder(DeviceMonitorFilter):
+
+class Esp32ExceptionDecoder(DeviceMonitorFilterBase):
     NAME = "esp32_exception_decoder"
 
     def __call__(self):
@@ -51,9 +54,9 @@ def __call__(self):
         return self
 
     def setup_paths(self):
-        self.project_dir = path_to_unicode(os.path.abspath(self.project_dir))
+        self.project_dir = os.path.abspath(self.project_dir)
         try:
-            data = load_project_ide_data(self.project_dir, self.environment)
+            data = load_build_metadata(self.project_dir, self.environment)
             self.firmware_path = data["prog_path"]
             if not os.path.isfile(self.firmware_path):
                 sys.stderr.write(
@@ -109,7 +112,7 @@ def rx(self, text):
 
     def get_backtrace(self, match):
         trace = ""
-        enc = "mbcs" if WINDOWS else "utf-8"
+        enc = "mbcs" if IS_WINDOWS else "utf-8"
         args = [self.addr2line_path, u"-fipC", u"-e", self.firmware_path]
         try:
             for i, addr in enumerate(match.group(1).split()):

monitor/filter_exception_decoder.py

@@ -12,13 +12,13 @@
     "RISC-V"
   ],
   "engines": {
-    "platformio": "^5"
+    "platformio": "^6"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif32.git"
   },
-  "version": "4.3.0",
+  "version": "4.4.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinoespressif32",

platform.json

@@ -12,23 +12,23 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import copy
 import os
 import urllib
 import sys
 import json
 import re
 import requests
 
-from platformio import fs
-from platformio.managers.platform import PlatformBase
-from platformio.util import get_systype
+from platformio.public import PlatformBase, to_unix_path
+
+
+IS_WINDOWS = sys.platform.startswith("win")
 
 
 class Espressif32Platform(PlatformBase):
     def configure_default_packages(self, variables, targets):
         if not variables.get("board"):
-            return PlatformBase.configure_default_packages(self, variables, targets)
+            return super().configure_default_packages(variables, targets)
 
         board_config = self.board_config(variables.get("board"))
         mcu = variables.get("board_build.mcu", board_config.get("build.mcu", "esp32"))
@@ -92,7 +92,7 @@ def configure_default_packages(self, variables, targets):
             for p in self.packages:
                 if p in ("tool-cmake", "tool-ninja", "toolchain-%sulp" % mcu):
                     self.packages[p]["optional"] = False
-                elif p in ("tool-mconf", "tool-idf") and "windows" in get_systype():
+                elif p in ("tool-mconf", "tool-idf") and IS_WINDOWS:
                     self.packages[p]["optional"] = False
 
         for available_mcu in ("esp32", "esp32s2", "esp32s3"):
@@ -143,10 +143,10 @@ def configure_default_packages(self, variables, targets):
                 self.packages["tool-mbctool"]["type"] = "uploader"
                 self.packages["tool-mbctool"]["optional"] = False
 
-        return PlatformBase.configure_default_packages(self, variables, targets)
+        return super().configure_default_packages(variables, targets)
 
     def get_boards(self, id_=None):
-        result = PlatformBase.get_boards(self, id_)
+        result = super().get_boards(id_)
         if not result:
             return result
         if id_:
@@ -266,60 +266,19 @@ def configure_debug_session(self, debug_config):
 
         load_cmds = [
             'monitor program_esp "{{{path}}}" {offset} verify'.format(
-                path=fs.to_unix_path(item["path"]), offset=item["offset"]
+                path=to_unix_path(item["path"]), offset=item["offset"]
             )
             for item in flash_images
         ]
         load_cmds.append(
             'monitor program_esp "{%s.bin}" %s verify'
             % (
-                fs.to_unix_path(debug_config.build_data["prog_path"][:-4]),
+                to_unix_path(debug_config.build_data["prog_path"][:-4]),
                 build_extra_data.get("application_offset", "0x10000"),
             )
         )
         debug_config.load_cmds = load_cmds
 
-    def configure_debug_options(self, initial_debug_options, ide_data):
-        """
-        Deprecated. Remove method when PlatformIO Core 5.2 is released
-        """
-        ide_extra_data = ide_data.get("extra", {})
-        flash_images = ide_extra_data.get("flash_images", [])
-        debug_options = copy.deepcopy(initial_debug_options)
-
-        if "openocd" in debug_options["server"].get("executable", ""):
-            debug_options["server"]["arguments"].extend(
-                [
-                    "-c",
-                    "adapter_khz %s" % (initial_debug_options.get("speed") or "5000"),
-                ]
-            )
-
-        ignore_conds = [
-            initial_debug_options["load_cmds"] != ["load"],
-            not flash_images,
-            not all([os.path.isfile(item["path"]) for item in flash_images]),
-        ]
-
-        if any(ignore_conds):
-            return debug_options
-
-        load_cmds = [
-            'monitor program_esp "{{{path}}}" {offset} verify'.format(
-                path=fs.to_unix_path(item["path"]), offset=item["offset"]
-            )
-            for item in flash_images
-        ]
-        load_cmds.append(
-            'monitor program_esp "{%s.bin}" %s verify'
-            % (
-                fs.to_unix_path(ide_data["prog_path"][:-4]),
-                ide_extra_data.get("application_offset", "0x10000"),
-            )
-        )
-        debug_options["load_cmds"] = load_cmds
-        return debug_options
-
     @staticmethod
     def extract_toolchain_versions(tool_deps):
         def _parse_version(original_version):