Skip to content

Commit ab8441d

Browse files
committed
Merge remote-tracking branch 'adafruit/main' into tdeck-libs
2 parents 9c4534f + 617915e commit ab8441d

File tree

6 files changed

+172
-13
lines changed

6 files changed

+172
-13
lines changed

locale/fr.po

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ msgstr ""
88
"Project-Id-Version: 0.1\n"
99
"Report-Msgid-Bugs-To: \n"
1010
"POT-Creation-Date: 2021-01-04 12:55-0600\n"
11-
"PO-Revision-Date: 2023-11-20 16:56+0000\n"
12-
"Last-Translator: jessyjones <amarsy.alya@gmail.com>\n"
11+
"PO-Revision-Date: 2024-11-27 20:00+0000\n"
12+
"Last-Translator: Olivier Deveault <olivierdeveault+g@gmail.com>\n"
1313
"Language-Team: \n"
1414
"Language: fr\n"
1515
"MIME-Version: 1.0\n"
1616
"Content-Type: text/plain; charset=utf-8\n"
1717
"Content-Transfer-Encoding: 8bit\n"
1818
"Plural-Forms: nplurals=2; plural=n > 1;\n"
19-
"X-Generator: Weblate 5.2\n"
19+
"X-Generator: Weblate 5.9-dev\n"
2020

2121
#: main.c
2222
msgid ""
@@ -104,11 +104,11 @@ msgstr "%q et %q doivent être différents"
104104

105105
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
106106
msgid "%q and %q must share a clock unit"
107-
msgstr ""
107+
msgstr "%q et %q doivent partager une unité d'horloge"
108108

109109
#: ports/nordic/common-hal/watchdog/WatchDogTimer.c
110110
msgid "%q cannot be changed once mode is set to %q"
111-
msgstr ""
111+
msgstr "%q ne peut être modifié lorsque le mode est configuré à %q"
112112

113113
#: shared-bindings/microcontroller/Pin.c
114114
msgid "%q contains duplicate pins"
@@ -205,7 +205,7 @@ msgstr "%q doit être >= %d"
205205

206206
#: shared-module/audiofilters/Filter.c
207207
msgid "%q must be a %q object, %q, or %q"
208-
msgstr ""
208+
msgstr "%q doit être un objet %q, %q ou %q"
209209

210210
#: shared-bindings/analogbufio/BufferedIn.c
211211
msgid "%q must be a bytearray or array of type 'H' or 'B'"
@@ -229,7 +229,7 @@ msgstr "%q doit être un array de type 'h'"
229229

230230
#: shared-bindings/audiobusio/PDMIn.c
231231
msgid "%q must be multiple of 8."
232-
msgstr ""
232+
msgstr "%q doit être un multiple de 8."
233233

234234
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
235235
#: shared-bindings/bitmapfilter/__init__.c shared-bindings/canio/CAN.c
@@ -240,7 +240,7 @@ msgstr "%q doit être de type %q ou %q, pas %q"
240240

241241
#: shared-bindings/jpegio/JpegDecoder.c
242242
msgid "%q must be of type %q, %q, or %q, not %q"
243-
msgstr ""
243+
msgstr "%q doit être de type %q, %q ou %q, pas %q"
244244

245245
#: py/argcheck.c py/runtime.c shared-bindings/bitmapfilter/__init__.c
246246
#: shared-module/synthio/__init__.c
@@ -274,15 +274,15 @@ msgstr "le pas ne peut être zéro dans %q"
274274

275275
#: shared-module/bitbangio/I2C.c
276276
msgid "%q too long"
277-
msgstr ""
277+
msgstr "%q trop long"
278278

279279
#: py/bc.c py/objnamedtuple.c
280280
msgid "%q() takes %d positional arguments but %d were given"
281281
msgstr "%q() prend %d paramètres de position mais %d ont été donnés"
282282

283283
#: shared-module/jpegio/JpegDecoder.c
284284
msgid "%q() without %q()"
285-
msgstr ""
285+
msgstr "%q() sans %q()"
286286

287287
#: shared-bindings/usb_hid/Device.c
288288
msgid "%q, %q, and %q must all be the same length"
@@ -439,7 +439,7 @@ msgstr "'label' nécessite 1 paramètre"
439439

440440
#: py/emitnative.c
441441
msgid "'not' not implemented"
442-
msgstr ""
442+
msgstr "'not' n'est pas implémenté"
443443

444444
#: py/compile.c
445445
msgid "'return' outside function"
@@ -576,7 +576,7 @@ msgstr "Il y a déjà un auditeur all-matches"
576576

577577
#: ports/espressif/common-hal/_bleio/__init__.c
578578
msgid "Already in progress"
579-
msgstr ""
579+
msgstr "Déjà en cours"
580580

581581
#: ports/espressif/bindings/espnow/ESPNow.c
582582
#: ports/espressif/common-hal/espulp/ULP.c
@@ -697,7 +697,7 @@ msgstr "La longueur du tampon %d est trop grande. Il doit être inférieur à %d
697697
#: shared-module/sdcardio/SDCard.c
698698
#, c-format
699699
msgid "Buffer must be a multiple of %d bytes"
700-
msgstr ""
700+
msgstr "Tampon doit être un multiple de %d octets"
701701

702702
#: shared-bindings/_bleio/PacketBuffer.c
703703
#, c-format
@@ -899,6 +899,7 @@ msgstr "Un bloc de données doit suivre un bloc fmt"
899899
#: shared-module/jpegio/JpegDecoder.c
900900
msgid "Data format error (may be broken data)"
901901
msgstr ""
902+
"Erreur de format de données (celles-ci sont potentiellement endommagées)"
902903

903904
#: ports/espressif/common-hal/_bleio/Adapter.c
904905
#: ports/nordic/common-hal/_bleio/Adapter.c
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "supervisor/board.h"
8+
9+
// Use the MP_WEAK supervisor/shared/board.c versions of routines not defined here.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
#define MICROPY_HW_BOARD_NAME "Music Thing Modular Workshop Computer"
10+
#define MICROPY_HW_MCU_NAME "rp2040"
11+
12+
13+
#define DEFAULT_UART_BUS_RX (&pin_GPIO1)
14+
#define DEFAULT_UART_BUS_TX (&pin_GPIO0)
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
USB_VID = 0x2E8A
2+
USB_PID = 0x10C1
3+
USB_PRODUCT = "Workshop Computer"
4+
USB_MANUFACTURER = "Music Thing Modular"
5+
6+
CHIP_VARIANT = RP2040
7+
CHIP_FAMILY = rp2
8+
9+
EXTERNAL_FLASH_DEVICES = "W25Q16JVxQ"
10+
11+
CIRCUITPY_AUDIOEFFECTS = 1
12+
CIRCUITPY_IMAGECAPTURE = 0
13+
CIRCUITPY_PICODVI = 0
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2021 Scott Shawcroft for Adafruit Industries
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#pragma once
8+
9+
// Put board-specific pico-sdk definitions here. This file must exist.
10+
11+
// Allow extra time for xosc to start.
12+
#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64
Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
// This file is part of the CircuitPython project: https://circuitpython.org
2+
//
3+
// SPDX-FileCopyrightText: Copyright (c) 2024 Tod Kurt
4+
//
5+
// SPDX-License-Identifier: MIT
6+
7+
#include "shared-bindings/board/__init__.h"
8+
9+
static const mp_rom_map_elem_t board_module_globals_table[] = {
10+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
11+
12+
{ MP_ROM_QSTR(MP_QSTR_UART_TX), MP_ROM_PTR(&pin_GPIO0) },
13+
{ MP_ROM_QSTR(MP_QSTR_GP0), MP_ROM_PTR(&pin_GPIO0) },
14+
15+
{ MP_ROM_QSTR(MP_QSTR_UART_RX), MP_ROM_PTR(&pin_GPIO1) },
16+
{ MP_ROM_QSTR(MP_QSTR_GP1), MP_ROM_PTR(&pin_GPIO1) },
17+
18+
{ MP_ROM_QSTR(MP_QSTR_PULSE_1_IN), MP_ROM_PTR(&pin_GPIO2) },
19+
{ MP_ROM_QSTR(MP_QSTR_GP2), MP_ROM_PTR(&pin_GPIO2) },
20+
21+
{ MP_ROM_QSTR(MP_QSTR_PULSE_2_IN), MP_ROM_PTR(&pin_GPIO3) },
22+
{ MP_ROM_QSTR(MP_QSTR_GP3), MP_ROM_PTR(&pin_GPIO3) },
23+
24+
25+
{ MP_ROM_QSTR(MP_QSTR_NORM_PROBE), MP_ROM_PTR(&pin_GPIO4) },
26+
{ MP_ROM_QSTR(MP_QSTR_GP4), MP_ROM_PTR(&pin_GPIO4) },
27+
28+
// GPIO 5,6,7 are ID bits: 0,0,0 = Proto1.2 (pins floating), 1,0,0 = Proto 2.0
29+
{ MP_ROM_QSTR(MP_QSTR_ID0), MP_ROM_PTR(&pin_GPIO5) },
30+
{ MP_ROM_QSTR(MP_QSTR_GP5), MP_ROM_PTR(&pin_GPIO5) },
31+
32+
{ MP_ROM_QSTR(MP_QSTR_ID1), MP_ROM_PTR(&pin_GPIO6) },
33+
{ MP_ROM_QSTR(MP_QSTR_GP6), MP_ROM_PTR(&pin_GPIO6) },
34+
35+
{ MP_ROM_QSTR(MP_QSTR_ID2), MP_ROM_PTR(&pin_GPIO7) },
36+
{ MP_ROM_QSTR(MP_QSTR_GP7), MP_ROM_PTR(&pin_GPIO7) },
37+
38+
{ MP_ROM_QSTR(MP_QSTR_PULSE_1_OUT), MP_ROM_PTR(&pin_GPIO8) },
39+
{ MP_ROM_QSTR(MP_QSTR_GP8), MP_ROM_PTR(&pin_GPIO8) },
40+
41+
{ MP_ROM_QSTR(MP_QSTR_PULSE_2_OUT), MP_ROM_PTR(&pin_GPIO9) },
42+
{ MP_ROM_QSTR(MP_QSTR_GP9), MP_ROM_PTR(&pin_GPIO9) },
43+
44+
{ MP_ROM_QSTR(MP_QSTR_LED1), MP_ROM_PTR(&pin_GPIO10) },
45+
{ MP_ROM_QSTR(MP_QSTR_GP10), MP_ROM_PTR(&pin_GPIO10) },
46+
47+
{ MP_ROM_QSTR(MP_QSTR_LED2), MP_ROM_PTR(&pin_GPIO11) },
48+
{ MP_ROM_QSTR(MP_QSTR_GP11), MP_ROM_PTR(&pin_GPIO11) },
49+
50+
{ MP_ROM_QSTR(MP_QSTR_LED3), MP_ROM_PTR(&pin_GPIO12) },
51+
{ MP_ROM_QSTR(MP_QSTR_GP12), MP_ROM_PTR(&pin_GPIO12) },
52+
53+
{ MP_ROM_QSTR(MP_QSTR_LED4), MP_ROM_PTR(&pin_GPIO13) },
54+
{ MP_ROM_QSTR(MP_QSTR_GP13), MP_ROM_PTR(&pin_GPIO13) },
55+
56+
{ MP_ROM_QSTR(MP_QSTR_LED5), MP_ROM_PTR(&pin_GPIO14) },
57+
{ MP_ROM_QSTR(MP_QSTR_GP14), MP_ROM_PTR(&pin_GPIO14) },
58+
59+
{ MP_ROM_QSTR(MP_QSTR_LED6), MP_ROM_PTR(&pin_GPIO15) },
60+
{ MP_ROM_QSTR(MP_QSTR_GP15), MP_ROM_PTR(&pin_GPIO15) },
61+
62+
{ MP_ROM_QSTR(MP_QSTR_EEPROM_SDA), MP_ROM_PTR(&pin_GPIO16) },
63+
{ MP_ROM_QSTR(MP_QSTR_GP16), MP_ROM_PTR(&pin_GPIO16) },
64+
65+
{ MP_ROM_QSTR(MP_QSTR_EEPROM_SCL), MP_ROM_PTR(&pin_GPIO17) },
66+
{ MP_ROM_QSTR(MP_QSTR_GP17), MP_ROM_PTR(&pin_GPIO17) },
67+
68+
{ MP_ROM_QSTR(MP_QSTR_DAC_SCK), MP_ROM_PTR(&pin_GPIO18) },
69+
{ MP_ROM_QSTR(MP_QSTR_GP18), MP_ROM_PTR(&pin_GPIO18) },
70+
71+
{ MP_ROM_QSTR(MP_QSTR_DAC_SDI), MP_ROM_PTR(&pin_GPIO19) },
72+
{ MP_ROM_QSTR(MP_QSTR_GP19), MP_ROM_PTR(&pin_GPIO19) },
73+
74+
// GP20 is unused
75+
// { MP_ROM_QSTR(MP_QSTR_GP20), MP_ROM_PTR(&pin_GPIO20) },
76+
77+
{ MP_ROM_QSTR(MP_QSTR_DAC_CS), MP_ROM_PTR(&pin_GPIO21) },
78+
{ MP_ROM_QSTR(MP_QSTR_GP21), MP_ROM_PTR(&pin_GPIO21) },
79+
80+
{ MP_ROM_QSTR(MP_QSTR_CV_2_OUT), MP_ROM_PTR(&pin_GPIO22) },
81+
{ MP_ROM_QSTR(MP_QSTR_GP22), MP_ROM_PTR(&pin_GPIO22) },
82+
83+
{ MP_ROM_QSTR(MP_QSTR_CV_1_OUT), MP_ROM_PTR(&pin_GPIO23) },
84+
{ MP_ROM_QSTR(MP_QSTR_GP23), MP_ROM_PTR(&pin_GPIO23) },
85+
86+
{ MP_ROM_QSTR(MP_QSTR_MUX_A), MP_ROM_PTR(&pin_GPIO24) },
87+
{ MP_ROM_QSTR(MP_QSTR_GP24), MP_ROM_PTR(&pin_GPIO24) },
88+
89+
{ MP_ROM_QSTR(MP_QSTR_MUX_B), MP_ROM_PTR(&pin_GPIO25) },
90+
{ MP_ROM_QSTR(MP_QSTR_GP25), MP_ROM_PTR(&pin_GPIO25) },
91+
92+
{ MP_ROM_QSTR(MP_QSTR_AUDIO_R_IN), MP_ROM_PTR(&pin_GPIO26) },
93+
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_GPIO26) },
94+
{ MP_ROM_QSTR(MP_QSTR_GP26), MP_ROM_PTR(&pin_GPIO26) },
95+
96+
{ MP_ROM_QSTR(MP_QSTR_AUDIO_L_IN), MP_ROM_PTR(&pin_GPIO27) },
97+
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_GPIO27) },
98+
{ MP_ROM_QSTR(MP_QSTR_GP27), MP_ROM_PTR(&pin_GPIO27) },
99+
100+
{ MP_ROM_QSTR(MP_QSTR_MUX_1), MP_ROM_PTR(&pin_GPIO28) },
101+
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO28) },
102+
{ MP_ROM_QSTR(MP_QSTR_GP28), MP_ROM_PTR(&pin_GPIO28) },
103+
104+
{ MP_ROM_QSTR(MP_QSTR_MUX_2), MP_ROM_PTR(&pin_GPIO29) },
105+
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO29) },
106+
{ MP_ROM_QSTR(MP_QSTR_GP29), MP_ROM_PTR(&pin_GPIO29) },
107+
108+
// { MP_ROM_QSTR(MP_QSTR_EEPROM_I2C), MP_ROM_PTR(&board_i2c_obj) },
109+
};
110+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)