Merge branch 'adafruit:main' into rm690b0

Author: ppsx

devices/ble_hci/common-hal/_bleio/Characteristic.c

@@ -180,7 +180,7 @@ void common_hal_bleio_characteristic_set_cccd(bleio_characteristic_obj_t *self,
     }
 
     const uint16_t conn_handle = bleio_connection_get_conn_handle(self->service->connection);
-    common_hal_bleio_check_connected(conn_handle);
+    bleio_check_connected(conn_handle);
 
     uint16_t cccd_value =
         (notify ? CCCD_NOTIFY : 0) |

devices/ble_hci/common-hal/_bleio/Connection.h

@@ -61,6 +61,7 @@ typedef struct {
     uint8_t disconnect_reason;
 } bleio_connection_obj_t;
 
+void bleio_check_connected(uint16_t conn_handle);
 uint16_t bleio_connection_get_conn_handle(bleio_connection_obj_t *self);
 mp_obj_t bleio_connection_new_from_internal(bleio_connection_internal_t *connection);
 bleio_connection_internal_t *bleio_conn_handle_to_connection(uint16_t conn_handle);

devices/ble_hci/common-hal/_bleio/__init__.c

@@ -84,7 +84,7 @@ bleio_adapter_obj_t *common_hal_bleio_allocate_adapter_or_raise(void) {
     return &common_hal_bleio_adapter_obj;
 }
 
-void common_hal_bleio_check_connected(uint16_t conn_handle) {
+void bleio_check_connected(uint16_t conn_handle) {
     if (conn_handle == BLE_CONN_HANDLE_INVALID) {
         mp_raise_ConnectionError(MP_ERROR_TEXT("Not connected"));
     }

locale/circuitpython.pot

@@ -477,7 +477,7 @@ msgstr ""
 msgid "AP could not be started"
 msgstr ""
 
-#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
+#: shared-bindings/ipaddress/IPv4Address.c
 #, c-format
 msgid "Address must be %d bytes long"
 msgstr ""
@@ -674,11 +674,6 @@ msgstr ""
 msgid "Brightness not adjustable"
 msgstr ""
 
-#: shared-bindings/_bleio/UUID.c
-#, c-format
-msgid "Buffer + offset too small %d %d %d"
-msgstr ""
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "Buffer elements must be 4 bytes long or less"
 msgstr ""
@@ -721,10 +716,6 @@ msgstr ""
 msgid "Bus pin %d is already in use"
 msgstr ""
 
-#: shared-bindings/_bleio/UUID.c
-msgid "Byte buffer must be 16 bytes."
-msgstr ""
-
 #: shared-bindings/aesio/aes.c
 msgid "CBC blocks must be multiples of 16 bytes"
 msgstr ""
@@ -1032,12 +1023,18 @@ msgstr ""
 msgid "Failed to buffer the sample"
 msgstr ""
 
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
+msgid "Failed to connect"
+msgstr ""
+
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nordic/common-hal/_bleio/Adapter.c
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: internal error"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: timeout"
 msgstr ""
 
@@ -2253,10 +2250,6 @@ msgstr ""
 msgid "USB error"
 msgstr ""
 
-#: shared-bindings/_bleio/UUID.c
-msgid "UUID integer value must be 0-0xffff"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
 msgstr ""
@@ -3399,10 +3392,6 @@ msgstr ""
 msgid "initial values must be iterable"
 msgstr ""
 
-#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
-msgid "initial_value length is wrong"
-msgstr ""
-
 #: py/compile.c
 msgid "inline assembler must be a function"
 msgstr ""
@@ -3814,7 +3803,6 @@ msgid "non-hex digit"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
-#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "non-zero timeout must be > 0.01"
 msgstr ""
 
@@ -4298,7 +4286,6 @@ msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
-#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
 

locale/cs.po

@@ -487,7 +487,7 @@ msgstr "pow() nepodporuje 3 argumenty"
 msgid "AP could not be started"
 msgstr "AP nemohl být spuštěn"
 
-#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
+#: shared-bindings/ipaddress/IPv4Address.c
 #, c-format
 msgid "Address must be %d bytes long"
 msgstr "Adresa musí být %d bajtů dlouhá"
@@ -686,11 +686,6 @@ msgstr "RX a TX jsou vyžadovány pro kontrolu toku"
 msgid "Brightness not adjustable"
 msgstr "Jas není nastavitelný"
 
-#: shared-bindings/_bleio/UUID.c
-#, c-format
-msgid "Buffer + offset too small %d %d %d"
-msgstr "Vyrovnávací paměť + offset je příliš malý %d %d %d"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "Buffer elements must be 4 bytes long or less"
 msgstr "Prvky bufferu musí být 4 bajty dlouhé nebo méně"
@@ -733,10 +728,6 @@ msgstr "Buffer příliš malý"
 msgid "Bus pin %d is already in use"
 msgstr "Sběrnicový pin %d je již používán"
 
-#: shared-bindings/_bleio/UUID.c
-msgid "Byte buffer must be 16 bytes."
-msgstr "Buffer musí být dlouhý 16 bajtů."
-
 #: shared-bindings/aesio/aes.c
 msgid "CBC blocks must be multiples of 16 bytes"
 msgstr "Bloky CBC musí být násobky 16 bajtů"
@@ -1047,12 +1038,18 @@ msgstr "Nepodařilo se alokovat paměť pro wifi scan"
 msgid "Failed to buffer the sample"
 msgstr "Nepodařilo se nabufferovat sample"
 
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
+msgid "Failed to connect"
+msgstr ""
+
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nordic/common-hal/_bleio/Adapter.c
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: internal error"
 msgstr "Připojení se nezdařilo: interní chyba"
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: timeout"
 msgstr "Nepodařilo se připojit: časový limit"
 
@@ -2271,10 +2268,6 @@ msgstr "USB zařízení používají příliš mnoho názvů rozhraní."
 msgid "USB error"
 msgstr "Chyba USB"
 
-#: shared-bindings/_bleio/UUID.c
-msgid "UUID integer value must be 0-0xffff"
-msgstr "UUID integer musí být 0-0xffff"
-
 #: shared-bindings/_bleio/UUID.c
 msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
 msgstr "UUID řetězec neodpovídá 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
@@ -3422,10 +3415,6 @@ msgstr ""
 msgid "initial values must be iterable"
 msgstr "výchozí hodnoty musí být iterovatelné"
 
-#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
-msgid "initial_value length is wrong"
-msgstr "délka initial_value je chybná"
-
 #: py/compile.c
 msgid "inline assembler must be a function"
 msgstr ""
@@ -3837,7 +3826,6 @@ msgid "non-hex digit"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
-#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "non-zero timeout must be > 0.01"
 msgstr "nenulový timeout musí být > 0.01"
 
@@ -4321,7 +4309,6 @@ msgid "timeout duration exceeded the maximum supported value"
 msgstr "timeout překročil maximální podporovanou hodnotu"
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
-#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr "timeout musí být < 655.35 s"
 
@@ -4614,6 +4601,19 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#, c-format
+#~ msgid "Buffer + offset too small %d %d %d"
+#~ msgstr "Vyrovnávací paměť + offset je příliš malý %d %d %d"
+
+#~ msgid "Byte buffer must be 16 bytes."
+#~ msgstr "Buffer musí být dlouhý 16 bajtů."
+
+#~ msgid "UUID integer value must be 0-0xffff"
+#~ msgstr "UUID integer musí být 0-0xffff"
+
+#~ msgid "initial_value length is wrong"
+#~ msgstr "délka initial_value je chybná"
+
 #, c-format
 #~ msgid "Invalid byte %.*s"
 #~ msgstr "Špatný byte %.*s"

locale/el.po

@@ -491,7 +491,7 @@ msgstr "pow() με 3 παραμέτρους δεν υποστηρίζεται"
 msgid "AP could not be started"
 msgstr "AP δεν μπόρεσε να εκκινηθεί"
 
-#: shared-bindings/_bleio/Address.c shared-bindings/ipaddress/IPv4Address.c
+#: shared-bindings/ipaddress/IPv4Address.c
 #, c-format
 msgid "Address must be %d bytes long"
 msgstr "Η διεύθυνση πρέπει να είναι %d bytes μεγάλη"
@@ -690,11 +690,6 @@ msgstr "Και RX και TX απαιτούνται για έλεγχο flow"
 msgid "Brightness not adjustable"
 msgstr "H φωτεινότητα δεν μπορεί να προσαρμοστεί"
 
-#: shared-bindings/_bleio/UUID.c
-#, c-format
-msgid "Buffer + offset too small %d %d %d"
-msgstr "Buffer + offset είναι πολύ μικρά %d %d %d"
-
 #: ports/raspberrypi/bindings/rp2pio/StateMachine.c
 msgid "Buffer elements must be 4 bytes long or less"
 msgstr "Στοιχεία του buffer πρέπει να είναι το πολύ 4 bytes"
@@ -737,10 +732,6 @@ msgstr "Buffer πολύ μικρός"
 msgid "Bus pin %d is already in use"
 msgstr "Bus pin %d είναι ήδη σε χρήση"
 
-#: shared-bindings/_bleio/UUID.c
-msgid "Byte buffer must be 16 bytes."
-msgstr "Byte buffer πρέπει να είναι 16 bytes."
-
 #: shared-bindings/aesio/aes.c
 msgid "CBC blocks must be multiples of 16 bytes"
 msgstr "CBC blocks πρέπει να είναι πολλαπλάσια του 16 bytes"
@@ -1055,12 +1046,18 @@ msgstr ""
 msgid "Failed to buffer the sample"
 msgstr ""
 
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
+msgid "Failed to connect"
+msgstr ""
+
 #: ports/espressif/common-hal/_bleio/Adapter.c
 #: ports/nordic/common-hal/_bleio/Adapter.c
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: internal error"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
+#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "Failed to connect: timeout"
 msgstr ""
 
@@ -2275,10 +2272,6 @@ msgstr ""
 msgid "USB error"
 msgstr ""
 
-#: shared-bindings/_bleio/UUID.c
-msgid "UUID integer value must be 0-0xffff"
-msgstr ""
-
 #: shared-bindings/_bleio/UUID.c
 msgid "UUID string not 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'"
 msgstr ""
@@ -3421,10 +3414,6 @@ msgstr ""
 msgid "initial values must be iterable"
 msgstr ""
 
-#: shared-bindings/_bleio/Characteristic.c shared-bindings/_bleio/Descriptor.c
-msgid "initial_value length is wrong"
-msgstr ""
-
 #: py/compile.c
 msgid "inline assembler must be a function"
 msgstr ""
@@ -3836,7 +3825,6 @@ msgid "non-hex digit"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
-#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "non-zero timeout must be > 0.01"
 msgstr ""
 
@@ -4320,7 +4308,6 @@ msgid "timeout duration exceeded the maximum supported value"
 msgstr ""
 
 #: ports/nordic/common-hal/_bleio/Adapter.c
-#: ports/zephyr-cp/common-hal/_bleio/Adapter.c
 msgid "timeout must be < 655.35 secs"
 msgstr ""
 
@@ -4613,6 +4600,13 @@ msgstr ""
 msgid "zi must be of shape (n_section, 2)"
 msgstr ""
 
+#, c-format
+#~ msgid "Buffer + offset too small %d %d %d"
+#~ msgstr "Buffer + offset είναι πολύ μικρά %d %d %d"
+
+#~ msgid "Byte buffer must be 16 bytes."
+#~ msgstr "Byte buffer πρέπει να είναι 16 bytes."
+
 #~ msgid "%q moved from %q to %q"
 #~ msgstr "%q μετακινήθηκε από το %q στο %q"