Skip to content

Fix cardputer boot loop, and do some cleanup #10607

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

Merged
merged 4 commits into from
Sep 4, 2025
Merged

Fix cardputer boot loop, and do some cleanup #10607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de2efe0
Fix cardputer boot loop, and do some cleanup.
dhalbert Sep 3, 2025
1d83528
lib/littlefs: Fix string initializer in lfs1.c.
projectgus May 9, 2025
1630f21
py/emitinlinethumb: Refactor string literal as array initializer.
projectgus May 9, 2025
8993356
remove unused mp_board_init() and board_gc_collect() per review comments
dhalbert Sep 3, 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
2 changes: 1 addition & 1 deletion lib/littlefs/lfs1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2141,7 +2141,7 @@ int lfs1_format(lfs1_t *lfs1, const struct lfs1_config *cfg) {
.d.elen = sizeof(superblock.d) - sizeof(superblock.d.magic) - 4,
.d.nlen = sizeof(superblock.d.magic),
.d.version = LFS1_DISK_VERSION,
.d.magic = {"littlefs"},
.d.magic = {'l', 'i', 't', 't', 'l', 'e', 'f', 's'},
.d.block_size = lfs1->cfg->block_size,
.d.block_count = lfs1->cfg->block_count,
.d.root = {lfs1->root[0], lfs1->root[1]},
Expand Down
4 changes: 0 additions & 4 deletions main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1179,10 +1179,6 @@ void gc_collect(void) {
gc_collect_end();
}

// Ports may provide an implementation of this function if it is needed
MP_WEAK void port_gc_collect(void) {
}

size_t gc_get_max_new_split(void) {
return port_heap_get_largest_free_size();
}
Expand Down
2 changes: 1 addition & 1 deletion ports/espressif/boards/m5stack_cardputer/mpconfigboard.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ CIRCUITPY_ESP_FLASH_SIZE = 8MB
CIRCUITPY_ESPCAMERA = 0
CIRCUITPY_MAX3421E = 0

SRC_C += boards/$(BOARD)/cardputer_keyboard.c
SRC_C += module/cardputer_keyboard.c
238 changes: 0 additions & 238 deletions ports/espressif/boards/m5stack_cardputer_ros/cardputer_keyboard.c
View file
Open in desktop

This file was deleted.

Loading