From 267d2dae26b8e3714d43ff52c2b330120ee892c4 Mon Sep 17 00:00:00 2001 From: lumapu Date: Mon, 20 May 2024 12:09:43 +0200 Subject: [PATCH] 0.8.121 * fix ESP32 factory image generation --- scripts/add_littlefs_binary.py | 7 +++++-- src/CHANGES.md | 3 +++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/scripts/add_littlefs_binary.py b/scripts/add_littlefs_binary.py index 8f6556f9..ffc948cb 100644 --- a/scripts/add_littlefs_binary.py +++ b/scripts/add_littlefs_binary.py @@ -8,6 +8,7 @@ Import("env") def build_littlefs(): if os.path.isfile('data/settings.json') == False: return # nothing to do + result = subprocess.run(["pio", "run", "--target", "buildfs", "--environment", env['PIOENV']]) if result.returncode != 0: print("Error building LittleFS:") @@ -23,14 +24,16 @@ def merge_bins(): PARTITIONS_OFFSET = 0x8000 FIRMWARE_OFFSET = 0x10000 - flash_size = int(env.BoardConfig().get("upload.maximum_size", "4194304")) + if env['PIOENV'][:13] == "esp32-wroom32": + BOOTLOADER_OFFSET = 0x1000 + + flash_size = int(env.BoardConfig().get("upload.maximum_size", "1310720")) # 0x140000 app0_offset = 0x10000 if env['PIOENV'][:7] == "esp8266": app0_offset = 0 elif env['PIOENV'][:7] == "esp8285": app0_offset = 0 - print(flash_size) littlefs_offset = 0x290000 if flash_size == 0x330000: littlefs_offset = 0x670000 diff --git a/src/CHANGES.md b/src/CHANGES.md index 93e0d834..9bc01cd3 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,8 @@ # Development Changes +## 0.8.121 - 2024-05-20 +* fix ESP32 factory image generation + ## 0.8.120 - 2024-05-18 * fix crash if invalid serial number was set -> inverter will be disabled automatically * improved and fixed factory image generation