Skip to content

Commit 8e38ca1

Browse files
hierophecthierophect
authored
Merge pull request adafruit#2 from hathach/hierophect-update-tusb
merge with current master of circuitpython
2 parents 409b5ff + d1f0458 commit 8e38ca1

276 files changed

Lines changed: 2787 additions & 3041 deletions

File tree

Some content is hidden

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

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -155,12 +155,15 @@ jobs:
155155
- "stm32f411ve_discovery"
156156
- "stm32f412zg_discovery"
157157
- "stringcar_m0_express"
158+
- "teknikio_bluebird"
158159
- "trellis_m4_express"
159160
- "trinket_m0"
160161
- "trinket_m0_haxpress"
161162
- "uchip"
162163
- "ugame10"
163164
- "winterbloom_sol"
165+
- "xinabox_cc03"
166+
- "xinabox_cs11"
164167

165168
steps:
166169
- name: Set up Python 3.5

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ TAGS
6565
*~
6666

6767
*.DS_Store
68+
**/*.DS_Store
69+
*.icloud
6870

6971
# POEdit mo files
7072
####################

‎.gitmodules‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,9 @@
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 "frozen/Adafruit_CircuitPython_SD"]
106+
path = frozen/Adafruit_CircuitPython_SD
107+
url = https://github.com/adafruit/Adafruit_CircuitPython_SD.git
105108
[submodule "lib/mp3"]
106109
path = lib/mp3
107110
url = https://github.com/adafruit/Adafruit_MP3

‎frozen/Adafruit_CircuitPython_SD‎

‎locale/ID.po‎

Lines changed: 69 additions & 51 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-10 13:55-0600\n"
11+
"POT-Creation-Date: 2019-12-12 15:33-0800\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -23,6 +23,19 @@ msgid ""
2323
"Code done running. Waiting for reload.\n"
2424
msgstr ""
2525

26+
#: supervisor/shared/safe_mode.c
27+
msgid ""
28+
"\n"
29+
"Please file an issue with the contents of your CIRCUITPY drive at \n"
30+
"https://github.com/adafruit/circuitpython/issues\n"
31+
msgstr ""
32+
33+
#: supervisor/shared/safe_mode.c
34+
msgid ""
35+
"\n"
36+
"To exit, please reset the board without "
37+
msgstr ""
38+
2639
#: py/obj.c
2740
msgid " File \"%q\""
2841
msgstr ""
@@ -294,7 +307,7 @@ msgid "Array values should be single bytes."
294307
msgstr ""
295308

296309
#: supervisor/shared/safe_mode.c
297-
msgid "Attempted heap allocation when MicroPython VM not running.\n"
310+
msgid "Attempted heap allocation when MicroPython VM not running."
298311
msgstr ""
299312

300313
#: main.c
@@ -406,6 +419,10 @@ msgstr "Tidak bisa mendapatkan pull pada saat mode output"
406419
msgid "Cannot get temperature"
407420
msgstr "Tidak bisa mendapatkan temperatur. status: 0x%02x"
408421

422+
#: shared-bindings/_bleio/Adapter.c
423+
msgid "Cannot have scan responses for extended, connectable advertisements."
424+
msgstr ""
425+
409426
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
410427
msgid "Cannot output both channels on the same pin"
411428
msgstr ""
@@ -454,6 +471,16 @@ msgstr ""
454471
msgid "CharacteristicBuffer writing not provided"
455472
msgstr ""
456473

474+
#: supervisor/shared/safe_mode.c
475+
msgid "CircuitPython core code crashed hard. Whoops!\n"
476+
msgstr ""
477+
478+
#: supervisor/shared/safe_mode.c
479+
msgid ""
480+
"CircuitPython is in safe mode because you pressed the reset button during "
481+
"boot. Press again to exit safe mode.\n"
482+
msgstr ""
483+
457484
#: shared-module/bitbangio/SPI.c
458485
msgid "Clock pin init failed."
459486
msgstr ""
@@ -515,7 +542,7 @@ msgid "Couldn't allocate second buffer"
515542
msgstr ""
516543

517544
#: supervisor/shared/safe_mode.c
518-
msgid "Crash into the HardFault_Handler.\n"
545+
msgid "Crash into the HardFault_Handler."
519546
msgstr ""
520547

521548
#: ports/atmel-samd/common-hal/audioio/AudioOut.c
@@ -632,28 +659,18 @@ msgstr ""
632659
msgid "Failed to release mutex, err 0x%04x"
633660
msgstr "Gagal untuk melepaskan mutex, status: 0x%08lX"
634661

635-
#: py/moduerrno.c
636-
msgid "File exists"
637-
msgstr ""
638-
639-
#: ports/nrf/peripherals/nrf/nvm.c
640-
msgid "Flash erase failed"
662+
#: supervisor/shared/safe_mode.c
663+
msgid "Failed to write internal flash."
641664
msgstr ""
642665

643-
#: ports/nrf/peripherals/nrf/nvm.c
644-
#, c-format
645-
msgid "Flash erase failed to start, err 0x%04x"
666+
#: py/moduerrno.c
667+
msgid "File exists"
646668
msgstr ""
647669

648-
#: ports/nrf/peripherals/nrf/nvm.c
670+
#: ports/nrf/common-hal/nvm/ByteArray.c
649671
msgid "Flash write failed"
650672
msgstr ""
651673

652-
#: ports/nrf/peripherals/nrf/nvm.c
653-
#, c-format
654-
msgid "Flash write failed to start, err 0x%04x"
655-
msgstr ""
656-
657674
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
658675
msgid "Frequency captured is above capability. Capture Paused."
659676
msgstr ""
@@ -826,13 +843,6 @@ msgstr ""
826843
msgid "Length must be non-negative"
827844
msgstr ""
828845

829-
#: supervisor/shared/safe_mode.c
830-
msgid ""
831-
"Looks like our core CircuitPython code crashed hard. Whoops!\n"
832-
"Please file an issue at https://github.com/adafruit/circuitpython/issues\n"
833-
" with the contents of your CIRCUITPY drive and this message:\n"
834-
msgstr ""
835-
836846
#: shared-module/bitbangio/SPI.c
837847
msgid "MISO pin init failed."
838848
msgstr ""
@@ -847,11 +857,11 @@ msgid "Maximum x value when mirrored is %d"
847857
msgstr ""
848858

849859
#: supervisor/shared/safe_mode.c
850-
msgid "MicroPython NLR jump failed. Likely memory corruption.\n"
860+
msgid "MicroPython NLR jump failed. Likely memory corruption."
851861
msgstr ""
852862

853863
#: supervisor/shared/safe_mode.c
854-
msgid "MicroPython fatal error.\n"
864+
msgid "MicroPython fatal error."
855865
msgstr ""
856866

857867
#: shared-bindings/audiobusio/PDMIn.c
@@ -920,6 +930,10 @@ msgstr ""
920930
msgid "No such file/directory"
921931
msgstr ""
922932

933+
#: supervisor/shared/safe_mode.c
934+
msgid "Nordic Soft Device failure assertion."
935+
msgstr ""
936+
923937
#: ports/nrf/common-hal/_bleio/__init__.c
924938
#: shared-bindings/_bleio/CharacteristicBuffer.c
925939
#, fuzzy
@@ -1103,10 +1117,7 @@ msgstr ""
11031117
#: supervisor/shared/safe_mode.c
11041118
msgid ""
11051119
"The CircuitPython heap was corrupted because the stack was too small.\n"
1106-
"Please increase stack size limits and press reset (after ejecting "
1107-
"CIRCUITPY).\n"
1108-
"If you didn't change the stack, then file an issue here with the contents of "
1109-
"your CIRCUITPY drive:\n"
1120+
"Please increase the stack size if you know how, or if not:"
11101121
msgstr ""
11111122

11121123
#: supervisor/shared/safe_mode.c
@@ -1116,21 +1127,11 @@ msgid ""
11161127
msgstr ""
11171128

11181129
#: supervisor/shared/safe_mode.c
1119-
#, fuzzy
11201130
msgid ""
1121-
"The microcontroller's power dipped. Please make sure your power supply "
1122-
"provides\n"
1131+
"The microcontroller's power dipped. Make sure your power supply provides\n"
11231132
"enough power for the whole circuit and press reset (after ejecting "
11241133
"CIRCUITPY).\n"
11251134
msgstr ""
1126-
"Tegangan dari mikrokontroler turun atau mati. Pastikan sumber tegangan "
1127-
"memberikan daya\n"
1128-
1129-
#: supervisor/shared/safe_mode.c
1130-
msgid ""
1131-
"The reset button was pressed while booting CircuitPython. Press again to "
1132-
"exit safe mode.\n"
1133-
msgstr ""
11341135

11351136
#: shared-module/audiomixer/MixerVoice.c
11361137
msgid "The sample's bits_per_sample does not match the mixer's"
@@ -1164,10 +1165,6 @@ msgstr ""
11641165
msgid "Tile width must exactly divide bitmap width"
11651166
msgstr ""
11661167

1167-
#: supervisor/shared/safe_mode.c
1168-
msgid "To exit, please reset the board without "
1169-
msgstr "Untuk keluar, silahkan reset board tanpa "
1170-
11711168
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
11721169
msgid "Too many channels in sample."
11731170
msgstr "Terlalu banyak channel dalam sampel"
@@ -1246,6 +1243,10 @@ msgstr ""
12461243
msgid "Unknown gatt error: 0x%04x"
12471244
msgstr ""
12481245

1246+
#: supervisor/shared/safe_mode.c
1247+
msgid "Unknown reason."
1248+
msgstr ""
1249+
12491250
#: ports/nrf/common-hal/_bleio/__init__.c
12501251
#, c-format
12511252
msgid "Unknown security error: 0x%04x"
@@ -1323,12 +1324,8 @@ msgstr ""
13231324
"Untuk menampilkan modul built-in silahkan ketik `help(\"modules\")`.\n"
13241325

13251326
#: supervisor/shared/safe_mode.c
1326-
#, fuzzy
1327-
msgid ""
1328-
"You are running in safe mode which means something unanticipated happened.\n"
1327+
msgid "You are in safe mode: something unanticipated happened.\n"
13291328
msgstr ""
1330-
"Anda sedang menjalankan mode aman (safe mode) yang berarti sesuatu yang "
1331-
"sangat buruk telah terjadi.\n"
13321329

13331330
#: supervisor/shared/safe_mode.c
13341331
msgid "You requested starting safe mode by "
@@ -2853,6 +2850,19 @@ msgstr ""
28532850
#~ msgid "Soft device assert, id: 0x%08lX, pc: 0x%08lX"
28542851
#~ msgstr "Dukungan soft device, id: 0x%08lX, pc: 0x%08l"
28552852

2853+
#, fuzzy
2854+
#~ msgid ""
2855+
#~ "The microcontroller's power dipped. Please make sure your power supply "
2856+
#~ "provides\n"
2857+
#~ "enough power for the whole circuit and press reset (after ejecting "
2858+
#~ "CIRCUITPY).\n"
2859+
#~ msgstr ""
2860+
#~ "Tegangan dari mikrokontroler turun atau mati. Pastikan sumber tegangan "
2861+
#~ "memberikan daya\n"
2862+
2863+
#~ msgid "To exit, please reset the board without "
2864+
#~ msgstr "Untuk keluar, silahkan reset board tanpa "
2865+
28562866
#~ msgid "UART(%d) does not exist"
28572867
#~ msgstr "UART(%d) tidak ada"
28582868

@@ -2870,6 +2880,14 @@ msgstr ""
28702880
#~ "Gunakan esptool untuk menghapus flash dan upload ulang Python sebagai "
28712881
#~ "gantinya"
28722882

2883+
#, fuzzy
2884+
#~ msgid ""
2885+
#~ "You are running in safe mode which means something unanticipated "
2886+
#~ "happened.\n"
2887+
#~ msgstr ""
2888+
#~ "Anda sedang menjalankan mode aman (safe mode) yang berarti sesuatu yang "
2889+
#~ "sangat buruk telah terjadi.\n"
2890+
28732891
#~ msgid "[addrinfo error %d]"
28742892
#~ msgstr "[addrinfo error %d]"
28752893

0 commit comments

Comments
 (0)