Skip to content

Commit 3400815

Browse files
weblateweblate
committed
Merge remote-tracking branch 'origin/main'
2 parents f3e5814 + 85ef0c4 commit 3400815

File tree

18 files changed

+73
-67
lines changed

18 files changed

+73
-67
lines changed

‎locale/circuitpython.pot‎

Lines changed: 25 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,10 @@ msgstr ""
8686
msgid "%q and %q must be different"
8787
msgstr ""
8888

89+
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
90+
msgid "%q and %q must share a clock unit"
91+
msgstr ""
92+
8993
#: shared-bindings/microcontroller/Pin.c
9094
msgid "%q contains duplicate pins"
9195
msgstr ""
@@ -198,6 +202,10 @@ msgstr ""
198202
msgid "%q must be array of type 'h'"
199203
msgstr ""
200204

205+
#: shared-bindings/audiobusio/PDMIn.c
206+
msgid "%q must be multiple of 8."
207+
msgstr ""
208+
201209
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
202210
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
203211
#: shared-module/synthio/Synthesizer.c
@@ -233,6 +241,10 @@ msgstr ""
233241
msgid "%q step cannot be zero"
234242
msgstr ""
235243

244+
#: shared-module/bitbangio/I2C.c
245+
msgid "%q too long"
246+
msgstr ""
247+
236248
#: py/bc.c py/objnamedtuple.c
237249
msgid "%q() takes %d positional arguments but %d were given"
238250
msgstr ""
@@ -425,12 +437,6 @@ msgstr ""
425437
msgid "3-arg pow() not supported"
426438
msgstr ""
427439

428-
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
429-
#: ports/atmel-samd/common-hal/countio/Counter.c
430-
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
431-
msgid "A hardware interrupt channel is already in use"
432-
msgstr ""
433-
434440
#: ports/raspberrypi/common-hal/wifi/Radio.c
435441
msgid "AP could not be started"
436442
msgstr ""
@@ -611,14 +617,6 @@ msgstr ""
611617
msgid "Bit clock and word select must be sequential GPIO pins"
612618
msgstr ""
613619

614-
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
615-
msgid "Bit clock and word select must share a clock unit"
616-
msgstr ""
617-
618-
#: shared-bindings/audiobusio/PDMIn.c
619-
msgid "Bit depth must be multiple of 8."
620-
msgstr ""
621-
622620
#: shared-bindings/bitmaptools/__init__.c
623621
msgid "Bitmap size and bits per value must match"
624622
msgstr ""
@@ -631,10 +629,6 @@ msgstr ""
631629
msgid "Both RX and TX required for flow control"
632630
msgstr ""
633631

634-
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
635-
msgid "Both pins must support hardware interrupts"
636-
msgstr ""
637-
638632
#: shared-bindings/busdisplay/BusDisplay.c
639633
#: shared-bindings/framebufferio/FramebufferDisplay.c
640634
msgid "Brightness not adjustable"
@@ -817,10 +811,6 @@ msgstr ""
817811
msgid "CircuitPython core code crashed hard. Whoops!\n"
818812
msgstr ""
819813

820-
#: shared-module/bitbangio/I2C.c
821-
msgid "Clock stretch too long"
822-
msgstr ""
823-
824814
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
825815
msgid "Clock unit in use"
826816
msgstr ""
@@ -946,9 +936,12 @@ msgstr ""
946936
msgid "ESP-IDF memory allocation failed"
947937
msgstr ""
948938

939+
#: ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c
940+
#: ports/atmel-samd/common-hal/countio/Counter.c
949941
#: ports/atmel-samd/common-hal/frequencyio/FrequencyIn.c
950942
#: ports/atmel-samd/common-hal/ps2io/Ps2.c
951943
#: ports/atmel-samd/common-hal/pulseio/PulseIn.c
944+
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
952945
#: ports/cxd56/common-hal/pulseio/PulseIn.c
953946
msgid "EXTINT channel already in use"
954947
msgstr ""
@@ -1108,13 +1101,6 @@ msgstr ""
11081101
msgid "Group already used"
11091102
msgstr ""
11101103

1111-
#: ports/atmel-samd/common-hal/busio/SPI.c ports/cxd56/common-hal/busio/SPI.c
1112-
#: ports/espressif/common-hal/busio/SPI.c
1113-
#: ports/mimxrt10xx/common-hal/busio/SPI.c ports/nrf/common-hal/busio/SPI.c
1114-
#: ports/raspberrypi/common-hal/busio/SPI.c
1115-
msgid "Half duplex SPI is not implemented"
1116-
msgstr ""
1117-
11181104
#: supervisor/shared/safe_mode.c
11191105
msgid "Hard fault: memory access or instruction error."
11201106
msgstr ""
@@ -1347,10 +1333,6 @@ msgstr ""
13471333
msgid "Mapping must be a tuple"
13481334
msgstr ""
13491335

1350-
#: shared-bindings/audiobusio/PDMIn.c
1351-
msgid "Microphone startup delay must be in range 0.0 to 1.0"
1352-
msgstr ""
1353-
13541336
#: ports/raspberrypi/bindings/rp2pio/StateMachine.c
13551337
#: ports/raspberrypi/common-hal/rp2pio/StateMachine.c
13561338
msgid "Mismatched data size"
@@ -1492,10 +1474,15 @@ msgstr ""
14921474
msgid "No default %q bus"
14931475
msgstr ""
14941476

1477+
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
14951478
#: ports/atmel-samd/common-hal/touchio/TouchIn.c
14961479
msgid "No free GCLKs"
14971480
msgstr ""
14981481

1482+
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
1483+
msgid "No free GLCKs"
1484+
msgstr ""
1485+
14991486
#: shared-bindings/os/__init__.c
15001487
msgid "No hardware random available"
15011488
msgstr ""
@@ -1694,10 +1681,6 @@ msgstr ""
16941681
msgid "Out-buffer elements must be <= 4 bytes long"
16951682
msgstr ""
16961683

1697-
#: shared-bindings/audiobusio/PDMIn.c
1698-
msgid "Oversample must be multiple of 8."
1699-
msgstr ""
1700-
17011684
#: shared-bindings/pwmio/PWMOut.c
17021685
msgid ""
17031686
"PWM frequency not writable when variable_frequency is False on construction."
@@ -1749,6 +1732,7 @@ msgid "Pin must be on PWM Channel B"
17491732
msgstr ""
17501733

17511734
#: ports/atmel-samd/common-hal/countio/Counter.c
1735+
#: ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c
17521736
msgid "Pin must support hardware interrupts"
17531737
msgstr ""
17541738

@@ -1824,6 +1808,10 @@ msgstr ""
18241808
msgid "RISE_AND_FALL not available on this chip"
18251809
msgstr ""
18261810

1811+
#: shared-module/displayio/OnDiskBitmap.c
1812+
msgid "RLE-compressed BMP not supported"
1813+
msgstr ""
1814+
18271815
#: ports/stm/common-hal/os/__init__.c
18281816
msgid "RNG DeInit Error"
18291817
msgstr ""
@@ -2083,7 +2071,6 @@ msgstr ""
20832071
msgid "Total data to write is larger than %q"
20842072
msgstr ""
20852073

2086-
#: ports/atmel-samd/common-hal/alarm/touch/TouchAlarm.c
20872074
#: ports/raspberrypi/common-hal/alarm/touch/TouchAlarm.c
20882075
#: ports/stm/common-hal/alarm/touch/TouchAlarm.c
20892076
msgid "Touch alarms not available"
@@ -2175,11 +2162,6 @@ msgstr ""
21752162
msgid "Unable to find I2C Display at %x"
21762163
msgstr ""
21772164

2178-
#: ports/atmel-samd/common-hal/audiobusio/I2SOut.c
2179-
#: ports/atmel-samd/common-hal/audiobusio/PDMIn.c
2180-
msgid "Unable to find free GCLK"
2181-
msgstr ""
2182-
21832165
#: py/parse.c
21842166
msgid "Unable to init parser"
21852167
msgstr ""

‎ports/atmel-samd/common-hal/alarm/pin/PinAlarm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ static void pinalarm_set_alarms_light(size_t n_alarms, const mp_obj_t *alarms) {
235235
case PINALARM_ERR_NOEXTINT:
236236
raise_ValueError_invalid_pin();
237237
case PINALARM_ERR_NOCHANNEL:
238-
mp_raise_RuntimeError(MP_ERROR_TEXT("A hardware interrupt channel is already in use"));
238+
mp_raise_RuntimeError(MP_ERROR_TEXT("EXTINT channel already in use"));
239239
default:
240240
mp_raise_RuntimeError(MP_ERROR_TEXT("Unknown reason."));
241241
}

‎ports/atmel-samd/common-hal/alarm/touch/TouchAlarm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,5 @@
2828
#include "shared-bindings/microcontroller/__init__.h"
2929

3030
void common_hal_alarm_touch_touchalarm_construct(alarm_touch_touchalarm_obj_t *self, const mcu_pin_obj_t *pin) {
31-
mp_raise_NotImplementedError(MP_ERROR_TEXT("Touch alarms not available"));
31+
mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_TouchAlarm);
3232
}

‎ports/atmel-samd/common-hal/audiobusio/I2SOut.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void common_hal_audiobusio_i2sout_construct(audiobusio_i2sout_obj_t *self,
159159
raise_ValueError_invalid_pin_name(MP_QSTR_word_select);
160160
}
161161
if (bc_clock_unit != ws_clock_unit) {
162-
mp_raise_ValueError(MP_ERROR_TEXT("Bit clock and word select must share a clock unit"));
162+
mp_raise_ValueError_varg(MP_ERROR_TEXT("%q and %q must share a clock unit"), MP_QSTR_bit_clock, MP_QSTR_word_select);
163163
}
164164
if (serializer == 0xff) {
165165
raise_ValueError_invalid_pin_name(MP_QSTR_data);
@@ -243,7 +243,7 @@ void common_hal_audiobusio_i2sout_play(audiobusio_i2sout_obj_t *self,
243243
// Find a free GCLK to generate the MCLK signal.
244244
uint8_t gclk = find_free_gclk(divisor);
245245
if (gclk > GCLK_GEN_NUM) {
246-
mp_raise_RuntimeError(MP_ERROR_TEXT("Unable to find free GCLK"));
246+
mp_raise_RuntimeError(MP_ERROR_TEXT("No free GLCKs"));
247247
}
248248
self->gclk = gclk;
249249

‎ports/atmel-samd/common-hal/audiobusio/PDMIn.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ void common_hal_audiobusio_pdmin_construct(audiobusio_pdmin_obj_t *self,
194194
// Find a free GCLK to generate the MCLK signal.
195195
uint8_t gclk = find_free_gclk(clock_divisor);
196196
if (gclk > GCLK_GEN_NUM) {
197-
mp_raise_RuntimeError(MP_ERROR_TEXT("Unable to find free GCLK"));
197+
mp_raise_RuntimeError(MP_ERROR_TEXT("No free GCLKs"));
198198
}
199199
self->gclk = gclk;
200200

‎ports/atmel-samd/common-hal/busio/SPI.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self,
5858
uint8_t dopo = 255;
5959

6060
if (half_duplex) {
61-
mp_raise_NotImplementedError(MP_ERROR_TEXT("Half duplex SPI is not implemented"));
61+
mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_half_duplex);
6262
}
6363

6464
// Ensure the object starts in its deinit state.

‎ports/atmel-samd/common-hal/countio/Counter.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ void common_hal_countio_counter_construct(countio_counter_obj_t *self,
1717

1818
if (eic_get_enable()) {
1919
if (!eic_channel_free(pin->extint_channel)) {
20-
mp_raise_RuntimeError(MP_ERROR_TEXT("A hardware interrupt channel is already in use"));
20+
mp_raise_RuntimeError(MP_ERROR_TEXT("EXTINT channel already in use"));
2121
}
2222
} else {
2323
turn_on_external_interrupt_controller();

‎ports/atmel-samd/common-hal/rotaryio/IncrementalEncoder.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737
void common_hal_rotaryio_incrementalencoder_construct(rotaryio_incrementalencoder_obj_t *self,
3838
const mcu_pin_obj_t *pin_a, const mcu_pin_obj_t *pin_b) {
3939
if (!pin_a->has_extint || !pin_b->has_extint) {
40-
mp_raise_RuntimeError(MP_ERROR_TEXT("Both pins must support hardware interrupts"));
40+
mp_raise_RuntimeError(MP_ERROR_TEXT("Pin must support hardware interrupts"));
4141
}
4242

4343
// TODO: The SAMD51 has a peripheral dedicated to quadrature encoder debugging. Use it instead
4444
// of the external interrupt.
4545

4646
if (eic_get_enable()) {
4747
if (!eic_channel_free(pin_a->extint_channel) || !eic_channel_free(pin_b->extint_channel)) {
48-
mp_raise_RuntimeError(MP_ERROR_TEXT("A hardware interrupt channel is already in use"));
48+
mp_raise_RuntimeError(MP_ERROR_TEXT("EXTINT channel already in use"));
4949
}
5050
} else {
5151
turn_on_external_interrupt_controller();

‎ports/cxd56/common-hal/busio/SPI.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ void common_hal_busio_spi_construct(busio_spi_obj_t *self, const mcu_pin_obj_t *
4040
int port = -1;
4141

4242
if (half_duplex) {
43-
mp_raise_NotImplementedError(MP_ERROR_TEXT("Half duplex SPI is not implemented"));
43+
mp_raise_NotImplementedError_varg(MP_ERROR_TEXT("%q"), MP_QSTR_half_duplex);
4444
}
4545

4646
if (clock->number == PIN_SPI4_SCK &&

‎ports/espressif/boards/m5stack_atom_lite/pins.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
2020
{ MP_ROM_QSTR(MP_QSTR_D33), MP_ROM_PTR(&pin_GPIO33) },
2121
{ MP_ROM_QSTR(MP_QSTR_A33), MP_ROM_PTR(&pin_GPIO33) },
2222

23+
{ MP_ROM_QSTR(MP_QSTR_IR), MP_ROM_PTR(&pin_GPIO12) },
24+
{ MP_ROM_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_GPIO12) },
25+
2326
{ MP_ROM_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_GPIO21) },
2427
{ MP_ROM_QSTR(MP_QSTR_D21), MP_ROM_PTR(&pin_GPIO21) },
2528

0 commit comments

Comments
 (0)