Merge branch 'feature/a20' into develop

platform.json

@@ -47,17 +47,31 @@
     }
   },
   "packages": {
-    "toolchain-xtensa32": {
+    "toolchain-xtensa-esp32": {
       "type": "toolchain",
-      "owner": "platformio",
-      "version": "~2.50200.0",
-      "optionalVersions": ["~2.80400.0"]
+      "owner": "espressif",
+      "version": "8.4.0+2021r1",
+      "optionalVersions": [
+        "8.4.0+2021r2-patch2"
+      ]
     },
-    "toolchain-xtensa32s2": {
+    "toolchain-xtensa-esp32s2": {
       "type": "toolchain",
       "optional": true,
-      "owner": "platformio",
-      "version": "~1.80400.0"
+      "owner": "espressif",
+      "version": "8.4.0+2021r1",
+      "optionalVersions": [
+        "8.4.0+2021r2-patch2"
+      ]
+    },
+    "toolchain-riscv32-esp": {
+      "type": "toolchain",
+      "optional": true,
+      "owner": "espressif",
+      "version": "8.4.0+2021r1",
+      "optionalVersions": [
+        "8.4.0+2021r2-patch2"
+      ]
     },
     "toolchain-esp32ulp": {
       "type": "toolchain",
@@ -71,35 +85,11 @@
       "owner": "platformio",
       "version": "~1.22851.0"
     },
-    "toolchain-riscv-esp": {
-      "type": "toolchain",
-      "optional": true,
-      "owner": "platformio",
-      "version": "~1.80400.0"
-    },
-    "toolchain-xtensa-esp32": {
-      "type": "toolchain",
-      "optional": true,
-      "owner": "espressif",
-      "version": "8.4.0+2021r2-patch2"
-    },
-    "toolchain-xtensa-esp32s2": {
-      "type": "toolchain",
-      "optional": true,
-      "owner": "espressif",
-      "version": "8.4.0+2021r2-patch2"
-    },
-    "toolchain-riscv32-esp": {
-      "type": "toolchain",
-      "optional": true,
-      "owner": "espressif",
-      "version": "8.4.0+2021r2-patch2"
-    },
     "framework-arduinoespressif32": {
       "type": "framework",
       "optional": true,
       "owner": "platformio",
-      "version": "~3.10006.0"
+      "version": "~3.20000.0"
     },
     "framework-arduino-mbcwb": {
       "type": "framework",