Merge pull request #5171 from tannewt/unicode_filenames

dhalbert · web-flow · commit 57841dc92bae · 2021-08-21T16:31:54.000-04:00
Turn on unicode for FATFS
diff --git a/lib/oofatfs/ff.c b/lib/oofatfs/ff.c
@@ -1175,6 +1175,7 @@ static DWORD get_fat (      /* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x7FF
                     break;
                 }
             }
+            MP_FALLTHROUGH
             /* go to default */
 #endif
         default:
@@ -5518,6 +5519,7 @@ FRESULT f_mkfs (
                 }
                 st = 1;         /* Do not compress short run */
                 /* go to next case */
+                MP_FALLTHROUGH
             case 1:
                 ch = si++;      /* Fill the short run */
                 if (--j == 0) st = 0;
diff --git a/lib/oofatfs/ffconf.h b/lib/oofatfs/ffconf.h
@@ -163,8 +163,11 @@
 /  memory for the working buffer, memory management functions, ff_memalloc() and
 /  ff_memfree() in ffsystem.c, need to be added to the project. */
 
-
+#ifdef MICROPY_FATFS_LFN_UNICODE
+#define FF_LFN_UNICODE  (MICROPY_FATFS_LFN_UNICODE)
+#else
 #define FF_LFN_UNICODE  0
+#endif
 /* This option switches the character encoding on the API when LFN is enabled.
 /
 /   0: ANSI/OEM in current CP (TCHAR = char)
diff --git a/locale/fr.po b/locale/fr.po
@@ -266,7 +266,7 @@ msgstr "l'objet %s ne supporte pas l'assignation d'éléments"
 #: py/obj.c
 #, c-format
 msgid "'%s' object doesn't support item deletion"
-msgstr "L’objet '%s' ne prend pas en charge la suppression d’éléments"
+msgstr "L'objet '%s' ne prend pas en charge la suppression d'éléments"
 
 #: py/runtime.c
 msgid "'%s' object has no attribute '%q'"
diff --git a/ports/atmel-samd/boards/arduino_zero/mpconfigboard.h b/ports/atmel-samd/boards/arduino_zero/mpconfigboard.h
@@ -19,3 +19,11 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Connected to a crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
+// SWD-only
+#define IGNORE_PIN_PA30     1
+#define IGNORE_PIN_PA31     1
diff --git a/ports/atmel-samd/boards/datum_distance/mpconfigboard.h b/ports/atmel-samd/boards/datum_distance/mpconfigboard.h
@@ -19,3 +19,24 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Connected to a crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
+// Unconnected
+// Schematic at: https://jandjstudios.io/assets/pdfs/datum-Distance.pdf
+#define IGNORE_PIN_PA03     1
+#define IGNORE_PIN_PA02     1
+#define IGNORE_PIN_PB08     1
+#define IGNORE_PIN_PB09     1
+#define IGNORE_PIN_PA04     1
+#define IGNORE_PIN_PA05     1
+#define IGNORE_PIN_PB02     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA15     1
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PA28     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PA13     1
diff --git a/ports/atmel-samd/boards/datum_imu/mpconfigboard.h b/ports/atmel-samd/boards/datum_imu/mpconfigboard.h
@@ -19,3 +19,22 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Connected to a crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
+// Unconnected
+// Schematic at: https://jandjstudios.io/assets/pdfs/datum-IMU.pdf
+#define IGNORE_PIN_PB08     1
+#define IGNORE_PIN_PB09     1
+#define IGNORE_PIN_PA04     1
+#define IGNORE_PIN_PA05     1
+#define IGNORE_PIN_PB02     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA15     1
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PA28     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PA13     1
diff --git a/ports/atmel-samd/boards/datum_light/mpconfigboard.h b/ports/atmel-samd/boards/datum_light/mpconfigboard.h
@@ -19,3 +19,24 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Connected to a crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
+// Unconnected
+// Schematic at: https://jandjstudios.io/assets/pdfs/datum-Light.pdf
+#define IGNORE_PIN_PA03     1
+#define IGNORE_PIN_PA02     1
+#define IGNORE_PIN_PB08     1
+#define IGNORE_PIN_PB09     1
+#define IGNORE_PIN_PA04     1
+#define IGNORE_PIN_PA05     1
+#define IGNORE_PIN_PB02     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA15     1
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PA28     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PA13     1
diff --git a/ports/atmel-samd/boards/datum_weather/mpconfigboard.h b/ports/atmel-samd/boards/datum_weather/mpconfigboard.h
@@ -19,3 +19,24 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Connected to a crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
+// Unconnected
+// Schematic at: https://jandjstudios.io/assets/pdfs/datum-Weather.pdf
+#define IGNORE_PIN_PA03     1
+#define IGNORE_PIN_PA02     1
+#define IGNORE_PIN_PB08     1
+#define IGNORE_PIN_PB09     1
+#define IGNORE_PIN_PA04     1
+#define IGNORE_PIN_PA05     1
+#define IGNORE_PIN_PB02     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA15     1
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PA28     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PA13     1
diff --git a/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.h b/ports/atmel-samd/boards/feather_m0_adalogger/mpconfigboard.h
@@ -17,3 +17,21 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Connected to a crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
+// Unconnected
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PA09     1
+#define IGNORE_PIN_PA13     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA27     1
+#define IGNORE_PIN_PA28     1
+
+// SWD-only
+#define IGNORE_PIN_PA30     1
+#define IGNORE_PIN_PA31     1
diff --git a/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.h b/ports/atmel-samd/boards/feather_m0_basic/mpconfigboard.h
@@ -17,3 +17,24 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Connected to a crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
+
+// Unconnected
+#define IGNORE_PIN_PB03     1
+#define IGNORE_PIN_PB22     1
+#define IGNORE_PIN_PB23     1
+#define IGNORE_PIN_PA06     1
+#define IGNORE_PIN_PA08     1
+#define IGNORE_PIN_PA09     1
+#define IGNORE_PIN_PA13     1
+#define IGNORE_PIN_PA14     1
+#define IGNORE_PIN_PA21     1
+#define IGNORE_PIN_PA27     1
+#define IGNORE_PIN_PA28     1
+
+// SWD-only
+#define IGNORE_PIN_PA30     1
+#define IGNORE_PIN_PA31     1
diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.h
@@ -19,3 +19,5 @@
 
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+#define MICROPY_FATFS_EXFAT 0
diff --git a/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk b/ports/atmel-samd/boards/kicksat-sprite/mpconfigboard.mk
@@ -15,6 +15,7 @@ CIRCUITPY_AUDIOMP3 = 0
 CIRCUITPY_BLEIO_HCI = 0
 CIRCUITPY_DISPLAYIO = 0
 CIRCUITPY_FRAMEBUFFERIO = 0
+CIRCUITPY_GETPASS = 0
 CIRCUITPY_KEYPAD = 0
 CIRCUITPY_MSGPACK = 0
 CIRCUITPY_PS2IO = 0
diff --git a/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.h b/ports/atmel-samd/boards/sensebox_mcu/mpconfigboard.h
@@ -18,3 +18,7 @@
 // USB is always used internally so skip the pin objects for it.
 #define IGNORE_PIN_PA24     1
 #define IGNORE_PIN_PA25     1
+
+// Connected to a crystal
+#define IGNORE_PIN_PA00     1
+#define IGNORE_PIN_PA01     1
diff --git a/ports/atmel-samd/mpconfigport.h b/ports/atmel-samd/mpconfigport.h
@@ -59,6 +59,8 @@
     X(EISDIR) \
     X(EINVAL) \
 
+#define MICROPY_FATFS_EXFAT 0
+
 #endif // SAMD21
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -238,8 +240,13 @@
 
 #include "peripherals/samd/dma.h"
 
+#if CIRCUITPY_AUDIOCORE
 #define MICROPY_PORT_ROOT_POINTERS \
     CIRCUITPY_COMMON_ROOT_POINTERS \
     mp_obj_t playing_audio[AUDIO_DMA_CHANNEL_COUNT];
+#else
+#define MICROPY_PORT_ROOT_POINTERS \
+    CIRCUITPY_COMMON_ROOT_POINTERS
+#endif
 
 #endif  // __INCLUDED_MPCONFIGPORT_H
diff --git a/ports/nrf/boards/pca10100/mpconfigboard.h b/ports/nrf/boards/pca10100/mpconfigboard.h
@@ -48,3 +48,5 @@
 #define BLEIO_ATTR_TAB_SIZE (BLE_GATTS_ATTR_TAB_SIZE_DEFAULT * 2)
 
 #define SOFTDEVICE_RAM_SIZE (32 * 1024)
+
+#define MICROPY_FATFS_EXFAT 0
diff --git a/ports/nrf/boards/simmel/mpconfigboard.h b/ports/nrf/boards/simmel/mpconfigboard.h
@@ -57,3 +57,5 @@
 #define BLEIO_ATTR_TAB_SIZE (BLE_GATTS_ATTR_TAB_SIZE_DEFAULT * 2)
 
 #define SOFTDEVICE_RAM_SIZE (32 * 1024)
+
+#define MICROPY_FATFS_EXFAT 0
diff --git a/ports/stm/boards/espruino_pico/mpconfigboard.h b/ports/stm/boards/espruino_pico/mpconfigboard.h
@@ -41,3 +41,5 @@
 #define BOARD_HAS_LOW_SPEED_CRYSTAL (0)
 // #define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
 // #define LSE_VALUE ((uint32_t)32768)
+
+#define MICROPY_FATFS_EXFAT 0
diff --git a/ports/stm/boards/pyb_nano_v2/mpconfigboard.h b/ports/stm/boards/pyb_nano_v2/mpconfigboard.h
@@ -47,3 +47,5 @@
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x2000 - 0xC000)
 
 #define AUTORESET_DELAY_MS (500)
+
+#define MICROPY_FATFS_EXFAT 0
diff --git a/ports/stm/boards/stm32f411ce_blackpill_with_flash/mpconfigboard.h b/ports/stm/boards/stm32f411ce_blackpill_with_flash/mpconfigboard.h
@@ -50,3 +50,5 @@
 #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x2000 - 0xC000)
 
 #define AUTORESET_DELAY_MS (500)
+
+#define MICROPY_FATFS_EXFAT 0
diff --git a/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.h b/ports/stm/boards/stm32f411ve_discovery/mpconfigboard.h
@@ -39,3 +39,5 @@
 // The schematic has a 32k crystal that isn't fitted. Uncommented the line below if you add it.
 // #define BOARD_HAS_LOW_SPEED_CRYSTAL (1)
 // #define LSE_VALUE  ((uint32_t)32000U)
+
+#define MICROPY_FATFS_EXFAT 0
diff --git a/ports/stm/boards/thunderpack_v11/mpconfigboard.h b/ports/stm/boards/thunderpack_v11/mpconfigboard.h
@@ -51,3 +51,5 @@
 
 #define DEFAULT_I2C_BUS_SCL         (&pin_PB06)
 #define DEFAULT_I2C_BUS_SDA         (&pin_PB07)
+
+#define MICROPY_FATFS_EXFAT 0
diff --git a/ports/unix/mpconfigport.h b/ports/unix/mpconfigport.h
@@ -60,6 +60,7 @@
 #define MICROPY_MALLOC_USES_ALLOCATED_SIZE (1)
 #define MICROPY_MEM_STATS           (1)
 #define MICROPY_DEBUG_PRINTERS      (1)
+#define CIRCUITPY_MICROPYTHON_ADVANCED (1)
 // Printing debug to stderr may give tests which
 // check stdout a chance to pass, etc.
 #define MICROPY_DEBUG_PRINTER       (&mp_stderr_print)
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
@@ -132,12 +132,14 @@
 //
 // 1 = SFN/ANSI 437=LFN/U.S.(OEM)
 #define MICROPY_FATFS_ENABLE_LFN      (1)
+// Code page is ignored because unicode is enabled.
 // Don't use parens on the value below because it gets combined with a prefix in
 // the preprocessor.
 #define MICROPY_FATFS_LFN_CODE_PAGE   437
 #define MICROPY_FATFS_USE_LABEL       (1)
 #define MICROPY_FATFS_RPATH           (2)
 #define MICROPY_FATFS_MULTI_PARTITION (1)
+#define MICROPY_FATFS_LFN_UNICODE      2  // UTF-8
 
 // Only enable this if you really need it. It allocates a byte cache of this size.
 // #define MICROPY_FATFS_MAX_SS           (4096)
@@ -209,6 +211,12 @@ typedef long mp_off_t;
 #define MICROPY_PY_URE_MATCH_SPAN_START_END   (CIRCUITPY_RE)
 #define MICROPY_PY_URE_SUB                    (CIRCUITPY_RE)
 
+#define CIRCUITPY_MICROPYTHON_ADVANCED        (CIRCUITPY_FULL_BUILD)
+
+#ifndef MICROPY_FATFS_EXFAT
+#define MICROPY_FATFS_EXFAT           (CIRCUITPY_FULL_BUILD)
+#endif
+
 // LONGINT_IMPL_xxx are defined in the Makefile.
 //
 #ifdef LONGINT_IMPL_NONE
diff --git a/py/modmicropython.c b/py/modmicropython.c
diff --git a/py/objstrunicode.c b/py/objstrunicode.c
diff --git a/tests/unicode/unicode.py b/tests/unicode/unicode.py
diff --git a/tests/unicode/unicode_repr.py b/tests/unicode/unicode_repr.py

Original file line number	Diff line number	Diff line change
`@@ -1175,6 +1175,7 @@ static DWORD get_fat ( /* 0xFFFFFFFF:Disk error, 1:Internal error, 2..0x7FF`
`1175`	`1175`	`break;`
`1176`	`1176`	`}`
`1177`	`1177`	`}`
	`1178`	`+ MP_FALLTHROUGH`
`1178`	`1179`	`/* go to default */`
`1179`	`1180`	`#endif`
`1180`	`1181`	`default:`
`@@ -5518,6 +5519,7 @@ FRESULT f_mkfs (`
`5518`	`5519`	`}`
`5519`	`5520`	`st = 1; /* Do not compress short run */`
`5520`	`5521`	`/* go to next case */`
	`5522`	`+ MP_FALLTHROUGH`
`5521`	`5523`	`case 1:`
`5522`	`5524`	`ch = si++; /* Fill the short run */`
`5523`	`5525`	`if (--j == 0) st = 0;`