Merge branch 'release/v6.6.0'

platformio · Mar 29, 2024 · 38f570b · 38f570b
2 parents b0a7f56 + 8494318
commit 38f570b
Show file tree

Hide file tree

Showing 229 changed files with 3,638 additions and 44,890 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -11,7 +11,6 @@ jobs:
         example:
           - "examples/arduino-ble5-advertising"
           - "examples/arduino-blink"
-          - "examples/arduino-briki-internal-libs"
           - "examples/arduino-usb-keyboard"
           - "examples/arduino-wifiscan"
           - "examples/espidf-arduino-blink"

diff --git a/boards/adafruit_feather_esp32s2.json b/boards/adafruit_feather_esp32s2.json
@@ -0,0 +1,64 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s2_out.ld",
+      "partitions": "partitions-4MB-tinyuf2.csv",
+      "memory_type": "qio_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_ADAFRUIT_FEATHER_ESP32S2",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x239A",
+        "0x80EB"
+      ],
+      [
+        "0x239A",
+        "0x00EB"
+      ],
+      [
+        "0x239A",
+        "0x80EC"
+      ]
+    ],
+    "mcu": "esp32s2",
+    "variant": "adafruit_feather_esp32s2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Adafruit Feather ESP32-S2",
+  "upload": {
+    "arduino": {
+      "flash_extra_images": [
+        [
+          "0x2d0000",
+          "variants/adafruit_feather_esp32s2/tinyuf2.bin"
+        ]
+      ]
+    },
+    "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://www.adafruit.com/product/5000",
+  "vendor": "Adafruit"
+}
diff --git a/boards/briki_abc_esp32.json b/boards/briki_abc_esp32.json
diff --git a/boards/briki_mbc-wb_esp32.json b/boards/briki_mbc-wb_esp32.json
diff --git a/boards/esp32-s3-devkitm-1.json b/boards/esp32-s3-devkitm-1.json
@@ -24,6 +24,7 @@
     "variant": "esp32s3"
   },
   "connectivity": [
+    "bluetooth",
     "wifi"
   ],
   "debug": {

diff --git a/boards/lilka_v2.json b/boards/lilka_v2.json
@@ -0,0 +1,60 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi",
+      "partitions": "default_16MB.csv"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_LILKA",
+      "-DLILKA_VERSION=2",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
+      "-DBOARD_HAS_PSRAM"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x239A",
+        "0x8145"
+      ],
+      [
+        "0x239A",
+        "0x0145"
+      ],
+      [
+        "0x239A",
+        "0x8146"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": [
+    "bluetooth",
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Lilka v2",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://github.com/and3rson/lilka",
+  "vendor": "Anderson & friends"
+}
+
diff --git a/boards/lolin32_lite.json b/boards/lolin32_lite.json
@@ -17,6 +17,9 @@
     "ethernet",
     "can"
   ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
   "frameworks": [
     "arduino",
     "espidf"

diff --git a/boards/lolin_s3_pro.json b/boards/lolin_s3_pro.json
@@ -0,0 +1,49 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "partitions": "default_16MB.csv",
+      "memory_type": "qio_opi"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DARDUINO_LOLIN_S3_PRO",
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [
+      [
+        "0x303A",
+        "0x8161"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "lolin_s3_pro"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "WEMOS LOLIN S3 PRO",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://www.wemos.cc/en/latest/s3/s3_pro.html",
+  "vendor": "WEMOS"
+}
diff --git a/builder/frameworks/arduino.py b/builder/frameworks/arduino.py
@@ -32,12 +32,7 @@
 
 SConscript("_embed_files.py", exports="env")
 
-if build_core == "mbcwb":
-    SConscript(
-        join(DefaultEnvironment().PioPlatform().get_package_dir(
-            "framework-arduino-mbcwb"), "tools", "platformio-esp-build.py"))
-
-elif "espidf" not in env.subst("$PIOFRAMEWORK"):
+if "espidf" not in env.subst("$PIOFRAMEWORK"):
     SConscript(
         join(DefaultEnvironment().PioPlatform().get_package_dir(
             "framework-arduinoespressif32"), "tools", "platformio-build.py"))