Merge branch 'release/v4.1.0'

boards/ttgo-t-oi-plus.json

@@ -0,0 +1,34 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32c3_out.ld"
+    },
+    "core": "esp32",
+    "f_cpu": "160000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "extra_flags": "-DARDUINO_TTGO_T_OI_PLUS_DEV",
+    "mcu": "esp32c3",
+    "variant": "ttgo-t-oi-plus"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32c3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "TTGO T-OI PLUS RISC-V ESP32-C3",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "http://www.lilygo.cn/prod_view.aspx?TypeId=50044&Id=1361&FId=t3:50044:3",
+  "vendor": "TTGO"
+}

platform.json

@@ -18,7 +18,7 @@
     "type": "git",
     "url": "https://github.com/platformio/platform-espressif32.git"
   },
-  "version": "4.0.0",
+  "version": "4.1.0",
   "frameworks": {
     "arduino": {
       "package": "framework-arduinoespressif32",
@@ -36,28 +36,19 @@
     "toolchain-xtensa-esp32": {
       "type": "toolchain",
       "owner": "espressif",
-      "version": "8.4.0+2021r1",
-      "optionalVersions": [
-        "8.4.0+2021r2-patch2"
-      ]
+      "version": "8.4.0+2021r2-patch3"
     },
     "toolchain-xtensa-esp32s2": {
       "type": "toolchain",
       "optional": true,
       "owner": "espressif",
-      "version": "8.4.0+2021r1",
-      "optionalVersions": [
-        "8.4.0+2021r2-patch2"
-      ]
+      "version": "8.4.0+2021r2-patch3"
     },
     "toolchain-riscv32-esp": {
       "type": "toolchain",
       "optional": true,
       "owner": "espressif",
-      "version": "8.4.0+2021r1",
-      "optionalVersions": [
-        "8.4.0+2021r2-patch2"
-      ]
+      "version": "8.4.0+2021r2-patch3"
     },
     "toolchain-esp32ulp": {
       "type": "toolchain",
@@ -75,7 +66,7 @@
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.20000.0"
+      "version": "~3.20001.0"
     },
     "framework-arduino-mbcwb": {
       "type": "framework",

platform.py

@@ -95,15 +95,6 @@ def configure_default_packages(self, variables, targets):
                 elif p in ("tool-mconf", "tool-idf") and "windows" in get_systype():
                     self.packages[p]["optional"] = False
 
-            # Toolchains for stable IDF are different from Arduino
-            if len(frameworks) == 1:
-                for toolchain in (
-                    "toolchain-xtensa-esp32",
-                    "toolchain-xtensa-esp32s2",
-                    "toolchain-riscv32-esp",
-                ):
-                    self.packages[toolchain]["version"] = "8.4.0+2021r2-patch2"
-
         if mcu in ("esp32s2", "esp32c3"):
             self.packages.pop("toolchain-xtensa-esp32", None)
             self.packages.pop("toolchain-esp32ulp", None)