Skip to content

Fix check size output. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix check size output. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ac4494b
Fix check size output.
Adam5Wu Jan 25, 2025
75dbb08
Improve the size patterns, matches the actual data better
Adam5Wu Apr 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions builder/frameworks/esp8266-rtos-sdk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,7 +1068,7 @@ def _get_installed_pip_packages():
"esp8266.ld"),
),
env.VerboseAction(
'$CC -I"$BUILD_DIR/config" -C -P -x c -E $SOURCE -DAPP_OFFSET=$ENV_APP_OFFSET -DAPP_SIZE=$ENV_APP_SIZE -o $TARGET',
'$CC -I"$BUILD_DIR/config" -C -P -x c -E $SOURCE -DAPP_OFFSET=$RTOS_APP_OFFSET -DAPP_SIZE=$RTOS_APP_SIZE -o $TARGET',
"Generating LD script $TARGET",
),
)
Expand Down Expand Up @@ -1280,8 +1280,8 @@ def _skip_prj_source_files(node):
app_offset = app_params.get("offset")
app_size = app_params.get("size")
env.Replace(
ENV_APP_OFFSET=app_offset,
ENV_APP_SIZE=app_size,
RTOS_APP_OFFSET=app_offset,
RTOS_APP_SIZE=app_size,
)

#
Expand Down
14 changes: 9 additions & 5 deletions builder/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,9 +124,13 @@ def __fetch_fs_size(target, source, env):


def _update_max_upload_size(env):
ldsizes = _parse_ld_sizes(env.GetActualLDScript())
if ldsizes and "app_size" in ldsizes:
env.BoardConfig().update("upload.maximum_size", ldsizes['app_size'])
if "esp8266-rtos-sdk" in env.subst("$PIOFRAMEWORK"):
if "RTOS_APP_SIZE" in env:
env.BoardConfig().update("upload.maximum_size", _parse_size(env['RTOS_APP_SIZE']))
else:
ldsizes = _parse_ld_sizes(env.GetActualLDScript())
if ldsizes and "app_size" in ldsizes:
env.BoardConfig().update("upload.maximum_size", ldsizes['app_size'])


def get_esptoolpy_reset_flags(resetmethod):
Expand Down Expand Up @@ -177,8 +181,8 @@ def get_esptoolpy_reset_flags(resetmethod):
# Misc
#

SIZEPROGREGEXP=r"^(?:\.irom0\.text|\.text|\.text1|\.data|\.rodata|)\s+([0-9]+).*",
SIZEDATAREGEXP=r"^(?:\.data|\.rodata|\.bss)\s+([0-9]+).*",
SIZEPROGREGEXP=r"^(?:\.irom0\.text|\.text|\.text1|\.data|\.rodata|\.iram0\.\w+|\.flash\.\w+)\s+(\d+)\s",
SIZEDATAREGEXP=r"^(?:\.data|\.rodata|\.bss|\.noinit|\.dram0\.\w+)\s+([0-9]+).*",
SIZECHECKCMD="$SIZETOOL -A -d $SOURCES",
SIZEPRINTCMD='$SIZETOOL -B -d $SOURCES',

Expand Down