From 6a6d7a15214cf848c9275afea5d049fcb7acd8d9 Mon Sep 17 00:00:00 2001
From: Jason2866 <24528715+Jason2866@users.noreply.github.com>
Date: Wed, 22 Feb 2023 12:42:12 +0100
Subject: [PATCH] add specific firmware image names (#18021)

* add image names
* rm duplicate define
---
 platformio_tasmota_env.ini   | 11 ++++++++---
 platformio_tasmota_env32.ini | 15 ++++++++++-----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index 7912f7214..b6357670a 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -36,8 +36,9 @@ build_flags             = ${env.build_flags} -DOTA_URL='"http://ota.tasmota.com/
 
 [env:tasmota-4M]
 board                   = esp8266_4M2M
-build_flags             = ${env.build_flags} -DOTA_URL='"http://ota.tasmota.com/tasmota/release/tasmota-4M.bin.gz"'
-
+build_flags             = ${env.build_flags}
+                          -DCODE_IMAGE_STR='"tasmota-4M"'
+                          -DOTA_URL='"http://ota.tasmota.com/tasmota/release/tasmota-4M.bin.gz"'
 
 [env:tasmota-minimal]
 build_flags             = ${env.build_flags} -DFIRMWARE_MINIMAL -DOTA_URL='"http://ota.tasmota.com/tasmota/release/tasmota-minimal.bin.gz"'
@@ -69,7 +70,11 @@ board                   = esp8266_zbbridge
 lib_extra_dirs          = lib/lib_basic, lib/lib_ssl, lib/lib_div
 
 [env:tasmota-zigbee]
-build_flags             = ${env.build_flags} -DUSE_ZIGBEE -DUSE_CCLOADER -DUSE_UFILESYS -DOTA_URL='"http://ota.tasmota.com/tasmota/release/tasmota-zigbee.bin.gz"'
+build_flags             = ${env.build_flags}
+                          -DUSE_ZIGBEE
+                          -DUSE_CCLOADER
+                          -DCODE_IMAGE_STR='"zigbee"'
+                          -DOTA_URL='"http://ota.tasmota.com/tasmota/release/tasmota-zigbee.bin.gz"'
 board                   = esp8266_4M2M
 board_build.f_cpu       = 160000000L
 
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index a408338d4..75ca2cb78 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -62,17 +62,20 @@ extends                 = env:tasmota32_base
 board                   = esp32-fix
 board_build.f_cpu       = 240000000L
 build_flags             = ${env:tasmota32_base.build_flags}
-                          -DFIRMWARE_WEBCAM -DCAMERA_MODEL_AI_THINKER
+                          -DFIRMWARE_WEBCAM
+                          -DCAMERA_MODEL_AI_THINKER
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-webcam.bin"'
 lib_extra_dirs          = lib/lib_ssl, lib/libesp32
 
 [env:tasmota32-odroidgo]
 extends                 = env:tasmota32-lvgl
+board                   = esp32-fix
 board_build.f_cpu       = 240000000L
 build_flags             = ${env:tasmota32_base.build_flags}
-                          -DFIRMWARE_TASMOTA32 -DARDUINO_ODROID_ESP32
+                          -DFIRMWARE_TASMOTA32
+                          -DARDUINO_ODROID_ESP32
+                          -DCODE_IMAGE_STR='"odroid"'
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-lvgl.bin"'
-board                   = esp32-fix
 
 [env:tasmota32-core2]
 extends                 = env:tasmota32-lvgl
@@ -83,6 +86,7 @@ build_flags             = ${env:tasmota32-lvgl.build_flags}
                           -DUSE_I2S_SAY_TIME
                           -DUSE_I2S_WEBRADIO
                           -DUSE_SENDMAIL
+                          -DCODE_IMAGE_STR='"core2"'
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-lvgl.bin"'
 lib_extra_dirs          = lib/libesp32, lib/libesp32_lvgl, lib/lib_basic, lib/lib_i2c, lib/lib_rf, lib/lib_div, lib/lib_ssl, lib/lib_display, lib/lib_audio
 
@@ -121,6 +125,7 @@ extends                 = env:tasmota32_base
 board                   = esp32_solo1
 build_flags             = ${env:tasmota32_base.build_flags}
                           -DFIRMWARE_TASMOTA32
+                          -DCODE_IMAGE_STR='"solo1"'
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32solo1.bin"'
 
 [env:tasmota32solo1-safeboot]
@@ -153,9 +158,9 @@ lib_extra_dirs          = lib/lib_basic, lib/lib_ssl, lib/libesp32
 [env:tasmota32-nspanel]
 extends                 = env:tasmota32_base
 build_flags             = ${env:tasmota32_base.build_flags}
-                          -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin"'
                           -DFIRMWARE_NSPANEL
                           -DFRAMEWORK_ARDUINO_ITEAD
+                          -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32-nspanel.bin"'
 
 [env:tasmota32c3-safeboot]
 extends                 = env:tasmota32_base
@@ -193,9 +198,9 @@ lib_ignore              =
 extends                 = env:tasmota32c3-safeboot
 board                   = esp32c3cdc
 build_flags             = ${env:tasmota32_base.build_flags}
+                          -fno-lto
                           -DFIRMWARE_SAFEBOOT
                           -DOTA_URL='"http://ota.tasmota.com/tasmota32/release/tasmota32c3cdc-safeboot.bin"'
-                          -fno-lto
 
 [env:tasmota32c3cdc]
 extends                 = env:tasmota32c3