Use WLED_RELEASE_NAME to generate bin names and show the name in update

Package.json: set version to mmod numbering
platformio.ini: refactor mmod entries using extend and WLED_RELEASE_NAME
update.htm: change to installed bin
wled.h: add releaseString
xml.cpp: set bin name
This commit is contained in:
Ewoud
2022-10-28 12:25:10 +02:00
parent 306fb01991
commit 305c9c5566
9 changed files with 1809 additions and 3902 deletions

View File

@@ -32,12 +32,11 @@
; default_envs = esp8285_4CH_MagicHome
; default_envs = esp8285_H801
; default_envs = d1_mini_5CH_Shojo_PCB
; default_envs = esp32mdev
default_envs = esp32mdevmax
default_envs = min_esp32_4MB, max_esp32_4MB, wemos_shield_esp32_4MB
; default_envs = max_esp32_16MB, wemos_shield_esp32_16MB
; default_envs = esp32mdev_PSRAM
; default_envs = esp32s3-mdev
; default_envs = esp8266mdev
; default_envs = wemos_shield_esp32
; default_envs = m5atom
; default_envs = esp32_eth
; default_envs = esp32dev_qio80
@@ -530,72 +529,69 @@ lib_deps = ${esp32s2.lib_deps}
# MoonModules configs
# ------------------------------------------------------------------------------
[env:esp32mdev]
[env:min_esp32_4MB_base]
board = esp32dev
platform = ${esp32.platform}
upload_speed = 460800 ; or 921600
platform_packages = ${esp32.platform_packages}
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp32}
-D WLED_RELEASE_NAME=ESP32 #-D WLED_DISABLE_BLYNK #-D WLED_DISABLE_BROWNOUT_DET
-Wall -Wformat -Woverflow -Wuninitialized -Winit-self -Warray-bounds ; enables more warnings
-Wno-attributes -Wno-unused-variable -Wno-unused-function ; disables some stupid warnings
-D ABL_MILLIAMPS_DEFAULT=1500 ; 850 not enough for 1024 leds
-D WLED_USE_MY_CONFIG
-D USERMOD_AUDIOREACTIVE
-D UM_AUDIOREACTIVE_USE_NEW_FFT
-D USERMOD_CUSTOMEFFECTS
; -D WLED_DEBUG
; -D SR_DEBUG
lib_deps = ${esp32.lib_deps}
https://github.com/kosme/arduinoFFT#develop @ 1.9.2
; monitor_filters = esp32_exception_decoder
board_build.partitions = ${esp32.default_partitions}
board_build.f_flash = 80000000L
board_build.flash_mode = dio
[env:esp32mdevmax]
board = esp32dev ;; standard ESP32 with 4MB Flash
; board = esp32_twilord ;; "TwilightLord" ESP32 with 16MB Flash
platform = ${esp32.platform}
upload_speed = 460800 ; or 921600
platform_packages = ${esp32.platform_packages}
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp32}
-D WLED_RELEASE_NAME=ESP32 ; This will be included in the firmware.bin filename
; -Wall -Wformat -Woverflow -Wuninitialized -Winit-self -Warray-bounds ; enables more warnings
; -Wno-attributes -Wno-unused-variable -Wno-unused-function ; disables some stupid warnings
-D WLED_DISABLE_BLYNK ; BLYNK is only provided for backwards compatibility (no new users accepted)
;-D WLED_DISABLE_BROWNOUT_DET ; enable if you get "brownout detected" errors at startup
-D ABL_MILLIAMPS_DEFAULT=1500 ; 850 not enough for 1024 leds
-D WLED_USE_MY_CONFIG
-D USERMOD_AUDIOREACTIVE
-D UM_AUDIOREACTIVE_USE_NEW_FFT ; use latest (upstream) FFTLib, instead of older library midified by blazoncek. Slightly faster, more accurate, needs 2KB RAM extra
-D USERMOD_CUSTOMEFFECTS
; -D WLED_DEBUG ; lots of generic debug messages
; -D SR_DEBUG ; some extra debug messages from audioreactive
lib_deps = ${esp32.lib_deps}
https://github.com/kosme/arduinoFFT#develop @ 1.9.2 ; used for USERMOD_AUDIOREACTIVE
; monitor_filters = esp32_exception_decoder ; used to show crash details
board_build.partitions = ${esp32.default_partitions}
board_build.f_flash = 80000000L ; use full 80MHz speed for flash (default = 40Mhz)
board_build.flash_mode = dio ; (dio = dual i/o; more compatible than qio = quad i/o)
[env:min_esp32_4MB]
extends = env:min_esp32_4MB_base
build_flags = ${env:min_esp32_4MB_base.build_flags}
-D WLED_RELEASE_NAME=min_esp32_4MB ; This will be included in the firmware.bin filename
[env:max_esp32_4MB_base]
extends = env:min_esp32_4MB_base
build_flags = ${env:min_esp32_4MB_base.build_flags}
-D WLED_MAX_USERMODS=9 ; default only 4-6
-D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4
-D WLED_USE_MY_CONFIG ; include custom my_config.h
-D USERMOD_AUDIOREACTIVE
-D UM_AUDIOREACTIVE_USE_NEW_FFT ; use latest (upstream) FFTLib, instead of older library midified by blazoncek. Slightly faster, more accurate, needs 2KB RAM extra
-D USERMOD_DALLASTEMPERATURE
-D USE_ALT_DISPlAY ; new versions of USERMOD_FOUR_LINE_DISPLAY and USERMOD_ROTARY_ENCODER_UI
-D USERMOD_FOUR_LINE_DISPLAY
-D USERMOD_ROTARY_ENCODER_UI
-D USERMOD_AUTO_SAVE
-D USERMOD_CUSTOMEFFECTS ; WLEDSR usermod
; -D USERMOD_CUSTOMEFFECTS ; WLEDSR usermod
-D USERMOD_WEATHER ; WLEDSR usermod
-D USERMOD_MPU6050_IMU ; gyro/accelero for USERMOD_GAMES (ONLY WORKS IF USERMOD_FOUR_LINE_DISPLAY NOT INCLUDED - I2C SHARING BUG)
-D USERMOD_GAMES ; WLEDSR usermod
; -D WLED_DEBUG ; lots of generic debug messages
; -D SR_DEBUG ; some extra debug messages from audioreactive
lib_deps = ${esp32.lib_deps}
lib_deps = ${env:min_esp32_4MB_base.lib_deps}
OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE
olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY
https://github.com/kosme/arduinoFFT#develop @ 1.9.2 ; used for USERMOD_AUDIOREACTIVE
ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU
; monitor_filters = esp32_exception_decoder ; used to show crash details
board_build.partitions = ${esp32.default_partitions}
; board_build.partitions = tools/WLED_ESP32_16MB.csv ; for esp32_twilord with 16MB flash
board_build.partitions = ${env:min_esp32_4MB_base.board_build.partitions}
; board_build.partitions = tools/WLED_ESP32-wrover_4MB.csv
board_build.f_flash = 80000000L ; use full 80MHz speed for flash (default = 40Mhz)
board_build.flash_mode = dio ; (dio = dual i/o; more compatible than qio = quad i/o)
[env:max_esp32_4MB]
extends = env:max_esp32_4MB_base
build_flags = ${env:max_esp32_4MB_base.build_flags}
-D WLED_RELEASE_NAME=max_esp32_4MB ; This will be included in the firmware.bin filename
[env:max_esp32_16MB]
extends = env:max_esp32_4MB_base
board = esp32_twilord ; "TwilightLord" ESP32 with 16MB Flash
board_build.partitions = tools/WLED_ESP32_16MB.csv ; for esp32_twilord with 16MB flash
build_flags = ${env:max_esp32_4MB_base.build_flags}
-D WLED_RELEASE_NAME=max_esp32_16MB ; This will be included in the firmware.bin filename
[env:esp8266mdev]
extends = env:d1_mini
@@ -700,36 +696,29 @@ monitor_filters = esp32_exception_decoder
# custom board configurations
# ------------------------------------------------------------------------------
[env:wemos_shield_esp32]
board = esp32dev
platform = espressif32@3.2
upload_speed = 460800 ; or 921600
build_unflags = ${common.build_unflags}
build_flags = ${common.build_flags_esp32}
-D ABL_MILLIAMPS_DEFAULT=1500 ; 850 not enough for 1024 leds
-D WLED_MAX_USERMODS=8
[env:wemos_shield_esp32_4MB_base]
extends = env:max_esp32_4MB_base
build_flags = ${env:max_esp32_4MB_base.build_flags}
-D LEDPIN=16
-D RLYPIN=19
-D BTNPIN=17
-D IRPIN=18
-D UWLED_USE_MY_CONFIG
-D USERMOD_CUSTOMEFFECTS
-D USERMOD_AUDIOREACTIVE -D AUDIOPIN=-1 -D DMTYPE=1 -D I2S_SDPIN=32 -D I2S_WSPIN=15 -D I2S_CKPIN=14
-D UM_AUDIOREACTIVE_USE_NEW_FFT
-D USERMOD_DALLASTEMPERATURE -D TEMPERATURE_PIN=23
-D USE_ALT_DISPlAY
-D USERMOD_FOUR_LINE_DISPLAY -D FLD_PIN_SCL=22 -D FLD_PIN_SDA=21
-D USERMOD_ROTARY_ENCODER_UI ; -D ENCODER_DT_PIN=18 -D ENCODER_CLK_PIN=5 -D ENCODER_SW_PIN=19
-D USERMOD_AUTO_SAVE
-D USERMOD_WEATHER
-D USERMOD_GAMES
; -D WLED_DEBUG
lib_deps = ${esp32.lib_deps}
OneWire@~2.3.5
olikraus/U8g2 @ ^2.28.8
https://github.com/kosme/arduinoFFT#develop @ 1.9.2
board_build.partitions = ${esp32.default_partitions}
; board_build.partitions = tools/WLED_ESP32_16MB.csv
-D AUDIOPIN=-1 -D DMTYPE=1 -D I2S_SDPIN=32 -D I2S_WSPIN=15 -D I2S_CKPIN=14
-D TEMPERATURE_PIN=23
-D FLD_PIN_SCL=22 -D FLD_PIN_SDA=21
; -D ENCODER_DT_PIN=18 -D ENCODER_CLK_PIN=5 -D ENCODER_SW_PIN=19
[env:wemos_shield_esp32_4MB]
extends = env:wemos_shield_esp32_4MB_base
build_flags = ${env:wemos_shield_esp32_4MB_base.build_flags}
-D WLED_RELEASE_NAME=wemos_shield_esp32_4MB ; This will be included in the firmware.bin filename
[env:wemos_shield_esp32_16MB]
extends = env:wemos_shield_esp32_4MB_base
board = esp32_twilord ; "TwilightLord" ESP32 with 16MB Flash
board_build.partitions = tools/WLED_ESP32_16MB.csv ; for esp32_twilord with 16MB flash
build_flags = ${env:wemos_shield_esp32_4MB_base.build_flags}
-D WLED_RELEASE_NAME=wemos_shield_esp32_16MB ; This will be included in the firmware.bin filename
[env:m5atom]
board = esp32dev