jepler/circuitpython
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/8.2.x' into merge-82x-main

Browse source
This commit is contained in:
Jeff Epler 2024-01-30 14:31:41 -06:00
commit 335dd66bcf
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
shared-module/rgbmatrix/RGBMatrix.h
View file

@ -36,7 +36,8 @@ typedef struct {
mp_buffer_info_t bufinfo;
Protomatter_core protomatter;
void *timer;
uint16_t bufsize, width;
uint32_t bufsize;
uint16_t width;
uint8_t rgb_pins[30];
uint8_t addr_pins[10];
uint8_t clock_pin, latch_pin, oe_pin;

3
shared-module/storage/__init__.c
View file

@ -177,6 +177,9 @@ void common_hal_storage_mount(mp_obj_t vfs_obj, const char *mount_path, bool rea
args[0] = readonly ? mp_const_true : mp_const_false;
args[1] = mp_const_false; // Don't make the file system automatically when mounting.
// 8.2.x: no check for existence of mount point, to ease the 8.2.x -> 9 transition
// 9: requires existence of mount point as directory
// Check that there is a directory with the same name as the mount point.
// But it's ok to mount '/' in any case.
if (strcmp(vfs->str, "/") != 0) {