Merge branch 'main' into mixervoice-loop-property

Author: jepler

locale/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"PO-Revision-Date: 2024-11-14 12:00+0000\n"
+"PO-Revision-Date: 2024-12-04 13:00+0000\n"
 "Last-Translator: Andi Chandler <[email protected]>\n"
 "Language-Team: none\n"
 "Language: en_GB\n"
@@ -2535,7 +2535,7 @@ msgstr "binary op %q not implemented"
 
 #: ports/espressif/common-hal/audiobusio/PDMIn.c
 msgid "bit_depth must be 8, 16, 24, or 32."
-msgstr ""
+msgstr "bit_depth must be 8, 16, 24, or 32."
 
 #: shared-module/bitmapfilter/__init__.c
 msgid "bitmap size and depth must match"

locale/pt_BR.po

@@ -6,15 +6,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-01-04 12:55-0600\n"
-"PO-Revision-Date: 2024-11-11 07:05+0000\n"
+"PO-Revision-Date: 2024-12-04 19:57+0000\n"
 "Last-Translator: Wellington Terumi Uemura <[email protected]>\n"
 "Language-Team: \n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 5.8.2\n"
+"X-Generator: Weblate 5.9-dev\n"
 
 #: main.c
 msgid ""
@@ -2571,7 +2571,7 @@ msgstr "a operação binário %q não foi implementada"
 
 #: ports/espressif/common-hal/audiobusio/PDMIn.c
 msgid "bit_depth must be 8, 16, 24, or 32."
-msgstr ""
+msgstr "o bit_depth deve ser 8, 16, 24 ou 32."
 
 #: shared-module/bitmapfilter/__init__.c
 msgid "bitmap size and depth must match"

ports/atmel-samd/boards/itsybitsy_m4_express/mpconfigboard.mk

@@ -16,3 +16,13 @@ CIRCUITPY_GIFIO = 0
 CIRCUITPY_JPEGIO = 0
 
 CIRCUITPY_BITBANG_APA102 = 1
+
+# We don't have room for the fonts for terminalio for certain languages,
+# so turn off terminalio, and if it's off and displayio is on,
+# force a clean build.
+# Note that we cannot test $(CIRCUITPY_DISPLAYIO) directly with an
+# ifeq, because it's not set yet.
+ifneq (,$(filter $(TRANSLATION),ja ko ru))
+CIRCUITPY_TERMINALIO = 0
+RELEASE_NEEDS_CLEAN_BUILD = $(CIRCUITPY_DISPLAYIO)
+endif

shared-bindings/audiomixer/MixerVoice.c

@@ -82,26 +82,13 @@ static mp_obj_t audiomixer_mixervoice_obj_get_level(mp_obj_t self_in) {
 }
 MP_DEFINE_CONST_FUN_OBJ_1(audiomixer_mixervoice_get_level_obj, audiomixer_mixervoice_obj_get_level);
 
-static mp_obj_t audiomixer_mixervoice_obj_set_level(size_t n_args, const mp_obj_t *pos_args, mp_map_t *kw_args) {
-    enum { ARG_level };
-    static const mp_arg_t allowed_args[] = {
-        { MP_QSTR_level,     MP_ARG_OBJ | MP_ARG_REQUIRED, {} },
-    };
-    audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(pos_args[0]);
-    mp_arg_val_t args[MP_ARRAY_SIZE(allowed_args)];
-    mp_arg_parse_all(n_args - 1, pos_args + 1, kw_args, MP_ARRAY_SIZE(allowed_args), allowed_args, args);
-
-    mp_float_t level = mp_obj_get_float(args[ARG_level].u_obj);
-
-    if (level > 1 || level < 0) {
-        mp_raise_ValueError(MP_ERROR_TEXT("level must be between 0 and 1"));
-    }
-
+static mp_obj_t audiomixer_mixervoice_obj_set_level(mp_obj_t self_in, mp_obj_t level_in) {
+    audiomixer_mixervoice_obj_t *self = MP_OBJ_TO_PTR(self_in);
+    mp_float_t level = mp_arg_validate_obj_float_range(level_in, 0, 1, MP_QSTR_level);
     common_hal_audiomixer_mixervoice_set_level(self, level);
-
     return mp_const_none;
 }
-MP_DEFINE_CONST_FUN_OBJ_KW(audiomixer_mixervoice_set_level_obj, 1, audiomixer_mixervoice_obj_set_level);
+MP_DEFINE_CONST_FUN_OBJ_2(audiomixer_mixervoice_set_level_obj, audiomixer_mixervoice_obj_set_level);
 
 MP_PROPERTY_GETSET(audiomixer_mixervoice_level_obj,
     (mp_obj_t)&audiomixer_mixervoice_get_level_obj,

shared-bindings/rgbmatrix/RGBMatrix.c

@@ -116,6 +116,16 @@ static void preflight_pins_or_throw(uint8_t clock_pin, uint8_t *rgb_pins, uint8_
     #endif
 }
 
+typedef struct {
+    nlr_jump_callback_node_t callback;
+    mp_obj_base_t *base_ptr;
+} nlr_jump_callback_node_clear_displaybus_t;
+
+static void clear_display_bus(void *node_in) {
+    nlr_jump_callback_node_clear_displaybus_t *node = node_in;
+    node->base_ptr->type = &mp_type_NoneType;
+}
+
 //|     def __init__(
 //|         self,
 //|         *,
@@ -217,6 +227,13 @@ static mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n
     rgbmatrix_rgbmatrix_obj_t *self = &allocate_display_bus_or_raise()->rgbmatrix;
     self->base.type = &rgbmatrix_RGBMatrix_type;
 
+    // If an exception is thrown, ensure the display bus object's type is set
+    // back to the uninitialized/deinitialied type. **note that all other resource
+    // deallocations must be handled by the shared-module code**
+    nlr_jump_callback_node_clear_displaybus_t node;
+    node.base_ptr = &self->base;
+    nlr_push_jump_callback(&node.callback, clear_display_bus);
+
     uint8_t rgb_count, addr_count;
     uint8_t rgb_pins[MP_ARRAY_SIZE(self->rgb_pins)];
     uint8_t addr_pins[MP_ARRAY_SIZE(self->addr_pins)];
@@ -254,7 +271,6 @@ static mp_obj_t rgbmatrix_rgbmatrix_make_new(const mp_obj_type_t *type, size_t n
         clock_pin, latch_pin, output_enable_pin,
         args[ARG_doublebuffer].u_bool,
         args[ARG_framebuffer].u_obj, tile, args[ARG_serpentine].u_bool, NULL);
-
     claim_and_never_reset_pins(args[ARG_rgb_list].u_obj);
     claim_and_never_reset_pins(args[ARG_addr_list].u_obj);
     claim_and_never_reset_pin(args[ARG_clock_pin].u_obj);