diff --git a/boards/esp32c3.json b/boards/esp32c3.json deleted file mode 100644 index 884ad3953..000000000 --- a/boards/esp32c3.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "build": { - "arduino":{ - "ldscript": "esp32c3_out.ld" - }, - "core": "esp32", - "extra_flags": "-DESP32_4M -DESP32C3", - "f_cpu": "160000000L", - "f_flash": "80000000L", - "flash_mode": "dio", - "mcu": "esp32c3", - "variant": "esp32c3", - "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" - }, - "connectivity": [ - "wifi", - "bluetooth" - ], - "debug": { - "openocd_target": "esp32c3.cfg" - }, - "frameworks": [ - "arduino", - "espidf" - ], - "name": "Espressif Generic ESP32-C3 4M Flash ESPEasy 1810k Code/OTA 316k FS", - "upload": { - "flash_size": "4MB", - "maximum_ram_size": 327680, - "maximum_size": 4194304, - "require_upload_port": true, - "speed": 460800 - }, - "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 deleted file mode 100644 index 10555b49c..000000000 --- a/boards/esp32c6.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "build": { - "arduino":{ - "ldscript": "esp32c6_out.ld" - }, - "core": "esp32", - "extra_flags": "-DESP32_4M -DESP32C6", - "f_cpu": "160000000L", - "f_flash": "80000000L", - "flash_mode": "qio", - "mcu": "esp32c6", - "variant": "esp32c6", - "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" - }, - "connectivity": [ - "wifi", - "bluetooth" - ], - "debug": { - "openocd_target": "esp32c6.cfg" - }, - "frameworks": [ - "arduino", - "espidf" - ], - "name": "Espressif Generic ESP32-C6 >= 4M Flash, ESPEasy 1810k Code/OTA 316k FS", - "upload": { - "flash_size": "4MB", - "maximum_ram_size": 327680, - "maximum_size": 4194304, - "require_upload_port": true, - "speed": 460800 - }, - "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/esp32s2.json b/boards/esp32s2.json deleted file mode 100644 index 0eb189030..000000000 --- a/boards/esp32s2.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "build": { - "arduino":{ - "ldscript": "esp32s2_out.ld", - "memory_type": "dio_qspi" - }, - "core": "esp32", - "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2 -DCONFIG_IDF_TARGET_ESP32S2=1", - "f_cpu": "240000000L", - "f_flash": "80000000L", - "flash_mode": "dio", - "mcu": "esp32s2", - "variant": "esp32s2", - "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" - }, - "connectivity": [ - "wifi" - ], - "debug": { - "openocd_target": "esp32s2.cfg" - }, - "frameworks": [ - "espidf", - "arduino" - ], - "name": "Espressif Generic ESP32-S2 4M Flash ESPEasy 1810k Code/OTA 316k FS", - "upload": { - "flash_size": "4MB", - "maximum_ram_size": 327680, - "maximum_size": 4194304, - "require_upload_port": true, - "speed": 460800 - }, - "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-saola-1-v1.2.html", - "vendor": "Espressif" -} diff --git a/boards/esp32s2_cdc.json b/boards/esp32s2_cdc.json deleted file mode 100644 index f358f6a3c..000000000 --- a/boards/esp32s2_cdc.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "build": { - "arduino":{ - "ldscript": "esp32s2_out.ld", - "memory_type": "dio_qspi" - }, - "core": "esp32", - "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2 -DCONFIG_IDF_TARGET_ESP32S2=1 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1", - "f_cpu": "240000000L", - "f_flash": "80000000L", - "flash_mode": "dio", - "mcu": "esp32s2", - "variant": "esp32s2", - "partitions": "boards/partitions/esp32_partition_app1810k_spiffs316k.csv" - }, - "connectivity": [ - "wifi" - ], - "debug": { - "openocd_target": "esp32s2.cfg" - }, - "frameworks": [ - "espidf", - "arduino" - ], - "name": "Espressif Generic ESP32-S2 USB CDC 4M Flash ESPEasy 1810k Code/OTA 316k FS", - "upload": { - "flash_size": "4MB", - "maximum_ram_size": 327680, - "maximum_size": 4194304, - "before_reset": "usb_reset", - "after_reset": "hard_reset", - "use_1200bps_touch": true, - "wait_for_upload_port": true, - "require_upload_port": true, - "speed": 460800 - }, - "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-saola-1-v1.2.html", - "vendor": "Espressif" -} diff --git a/boards/esp32s2cdc.json b/boards/esp32s2cdc.json index 166ef3287..f358f6a3c 100644 --- a/boards/esp32s2cdc.json +++ b/boards/esp32s2cdc.json @@ -1,10 +1,11 @@ { "build": { "arduino":{ - "ldscript": "esp32s2_out.ld" + "ldscript": "esp32s2_out.ld", + "memory_type": "dio_qspi" }, "core": "esp32", - "extra_flags": "-DBOARD_HAS_PSRAM -DUSE_USB_CDC_CONSOLE -DESP32_4M -DESP32S2", + "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2 -DCONFIG_IDF_TARGET_ESP32S2=1 -DUSE_USB_CDC_CONSOLE -DARDUINO_USB_CDC_ON_BOOT=1", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dio", @@ -22,14 +23,16 @@ "espidf", "arduino" ], - "name": "Espressif Generic ESP32-S2 >= 4M Flash PSRAM, ESPEasy 1810k Code/OTA 316k FS", + "name": "Espressif Generic ESP32-S2 USB CDC 4M Flash ESPEasy 1810k Code/OTA 316k FS", "upload": { "flash_size": "4MB", "maximum_ram_size": 327680, "maximum_size": 4194304, - "require_upload_port": true, "before_reset": "usb_reset", - "after_reset": "no_reset", + "after_reset": "hard_reset", + "use_1200bps_touch": true, + "wait_for_upload_port": true, + "require_upload_port": true, "speed": 460800 }, "url": "https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/hw-reference/esp32s2/user-guide-saola-1-v1.2.html", diff --git a/platformio_esp32c6_envs.ini b/platformio_esp32c6_envs.ini index 90469a716..4d07f4a11 100644 --- a/platformio_esp32c6_envs.ini +++ b/platformio_esp32c6_envs.ini @@ -14,19 +14,18 @@ lib_ignore = ${esp32_base_idf5.lib_ignore} NeoPixelBus NeoPixelBus_wrapper Adafruit NeoMatrix via NeoPixelBus +board = esp32c6cdc [env:custom_ESP32c6_4M316k_LittleFS_CDC] extends = esp32c6_common_LittleFS -board = esp32c6cdc build_flags = ${esp32c6_common_LittleFS.build_flags} -DPLUGIN_BUILD_CUSTOM extra_scripts = ${esp32c6_common_LittleFS.extra_scripts} pre:tools/pio/pre_custom_esp32c6.py -[env:normal_ESP32c6_4M316k_LittleFS] +[env:normal_ESP32c6_4M316k_LittleFS_CDC] extends = esp32c6_common_LittleFS -board = esp32c6 lib_ignore = ${esp32c6_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} diff --git a/platformio_esp32s2_envs.ini b/platformio_esp32s2_envs.ini index 44c0d0231..7b65fb351 100644 --- a/platformio_esp32s2_envs.ini +++ b/platformio_esp32s2_envs.ini @@ -29,7 +29,7 @@ board_build.filesystem = littlefs [env:custom_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_BUILD_CUSTOM -DESP_CONSOLE_USB_CDC=y @@ -38,7 +38,7 @@ extra_scripts = ${esp32s2_common.extra_scripts} [env:neopixel_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 @@ -46,7 +46,7 @@ build_flags = ${esp32s2_common.build_flags} [env:neopixel_ESP32s2_4M316k_LittleFS_CDC] extends = esp32s2_common_LittleFS -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common_LittleFS.build_flags} -DFEATURE_ARDUINO_OTA=1 -DFEATURE_SD=1 @@ -55,7 +55,7 @@ build_flags = ${esp32s2_common_LittleFS.build_flags} [env:custom_IR_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_BUILD_CUSTOM -DPLUGIN_BUILD_IR @@ -69,62 +69,62 @@ extra_scripts = ${esp32s2_common.extra_scripts} [env:normal_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc lib_ignore = ${esp32s2_common.lib_ignore} ${no_ir.lib_ignore} [env:normal_ESP32s2_4M316k_LittleFS_CDC] extends = esp32s2_common_LittleFS -board = esp32s2_cdc +board = esp32s2cdc lib_ignore = ${esp32s2_common_LittleFS.lib_ignore} ${no_ir.lib_ignore} [env:collection_A_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_SET_COLLECTION_ESP32 -DCOLLECTION_USE_RTTTL [env:collection_B_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_SET_COLLECTION_B_ESP32 -DCOLLECTION_USE_RTTTL [env:collection_C_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_SET_COLLECTION_C_ESP32 -DCOLLECTION_USE_RTTTL [env:collection_D_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_SET_COLLECTION_D_ESP32 -DCOLLECTION_USE_RTTTL [env:collection_E_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_SET_COLLECTION_E_ESP32 -DCOLLECTION_USE_RTTTL [env:collection_F_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_SET_COLLECTION_F_ESP32 -DCOLLECTION_USE_RTTTL [env:collection_G_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -DPLUGIN_SET_COLLECTION_G_ESP32 -DCOLLECTION_USE_RTTTL @@ -132,19 +132,19 @@ build_flags = ${esp32s2_common.build_flags} [env:energy_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -D PLUGIN_ENERGY_COLLECTION [env:display_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -D PLUGIN_DISPLAY_COLLECTION [env:climate_ESP32s2_4M316k_CDC] extends = esp32s2_common -board = esp32s2_cdc +board = esp32s2cdc build_flags = ${esp32s2_common.build_flags} -D PLUGIN_CLIMATE_COLLECTION