Jan/WLED_MM_Infinity
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

optional 16MB partition file with 3MB program space

Browse Source 
* This is basically "app3M_fat9M_16MB.csv" from arduino-esp32 2.0.7 - just changing the filesystem type from FAT to spiffs.
* deleted the older, broken "Soundreactive 16MB" partition file.

* minor fixes for pio.ini
* adding wled.ini.cpp to .gitignore (was overdue ...)
This commit is contained in:
Frank
2023-03-10 16:16:28 +01:00
parent a0a0f99c3e
commit d6c8f44dfa
4 changed files with 40 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -17,4 +17,5 @@ node_modules
wled-update.sh
esp01-update.sh
/wled00/LittleFS
replace_fs.py
replace_fs.py
wled00/wled00.ino.cpp

44
platformio.ini
View File

@@ -146,6 +146,8 @@ build_flags =
-D DECODE_SONY=true
-D DECODE_SAMSUNG=true
-D DECODE_LG=true
;-D DECODE_RC5=true
;-D DECODE_RC6=true
; -Dregister= # remove warnings in C++17 due to use of deprecated register keyword by the FastLED library
-DWLED_USE_MY_CONFIG
; -D USERMOD_SENSORSTOMQTT
@@ -337,7 +339,7 @@ lib_deps =
${env.lib_deps}
;; currently we need the latest NeoPixelBus dev version, because it contains important bugfixes for -S3
;https://github.com/Makuna/NeoPixelBus.git#master ;; NPB 2.6.9 tends to crash whith IDF V4.4.3 -> use latest NeoPixelBus dev instead
makuna/NeoPixelBus @ 2.7.1
makuna/NeoPixelBus @ ~2.7.1
https://github.com/pbolduc/AsyncTCP.git @ 1.2.0
@@ -788,11 +790,13 @@ build_flags_M =
-D WLED_DEBUG_PORT=1768 ;; port for network debugging. default = 7868
lib_deps_M =
;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings
OneWire@~2.3.5 ; used for USERMOD_FOUR_LINE_DISPLAY and USERMOD_DALLASTEMPERATURE
olikraus/U8g2 @ ^2.28.8 ; used for USERMOD_FOUR_LINE_DISPLAY
ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU
lib_deps_V4_M =
;https://github.com/blazoncek/OneWire.git ; includes bugfixes for inconsistent readings
paulstoffregen/OneWire@ ^2.3.7 ; used for USERMOD_DALLASTEMPERATURE -> need newer release with bugfixes for -S3; still requires TEMPERATURE_PIN < 46
olikraus/U8g2@ ^2.34.5 ; used for USERMOD_FOUR_LINE_DISPLAY -> need newer version with bugfixes for arduino-esp32 v2.0.4 (Wire inititialization)
ElectronicCats/MPU6050 @ 0.6.0 ; used for USERMOD_MPU6050_IMU
@@ -875,7 +879,7 @@ board_build.flash_mode = dio ; (dio = dual i/o; more compatible than qio = quad
[esp32_4MB_V4_M_base]
extends = esp32_4MB_V4_S_base
build_flags = ${esp32_4MB_V4_S_base.build_flags} ${common_mm.build_flags_M}
lib_deps = ${esp32_4MB_V4_S_base.lib_deps} ${common_mm.lib_deps_M}
lib_deps = ${esp32_4MB_V4_S_base.lib_deps} ${common_mm.lib_deps_V4_M}
board_build.partitions = ${esp32_4MB_V4_S_base.board_build.partitions}
;board_build.flash_mode = qio ; (dio = dual i/o; more compatible than qio = quad i/o)
@@ -933,7 +937,8 @@ extends = esp32_4MB_M_base
build_flags = ${esp32_4MB_M_base.build_flags}
-D WLED_RELEASE_NAME=esp32_16MB_M
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
; RAM: [== ] 24.4% (used 79916 bytes from 327680 bytes)
; Flash: [======= ] 67.0% (used 1405701 bytes from 2097152 bytes)
;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
@@ -960,7 +965,8 @@ build_flags = ${esp32_4MB_M_base.build_flags}
-D WLED_RELEASE_NAME=esp32_16MB_M_debug
monitor_filters = esp32_exception_decoder
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
; RAM: [== ] 24.5% (used 80292 bytes from 327680 bytes)
; Flash: [======= ] 70.9% (used 1487129 bytes from 2097152 bytes)
@@ -969,14 +975,16 @@ extends = esp32_4MB_XL_base
build_flags = ${esp32_4MB_XL_base.build_flags}
-D WLED_RELEASE_NAME=esp32_16MB_XL
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
; RAM: [== ] 24.4% (used 79916 bytes from 327680 bytes)
; Flash: [======= ] 67.0% (used 1405701 bytes from 2097152 bytes)
;lib_ignore = IRremoteESP8266 ; use with WLED_DISABLE_INFRARED for faster compilation
[env:esp32_16MB_M_eth]
extends = esp32_4MB_M_base
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
board = esp32_16MB
build_flags = ${esp32_4MB_M_base.build_flags}
-D WLED_RELEASE_NAME=esp32_16MB_M_eth ; This will be included in the firmware.bin filename
@@ -1181,7 +1189,8 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
-D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
-D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
; RAM: [== ] 24.8% (used 81316 bytes from 327680 bytes)
; Flash: [======= ] 72.9% (used 1528253 bytes from 2097152 bytes)
@@ -1196,7 +1205,8 @@ build_flags = ${esp32_4MB_V4_M_base.build_flags}
-D WLED_WATCHDOG_TIMEOUT=0 #-D WLED_DISABLE_BROWNOUT_DET
-D ARDUINO_USB_CDC_ON_BOOT=0 ; needed for arduino-esp32 >=2.0.4; avoids errors on startup
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
monitor_filters = esp32_exception_decoder
; RAM: [=== ] 25.0% (used 82008 bytes from 327680 bytes)
; Flash: [======== ] 78.1% (used 1638193 bytes from 2097152 bytes) WLEDMM: Earlier 76.9
@@ -1387,7 +1397,7 @@ build_flags = ${esp32_4MB_M_base.build_flags}
-D FLD_PIN_SCL=-1 -D FLD_PIN_SDA=-1 ; use global!
-D HW_PIN_SCL=22 -D HW_PIN_SDA=21
-D HW_PIN_CLOCKSPI=-1 -D HW_PIN_MOSISPI=-1 -D HW_PIN_MISOSPI=-1 ; WLEDMM: is now also default but just to show we didn't agree on wemos pins for spi yet
-D ENCODER_DT_PIN=35 -D ENCODER_CLK_PIN=5 -D ENCODER_SW_PIN=39 ;WLEDMM spec by @SERG74: use 35 and 39 instead of 18 and 19 (conflicts)
-D ENCODER_DT_PIN=35 -D ENCODER_CLK_PIN=39 -D ENCODER_SW_PIN=5 ; WLEDMM spec by @SERG74: use 35 and 39 instead of 18 and 19 (conflicts)
-D PIR_SENSOR_PIN=-1
-D PWM_PIN=-1
; -D WLED_USE_MY_CONFIG
@@ -1428,7 +1438,9 @@ extends = wemos_shield_esp32_4MB_M_base
build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags}
-D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_M
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
;board_build.flash_mode = qio
; RAM: [== ] 24.4% (used 79820 bytes from 327680 bytes)
; Flash: [======= ] 66.4% (used 1393421 bytes from 2097152 bytes)
@@ -1446,7 +1458,8 @@ extends = wemos_shield_esp32_4MB_XL_base
build_flags = ${wemos_shield_esp32_4MB_XL_base.build_flags} ${Shield_ICS4343x.build_flags}
-D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_ICS4343x_XL
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
; RAM: [== ] 24.4% (used 80044 bytes from 327680 bytes)
; Flash: [======= ] 67.9% (used 1424185 bytes from 2097152 bytes)
@@ -1455,7 +1468,8 @@ extends = wemos_shield_esp32_4MB_M_base
build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags} ${Shield_SPM1423.build_flags}
-D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_SPM1423_M
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
; RAM: [== ] 24.4% (used 79820 bytes from 327680 bytes)
; Flash: [========= ] 88.6% (used 1393421 bytes from 1572864 bytes)
@@ -1464,7 +1478,8 @@ extends = wemos_shield_esp32_4MB_XL_base
build_flags = ${wemos_shield_esp32_4MB_XL_base.build_flags} ${Shield_SPM1423.build_flags}
-D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_SPM1423_XL
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
; RAM: [== ] 24.4% (used 79820 bytes from 327680 bytes)
; Flash: [========= ] 88.6% (used 1393421 bytes from 1572864 bytes)
@@ -1473,7 +1488,8 @@ extends = wemos_shield_esp32_4MB_M_base
build_flags = ${wemos_shield_esp32_4MB_M_base.build_flags} ${Shield_LineIn.build_flags}
-D WLED_RELEASE_NAME=wemos_shield_esp32_16MB_LineIn_M
board = esp32_16MB
board_build.partitions = tools/WLED_ESP32_16MB.csv
board_build.partitions = tools/WLED_ESP32_16MB.csv ;; WLED standard for 16MB flash: 2MB firmware, 12 MB filesystem
;board_build.partitions = tools/WLED_ESP32_16MB_9MB_FS.csv ;; WLED extended for 16MB flash: 3.2MB firmware, 9 MB filesystem
; ESP32 WLED pico board with builtin ICS-43432 microphpone
[env:esp32_pico_4MB_M]

6
tools/SoundReactive_ESP32_16MB.csv
View File

@@ -1,6 +0,0 @@
# Name, Type, SubType, Offsaet, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x200000,
app1, app, ota_1, 0x210000, 0x200000,
spiffs, data, spiffs, 0x410000, 0x7f0000,
1 # Name Type SubType Offsaet Size Flags
2 nvs data nvs 0x9000 0x5000
3 otadata data ota 0xe000 0x2000
4 app0 app ota_0 0x10000 0x200000
5 app1 app ota_1 0x210000 0x200000
6 spiffs data spiffs 0x410000 0x7f0000

8
tools/WLED_ESP32_16MB_9MB_FS.csv Normal file
View File

@@ -0,0 +1,8 @@
# Name, Type, SubType, Offset, Size, Flags
nvs, data, nvs, 0x9000, 0x5000,
otadata, data, ota, 0xe000, 0x2000,
app0, app, ota_0, 0x10000, 0x300000,
app1, app, ota_1, 0x310000,0x300000,
spiffs, data, spiffs, 0x610000,0x9E0000,
coredump, data, coredump,0xFF0000,0x10000,
# to create/use ffat, see https://github.com/marcmerlin/esp32_fatfsimage
1 # Name, Type, SubType, Offset, Size, Flags
2 nvs, data, nvs, 0x9000, 0x5000,
3 otadata, data, ota, 0xe000, 0x2000,
4 app0, app, ota_0, 0x10000, 0x300000,
5 app1, app, ota_1, 0x310000,0x300000,
6 spiffs, data, spiffs, 0x610000,0x9E0000,
7 coredump, data, coredump,0xFF0000,0x10000,
8 # to create/use ffat, see https://github.com/marcmerlin/esp32_fatfsimage