From c7ff6342d8e5e856421c49b9b724e5bdda2928e4 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Thu, 18 Apr 2024 13:08:31 +0200 Subject: [PATCH] remove extensiom cdc from C3,C6,S3 variants (#21212) --- .github/workflows/Tasmota_build_devel.yml | 12 +- .github/workflows/Tasmota_build_master.yml | 14 +-- .github/workflows/build_all_the_things.yml | 15 ++- boards/esp32c3.json | 10 +- boards/{esp32c3cdc.json => esp32c3ser.json} | 12 +- boards/esp32c6.json | 10 +- boards/{esp32c6cdc.json => esp32c6ser.json} | 12 +- boards/esp32s3-opi_opi.json | 16 ++- boards/esp32s3-opi_opi_120.json | 10 +- boards/esp32s3-qio_opi.json | 16 ++- boards/esp32s3-qio_opi_120.json | 10 +- boards/esp32s3-qio_qspi.json | 16 ++- ...c-opi_opi.json => esp32s3ser-opi_opi.json} | 18 +-- ...i_120.json => esp32s3ser-opi_opi_120.json} | 12 +- ...c-qio_opi.json => esp32s3ser-qio_opi.json} | 18 +-- ...i_120.json => esp32s3ser-qio_opi_120.json} | 12 +- ...qio_qspi.json => esp32s3ser-qio_qspi.json} | 18 +-- pio-tools/post_esp32.py | 5 - platformio_override_sample.ini | 17 +-- platformio_tasmota_cenv_sample.ini | 40 +++---- platformio_tasmota_env32.ini | 108 +++++++++--------- 21 files changed, 193 insertions(+), 208 deletions(-) rename boards/{esp32c3cdc.json => esp32c3ser.json} (76%) rename boards/{esp32c6cdc.json => esp32c6ser.json} (76%) rename boards/{esp32s3cdc-opi_opi.json => esp32s3ser-opi_opi.json} (72%) rename boards/{esp32s3cdc-opi_opi_120.json => esp32s3ser-opi_opi_120.json} (77%) rename boards/{esp32s3cdc-qio_opi.json => esp32s3ser-qio_opi.json} (71%) rename boards/{esp32s3cdc-qio_opi_120.json => esp32s3ser-qio_opi_120.json} (77%) rename boards/{esp32s3cdc-qio_qspi.json => esp32s3ser-qio_qspi.json} (72%) diff --git a/.github/workflows/Tasmota_build_devel.yml b/.github/workflows/Tasmota_build_devel.yml index d1ca4d4d8..96fa3ac74 100644 --- a/.github/workflows/Tasmota_build_devel.yml +++ b/.github/workflows/Tasmota_build_devel.yml @@ -98,13 +98,13 @@ jobs: - tasmota32solo1-safeboot - tasmota32c2-safeboot - tasmota32c3-safeboot - - tasmota32c3cdc-safeboot + - tasmota32c3ser-safeboot - tasmota32s2-safeboot - tasmota32s2cdc-safeboot - tasmota32s3-safeboot - - tasmota32s3cdc-safeboot + - tasmota32s3ser-safeboot - tasmota32c6-safeboot - - tasmota32c6cdc-safeboot + - tasmota32c6ser-safeboot steps: - uses: actions/checkout@v4 with: @@ -194,11 +194,11 @@ jobs: - tasmota32-ir - tasmota32-lvgl - tasmota32c2 - - tasmota32c3cdc - - tasmota32c6cdc + - tasmota32c3 + - tasmota32c6 - tasmota32s2 - tasmota32s2cdc - - tasmota32s3cdc + - tasmota32s3 - tasmota32solo1 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/Tasmota_build_master.yml b/.github/workflows/Tasmota_build_master.yml index 991e249fa..3ae366cea 100644 --- a/.github/workflows/Tasmota_build_master.yml +++ b/.github/workflows/Tasmota_build_master.yml @@ -21,17 +21,17 @@ jobs: strategy: matrix: variant: - - tasmota32solo1-safeboot - tasmota32-safeboot + - tasmota32solo1-safeboot - tasmota32c2-safeboot - tasmota32c3-safeboot - - tasmota32c3cdc-safeboot + - tasmota32c3ser-safeboot - tasmota32s2-safeboot - tasmota32s2cdc-safeboot - tasmota32s3-safeboot - - tasmota32s3cdc-safeboot + - tasmota32s3ser-safeboot - tasmota32c6-safeboot - - tasmota32c6cdc-safeboot + - tasmota32c6ser-safeboot steps: - uses: actions/checkout@v4 with: @@ -114,11 +114,11 @@ jobs: - tasmota32-ir - tasmota32-lvgl - tasmota32c2 - - tasmota32c3cdc - - tasmota32c6cdc + - tasmota32c3 + - tasmota32c6 - tasmota32s2 - tasmota32s2cdc - - tasmota32s3cdc + - tasmota32s3 - tasmota32solo1 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml index fad665332..365b1ca81 100644 --- a/.github/workflows/build_all_the_things.yml +++ b/.github/workflows/build_all_the_things.yml @@ -91,8 +91,13 @@ jobs: - tasmota-sensors - tasmota-zbbridge - tasmota32 + - tasmota32solo1 - tasmota32c2 + - tasmota32c3 + - tasmota32c6 - tasmota32s2 + - tasmota32s2cdc + - tasmota32s3 - tasmota32-zbbrdgpro - tasmota-zigbee - tasmota32-bluetooth @@ -100,19 +105,13 @@ jobs: - tasmota32-display - tasmota32-ir - tasmota32-lvgl - - tasmota32c3cdc - - tasmota32c6cdc - - tasmota32s2cdc - - tasmota32s3cdc - - tasmota32solo1 - tasmota32-safeboot - tasmota32s2-safeboot - tasmota32s2cdc-safeboot - tasmota32s3-safeboot - tasmota32c2-safeboot - - tasmota32s3cdc-safeboot - - tasmota32c3cdc-safeboot - - tasmota32c6cdc-safeboot + - tasmota32c3-safeboot + - tasmota32c6-safeboot steps: - uses: actions/checkout@v4 - name: Set up Python diff --git a/boards/esp32c3.json b/boards/esp32c3.json index 6f3a9b777..5f77c6990 100644 --- a/boards/esp32c3.json +++ b/boards/esp32c3.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C3", + "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C3 -DUSE_USB_CDC_CONSOLE", "f_cpu": "160000000L", "f_flash": "80000000L", "flash_mode": "dio", @@ -14,6 +14,10 @@ "bluetooth" ], "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], "openocd_target": "esp32c3.cfg" }, "frameworks": [ @@ -33,10 +37,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 460800 + "speed": 2000000 }, "download": { - "speed": 230400 + "speed": 2000000 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html", "vendor": "Espressif" diff --git a/boards/esp32c3cdc.json b/boards/esp32c3ser.json similarity index 76% rename from boards/esp32c3cdc.json rename to boards/esp32c3ser.json index c742b630b..faf5649a7 100644 --- a/boards/esp32c3cdc.json +++ b/boards/esp32c3ser.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C3 -DUSE_USB_CDC_CONSOLE", + "extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C3", "f_cpu": "160000000L", "f_flash": "80000000L", "flash_mode": "dio", @@ -14,10 +14,6 @@ "bluetooth" ], "debug": { - "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], "openocd_target": "esp32c3.cfg" }, "frameworks": [ @@ -29,7 +25,7 @@ "flash_extra_images": [ [ "0x10000", - "tasmota32c3cdc-safeboot.bin" + "tasmota32c3ser-safeboot.bin" ] ] }, @@ -37,10 +33,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 2000000 + "speed": 460800 }, "download": { - "speed": 2000000 + "speed": 230400 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32c3/hw-reference/esp32c3/user-guide-devkitm-1.html", "vendor": "Espressif" diff --git a/boards/esp32c6.json b/boards/esp32c6.json index a0ab75ff5..dd5515743 100644 --- a/boards/esp32c6.json +++ b/boards/esp32c6.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C6", + "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C6 -DUSE_USB_CDC_CONSOLE", "f_cpu": "160000000L", "f_flash": "80000000L", "flash_mode": "qio", @@ -14,6 +14,10 @@ "bluetooth" ], "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], "openocd_target": "esp32c6.cfg" }, "frameworks": [ @@ -33,10 +37,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 460800 + "speed": 2000000 }, "download": { - "speed": 230400 + "speed": 2000000 }, "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html", "vendor": "Espressif" diff --git a/boards/esp32c6cdc.json b/boards/esp32c6ser.json similarity index 76% rename from boards/esp32c6cdc.json rename to boards/esp32c6ser.json index 922e50a9d..952b79399 100644 --- a/boards/esp32c6cdc.json +++ b/boards/esp32c6ser.json @@ -1,7 +1,7 @@ { "build": { "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DARDUINO_USB_MODE=1 -DESP32_4M -DESP32C6 -DUSE_USB_CDC_CONSOLE", + "extra_flags": "-DARDUINO_TASMOTA -DESP32_4M -DESP32C6", "f_cpu": "160000000L", "f_flash": "80000000L", "flash_mode": "qio", @@ -14,10 +14,6 @@ "bluetooth" ], "debug": { - "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], "openocd_target": "esp32c6.cfg" }, "frameworks": [ @@ -29,7 +25,7 @@ "flash_extra_images": [ [ "0x10000", - "tasmota32c6cdc-safeboot.bin" + "tasmota32c6ser-safeboot.bin" ] ] }, @@ -37,10 +33,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 2000000 + "speed": 460800 }, "download": { - "speed": 2000000 + "speed": 230400 }, "url": "https://docs.espressif.com/projects/espressif-esp-dev-kits/en/latest/esp32c6/esp32-c6-devkitc-1/index.html", "vendor": "Espressif" diff --git a/boards/esp32s3-opi_opi.json b/boards/esp32s3-opi_opi.json index ddca6737a..25541b95d 100644 --- a/boards/esp32s3-opi_opi.json +++ b/boards/esp32s3-opi_opi.json @@ -4,10 +4,16 @@ "memory_type": "opi_opi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dout", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" @@ -18,6 +24,10 @@ "ethernet" ], "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -37,10 +47,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 460800 + "speed": 2000000 }, "download": { - "speed": 230400 + "speed": 2000000 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3-opi_opi_120.json b/boards/esp32s3-opi_opi_120.json index abcaeb1b4..ab9ef01fb 100644 --- a/boards/esp32s3-opi_opi_120.json +++ b/boards/esp32s3-opi_opi_120.json @@ -11,7 +11,7 @@ "flash_mode": "dout", "mcu": "esp32s3", "variant": "esp32s3", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" }, "connectivity": [ @@ -20,6 +20,10 @@ "ethernet" ], "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -39,10 +43,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 460800 + "speed": 2000000 }, "download": { - "speed": 230400 + "speed": 2000000 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3-qio_opi.json b/boards/esp32s3-qio_opi.json index e4597ab84..c005158db 100644 --- a/boards/esp32s3-qio_opi.json +++ b/boards/esp32s3-qio_opi.json @@ -4,10 +4,16 @@ "memory_type": "qio_opi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" @@ -18,6 +24,10 @@ "ethernet" ], "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -37,10 +47,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 460800 + "speed": 2000000 }, "download": { - "speed": 230400 + "speed": 2000000 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3-qio_opi_120.json b/boards/esp32s3-qio_opi_120.json index 443080dbf..42589ce05 100644 --- a/boards/esp32s3-qio_opi_120.json +++ b/boards/esp32s3-qio_opi_120.json @@ -11,7 +11,7 @@ "flash_mode": "qio", "mcu": "esp32s3", "variant": "esp32s3", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" }, "connectivity": [ @@ -20,6 +20,10 @@ "ethernet" ], "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -39,10 +43,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 460800 + "speed": 2000000 }, "download": { - "speed": 230400 + "speed": 2000000 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3-qio_qspi.json b/boards/esp32s3-qio_qspi.json index e4df4ccb9..eb834f0c2 100644 --- a/boards/esp32s3-qio_qspi.json +++ b/boards/esp32s3-qio_qspi.json @@ -4,10 +4,16 @@ "memory_type": "qio_qspi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", + "hwids": [ + [ + "0x303A", + "0x1001" + ] + ], "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" @@ -18,6 +24,10 @@ "ethernet" ], "debug": { + "default_tool": "esp-builtin", + "onboard_tools": [ + "esp-builtin" + ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -37,10 +47,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 460800 + "speed": 2000000 }, "download": { - "speed": 230400 + "speed": 2000000 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3cdc-opi_opi.json b/boards/esp32s3ser-opi_opi.json similarity index 72% rename from boards/esp32s3cdc-opi_opi.json rename to boards/esp32s3ser-opi_opi.json index aa64ee9c4..9069a456e 100644 --- a/boards/esp32s3cdc-opi_opi.json +++ b/boards/esp32s3ser-opi_opi.json @@ -4,16 +4,10 @@ "memory_type": "opi_opi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dout", - "hwids": [ - [ - "0x303A", - "0x1001" - ] - ], "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" @@ -24,10 +18,6 @@ "ethernet" ], "debug": { - "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -39,7 +29,7 @@ "flash_extra_images": [ [ "0x10000", - "tasmota32s3cdc-safeboot.bin" + "tasmota32s3ser-safeboot.bin" ] ] }, @@ -47,10 +37,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 2000000 + "speed": 460800 }, "download": { - "speed": 2000000 + "speed": 230400 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3cdc-opi_opi_120.json b/boards/esp32s3ser-opi_opi_120.json similarity index 77% rename from boards/esp32s3cdc-opi_opi_120.json rename to boards/esp32s3ser-opi_opi_120.json index 2f6482c2b..5d370c746 100644 --- a/boards/esp32s3cdc-opi_opi_120.json +++ b/boards/esp32s3ser-opi_opi_120.json @@ -11,7 +11,7 @@ "flash_mode": "dout", "mcu": "esp32s3", "variant": "esp32s3", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" }, "connectivity": [ @@ -20,10 +20,6 @@ "ethernet" ], "debug": { - "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -35,7 +31,7 @@ "flash_extra_images": [ [ "0x10000", - "tasmota32s3cdc-safeboot.bin" + "tasmota32s3ser-safeboot.bin" ] ] }, @@ -43,10 +39,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 2000000 + "speed": 460800 }, "download": { - "speed": 2000000 + "speed": 230400 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3cdc-qio_opi.json b/boards/esp32s3ser-qio_opi.json similarity index 71% rename from boards/esp32s3cdc-qio_opi.json rename to boards/esp32s3ser-qio_opi.json index 99c7fa6b2..d588b060d 100644 --- a/boards/esp32s3cdc-qio_opi.json +++ b/boards/esp32s3ser-qio_opi.json @@ -4,16 +4,10 @@ "memory_type": "qio_opi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", - "hwids": [ - [ - "0x303A", - "0x1001" - ] - ], "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" @@ -24,10 +18,6 @@ "ethernet" ], "debug": { - "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -39,7 +29,7 @@ "flash_extra_images": [ [ "0x10000", - "tasmota32s3cdc-safeboot.bin" + "tasmota32s3ser-safeboot.bin" ] ] }, @@ -47,10 +37,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 2000000 + "speed": 460800 }, "download": { - "speed": 2000000 + "speed": 230400 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3cdc-qio_opi_120.json b/boards/esp32s3ser-qio_opi_120.json similarity index 77% rename from boards/esp32s3cdc-qio_opi_120.json rename to boards/esp32s3ser-qio_opi_120.json index 1bd0ab7ed..aea5ff20e 100644 --- a/boards/esp32s3cdc-qio_opi_120.json +++ b/boards/esp32s3ser-qio_opi_120.json @@ -11,7 +11,7 @@ "flash_mode": "qio", "mcu": "esp32s3", "variant": "esp32s3", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" }, "connectivity": [ @@ -20,10 +20,6 @@ "ethernet" ], "debug": { - "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -35,7 +31,7 @@ "flash_extra_images": [ [ "0x10000", - "tasmota32s3cdc-safeboot.bin" + "tasmota32s3ser-safeboot.bin" ] ] }, @@ -43,10 +39,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 2000000 + "speed": 460800 }, "download": { - "speed": 2000000 + "speed": 230400 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/boards/esp32s3cdc-qio_qspi.json b/boards/esp32s3ser-qio_qspi.json similarity index 72% rename from boards/esp32s3cdc-qio_qspi.json rename to boards/esp32s3ser-qio_qspi.json index 46c73dcb9..aedf4f3a5 100644 --- a/boards/esp32s3cdc-qio_qspi.json +++ b/boards/esp32s3ser-qio_qspi.json @@ -4,16 +4,10 @@ "memory_type": "qio_qspi" }, "core": "esp32", - "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DARDUINO_USB_MODE=1 -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S3", + "extra_flags": "-DARDUINO_TASMOTA -DBOARD_HAS_PSRAM -DESP32_4M -DESP32S3", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "qio", - "hwids": [ - [ - "0x303A", - "0x1001" - ] - ], "mcu": "esp32s3", "variant": "esp32s3", "partitions": "partitions/esp32_partition_app2880k_fs320k.csv" @@ -24,10 +18,6 @@ "ethernet" ], "debug": { - "default_tool": "esp-builtin", - "onboard_tools": [ - "esp-builtin" - ], "openocd_target": "esp32s3.cfg" }, "frameworks": [ @@ -39,7 +29,7 @@ "flash_extra_images": [ [ "0x10000", - "tasmota32s3cdc-safeboot.bin" + "tasmota32s3ser-safeboot.bin" ] ] }, @@ -47,10 +37,10 @@ "maximum_ram_size": 327680, "maximum_size": 4194304, "require_upload_port": true, - "speed": 2000000 + "speed": 460800 }, "download": { - "speed": 2000000 + "speed": 230400 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/hw-reference/esp32s3/", "vendor": "Espressif" diff --git a/pio-tools/post_esp32.py b/pio-tools/post_esp32.py index f89317019..a468e14e1 100644 --- a/pio-tools/post_esp32.py +++ b/pio-tools/post_esp32.py @@ -141,11 +141,6 @@ def esp32_create_chip_string(chip): print(Fore.YELLOW + "Unexpected naming convention in this build environment:" + Fore.RED, tasmota_platform_org) print(Fore.YELLOW + "Expected build environment name like " + Fore.GREEN + "'tasmota" + chip[3:] + "-whatever-you-want'") print(Fore.YELLOW + "Please correct your actual build environment, to avoid undefined behavior in build process!!") - if "-DUSE_USB_CDC_CONSOLE" in env.BoardConfig().get("build.extra_flags") and "cdc" not in tasmota_platform: - tasmota_platform += "cdc" - print(Fore.YELLOW + "Board definition uses CDC configuration, but environment name does not -> fix by adding 'cdc'") - print(Fore.YELLOW + "Expected build environment name like " + Fore.GREEN + "'tasmota" + chip[3:] + "cdc-whatever-you-want'") - print(Fore.YELLOW + "Please correct your actual build environment, to avoid undefined behavior in build process!!") return tasmota_platform def esp32_build_filesystem(fs_size): diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini index 9b2e2c3bd..83e69e23b 100644 --- a/platformio_override_sample.ini +++ b/platformio_override_sample.ini @@ -28,20 +28,23 @@ default_envs = ; tasmota-zbbridge ; tasmota-ir ; tasmota32 +; tasmota32solo1 +; tasmota32s2 +; tasmota32s2cdc +; tasmota32s3 +; tasmota32c2 +; tasmota32c3 +; tasmota32c6 ; tasmota32-zbbrdgpro ; tasmota32-bluetooth ; tasmota32-webcam ; tasmota32-knx ; tasmota32-lvgl ; tasmota32-ir -; tasmota32solo1 ; tasmota32-nspanel -; tasmota32c2 -; tasmota32c3cdc -; tasmota32c6cdc -; tasmota32s2 -; tasmota32s2cdc -; tasmota32s3cdc +; tasmota32c3ser +; tasmota32c6ser +; tasmota32s3ser [tasmota] ; *** Global build / unbuild compile time flags for ALL Tasmota / Tasmota32 [env] diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini index c8d881014..f10fad6b3 100644 --- a/platformio_tasmota_cenv_sample.ini +++ b/platformio_tasmota_cenv_sample.ini @@ -55,21 +55,9 @@ build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_LVGL -DUSE_LVGL_OPENHASP -DOTA_URL='""' - -[env:tasmota32s3cdc-opi_opi] +[env:tasmota32c3-bluetooth] extends = env:tasmota32_base -board = esp32s3cdc-opi_opi -board_build.f_cpu = 240000000L -board_build.f_flash = 80000000L -build_flags = ${env:tasmota32_base.build_flags} - -DUSE_BERRY_ULP - -DFIRMWARE_LVGL - -DUSE_LVGL_OPENHASP - -DOTA_URL='""' - -[env:tasmota32c3cdc-bluetooth] -extends = env:tasmota32_base -board = esp32c3cdc +board = esp32c3 build_unflags = ${env:tasmota32_base.build_unflags} -mtarget-align build_flags = ${env:tasmota32_base.build_flags} @@ -79,9 +67,9 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio lib_ignore = Micro-RTSP -[env:tasmota32s3cdc-bluetooth] +[env:tasmota32s3-bluetooth] extends = env:tasmota32_base -board = esp32s3cdc-qio_qspi +board = esp32s3-qio_qspi build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_BLUETOOTH -DOTA_URL='""' @@ -97,9 +85,9 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl lib_ignore = Micro-RTSP -[env:tasmota32c3cdc-mi32] +[env:tasmota32c3-mi32] extends = env:tasmota32_base -board = esp32c3cdc +board = esp32c3 build_unflags = ${env:tasmota32_base.build_unflags} -mtarget-align build_flags = ${env:tasmota32_base.build_flags} @@ -109,9 +97,9 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl lib_ignore = Micro-RTSP -[env:tasmota32s3cdc-mi32] +[env:tasmota32s3-mi32] extends = env:tasmota32_base -board = esp32s3cdc-qio_qspi +board = esp32s3-qio_qspi build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_BLUETOOTH -DUSE_MI_EXT_GUI @@ -119,9 +107,9 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/libesp32, lib/libesp32_div, lib/lib_basic, lib/lib_i2c, lib/lib_div, lib/lib_ssl lib_ignore = Micro-RTSP -[env:tasmota32c6cdc-mi32] +[env:tasmota32c6-mi32] extends = env:tasmota32_base -board = esp32c6cdc +board = esp32c6 build_unflags = ${env:tasmota32_base.build_unflags} -mtarget-align build_flags = ${env:tasmota32_base.build_flags} @@ -189,10 +177,10 @@ build_flags = ${env:tasmota32_base.build_flags} ; *** JTAG Debug versions (only C3/S3), uses inbuilt CDC/jtag. No extra jtag hardware required! -[env:tasmota32s3cdc-ocd] +[env:tasmota32s3-ocd] build_type = debug extends = env:tasmota32s3 -board = esp32s3cdc-qio_opi +board = esp32s3-qio_opi debug_tool = esp-builtin upload_protocol = esp-builtin debug_init_break = tbreak setup @@ -200,10 +188,10 @@ build_unflags = ${env:tasmota32_base.build_unflags} build_flags = ${env:tasmota32_base.build_flags} -DOTA_URL='""' -[env:tasmota32c3cdc-ocd] +[env:tasmota32c3-ocd] build_type = debug extends = env:tasmota32c3 -board = esp32c3cdc +board = esp32c3 debug_tool = esp-builtin upload_protocol = esp-builtin debug_init_break = tbreak setup diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index e92e1d4f8..0396a7cce 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -44,15 +44,6 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} -[env:tasmota32s2cdc-safeboot] -extends = env:tasmota32_base -board = esp32s2cdc -build_flags = ${env:tasmota32_base.build_flags} - -DFIRMWARE_SAFEBOOT - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc-safeboot.bin"' -lib_extra_dirs = lib/lib_ssl, lib/libesp32 -lib_ignore = ${safeboot_flags.lib_ignore} - [env:tasmota32s2-safeboot] extends = env:tasmota32_base board = esp32s2 @@ -62,6 +53,15 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} +[env:tasmota32s2cdc-safeboot] +extends = env:tasmota32_base +board = esp32s2cdc +build_flags = ${env:tasmota32_base.build_flags} + -DFIRMWARE_SAFEBOOT + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc-safeboot.bin"' +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + [env:tasmota32c2-safeboot] extends = env:tasmota32_base board = esp32c2 @@ -73,17 +73,6 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} -[env:tasmota32c3cdc-safeboot] -extends = env:tasmota32_base -board = esp32c3cdc -build_unflags = ${env:tasmota32_base.build_unflags} - -mtarget-align -build_flags = ${env:tasmota32_base.build_flags} - -DFIRMWARE_SAFEBOOT - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc-safeboot.bin"' -lib_extra_dirs = lib/lib_ssl, lib/libesp32 -lib_ignore = ${safeboot_flags.lib_ignore} - [env:tasmota32c3-safeboot] extends = env:tasmota32_base board = esp32c3 @@ -95,23 +84,23 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} -[env:tasmota32s3cdc-safeboot] +[env:tasmota32c3ser-safeboot] extends = env:tasmota32_base -board = esp32s3cdc-qio_qspi -build_flags = ${env:tasmota32_base.build_flags} - -DFIRMWARE_SAFEBOOT - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3cdc-safeboot.bin"' -lib_extra_dirs = lib/lib_ssl, lib/libesp32 -lib_ignore = ${safeboot_flags.lib_ignore} - -[env:tasmota32c6cdc-safeboot] -extends = env:tasmota32_base -board = esp32c6cdc +board = esp32c3ser build_unflags = ${env:tasmota32_base.build_unflags} -mtarget-align build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c6cdc-safeboot.bin"' + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3ser-safeboot.bin"' +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32s3-safeboot] +extends = env:tasmota32_base +board = esp32s3-qio_qspi +build_flags = ${env:tasmota32_base.build_flags} + -DFIRMWARE_SAFEBOOT + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3-safeboot.bin"' lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} @@ -126,12 +115,23 @@ build_flags = ${env:tasmota32_base.build_flags} lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} -[env:tasmota32s3-safeboot] +[env:tasmota32c6ser-safeboot] extends = env:tasmota32_base -board = esp32s3-qio_qspi +board = esp32c6ser +build_unflags = ${env:tasmota32_base.build_unflags} + -mtarget-align +build_flags = ${env:tasmota32_base.build_flags} + -DFIRMWARE_SAFEBOOT + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c6ser-safeboot.bin"' +lib_extra_dirs = lib/lib_ssl, lib/libesp32 +lib_ignore = ${safeboot_flags.lib_ignore} + +[env:tasmota32s3ser-safeboot] +extends = env:tasmota32_base +board = esp32s3ser-qio_qspi build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_SAFEBOOT - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3-safeboot.bin"' + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3ser-safeboot.bin"' lib_extra_dirs = lib/lib_ssl, lib/libesp32 lib_ignore = ${safeboot_flags.lib_ignore} @@ -152,16 +152,6 @@ lib_ignore = ${env:tasmota32_base.lib_ignore} Micro-RTSP epdiy -[env:tasmota32s2cdc] -extends = env:tasmota32_base -board = esp32s2cdc -build_flags = ${env:tasmota32_base.build_flags} - -DFIRMWARE_TASMOTA32 - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc.bin"' -lib_ignore = ${env:tasmota32_base.lib_ignore} - Micro-RTSP - epdiy - [env:tasmota32s2] extends = env:tasmota32_base board = esp32s2 @@ -172,6 +162,16 @@ lib_ignore = ${env:tasmota32_base.lib_ignore} Micro-RTSP epdiy +[env:tasmota32s2cdc] +extends = env:tasmota32_base +board = esp32s2cdc +build_flags = ${env:tasmota32_base.build_flags} + -DFIRMWARE_TASMOTA32 + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s2cdc.bin"' +lib_ignore = ${env:tasmota32_base.lib_ignore} + Micro-RTSP + epdiy + [env:tasmota32c2] extends = env:tasmota32_base board = esp32c2 @@ -181,30 +181,30 @@ build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c2.bin"' -[env:tasmota32c3cdc] +[env:tasmota32c3] extends = env:tasmota32_base -board = esp32c3cdc +board = esp32c3 build_unflags = ${env:tasmota32_base.build_unflags} -mtarget-align build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc.bin"' + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3.bin"' -[env:tasmota32c6cdc] +[env:tasmota32c6] extends = env:tasmota32_base -board = esp32c6cdc +board = esp32c6 build_unflags = ${env:tasmota32_base.build_unflags} -mtarget-align build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c6cdc.bin"' + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c6.bin"' -[env:tasmota32s3cdc] +[env:tasmota32s3] extends = env:tasmota32_base -board = esp32s3cdc-qio_qspi +board = esp32s3-qio_qspi build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 - -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3cdc.bin"' + -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32s3.bin"' lib_ignore = ${env:tasmota32_base.lib_ignore} Micro-RTSP epdiy