Merge branch 'release/v5.3.0'

platformio · Dec 29, 2022 · c7e0e37 · c7e0e37
2 parents 8565a82 + ee09e8b
commit c7e0e37
Show file tree

Hide file tree

Showing 12 changed files with 314 additions and 31 deletions.
diff --git a/boards/bpi_leaf_s3.json b/boards/bpi_leaf_s3.json
@@ -0,0 +1,48 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "partitions": "default_8MB.csv",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_BPI_LEAF_S3",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x303A",
+        "0x80DF"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "bpi_leaf_s3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "BPI-Leaf-S3",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://wiki.banana-pi.org/BPI-Leaf-S3",
+  "vendor": "BPI Tech"
+}
diff --git a/boards/cytron_maker_feather_aiot_s3.json b/boards/cytron_maker_feather_aiot_s3.json
@@ -0,0 +1,56 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi",
+      "partitions": "partitions-8MB-tinyuf2.csv"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_CYTRON_MAKER_FEATHER_AIOT_S3",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x303A",
+        "0x80F8"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "cytron_maker_feather_aiot_s3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Cytron Maker Feather AIoT S3",
+  "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x410000",
+          "variants/cytron_maker_feather_aiot_s3/tinyuf2.bin"
+        ]
+      ]
+    },
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://sg.cytron.io/c-development-tools/c-maker-series/p-v-maker-feather-aiot-s3-simplifying-aiot-with-esp32",
+  "vendor": "Cytron Technologies"
+}
diff --git a/boards/deneyapkart1Av2.json b/boards/deneyapkart1Av2.json
@@ -0,0 +1,46 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_DYDK1Av2",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x303A",
+        "0x8147"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "deneyapkart1Av2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Deneyap Kart 1A v2",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://wiki.banana-pi.org/BPI-Leaf-S3",
+  "vendor": "Deneyap"
+}
diff --git a/boards/deneyapmini.json b/boards/deneyapmini.json
@@ -4,14 +4,17 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
-    "extra_flags": "-DARDUINO_DYM",
+    "extra_flags": [
+      "-DARDUINO_DYM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
     "hwids": [
       [
         "0x303A",
-        "0x0002"
+        "0x8141"
       ]
     ],
     "mcu": "esp32s2",

diff --git a/boards/deneyapminiv2.json b/boards/deneyapminiv2.json
@@ -0,0 +1,49 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_DYMv2",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x303A",
+        "0x8144"
+      ]
+    ],
+    "mcu": "esp32s2",
+    "variant": "deneyapminiv2"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Deneyap Mini v2",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://deneyapkart.org/magaza/urun-deneyap-kart-mini.html",
+  "vendor": "Deneyap"
+}
diff --git a/boards/esp32-c3-m1i-kit.json b/boards/esp32-c3-m1i-kit.json
@@ -0,0 +1,37 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32c3_out.ld"
+    },
+    "core": "esp32",
+    "f_cpu": "160000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "extra_flags": [
+      "-DARDUINO_ESP32C3_M1_I_KIT",
+      "-DARDUINO_USB_MODE=1"
+    ],
+    "mcu": "esp32c3",
+    "variant": "esp_c3_m1_i_kit"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32c3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Ai-Thinker ESP-C3-M1-I-Kit",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://docs.ai-thinker.com/en/esp32c3",
+  "vendor": "Ai-Thinker"
+}
diff --git a/boards/redpill_esp32s3.json b/boards/redpill_esp32s3.json
@@ -0,0 +1,55 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_REDPILL_ESP32S3",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x303A",
+        "0x80F8"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "redpill_esp32s3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Munich Labs RedPill ESP32-S3",
+  "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x410000",
+          "variants/redpill_esp32s3/tinyuf2.bin"
+        ]
+      ]
+    },
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://munich-labs.com/index.php/redpill-esp32-s3/",
+  "vendor": "Munich Labs"
+}
diff --git a/boards/um_pros3.json b/boards/um_pros3.json
@@ -18,8 +18,8 @@
     "flash_mode": "qio",
     "hwids": [
       [
-        "0X303A",
-        "0x80D0"
+        "0x303A",
+        "0x1001"
       ]
     ],
     "mcu": "esp32s3",

diff --git a/builder/frameworks/espidf.py b/builder/frameworks/espidf.py
@@ -215,17 +215,17 @@ def get_cmake_code_model(src_dir, build_dir, extra_args=None):
 
 
 def populate_idf_env_vars(idf_env):
-    idf_env["IDF_PATH"] = FRAMEWORK_DIR
+    idf_env["IDF_PATH"] = fs.to_unix_path(FRAMEWORK_DIR)
     additional_packages = [
         os.path.join(TOOLCHAIN_DIR, "bin"),
         platform.get_package_dir("tool-ninja"),
         os.path.join(platform.get_package_dir("tool-cmake"), "bin"),
         os.path.dirname(env.subst("$PYTHONEXE")),
     ]
 
-    if mcu not in ("esp32c3", "esp32s3"):
+    if mcu != "esp32c3":
         additional_packages.append(
-            os.path.join(platform.get_package_dir("toolchain-%sulp" % mcu), "bin"),
+            os.path.join(platform.get_package_dir("toolchain-esp32ulp"), "bin"),
         )
 
     if "windows" in get_systype():

diff --git a/builder/frameworks/ulp.py b/builder/frameworks/ulp.py
@@ -36,14 +36,11 @@ def prepare_ulp_env_vars(env):
 
     additional_packages = [
         os.path.join(
-            platform.get_package_dir(
-                "toolchain-xtensa-esp%s"
-                % ("32s2" if idf_variant == "esp32s2" else "32")
-            ),
+            platform.get_package_dir("toolchain-xtensa-%s" % idf_variant),
             "bin",
         ),
         os.path.join(
-            platform.get_package_dir("toolchain-%sulp" % idf_variant),
+            platform.get_package_dir("toolchain-esp32ulp"),
             "bin",
         ),
         platform.get_package_dir("tool-ninja"),
@@ -99,6 +96,7 @@ def generate_ulp_config(target_config):
         "-DULP_APP_NAME=ulp_main",
         "-DCOMPONENT_DIR=" + os.path.join(ulp_env.subst("$PROJECT_DIR"), "ulp"),
         '-DCOMPONENT_INCLUDES="%s"' % ";".join(get_component_includes(target_config)),
+        "-DIDF_TARGET=%s" % idf_variant,
         "-DIDF_PATH=" + fs.to_unix_path(FRAMEWORK_DIR),
         "-DSDKCONFIG_HEADER=" + os.path.join(BUILD_DIR, "config", "sdkconfig.h"),
         "-DPYTHON=" + env.subst("$PYTHONEXE"),