remove extensiom cdc from C3,C6,S3 variants (#21212)

arendst · Apr 18, 2024 · c7ff634 · c7ff634
1 parent 7e14db4
commit c7ff634
Show file tree

Hide file tree

Showing 21 changed files with 178 additions and 193 deletions.
diff --git 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
@@ -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
@@ -91,28 +91,27 @@ jobs:
           - tasmota-sensors
           - tasmota-zbbridge
           - tasmota32
+          - tasmota32solo1
           - tasmota32c2
+          - tasmota32c3
+          - tasmota32c6
           - tasmota32s2
+          - tasmota32s2cdc
+          - tasmota32s3
           - tasmota32-zbbrdgpro
           - tasmota-zigbee
           - tasmota32-bluetooth
           - tasmota32-nspanel
           - 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
@@ -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 → boards/esp32c3ser.json b/boards/esp32c3cdc.json → 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,18 +25,18 @@
         "flash_extra_images": [
           [
             "0x10000",
-            "tasmota32c3cdc-safeboot.bin"
+            "tasmota32c3ser-safeboot.bin"
           ]
         ]
       },
       "flash_size": "4MB",
       "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
@@ -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 → boards/esp32c6ser.json b/boards/esp32c6cdc.json → 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,18 +25,18 @@
         "flash_extra_images": [
           [
             "0x10000",
-            "tasmota32c6cdc-safeboot.bin"
+            "tasmota32c6ser-safeboot.bin"
           ]
         ]
       },
       "flash_size": "4MB",
       "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
@@ -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
@@ -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
@@ -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"