Skip to content

Commit 335dd66

Browse files
committed
Merge remote-tracking branch 'origin/8.2.x' into merge-82x-main
2 parents ef066da + 7af7517 commit 335dd66

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

shared-module/rgbmatrix/RGBMatrix.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ typedef struct {
3636
mp_buffer_info_t bufinfo;
3737
Protomatter_core protomatter;
3838
void *timer;
39-
uint16_t bufsize, width;
39+
uint32_t bufsize;
40+
uint16_t width;
4041
uint8_t rgb_pins[30];
4142
uint8_t addr_pins[10];
4243
uint8_t clock_pin, latch_pin, oe_pin;

shared-module/storage/__init__.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,9 @@ void common_hal_storage_mount(mp_obj_t vfs_obj, const char *mount_path, bool rea
177177
args[0] = readonly ? mp_const_true : mp_const_false;
178178
args[1] = mp_const_false; // Don't make the file system automatically when mounting.
179179

180+
// 8.2.x: no check for existence of mount point, to ease the 8.2.x -> 9 transition
181+
// 9: requires existence of mount point as directory
182+
180183
// Check that there is a directory with the same name as the mount point.
181184
// But it's ok to mount '/' in any case.
182185
if (strcmp(vfs->str, "/") != 0) {

0 commit comments

Comments
 (0)