From 179920e8a366f04f44150259bbb25a4141265841 Mon Sep 17 00:00:00 2001 From: Jason2866 <24528715+Jason2866@users.noreply.github.com> Date: Wed, 29 Dec 2021 14:37:41 +0100 Subject: [PATCH] Boards.json definition updates Add definitions to boards.json to make it possible to differentiate later. --- boards/esp32-cam.json | 2 +- boards/esp32-m5core2.json | 2 +- boards/esp32-odroid.json | 2 +- boards/esp32_16M.json | 2 +- boards/esp32_4M.json | 2 +- boards/esp32_8M.json | 2 +- boards/esp32_solo1_4M.json | 2 +- boards/esp32c3.json | 1 + boards/esp32s2.json | 2 +- boards/esp8266_zbbridge.json | 2 +- platformio_tasmota32.ini | 2 +- platformio_tasmota_env32.ini | 1 + tasmota/my_user_config.h | 2 ++ 13 files changed, 14 insertions(+), 10 deletions(-) diff --git a/boards/esp32-cam.json b/boards/esp32-cam.json index fc3fc4f1f..66310f921 100644 --- a/boards/esp32-cam.json +++ b/boards/esp32-cam.json @@ -4,7 +4,7 @@ "ldscript": "esp32_out.ld" }, "core": "esp32", - "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw", + "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dout", diff --git a/boards/esp32-m5core2.json b/boards/esp32-m5core2.json index 0170649fa..266f6d7f3 100644 --- a/boards/esp32-m5core2.json +++ b/boards/esp32-m5core2.json @@ -4,7 +4,7 @@ "ldscript": "esp32_out.ld" }, "core": "esp32", - "extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM", + "extra_flags": "-DARDUINO_M5STACK_Core2 -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dout", diff --git a/boards/esp32-odroid.json b/boards/esp32-odroid.json index 10bb8bf4d..6354b6436 100644 --- a/boards/esp32-odroid.json +++ b/boards/esp32-odroid.json @@ -4,7 +4,7 @@ "ldscript": "esp32_out.ld" }, "core": "esp32", - "extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw", + "extra_flags": "-DARDUINO_ODROID_ESP32 -DBOARD_HAS_PSRAM -DHAS_PSRAM_FIX -mfix-esp32-psram-cache-issue -mfix-esp32-psram-cache-strategy=memw -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dout", diff --git a/boards/esp32_16M.json b/boards/esp32_16M.json index 69abb9a09..4e6dab9af 100644 --- a/boards/esp32_16M.json +++ b/boards/esp32_16M.json @@ -4,7 +4,7 @@ "ldscript": "esp32_out.ld" }, "core": "esp32", - "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DESP32_16M", + "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_16M", "f_cpu": "80000000L", "f_flash": "40000000L", "flash_mode": "dout", diff --git a/boards/esp32_4M.json b/boards/esp32_4M.json index f43be6848..1e1df8162 100644 --- a/boards/esp32_4M.json +++ b/boards/esp32_4M.json @@ -4,7 +4,7 @@ "ldscript": "esp32_out.ld" }, "core": "esp32", - "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DESP32_4M", + "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M", "f_cpu": "80000000L", "f_flash": "40000000L", "flash_mode": "dout", diff --git a/boards/esp32_8M.json b/boards/esp32_8M.json index adcd0caaa..5177a06ab 100644 --- a/boards/esp32_8M.json +++ b/boards/esp32_8M.json @@ -4,7 +4,7 @@ "ldscript": "esp32_out.ld" }, "core": "esp32", - "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DESP32_8M", + "extra_flags": "-DARDUINO_ESP32_DEV -DBOARD_HAS_PSRAM -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_8M", "f_cpu": "80000000L", "f_flash": "40000000L", "flash_mode": "dout", diff --git a/boards/esp32_solo1_4M.json b/boards/esp32_solo1_4M.json index 64759d331..270ff2bf2 100644 --- a/boards/esp32_solo1_4M.json +++ b/boards/esp32_solo1_4M.json @@ -4,7 +4,7 @@ "ldscript": "esp32_out.ld" }, "core": "esp32", - "extra_flags": "-DARDUINO_ESP32_DEV -DESP32_4M", + "extra_flags": "-DARDUINO_ESP32_DEV -DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DCORE32SOLO1", "f_cpu": "80000000L", "f_flash": "40000000L", "flash_mode": "dout", diff --git a/boards/esp32c3.json b/boards/esp32c3.json index cedcf1500..d7cb2da8f 100644 --- a/boards/esp32c3.json +++ b/boards/esp32c3.json @@ -4,6 +4,7 @@ "ldscript": "esp32c3_out.ld" }, "core": "esp32", + "extra_flags": "-DARDUINO_USB_CDC_ON_BOOT=0 -DESP32_4M -DESP32C3", "f_cpu": "160000000L", "f_flash": "80000000L", "flash_mode": "dout", diff --git a/boards/esp32s2.json b/boards/esp32s2.json index e18a2339c..0be6047cf 100644 --- a/boards/esp32s2.json +++ b/boards/esp32s2.json @@ -4,7 +4,7 @@ "ldscript": "esp32s2_out.ld" }, "core": "esp32", - "extra_flags": "-DBOARD_HAS_PSRAM", + "extra_flags": "-DBOARD_HAS_PSRAM -DESP32_4M -DESP32S2", "f_cpu": "240000000L", "f_flash": "80000000L", "flash_mode": "dout", diff --git a/boards/esp8266_zbbridge.json b/boards/esp8266_zbbridge.json index 975c1bc8c..73cff2dbe 100644 --- a/boards/esp8266_zbbridge.json +++ b/boards/esp8266_zbbridge.json @@ -4,7 +4,7 @@ "ldscript": "eagle.flash.2m256.ld" }, "core": "esp8266", - "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01", + "extra_flags": "-DESP8266 -DARDUINO_ARCH_ESP8266 -DARDUINO_ESP8266_ESP01 -DESP8266_2M -DESP8266_2M256", "f_cpu": "160000000L", "f_flash": "40000000L", "flash_mode": "dout", diff --git a/platformio_tasmota32.ini b/platformio_tasmota32.ini index 0eaa854e4..609450169 100644 --- a/platformio_tasmota32.ini +++ b/platformio_tasmota32.ini @@ -42,4 +42,4 @@ build_flags = ${esp32_defaults.build_flags} platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.2solo1/platform-tasmota-espressif32-2.0.2-solo1.zip platform_packages = build_unflags = ${esp32_defaults.build_unflags} -build_flags = ${esp32_defaults.build_flags} -DCORE32SOLO1 +build_flags = ${esp32_defaults.build_flags} diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini index a73ef16e4..24e165a64 100644 --- a/platformio_tasmota_env32.ini +++ b/platformio_tasmota_env32.ini @@ -49,6 +49,7 @@ build_flags = ${env:tasmota32_base.build_flags} -DFIRMWARE_TASMOTA32 [env:tasmota32solo1] extends = env:tasmota32_base +board = esp32_solo1_4M platform = ${core32solo1.platform} platform_packages = ${core32solo1.platform_packages} build_flags = ${core32solo1.build_flags} -DFIRMWARE_TASMOTA32 diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h index 050bc7c19..c5f6d3c04 100644 --- a/tasmota/my_user_config.h +++ b/tasmota/my_user_config.h @@ -98,6 +98,8 @@ #ifdef ESP32 #ifdef CONFIG_IDF_TARGET_ESP32C3 #define OTA_URL "http://ota.tasmota.com/tasmota32/release/tasmota32c3.bin" // [OtaUrl] +#elif defined(CONFIG_IDF_TARGET_ESP32S2) +#define OTA_URL "no official version (yet)" // [OtaUrl] #elif defined(CORE32SOLO1) #define OTA_URL "http://ota.tasmota.com/tasmota32/release/tasmota32solo1.bin" // [OtaUrl] #else