Skip to content

Commit 39f3063

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/master' into update-tusb
2 parents 885a141 + b220bef commit 39f3063

File tree

41 files changed

+1608
-30
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+1608
-30
lines changed

‎.github/workflows/build.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,7 @@ jobs:
151151
- "sparkfun_samd21_dev"
152152
- "sparkfun_samd21_mini"
153153
- "spresense"
154+
- "stm32f411ce_blackpill"
154155
- "stm32f411ve_discovery"
155156
- "stm32f412zg_discovery"
156157
- "stringcar_m0_express"

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,6 @@
102102
[submodule "ports/cxd56/spresense-exported-sdk"]
103103
path = ports/cxd56/spresense-exported-sdk
104104
url = https://github.com/sonydevworld/spresense-exported-sdk.git
105+
[submodule "lib/mp3"]
106+
path = lib/mp3
107+
url = https://github.com/adafruit/Adafruit_MP3

‎lib/mp3‎

Submodule mp3 added at 2a3cc78

‎lib/oofatfs/ff.c‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3382,7 +3382,11 @@ FRESULT f_read (
33823382
if (!sect) ABORT(fs, FR_INT_ERR);
33833383
sect += csect;
33843384
cc = btr / SS(fs); /* When remaining bytes >= sector size, */
3385-
if (cc) { /* Read maximum contiguous sectors directly */
3385+
if (cc
3386+
#if _FS_DISK_READ_ALIGNED
3387+
&& (((int)rbuff & 3) == 0)
3388+
#endif
3389+
) {/* Read maximum contiguous sectors directly */
33863390
if (csect + cc > fs->csize) { /* Clip at cluster boundary */
33873391
cc = fs->csize - csect;
33883392
}

‎lib/oofatfs/ffconf.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,12 @@
343343
/ SemaphoreHandle_t and etc.. A header file for O/S definitions needs to be
344344
/ included somewhere in the scope of ff.h. */
345345

346+
// Set to nonzero if buffers passed to disk_read have a word alignment
347+
// restriction
348+
#ifndef _FS_DISK_READ_ALIGNED
349+
#define _FS_DISK_READ_ALIGNED 0
350+
#endif
351+
346352
/* #include <windows.h> // O/S definitions */
347353

348354

‎locale/ID.po‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-12-06 13:25-0600\n"
11+
"POT-Creation-Date: 2019-12-10 13:55-0600\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -496,11 +496,21 @@ msgstr ""
496496
msgid "Could not initialize UART"
497497
msgstr "Tidak dapat menginisialisasi UART"
498498

499+
#: shared-module/audiomp3/MP3File.c
500+
msgid "Couldn't allocate decoder"
501+
msgstr ""
502+
499503
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
504+
#: shared-module/audiomp3/MP3File.c
500505
msgid "Couldn't allocate first buffer"
501506
msgstr ""
502507

508+
#: shared-module/audiomp3/MP3File.c
509+
msgid "Couldn't allocate input buffer"
510+
msgstr ""
511+
503512
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
513+
#: shared-module/audiomp3/MP3File.c
504514
msgid "Couldn't allocate second buffer"
505515
msgstr ""
506516

@@ -613,6 +623,10 @@ msgstr ""
613623
msgid "Failed to connect: timeout"
614624
msgstr ""
615625

626+
#: shared-module/audiomp3/MP3File.c
627+
msgid "Failed to parse MP3 file"
628+
msgstr ""
629+
616630
#: ports/nrf/sd_mutex.c
617631
#, fuzzy, c-format
618632
msgid "Failed to release mutex, err 0x%04x"
@@ -1779,7 +1793,7 @@ msgstr "argumen keyword ekstra telah diberikan"
17791793
msgid "extra positional arguments given"
17801794
msgstr "argumen posisi ekstra telah diberikan"
17811795

1782-
#: shared-bindings/audiocore/WaveFile.c
1796+
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3File.c
17831797
#: shared-bindings/displayio/OnDiskBitmap.c
17841798
msgid "file must be a file opened in byte mode"
17851799
msgstr ""

‎locale/circuitpython.pot‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: PACKAGE VERSION\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2019-12-06 13:25-0600\n"
11+
"POT-Creation-Date: 2019-12-10 13:55-0600\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -486,11 +486,21 @@ msgstr ""
486486
msgid "Could not initialize UART"
487487
msgstr ""
488488

489+
#: shared-module/audiomp3/MP3File.c
490+
msgid "Couldn't allocate decoder"
491+
msgstr ""
492+
489493
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
494+
#: shared-module/audiomp3/MP3File.c
490495
msgid "Couldn't allocate first buffer"
491496
msgstr ""
492497

498+
#: shared-module/audiomp3/MP3File.c
499+
msgid "Couldn't allocate input buffer"
500+
msgstr ""
501+
493502
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
503+
#: shared-module/audiomp3/MP3File.c
494504
msgid "Couldn't allocate second buffer"
495505
msgstr ""
496506

@@ -602,6 +612,10 @@ msgstr ""
602612
msgid "Failed to connect: timeout"
603613
msgstr ""
604614

615+
#: shared-module/audiomp3/MP3File.c
616+
msgid "Failed to parse MP3 file"
617+
msgstr ""
618+
605619
#: ports/nrf/sd_mutex.c
606620
#, c-format
607621
msgid "Failed to release mutex, err 0x%04x"
@@ -1749,7 +1763,7 @@ msgstr ""
17491763
msgid "extra positional arguments given"
17501764
msgstr ""
17511765

1752-
#: shared-bindings/audiocore/WaveFile.c
1766+
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3File.c
17531767
#: shared-bindings/displayio/OnDiskBitmap.c
17541768
msgid "file must be a file opened in byte mode"
17551769
msgstr ""

‎locale/de_DE.po‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-12-06 13:25-0600\n"
10+
"POT-Creation-Date: 2019-12-10 13:55-0600\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: Pascal Deneaux\n"
1313
"Language-Team: Sebastian Plamauer, Pascal Deneaux\n"
@@ -490,11 +490,21 @@ msgstr "Beschädigter raw code"
490490
msgid "Could not initialize UART"
491491
msgstr "Konnte UART nicht initialisieren"
492492

493+
#: shared-module/audiomp3/MP3File.c
494+
msgid "Couldn't allocate decoder"
495+
msgstr ""
496+
493497
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
498+
#: shared-module/audiomp3/MP3File.c
494499
msgid "Couldn't allocate first buffer"
495500
msgstr "Konnte first buffer nicht zuteilen"
496501

502+
#: shared-module/audiomp3/MP3File.c
503+
msgid "Couldn't allocate input buffer"
504+
msgstr ""
505+
497506
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
507+
#: shared-module/audiomp3/MP3File.c
498508
msgid "Couldn't allocate second buffer"
499509
msgstr "Konnte second buffer nicht zuteilen"
500510

@@ -606,6 +616,10 @@ msgstr ""
606616
msgid "Failed to connect: timeout"
607617
msgstr "Verbindung nicht erfolgreich: timeout"
608618

619+
#: shared-module/audiomp3/MP3File.c
620+
msgid "Failed to parse MP3 file"
621+
msgstr ""
622+
609623
#: ports/nrf/sd_mutex.c
610624
#, c-format
611625
msgid "Failed to release mutex, err 0x%04x"
@@ -1798,7 +1812,7 @@ msgstr "Es wurden zusätzliche Keyword-Argumente angegeben"
17981812
msgid "extra positional arguments given"
17991813
msgstr "Es wurden zusätzliche Argumente ohne Keyword angegeben"
18001814

1801-
#: shared-bindings/audiocore/WaveFile.c
1815+
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3File.c
18021816
#: shared-bindings/displayio/OnDiskBitmap.c
18031817
msgid "file must be a file opened in byte mode"
18041818
msgstr "Die Datei muss eine im Byte-Modus geöffnete Datei sein"

‎locale/en_US.po‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-12-06 13:25-0600\n"
10+
"POT-Creation-Date: 2019-12-10 13:55-0600\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -486,11 +486,21 @@ msgstr ""
486486
msgid "Could not initialize UART"
487487
msgstr ""
488488

489+
#: shared-module/audiomp3/MP3File.c
490+
msgid "Couldn't allocate decoder"
491+
msgstr ""
492+
489493
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
494+
#: shared-module/audiomp3/MP3File.c
490495
msgid "Couldn't allocate first buffer"
491496
msgstr ""
492497

498+
#: shared-module/audiomp3/MP3File.c
499+
msgid "Couldn't allocate input buffer"
500+
msgstr ""
501+
493502
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
503+
#: shared-module/audiomp3/MP3File.c
494504
msgid "Couldn't allocate second buffer"
495505
msgstr ""
496506

@@ -602,6 +612,10 @@ msgstr ""
602612
msgid "Failed to connect: timeout"
603613
msgstr ""
604614

615+
#: shared-module/audiomp3/MP3File.c
616+
msgid "Failed to parse MP3 file"
617+
msgstr ""
618+
605619
#: ports/nrf/sd_mutex.c
606620
#, c-format
607621
msgid "Failed to release mutex, err 0x%04x"
@@ -1749,7 +1763,7 @@ msgstr ""
17491763
msgid "extra positional arguments given"
17501764
msgstr ""
17511765

1752-
#: shared-bindings/audiocore/WaveFile.c
1766+
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3File.c
17531767
#: shared-bindings/displayio/OnDiskBitmap.c
17541768
msgid "file must be a file opened in byte mode"
17551769
msgstr ""

‎locale/en_x_pirate.po‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: \n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2019-12-06 13:25-0600\n"
10+
"POT-Creation-Date: 2019-12-10 13:55-0600\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -490,11 +490,21 @@ msgstr ""
490490
msgid "Could not initialize UART"
491491
msgstr ""
492492

493+
#: shared-module/audiomp3/MP3File.c
494+
msgid "Couldn't allocate decoder"
495+
msgstr ""
496+
493497
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
498+
#: shared-module/audiomp3/MP3File.c
494499
msgid "Couldn't allocate first buffer"
495500
msgstr ""
496501

502+
#: shared-module/audiomp3/MP3File.c
503+
msgid "Couldn't allocate input buffer"
504+
msgstr ""
505+
497506
#: shared-module/audiocore/WaveFile.c shared-module/audiomixer/Mixer.c
507+
#: shared-module/audiomp3/MP3File.c
498508
msgid "Couldn't allocate second buffer"
499509
msgstr ""
500510

@@ -606,6 +616,10 @@ msgstr ""
606616
msgid "Failed to connect: timeout"
607617
msgstr ""
608618

619+
#: shared-module/audiomp3/MP3File.c
620+
msgid "Failed to parse MP3 file"
621+
msgstr ""
622+
609623
#: ports/nrf/sd_mutex.c
610624
#, c-format
611625
msgid "Failed to release mutex, err 0x%04x"
@@ -1753,7 +1767,7 @@ msgstr ""
17531767
msgid "extra positional arguments given"
17541768
msgstr ""
17551769

1756-
#: shared-bindings/audiocore/WaveFile.c
1770+
#: shared-bindings/audiocore/WaveFile.c shared-bindings/audiomp3/MP3File.c
17571771
#: shared-bindings/displayio/OnDiskBitmap.c
17581772
msgid "file must be a file opened in byte mode"
17591773
msgstr ""

0 commit comments

Comments
 (0)