diff options
| author | Dan Halbert <halbert@halwitz.org> | 2019-11-27 14:47:35 -0500 |
|---|---|---|
| committer | Dan Halbert <halbert@halwitz.org> | 2019-11-27 14:47:35 -0500 |
| commit | dd6dfeb30a4e688339612d509fb491bc2e72d078 (patch) | |
| tree | 660a557f1febcb9dc810044ae7e836ddf7b7ea0d | |
| parent | 778a7a73e55b906cca170f9bfc961b87c18b4455 (diff) | |
Squeeze pyruler zh_Latn_pinyin
| -rw-r--r-- | ports/atmel-samd/boards/pyruler/mpconfigboard.mk | 4 | ||||
| -rw-r--r-- | ports/cxd56/common-hal/busio/UART.c | 2 | ||||
| -rw-r--r-- | shared-bindings/busio/UART.c | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/ports/atmel-samd/boards/pyruler/mpconfigboard.mk b/ports/atmel-samd/boards/pyruler/mpconfigboard.mk index 9663944a3..9d9e4ba34 100644 --- a/ports/atmel-samd/boards/pyruler/mpconfigboard.mk +++ b/ports/atmel-samd/boards/pyruler/mpconfigboard.mk @@ -12,3 +12,7 @@ LONGINT_IMPL = NONE CIRCUITPY_SMALL_BUILD = 1 SUPEROPT_GC = 0 + +ifeq ($(TRANSLATION), zh_Latn_pinyin) +CFLAGS_INLINE_LIMIT = 35 +endif diff --git a/ports/cxd56/common-hal/busio/UART.c b/ports/cxd56/common-hal/busio/UART.c index 6ae2403c1..40ae3b761 100644 --- a/ports/cxd56/common-hal/busio/UART.c +++ b/ports/cxd56/common-hal/busio/UART.c @@ -173,7 +173,7 @@ void common_hal_busio_uart_set_baudrate(busio_uart_obj_t *self, uint32_t baudrat } mp_float_t common_hal_busio_uart_get_timeout(busio_uart_obj_t *self) { - return (mp_float_t) (self->timeout / 1000000.0f); + return (mp_float_t) (self->timeout_us / 1000000.0f); } void common_hal_busio_uart_set_timeout(busio_uart_obj_t *self, mp_float_t timeout) { diff --git a/shared-bindings/busio/UART.c b/shared-bindings/busio/UART.c index 9606c77e9..4c0655e26 100644 --- a/shared-bindings/busio/UART.c +++ b/shared-bindings/busio/UART.c @@ -71,7 +71,7 @@ extern const busio_uart_parity_obj_t busio_uart_parity_odd_obj; STATIC void validate_timeout(mp_float_t timeout) { if (timeout < (mp_float_t) 0.0f || timeout > (mp_float_t) 100.0f) { - mp_raise_ValueError(translate("timeout must be 0.0-100.0 (units are now seconds, not msecs)")); + mp_raise_ValueError(translate("timeout must be 0.0-100.0")); } } |