8000 Merge remote-tracking branch 'adafruit/main' into rp2040-audio-and-sp… · domdfcoding/circuitpython@a843b8a · GitHub
[go: up one dir, main page]
Skip to content
8000

Commit a843b8a

Browse files
dhalbertdhalbert
committed
Merge remote-tracking branch 'adafruit/main' into rp2040-audio-and-spi-fixes
2 parents bd68264 + 53c0117 commit a843b8a

File tree

6 files changed

+5
-208
lines changed

6 files changed

+5
-208
lines changed

‎locale/zh_Latn_pinyin.po

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,15 @@ msgstr ""
77
"Project-Id-Version: circuitpython-cn\n"
88
"Report-Msgid-Bugs-To: \n"
99
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
10-
"PO-Revision-Date: 2021-06-25 18:15+0000\n"
10+
"PO-Revision-Date: 2021-07-06 16:32+0000\n"
1111
"Last-Translator: hexthat <hexthat@gmail.com>\n"
1212
"Language-Team: Chinese Hanyu Pinyin\n"
1313
"Language: zh_Latn_pinyin\n"
1414
"MIME-Version: 1.0\n"
1515
"Content-Type: text/plain; charset=UTF-8\n"
1616
"Content-Transfer-Encoding: 8bit\n"
1717
"Plural-Forms: nplurals=1; plural=0;\n"
18-
"X-Generator: Weblate 4.7.1-dev\n"
18+
"X-Generator: Weblate 4.8-dev\n"
1919

2020
#: main.c
2121
msgid ""
@@ -2066,7 +2066,7 @@ msgstr "SPI chóngxīn chūshǐhuà cuòwù"
20662066

20672067
#: ports/esp32s2/common-hal/busio/SPI.c
20682068
msgid "SPI configuration failed"
2069-
msgstr ""
2069+
msgstr "SPI pèi zhì shī bài"
20702070

20712071
#: ports/raspberrypi/common-hal/busio/SPI.c
20722072
msgid "SPI peripheral in use"

‎ports/esp32s2/mpconfigport.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ CIRCUITPY_AUDIOBUSIO = 1
1818
CIRCUITPY_AUDIOBUSIO_PDMIN = 0
1919
CIRCUITPY_AUDIOBUSIO_I2SOUT = 1
2020
CIRCUITPY_AUDIOIO = 0
21+
CIRCUITPY_AUDIOMIXER = 1
2122
CIRCUITPY_CANIO = 1
2223
CIRCUITPY_COUNTIO = 1
2324
CIRCUITPY_DUALBANK = 1

‎ports/nrf/examples/ubluepy_eddystone.py

Lines changed: 0 additions & 68 deletions
This file was deleted.

‎ports/nrf/examples/ubluepy_scan.py

Lines changed: 0 additions & 42 deletions
This file was deleted.

‎ports/nrf/examples/ubluepy_temp.py

Lines changed: 0 additions & 94 deletions
This file was deleted.

‎ports/raspberrypi/boards/adafruit_macropad_rp2040/pins.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4343
{ MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_GPIO28) },
4444

4545
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
46-
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_i2c_obj) },
46+
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
4747

4848
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}
4949
};

0 commit comments

Comments
 (0)
0