djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shrink by combining error messages

Browse Source
This commit is contained in:
Scott Shawcroft 2023-05-18 16:24:37 -07:00
parent 9d11bda9e8
commit 177b98174e
No known key found for this signature in database
GPG Key ID: 0DFD512649C052DA
2 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
locale/circuitpython.pot
View File

@ -165,11 +165,15 @@ msgstr ""
msgid "%q length must be >= %d"
msgstr ""
#: ports/raspberrypi/common-hal/picodvi/Framebuffer.c py/argcheck.c
#: py/argcheck.c
msgid "%q must be %d"
msgstr ""
#: py/argcheck.c shared-bindings/displayio/Bitmap.c
#: shared-bindings/displayio/Display.c
#: shared-bindings/framebufferio/FramebufferDisplay.c
#: shared-bindings/is31fl3741/FrameBuffer.c
#: shared-bindings/rgbmatrix/RGBMatrix.c
msgid "%q must be %d-%d"
msgstr ""
@ -203,6 +207,7 @@ msgstr ""
#: ports/raspberrypi/bindings/cyw43/__init__.c py/argcheck.c py/objexcept.c
#: shared-bindings/canio/CAN.c shared-bindings/digitalio/Pull.c
#: shared-module/synthio/Synthesizer.c
msgid "%q must be of type %q or %q, not %q"
msgstr ""
@ -425,6 +430,7 @@ msgid "Address must be %d bytes long"
msgstr ""
#: ports/espressif/common-hal/memorymap/AddressRange.c
#: ports/nrf/common-hal/memorymap/AddressRange.c
msgid "Address range not allowed"
msgstr ""
@ -608,13 +614,6 @@ msgstr ""
msgid "Both pins must support hardware interrupts"
msgstr ""
#: shared-bindings/displayio/Display.c
#: shared-bindings/framebufferio/FramebufferDisplay.c
#: shared-bindings/is31fl3741/FrameBuffer.c
#: shared-bindings/rgbmatrix/RGBMatrix.c
msgid "Brightness must be 0-1.0"
msgstr ""
#: shared-bindings/displayio/Display.c
#: shared-bindings/framebufferio/FramebufferDisplay.c
msgid "Brightness not adjustable"
@ -927,11 +926,6 @@ msgstr ""
msgid "EXTINT channel already in use"
msgstr ""
#: shared-module/synthio/MidiTrack.c
#, c-format
msgid "Error in MIDI stream at position %d"
msgstr ""
#: extmod/modure.c
msgid "Error in regex"
msgstr ""
@ -1343,11 +1337,6 @@ msgstr ""
msgid "Mapping must be a tuple"
msgstr ""
#: shared-module/displayio/Shape.c
#, c-format
msgid "Maximum x value when mirrored is %d"
msgstr ""
#: shared-bindings/audiobusio/PDMIn.c
msgid "Microphone startup delay must be in range 0.0 to 1.0"
msgstr ""
@ -1441,6 +1430,10 @@ msgstr ""
msgid "Nimble out of memory"
msgstr ""
#: ports/atmel-samd/common-hal/busio/UART.c
msgid "No %q pin"
msgstr ""
#: ports/espressif/common-hal/_bleio/Characteristic.c
#: ports/nrf/common-hal/_bleio/Characteristic.c
msgid "No CCCD for this Characteristic"
@ -1489,14 +1482,12 @@ msgstr ""
msgid "No MOSI pin"
msgstr ""
#: ports/atmel-samd/common-hal/busio/UART.c
#: ports/espressif/common-hal/busio/UART.c
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
msgid "No RX pin"
msgstr ""
#: ports/atmel-samd/common-hal/busio/UART.c
#: ports/espressif/common-hal/busio/UART.c
#: ports/mimxrt10xx/common-hal/busio/UART.c ports/nrf/common-hal/busio/UART.c
#: ports/raspberrypi/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
@ -2123,8 +2114,8 @@ msgstr ""
msgid "UART de-init"
msgstr ""
#: ports/atmel-samd/common-hal/busio/UART.c ports/cxd56/common-hal/busio/UART.c
#: ports/espressif/common-hal/busio/UART.c ports/stm/common-hal/busio/UART.c
#: ports/cxd56/common-hal/busio/UART.c ports/espressif/common-hal/busio/UART.c
#: ports/stm/common-hal/busio/UART.c
msgid "UART init"
msgstr ""
@ -4342,18 +4333,10 @@ msgstr ""
msgid "wrong output type"
msgstr ""
#: shared-module/displayio/Shape.c
msgid "x value out of bounds"
msgstr ""
#: ports/espressif/common-hal/audiobusio/__init__.c
msgid "xTaskCreate failed"
msgstr ""
#: shared-module/displayio/Shape.c
msgid "y value out of bounds"
msgstr ""
#: extmod/ulab/code/scipy/signal/signal.c
msgid "zi must be an ndarray"
msgstr ""

6
ports/atmel-samd/common-hal/busio/UART.c
View File

@ -241,7 +241,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
}
if (usart_async_init(usart_desc_p, sercom, self->buffer, self->buffer_length, NULL) != ERR_NONE) {
mp_raise_RuntimeError(translate("UART init"));
mp_raise_RuntimeError(NULL);
}
// usart_async_init() sets a number of defaults based on a prototypical SERCOM
@ -396,7 +396,7 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
// Read characters.
size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
if (self->rx_pin == NO_PIN) {
mp_raise_ValueError(translate("No RX pin"));
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_rx);
}
// This assignment is only here because the usart_async routines take a *const argument.
@ -453,7 +453,7 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
// Write characters.
size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
if (self->tx_pin == NO_PIN) {
mp_raise_ValueError(translate("No TX pin"));
mp_raise_ValueError_varg(translate("No %q pin"), MP_QSTR_tx);
}
// This assignment is only here because the usart_async routines take a *const argument.