Skip to content

Commit baf8d9e

Browse files
hierophecthierophect
committed
Merge remote-tracking branch 'upstream/master' into stm32-temperature-us
2 parents ea7f80e + e159829 commit baf8d9e

68 files changed

Lines changed: 1554 additions & 165 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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@ jobs:
130130
- "bast_pro_mini_m0"
131131
- "capablerobot_usbhub"
132132
- "catwan_usbstick"
133+
- "circuitbrains_basic_m0"
134+
- "circuitbrains_deluxe_m4"
133135
- "circuitplayground_bluefruit"
134136
- "circuitplayground_express"
135137
- "circuitplayground_express_crickit"
@@ -144,6 +146,8 @@ jobs:
144146
- "electronut_labs_blip"
145147
- "electronut_labs_papyr"
146148
- "escornabot_makech"
149+
- "espruino_pico"
150+
- "feather_bluefruit_sense"
147151
- "feather_m0_adalogger"
148152
- "feather_m0_basic"
149153
- "feather_m0_express"

‎extmod/vfs_fat_file.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#if MICROPY_VFS && MICROPY_VFS_FAT
2929

3030
#include <stdio.h>
31+
#include <string.h>
3132

3233
#include "py/runtime.h"
3334
#include "py/stream.h"
@@ -199,7 +200,7 @@ STATIC mp_obj_t file_open(fs_user_mount_t *vfs, const mp_obj_type_t *type, mp_ar
199200
FRESULT res = f_open(&vfs->fatfs, &o->fp, fname, mode);
200201
if (res != FR_OK) {
201202
m_del_obj(pyb_file_obj_t, o);
202-
mp_raise_OSError(fresult_to_errno_table[res]);
203+
mp_raise_OSError_errno_str(fresult_to_errno_table[res], args[0].u_obj);
203204
}
204205
// If we're reading, turn on fast seek.
205206
if (mode == FA_READ) {

‎locale/ID.po‎

Lines changed: 6 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: 2020-01-29 17:27-0800\n"
11+
"POT-Creation-Date: 2020-02-05 15:55-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"
@@ -676,6 +676,10 @@ msgstr ""
676676
msgid "Expected tuple of length %d, got %d"
677677
msgstr ""
678678

679+
#: ports/nrf/common-hal/_bleio/Adapter.c
680+
msgid "Extended advertisements with scan response not supported."
681+
msgstr ""
682+
679683
#: shared-bindings/ps2io/Ps2.c
680684
msgid "Failed sending command."
681685
msgstr ""
@@ -1845,7 +1849,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18451849
msgstr ""
18461850

18471851
#: shared-bindings/displayio/Palette.c
1848-
msgid "color buffer must be a buffer or int"
1852+
msgid "color buffer must be a buffer, tuple, list, or int"
18491853
msgstr ""
18501854

18511855
#: shared-bindings/displayio/Palette.c

‎locale/circuitpython.pot‎

Lines changed: 6 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: 2020-01-29 17:27-0800\n"
11+
"POT-Creation-Date: 2020-02-07 10:02-0500\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"
@@ -665,6 +665,10 @@ msgstr ""
665665
msgid "Expected tuple of length %d, got %d"
666666
msgstr ""
667667

668+
#: ports/nrf/common-hal/_bleio/Adapter.c
669+
msgid "Extended advertisements with scan response not supported."
670+
msgstr ""
671+
668672
#: shared-bindings/ps2io/Ps2.c
669673
msgid "Failed sending command."
670674
msgstr ""
@@ -1821,7 +1825,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18211825
msgstr ""
18221826

18231827
#: shared-bindings/displayio/Palette.c
1824-
msgid "color buffer must be a buffer or int"
1828+
msgid "color buffer must be a buffer, tuple, list, or int"
18251829
msgstr ""
18261830

18271831
#: shared-bindings/displayio/Palette.c

‎locale/de_DE.po‎

Lines changed: 10 additions & 6 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\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"
@@ -669,6 +669,10 @@ msgstr "Erwartet eine Adresse"
669669
msgid "Expected tuple of length %d, got %d"
670670
msgstr "Habe ein Tupel der Länge %d erwartet aber %d erhalten"
671671

672+
#: ports/nrf/common-hal/_bleio/Adapter.c
673+
msgid "Extended advertisements with scan response not supported."
674+
msgstr ""
675+
672676
#: shared-bindings/ps2io/Ps2.c
673677
msgid "Failed sending command."
674678
msgstr "Kommando nicht gesendet."
@@ -1849,8 +1853,8 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18491853
msgstr "Farbpuffer muss 3 Bytes (RGB) oder 4 Bytes (RGB + pad byte) sein"
18501854

18511855
#: shared-bindings/displayio/Palette.c
1852-
msgid "color buffer must be a buffer or int"
1853-
msgstr "Farbpuffer muss ein Puffer oder ein int sein"
1856+
msgid "color buffer must be a buffer, tuple, list, or int"
1857+
msgstr ""
18541858

18551859
#: shared-bindings/displayio/Palette.c
18561860
msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
@@ -2853,7 +2857,6 @@ msgstr ""
28532857
#~ msgid "C-level assert"
28542858
#~ msgstr "C-Level Assert"
28552859

2856-
#, c-format
28572860
#~ msgid "Can not use dotstar with %s"
28582861
#~ msgstr "Kann dotstar nicht mit %s verwenden"
28592862

@@ -3167,17 +3170,18 @@ msgstr ""
31673170
#~ "Sie laufen im abgesicherten Modus, was bedeutet, dass etwas Unerwartetes "
31683171
#~ "passiert ist.\n"
31693172

3170-
#, c-format
31713173
#~ msgid "buf is too small. need %d bytes"
31723174
#~ msgstr "buf ist zu klein. brauche %d Bytes"
31733175

31743176
#~ msgid "buffer too long"
31753177
#~ msgstr "Buffer zu lang"
31763178

3177-
#, c-format
31783179
#~ msgid "byteorder is not an instance of ByteOrder (got a %s)"
31793180
#~ msgstr "byteorder ist keine Instanz von ByteOrder (%s erhalten)"
31803181

3182+
#~ msgid "color buffer must be a buffer or int"
3183+
#~ msgstr "Farbpuffer muss ein Puffer oder ein int sein"
3184+
31813185
#~ msgid "expected a DigitalInOut"
31823186
#~ msgstr "erwarte DigitalInOut"
31833187

‎locale/en_US.po‎

Lines changed: 6 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -665,6 +665,10 @@ msgstr ""
665665
msgid "Expected tuple of length %d, got %d"
666666
msgstr ""
667667

668+
#: ports/nrf/common-hal/_bleio/Adapter.c
669+
msgid "Extended advertisements with scan response not supported."
670+
msgstr ""
671+
668672
#: shared-bindings/ps2io/Ps2.c
669673
msgid "Failed sending command."
670674
msgstr ""
@@ -1821,7 +1825,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18211825
msgstr ""
18221826

18231827
#: shared-bindings/displayio/Palette.c
1824-
msgid "color buffer must be a buffer or int"
1828+
msgid "color buffer must be a buffer, tuple, list, or int"
18251829
msgstr ""
18261830

18271831
#: shared-bindings/displayio/Palette.c

‎locale/en_x_pirate.po‎

Lines changed: 6 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2018-07-27 11:55-0700\n"
1212
"Last-Translator: \n"
1313
"Language-Team: @sommersoft, @MrCertainly\n"
@@ -669,6 +669,10 @@ msgstr ""
669669
msgid "Expected tuple of length %d, got %d"
670670
msgstr ""
671671

672+
#: ports/nrf/common-hal/_bleio/Adapter.c
673+
msgid "Extended advertisements with scan response not supported."
674+
msgstr ""
675+
672676
#: shared-bindings/ps2io/Ps2.c
673677
msgid "Failed sending command."
674678
msgstr ""
@@ -1825,7 +1829,7 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18251829
msgstr ""
18261830

18271831
#: shared-bindings/displayio/Palette.c
1828-
msgid "color buffer must be a buffer or int"
1832+
msgid "color buffer must be a buffer, tuple, list, or int"
18291833
msgstr ""
18301834

18311835
#: shared-bindings/displayio/Palette.c

‎locale/es.po‎

Lines changed: 10 additions & 8 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2018-08-24 22:56-0500\n"
1212
"Last-Translator: \n"
1313
"Language-Team: \n"
@@ -671,6 +671,10 @@ msgstr ""
671671
msgid "Expected tuple of length %d, got %d"
672672
msgstr "Se esperaba un tuple de %d, se obtuvo %d"
673673

674+
#: ports/nrf/common-hal/_bleio/Adapter.c
675+
msgid "Extended advertisements with scan response not supported."
676+
msgstr ""
677+
674678
#: shared-bindings/ps2io/Ps2.c
675679
msgid "Failed sending command."
676680
msgstr "Fallo enviando comando"
@@ -1850,8 +1854,8 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18501854
msgstr "color buffer debe ser 3 bytes (RGB) ó 4 bytes (RGB + pad byte)"
18511855

18521856
#: shared-bindings/displayio/Palette.c
1853-
msgid "color buffer must be a buffer or int"
1854-
msgstr "color buffer deber ser un buffer o un int"
1857+
msgid "color buffer must be a buffer, tuple, list, or int"
1858+
msgstr ""
18551859

18561860
#: shared-bindings/displayio/Palette.c
18571861
msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
@@ -2853,7 +2857,6 @@ msgstr "paso cero"
28532857
#~ "Intento de allocation de heap cuando la VM de MicroPython no estaba "
28542858
#~ "corriendo.\n"
28552859

2856-
#, c-format
28572860
#~ msgid "Can not use dotstar with %s"
28582861
#~ msgstr "No se puede usar dotstar con %s"
28592862

@@ -3194,14 +3197,12 @@ msgstr "paso cero"
31943197
#~ msgid "bad GATT role"
31953198
#~ msgstr "mal GATT role"
31963199

3197-
#, c-format
31983200
#~ msgid "buf is too small. need %d bytes"
31993201
#~ msgstr "buf es demasiado pequeño. necesita %d bytes"
32003202

32013203
#~ msgid "buffer too long"
32023204
#~ msgstr "buffer demasiado largo"
32033205

3204-
#, c-format
32053206
#~ msgid "byteorder is not an instance of ByteOrder (got a %s)"
32063207
#~ msgstr "byteorder no es instancia de ByteOrder (encontarmos un %s)"
32073208

@@ -3223,6 +3224,9 @@ msgstr "paso cero"
32233224
#~ msgid "characteristics includes an object that is not a Characteristic"
32243225
#~ msgstr "characteristics incluye un objeto que no es una Characteristica"
32253226

3227+
#~ msgid "color buffer must be a buffer or int"
3228+
#~ msgstr "color buffer deber ser un buffer o un int"
3229+
32263230
#~ msgid "either pos or kw args are allowed"
32273231
#~ msgstr "ya sea pos o kw args son permitidos"
32283232

@@ -3312,11 +3316,9 @@ msgstr "paso cero"
33123316
#~ msgid "unknown config param"
33133317
#~ msgstr "parámetro config desconocido"
33143318

3315-
#, c-format
33163319
#~ msgid "unknown format code '%c' for object of type 'float'"
33173320
#~ msgstr "codigo format desconocido '%c' para el typo de objeto 'float'"
33183321

3319-
#, c-format
33203322
#~ msgid "unknown format code '%c' for object of type 'str'"
33213323
#~ msgstr "codigo format desconocido '%c' para objeto de tipo 'str'"
33223324

‎locale/fil.po‎

Lines changed: 10 additions & 5 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: 2020-01-29 17:27-0800\n"
10+
"POT-Creation-Date: 2020-02-05 15:55-0800\n"
1111
"PO-Revision-Date: 2018-12-20 22:15-0800\n"
1212
"Last-Translator: Timothy <me@timothygarcia.ca>\n"
1313
"Language-Team: fil\n"
@@ -679,6 +679,10 @@ msgstr ""
679679
msgid "Expected tuple of length %d, got %d"
680680
msgstr ""
681681

682+
#: ports/nrf/common-hal/_bleio/Adapter.c
683+
msgid "Extended advertisements with scan response not supported."
684+
msgstr ""
685+
682686
#: shared-bindings/ps2io/Ps2.c
683687
msgid "Failed sending command."
684688
msgstr ""
@@ -1861,8 +1865,8 @@ msgid "color buffer must be 3 bytes (RGB) or 4 bytes (RGB + pad byte)"
18611865
msgstr "color buffer ay dapat na 3 bytes (RGB) o 4 bytes (RGB + pad byte)"
18621866

18631867
#: shared-bindings/displayio/Palette.c
1864-
msgid "color buffer must be a buffer or int"
1865-
msgstr "color buffer ay dapat buffer or int"
1868+
msgid "color buffer must be a buffer, tuple, list, or int"
1869+
msgstr ""
18661870

18671871
#: shared-bindings/displayio/Palette.c
18681872
msgid "color buffer must be a bytearray or array of type 'b' or 'B'"
@@ -3176,6 +3180,9 @@ msgstr "zero step"
31763180
#~ msgid "can't set STA config"
31773181
#~ msgstr "hindi makuha ang STA config"
31783182

3183+
#~ msgid "color buffer must be a buffer or int"
3184+
#~ msgstr "color buffer ay dapat buffer or int"
3185+
31793186
#~ msgid "either pos or kw args are allowed"
31803187
#~ msgstr "pos o kw args ang pinahihintulutan"
31813188

@@ -3254,11 +3261,9 @@ msgstr "zero step"
32543261
#~ msgid "unknown config param"
32553262
#~ msgstr "hindi alam na config param"
32563263

3257-
#, c-format
32583264
#~ msgid "unknown format code '%c' for object of type 'float'"
32593265
#~ msgstr "hindi alam ang format code '%c' sa object na ang type ay 'float'"
32603266

3261-
#, c-format
32623267
#~ msgid "unknown format code '%c' for object of type 'str'"
32633268
#~ msgstr ""
32643269
#~ "hindi alam ang format ng code na '%c' para sa object ng type ay 'str'"

0 commit comments

Comments
 (0)