Tasmota/203

* Changes for C3 and S3 * Add Adafruit Feather ESP32 V2 board * S2 has no PSRAM bugs which needs fixes * Fix Esptool S3 bootloader patching Co-authored-by: Maximilian Gerhardt <[email protected]>
tasmota · Mar 21, 2022 · 40bd233 · 40bd233
1 parent ef8796c
commit 40bd233
Show file tree

Hide file tree

Showing 28 changed files with 571 additions and 309 deletions.
diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -7,14 +7,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, windows-latest, macos-latest]
-        python-version: [3.7]
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        python-version: [3.8]
         example:
           - "examples/arduino-blink"
+          - "examples/arduino-rmt-blink"
           - "examples/arduino-briki-internal-libs"
           - "examples/arduino-wifiscan"
           - "examples/espidf-arduino-blink"
           - "examples/espidf-arduino-wifiscan"
+          - "examples/espidf-blink"
           - "examples/espidf-aws-iot"
           - "examples/espidf-ble-eddystone"
           - "examples/espidf-coap-server"
@@ -41,7 +43,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install -U https://github.com/platformio/platformio/archive/develop.zip
+          pip install -U platformio
           platformio platform install file://.
       - name: Build examples
         run: |

diff --git a/README.md b/README.md
@@ -1,6 +1,9 @@
-# Espressif 32: development platform for [PlatformIO](http://platformio.org)
+[![Build_special_firmware](https://raw.githubusercontent.com/vshymanskyy/StandWithUkraine/main/banner-direct.svg)](https://github.com/vshymanskyy/StandWithUkraine/blob/main/docs/README.md)
 
-[![Build Status](https://github.com/platformio/platform-espressif32/workflows/Examples/badge.svg)](https://github.com/platformio/platform-espressif32/actions)
+
+# Tasmota Espressif 32: development platform for [PlatformIO](http://platformio.org)
+
+[![Examples](https://github.com/Jason2866/platform-espressif32/actions/workflows/examples.yml/badge.svg)](https://github.com/Jason2866/platform-espressif32/actions/workflows/examples.yml)
 
 Espressif Systems is a privately held fabless semiconductor company. They provide wireless communications and Wi-Fi chips which are widely used in mobile devices and the Internet of Things applications.
 
@@ -16,16 +19,7 @@ Espressif Systems is a privately held fabless semiconductor company. They provid
 
 ```ini
 [env:stable]
-platform = espressif32
-board = ...
-...
-```
-
-## Development version
-
-```ini
-[env:development]
-platform = https://github.com/platformio/platform-espressif32.git
+platform = replace with url
 board = ...
 ...
 ```

diff --git a/boards/adafruit_feather_esp32_v2.json b/boards/adafruit_feather_esp32_v2.json
@@ -0,0 +1,37 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-DADAFRUIT_FEATHER_ESP32_V2 -DBOARD_HAS_PSRAM",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32",
+    "variant": "adafruit_feather_esp32_v2"
+  },
+  "connectivity": [
+    "wifi",
+    "bluetooth",
+    "ethernet",
+    "can"
+  ],
+  "debug": {
+    "openocd_board": "esp-wroom-32.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Adafruit Feather ESP32 V2",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.adafruit.com/product/5400",
+  "vendor": "Adafruit"
+}
diff --git a/boards/esp32-c3-devkitm-1.json b/boards/esp32-c3-devkitm-1.json
@@ -17,6 +17,7 @@
     "openocd_target": "esp32c3.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32-C3-DevKitM-1",

diff --git a/boards/esp32-s2-franzininho.json b/boards/esp32-s2-franzininho.json
@@ -4,13 +4,16 @@
       "ld": "esp32s2_out.ld"
     },
     "core": "esp32",
+    "extra_flags": "-DBOARD_HAS_PSRAM",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
     "mcu": "esp32s2",
     "variant": "esp32s2"
   },
   "connectivity": [
+    "arduino",
+    "espidf",
     "wifi"
   ],
   "debug": {

diff --git a/boards/esp32-s2-kaluga-1.json b/boards/esp32-s2-kaluga-1.json
@@ -4,6 +4,7 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
+    "extra_flags": "-DBOARD_HAS_PSRAM",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
@@ -21,6 +22,7 @@
     "openocd_target": "esp32s2.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32-S2-Kaluga-1 Kit",

diff --git a/boards/esp32-s2-saola-1.json b/boards/esp32-s2-saola-1.json
@@ -4,6 +4,7 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
+    "extra_flags": "-DBOARD_HAS_PSRAM",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
@@ -17,6 +18,7 @@
     "openocd_target": "esp32s2.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Espressif ESP32-S2-Saola-1",

diff --git a/boards/esp32-s3-devkitc-1.json b/boards/esp32-s3-devkitc-1.json
@@ -0,0 +1,35 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qspi_qspi"
+    },
+    "core": "esp32",
+    "extra_flags": "-DBOARD_HAS_PSRAM",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Espressif ESP32-S3-DevKitC-1",
+  "upload": {
+    "flash_size": "8MB",
+    "maximum_ram_size": 524288,
+    "maximum_size": 8388608,
+    "require_upload_port": true,
+    "speed": 460800
+  },
+  "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/user-guide-devkitc-1.html",
+  "vendor": "Espressif"
+}
diff --git a/boards/featheresp32-s2.json b/boards/featheresp32-s2.json
@@ -4,6 +4,7 @@
       "ldscript": "esp32s2_out.ld"
     },
     "core": "esp32",
+    "extra_flags": "-DBOARD_HAS_PSRAM",
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "dio",
@@ -17,6 +18,7 @@
     "openocd_target": "esp32s2.cfg"
   },
   "frameworks": [
+    "arduino",
     "espidf"
   ],
   "name": "Adafruit ESP32-S2 Feather Development Board",

diff --git a/boards/qtpy-esp32-s2.json b/boards/qtpy-esp32-s2.json
@@ -0,0 +1,34 @@
+{
+  "build": {
+    "arduino":{
+      "ldscript": "esp32s2_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": "-DBOARD_HAS_PSRAM",
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "mcu": "esp32s2",
+    "variant": "adafruit_qtpy_esp32s2"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s2.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "Adafruit QT Py ESP32-S2",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.adafruit.com/product/5325",
+  "vendor": "Adafruit"
+}
diff --git a/builder/frameworks/_embed_files.py b/builder/frameworks/_embed_files.py
@@ -108,7 +108,7 @@ def transform_to_asm(target, source, env):
             action=env.VerboseAction(
                 " ".join(
                     [
-                        "xtensa-esp32-elf-objcopy",
+                        "xtensa-%s-elf-objcopy" % board.get("build.mcu", "esp32"),
                         "--input-target",
                         "binary",
                         "--output-target",