correct firmware naming #1933

platformio.ini

@@ -1,12 +1,13 @@
 ; PlatformIO Project Configuration File for EMS-ESP
+;
 ; override any settings with your own local ones in pio_local.ini (see example pio_local.ini_example)
+; The firmware is renamed following this convention, and placed in the build/firmware folder:
+;   EMS-ESP32-<version>-<chip_type>-<flash_mem>[+ if PSRAM onboard].bin
+;   For example: EMS-ESP-3_7_0-dev_31-esp32-16MB+.bin
 
 [platformio]
-; default_envs = esp32_4M
-default_envs = lolin_s3
-; default_envs = esp32_16M
-; default_envs = native
-; default_envs = espressi32_v3
+; build all the CI targets as default. Use pio_local.ini to override.
+default_envs = ci_s_4M, ci_s_16M, ci_s_16M_P, ci_s3_16M_P
 
 extra_configs =
   factory_settings.ini
@@ -16,10 +17,9 @@ extra_configs =
 core_build_flags = -std=gnu++2a -Isrc -Wno-type-limits -Wall -Wextra -Wno-unused-parameter -Wno-unused-variable -Wno-format
 core_unbuild_flags = -std=gnu++11
 
-; my_build_flags is set in pio_local.ini
 my_build_flags =
 
-; explanation on some custom settings:
+; explanation on these custom settings:
 ;  CONFIG_ASYNC_TCP_QUEUE - see https://github.com/emsesp/EMS-ESP32/issues/177 
 ;  CONFIG_ASYNC_TCP_STACK_SIZE - stack usage measured: ESP32: ~2.3K, ESP32S3: ~3.5k
 ;  CONFIG_ASYNC_TCP_TASK_PRIORITY - default is 10, was 5 for EMS-ESP
@@ -81,18 +81,44 @@ lib_ldf_mode = chain+
 lib_deps = 
   https://github.com/emsesp/EMS-ESP-Modules.git
 
+;
 ; build for GitHub Actions CI
+;
 ; the Web interface is built seperately, so is skipped in extra_scripts
-[env:ci]
-; 4MB using Tasmota (no SSL) - like BBQKees older S32
+;
+[env:ci_s_4M]
+; 4MB ESP32 - using Tasmota - no SSL, no PSRAM - like BBQKees older S32
 extends = espressi32_base_tasmota
 extra_scripts = scripts/rename_fw.py
 board = esp32dev
 board_build.partitions = esp32_partition_4M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM
+build_flags =
+  ${espressi32_base_tasmota.build_flags}
+  '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
 
-[env:ci_s3]
-; 16MB ESP32-S3 - like BBQKees S3
+[env:ci_s_16M]
+; 16MB ESP32 - no PSRAM - like some of the older BBQKees S32
+extends = espressi32_base
+extra_scripts = scripts/rename_fw.py
+board = esp32dev
+board_build.partitions = esp32_partition_16M.csv
+build_flags =
+  ${espressi32_base.build_flags}
+  '-DEMSESP_DEFAULT_BOARD_PROFILE="S32"'
+
+[env:ci_s_16M_P]
+; 16MB ESP32 - with PSRAM - like BBQKees E32V2
+extends = espressi32_base
+extra_scripts = scripts/rename_fw.py
+board = esp32dev
+board_build.partitions = esp32_partition_16M.csv
+board_build.extra_flags = -DBOARD_HAS_PSRAM
+build_flags =
+  ${espressi32_base.build_flags}
+  '-DEMSESP_DEFAULT_BOARD_PROFILE="E32V2"'
+
+[env:ci_s3_16M_P]
+; 16MB ESP32-S3 - with PSRAM - like BBQKees S3
 extends = espressi32_base
 extra_scripts = scripts/rename_fw.py
 board = lolin_s3
@@ -104,20 +130,11 @@ build_flags =
   ${espressi32_base.build_flags}
   '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
 
-[env:ci_16M]
-; 16MB ESP32 with PSRAM - like BBQKees E32V2
-extends = espressi32_base
-extra_scripts = scripts/rename_fw.py
-board = esp32dev
-board_build.partitions = esp32_partition_16M.csv
-board_build.extra_flags = -DBOARD_HAS_PSRAM
-build_flags =
-  ${espressi32_base.build_flags}
-  '-DEMSESP_DEFAULT_BOARD_PROFILE="E32V2"'
-
+;
 ; Direct builds
+;
 
-[env:esp32_4M]
+[env:s_4M]
 extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
@@ -125,20 +142,20 @@ board_build.partitions = esp32_partition_4M.csv
 build_flags =
   ${espressi32_base_tasmota.build_flags}
 
-[env:esp32_4Mplus]
+[env:s_asym_4M]
 extends = espressi32_base_tasmota
 board = esp32dev
 board_upload.flash_size = 4MB
 board_build.partitions = esp32_asym_partition_4M.csv
 
-[env:esp32_16M]
+[env:s_16M_P]
 extends = espressi32_base
 board = esp32dev
 board_build.extra_flags = -DBOARD_HAS_PSRAM
 board_upload.flash_size = 16MB
 board_build.partitions = esp32_partition_16M.csv
 
-[env:lolin_c3_mini]
+[env:c3_mini_4M]
 extends = espressi32_base_tasmota
 board = lolin_c3_mini
 board_upload.flash_size = 4MB
@@ -149,7 +166,7 @@ build_flags =
 
 ; lolin C3 mini v1 needs special wifi init.
 ; https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
-[env:lolin_c3_mini_v1]
+[env:c3_miniv1_4M]
 extends = espressi32_base_tasmota
 board = lolin_c3_mini
 board_upload.flash_size = 4MB
@@ -159,7 +176,7 @@ build_flags =
   -DBOARD_C3_MINI_V1
   '-DEMSESP_DEFAULT_BOARD_PROFILE="C3MINI"'
 
-[env:lolin_s2_mini]
+[env:s2_4M]
 extends = espressi32_base_tasmota
 board = lolin_s2_mini
 board_upload.flash_size = 4MB
@@ -168,7 +185,7 @@ build_flags =
   ${espressi32_base_tasmota.build_flags}
   '-DEMSESP_DEFAULT_BOARD_PROFILE="S2MINI"'
 
-[env:lolin_s3]
+[env:s3_16M]
 extends = espressi32_base
 board = lolin_s3
 board_build.f_cpu = 240000000L
@@ -180,7 +197,7 @@ build_flags =
   ${espressi32_base.build_flags}
   '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
 
-[env:esp32_s3_32M]
+[env:s3_32M]
 extends = espressi32_base
 board = lolin_s3
 board_build.f_cpu = 240000000L