Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
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
8 changes: 4 additions & 4 deletions main.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,6 +207,9 @@ static void start_mp(safe_mode_t safe_mode) {

// Always return to root
common_hal_os_chdir("/");

// Initialization for individual boards when a VM starts.
mp_board_init();
}

static void stop_mp(void) {
Expand Down Expand Up @@ -1149,6 +1152,7 @@ void gc_collect(void) {
gc_collect_root((void **)&MP_STATE_VM(vfs_mount_table), sizeof(mp_vfs_mount_t) / sizeof(mp_uint_t));

port_gc_collect();
board_gc_collect();

background_callback_gc_collect();

Expand Down Expand Up @@ -1179,10 +1183,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
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

This file was deleted.

Loading