8000 Merge remote-tracking branch 'adafruit/master' into vectorio · adafruit/circuitpython@d274074 · GitHub
[go: up one dir, main page]
Skip to content

Commit d274074

Browse files
tannewttannewt
committed
Merge remote-tracking branch 'adafruit/master' into vectorio
2 parents fd94c08 + f7303e6 commit d274074

File tree

60 files changed

+997
-90
lines changed
  • en_US.po
  • en_x_pirate.po
  • es.po
  • fil.po
  • fr.po
  • it_IT.po
  • ko.po
  • pl.po
  • pt_BR.po
  • sv.po
  • zh_Latn_pinyin.po
  • ports
  • shared-bindings
  • supervisor/shared/external_flash

    • Some content is hidden

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

    60 files changed

    +997
    -90
    lines changed

    ‎.github/workflows/build.yml

    Lines changed: 3 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -216,11 +216,13 @@ jobs:
    216216
    - "pewpew10"
    217217
    - "pewpew_m4"
    218218
    - "pirkey_m0"
    219+
    - "pitaya_go"
    219220
    - "pyb_nano_v2"
    220221
    - "pybadge"
    221222
    - "pybadge_airlift"
    222223
    - "pyboard_v11"
    223224
    - "pycubed"
    225+
    - "pycubed_mram"
    224226
    - "pygamer"
    225227
    - "pygamer_advance"
    226228
    - "pyportal"
    @@ -249,6 +251,7 @@ jobs:
    249251
    - "stm32f746g_discovery"
    250252
    - "stringcar_m0_express"
    251253
    - "teensy40"
    254+
    - "teensy41"
    252255
    - "teknikio_bluebird"
    253256
    - "thunderpack"
    254257
    - "trellis_m4_express"

    ‎extmod/modujson.c

    Lines changed: 24 additions & 9 deletions
    Original file line numberDiff line numberDiff line change
    @@ -53,6 +53,10 @@ STATIC mp_obj_t mod_ujson_dumps(mp_obj_t obj) {
    5353
    }
    5454
    STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_dumps_obj, mod_ujson_dumps);
    5555

    56+
    #define JSON_DEBUG(...) (void)0
    57+
    // #define JSON_DEBUG(...) mp_printf(&mp_plat_print __VA_OPT__(,) __VA_ARGS__)
    58+
    59+
    5660
    // The function below implements a simple non-recursive JSON parser.
    5761
    //
    5862
    // The JSON specification is at http://www.ietf.org/rfc/rfc4627.txt
    @@ -80,6 +84,7 @@ typedef struct _ujson_stream_t {
    8084

    8185
    STATIC byte ujson_stream_next(ujson_stream_t *s) {
    8286
    mp_uint_t ret = s->read(s->stream_obj, &s->cur, 1, &s->errcode);
    87+
    JSON_DEBUG(" usjon_stream_next err:%2d cur: %c \n", s->errcode, s->cur);
    8388
    if (s->errcode != 0) {
    8489
    mp_raise_OSError(s->errcode);
    8590
    }
    @@ -89,9 +94,10 @@ STATIC byte ujson_stream_next(ujson_stream_t *s) {
    8994
    return s->cur;
    9095
    }
    9196

    92-
    STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
    97+
    STATIC mp_obj_t _mod_ujson_load(mp_obj_t stream_obj, bool return_first_json) {
    9398
    const mp_stream_p_t *stream_p = mp_get_stream_raise(stream_obj, MP_STREAM_OP_READ);
    9499
    ujson_stream_t s = {stream_obj, stream_p->read, 0, 0};
    100+
    JSON_DEBUG("got JSON stream\n");
    95101
    vstr_t vstr;
    96102
    vstr_init(&vstr, 8);
    97103
    mp_obj_list_t stack; // we use a list as a simple stack for nested JSON
    @@ -262,13 +268,18 @@ STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
    262268
    }
    263269
    }
    264270
    success:
    265-
    // eat trailing whitespace
    266-
    while (unichar_isspace(S_CUR(s))) {
    267-
    S_NEXT(s);
    268-
    }
    269-
    if (!S_END(s)) {
    270-
    // unexpected chars
    271-
    goto fail;
    271+
    // It is legal for a stream to have contents after JSON.
    272+
    // E.g., A UART is not closed after receiving an object; in load() we will
    273+
    // return the first complete JSON object, while in loads() we will retain
    274+
    // strict adherence to the buffer's complete semantic.
    275+
    if (!return_first_json) {
    276+
    while (unichar_isspace(S_CUR(s))) {
    277+
    S_NEXT(s);
    278+
    }
    279+
    if (!S_END(s)) {
    280+
    // unexpected chars
    281+
    goto fail;
    282+
    }
    272283
    }
    273284
    if (stack_top == MP_OBJ_NULL || stack.len != 0) {
    274285
    // not exactly 1 object
    @@ -280,14 +291,18 @@ STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
    280291
    fail:
    281292
    mp_raise_ValueError(translate("syntax error in JSON"));
    282293
    }
    294+
    295+
    STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
    296+
    return _mod_ujson_load(stream_obj, true);
    297+
    }
    283298
    STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_load_obj, mod_ujson_load);
    284299

    285300
    STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
    286301
    size_t len;
    287302
    const char *buf = mp_obj_str_get_data(obj, &len);
    288303
    vstr_t vstr = {len, len, (char*)buf, true};
    289304
    mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0, MP_OBJ_NULL};
    290-
    return mod_ujson_load(MP_OBJ_FROM_PTR(&sio));
    305+
    return _mod_ujson_load(MP_OBJ_FROM_PTR(&sio), false);
    291306
    }
    292307
    STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_loads_obj, mod_ujson_loads);
    293308

    ‎locale/ID.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    11+
    "POT-Creation-Date: 2020-05-12 12:24-0700\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"
    @@ -1152,6 +1152,10 @@ msgstr "Tidak ada dukungan hardware untuk pin"
    11521152
    msgid "No key was specified"
    11531153
    msgstr ""
    11541154

    1155+
    #: shared-bindings/time/__init__.c
    1156+
    msgid "No long integer support"
    1157+
    msgstr ""
    1158+
    11551159
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11561160
    msgid "No more timers available on this pin."
    11571161
    msgstr ""

    ‎locale/circuitpython.pot

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    11+
    "POT-Creation-Date: 2020-05-12 12:24-0700\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"
    @@ -1141,6 +1141,10 @@ msgstr ""
    11411141
    msgid "No key was specified"
    11421142
    msgstr ""
    11431143

    1144+
    #: shared-bindings/time/__init__.c
    1145+
    msgid "No long integer support"
    1146+
    msgstr ""
    1147+
    11441148
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11451149
    msgid "No more timers available on this pin."
    11461150
    msgstr ""

    ‎locale/de_DE.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    10+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1111
    "PO-Revision-Date: 2020-04-30 17:01+0000\n"
    1212
    "Last-Translator: Jeff Epler <jepler@gmail.com>\n"
    1313
    "Language-Team: German <https://later.unpythonic.net/projects/circuitpython/"
    @@ -1157,6 +1157,10 @@ msgstr "Keine Hardwareunterstützung an diesem Pin"
    11571157
    msgid "No key was specified"
    11581158
    msgstr ""
    11591159

    1160+
    #: shared-bindings/time/__init__.c
    1161+
    msgid "No long integer support"
    1162+
    msgstr ""
    1163+
    11601164
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11611165
    msgid "No more timers available on this pin."
    11621166
    msgstr ""

    ‎locale/en_US.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    10+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1111
    "PO-Revision-Date: 2018-07-27 11:55-0700\n"
    1212
    "Last-Translator: \n"
    1313
    "Language-Team: \n"
    @@ -1141,6 +1141,10 @@ msgstr ""
    11411141
    msgid "No key was specified"
    11421142
    msgstr ""
    11431143

    1144+
    #: shared-bindings/time/__init__.c
    1145+
    msgid "No long integer support"
    1146+
    msgstr ""
    1147+
    11441148
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11451149
    msgid "No more timers available on this pin."
    11461150
    msgstr ""

    ‎locale/en_x_pirate.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    10+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1111
    "PO-Revision-Date: 2020-03-30 22:11+0000\n"
    1212
    "Last-Translator: Tannewt <devnull@unpythonic.net>\n"
    1313
    "Language-Team: English <https://later.unpythonic.net/projects/circuitpython/"
    @@ -1150,6 +1150,10 @@ msgstr ""
    11501150
    msgid "No key was specified"
    11511151
    msgstr ""
    11521152

    1153+
    #: shared-bindings/time/__init__.c
    1154+
    msgid "No long integer support"
    1155+
    msgstr ""
    1156+
    11531157
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11541158
    msgid "No more timers available on this pin."
    11551159
    msgstr ""

    ‎locale/es.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    10+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1111
    "PO-Revision-Date: 2018-08-24 22:56-0500\n"
    1212
    "Last-Translator: \n"
    1313
    "Language-Team: \n"
    @@ -1149,6 +1149,10 @@ msgstr "Sin soporte de hardware en pin"
    11491149
    msgid "No key was specified"
    11501150
    msgstr ""
    11511151

    1152+
    #: shared-bindings/time/__init__.c
    1153+
    msgid "No long integer support"
    1154+
    msgstr ""
    1155+
    11521156
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11531157
    msgid "No more timers available on this pin."
    11541158
    msgstr ""

    ‎locale/fil.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    10+
    "POT-Creation-Date: 2020-05-12 12:24-0700\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"
    @@ -1157,6 +1157,10 @@ msgstr "Walang support sa hardware ang pin"
    11571157
    msgid "No key was specified"
    11581158
    msgstr ""
    11591159

    1160+
    #: shared-bindings/time/__init__.c
    1161+
    msgid "No long integer support"
    1162+
    msgstr ""
    1163+
    11601164
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11611165
    msgid "No more timers available on this pin."
    11621166
    msgstr ""

    ‎locale/fr.po

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -8,7 +8,7 @@ msgid ""
    88
    msgstr ""
    99
    "Project-Id-Version: 0.1\n"
    1010
    "Report-Msgid-Bugs-To: \n"
    11-
    "POT-Creation-Date: 2020-05-09 16:44-0700\n"
    11+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1212
    "PO-Revision-Date: 2020-05-05 20:24+0000\n"
    1313
    "Last-Translator: Jeff Epler <jepler@gmail.com>\n"
    1414
    "Language-Team: French <https://later.unpythonic.net/projects/circuitpython/"
    @@ -1171,6 +1171,10 @@ msgstr "Pas de support matériel pour cette broche"
    11711171
    msgid "No key was specified"
    11721172
    msgstr ""
    11731173

    1174+
    #: shared-bindings/time/__init__.c
    1175+
    msgid "No long integer support"
    1176+
    msgstr ""
    1177+
    11741178
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11751179
    msgid "No more timers available on this pin."
    11761180
    msgstr ""

    ‎locale/it_IT.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    11+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1212
    "PO-Revision-Date: 2018-10-02 16:27+0200\n"
    1313
    "Last-Translator: Enrico Paganin <enrico.paganin@mail.com>\n"
    1414
    "Language-Team: \n"
    @@ -1161,6 +1161,10 @@ msgstr "Nessun supporto hardware sul pin"
    11611161
    msgid "No key was specified"
    11621162
    msgstr ""
    11631163

    1164+
    #: shared-bindings/time/__init__.c
    1165+
    msgid "No long integer support"
    1166+
    msgstr ""
    1167+
    11641168
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11651169
    msgid "No more timers available on this pin."
    11661170
    msgstr ""

    ‎locale/ko.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    11+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1212
    "PO-Revision-Date: 2019-05-06 14:22-0700\n"
    1313
    "Last-Translator: \n"
    1414
    "Language-Team: LANGUAGE <LL@li.org>\n"
    @@ -1145,6 +1145,10 @@ msgstr ""
    11451145
    msgid "No key was specified"
    11461146
    msgstr ""
    11471147

    1148+
    #: shared-bindings/time/__init__.c
    1149+
    msgid "No long integer support"
    1150+
    msgstr ""
    1151+
    11481152
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11491153
    msgid "No more timers available on this pin."
    11501154
    msgstr ""

    ‎locale/pl.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    10+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1111
    "PO-Revision-Date: 2019-03-19 18:37-0700\n"
    1212
    "Last-Translator: Radomir Dopieralski <circuitpython@sheep.art.pl>\n"
    1313
    "Language-Team: pl\n"
    @@ -1146,6 +1146,10 @@ msgstr "Brak sprzętowej obsługi na nóżce"
    11461146
    msgid "No key was specified"
    11471147
    msgstr ""
    11481148

    1149+
    #: shared-bindings/time/__init__.c
    1150+
    msgid "No long integer support"
    1151+
    msgstr ""
    1152+
    11491153
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11501154
    msgid "No more timers available on this pin."
    11511155
    msgstr ""

    ‎locale/pt_BR.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    11+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1212
    "PO-Revision-Date: 2018-10-02 21:14-0000\n"
    1313
    "Last-Translator: \n"
    1414
    "Language-Team: \n"
    @@ -1153,6 +1153,10 @@ msgstr "Nenhum suporte de hardware no pino"
    11531153
    msgid "No key was specified"
    11541154
    msgstr ""
    11551155

    1156+
    #: shared-bindings/time/__init__.c
    1157+
    msgid "No long integer support"
    1158+
    msgstr ""
    1159+
    11561160
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11571161
    msgid "No more timers available on this pin."
    11581162
    msgstr ""

    ‎locale/sv.po

    Lines changed: 5 additions & 1 deletion
    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-05-09 16:44-0700\n"
    11+
    "POT-Creation-Date: 2020-05-12 12:24-0700\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"
    @@ -1141,6 +1141,10 @@ msgstr ""
    11411141
    msgid "No key was specified"
    11421142
    msgstr ""
    11431143

    1144+
    #: shared-bindings/time/__init__.c
    1145+
    msgid "No long integer support"
    1146+
    msgstr ""
    1147+
    11441148
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11451149
    msgid "No more timers available on this pin."
    11461150
    msgstr ""

    ‎locale/zh_Latn_pinyin.po

    Lines changed: 5 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -7,7 +7,7 @@ msgid ""
    77
    msgstr ""
    88
    "Project-Id-Version: circuitpython-cn\n"
    99
    "Report-Msgid-Bugs-To: \n"
    10-
    "POT-Creation-Date: 2020-05-09 16:44-0700\n"
    10+
    "POT-Creation-Date: 2020-05-12 12:24-0700\n"
    1111
    "PO-Revision-Date: 2019-04-13 10:10-0700\n"
    1212
    "Last-Translator: hexthat\n"
    1313
    "Language-Team: Chinese Hanyu Pinyin\n"
    @@ -1154,6 +1154,10 @@ msgstr "Méiyǒu zài yǐn jiǎo shàng de yìngjiàn zhīchí"
    11541154
    msgid "No key was specified"
    11551155
    msgstr ""
    11561156

    1157+
    #: shared-bindings/time/__init__.c
    1158+
    msgid "No long integer support"
    1159+
    msgstr ""
    1160+
    11571161
    #: ports/stm/common-hal/pulseio/PWMOut.c
    11581162
    msgid "No more timers available on this pin."
    11591163
    msgstr "Gāi yǐn jiǎo shàng méiyǒu kěyòng de dìngshí qì."

    ‎ports/atmel-samd/boards/pycubed/mpconfigboard.h

    Lines changed: 2 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -3,6 +3,7 @@
    33
    #define MICROPY_HW_MCU_NAME "samd51j19"
    44
    #define CIRCUITPY_MCU_FAMILY samd51
    55

    6+
    #define MICROPY_HW_LED_STATUS (&pin_PA16)
    67
    #define MICROPY_HW_NEOPIXEL (&pin_PA21)
    78

    89
    #define MICROPY_PORT_A (PORT_PA08 | PORT_PA09 | PORT_PA10 | PORT_PA11)
    @@ -16,6 +17,7 @@
    1617

    1718
    #define BOARD_FLASH_SIZE (FLASH_SIZE - 0x4000 - CIRCUITPY_INTERNAL_NVM_SIZE)
    1819

    20+
    // External flash W25Q80DV
    1921
    #define EXTERNAL_FLASH_QSPI_DUAL
    2022

    2123
    #define BOARD_HAS_CRYSTAL 1

    0 commit comments

    Comments
     (0)
    0