Merge pull request adafruit#10810 from dhalbert/merge-from-10.0.x

Merge from 10.0.x

Author: tannewt

locale/circuitpython.pot

@@ -1659,10 +1659,6 @@ msgstr ""
 msgid "Not playing"
 msgstr ""
 
-#: shared-module/jpegio/JpegDecoder.c
-msgid "Not supported JPEG standard"
-msgstr ""
-
 #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
 #: ports/espressif/common-hal/sdioio/SDCard.c
 #, c-format
@@ -2388,6 +2384,10 @@ msgid ""
 "declined or ignored."
 msgstr ""
 
+#: shared-module/jpegio/JpegDecoder.c
+msgid "Unsupported JPEG (may be progressive)"
+msgstr ""
+
 #: shared-bindings/bitmaptools/__init__.c
 msgid "Unsupported colorspace"
 msgstr ""

ports/espressif/bindings/espcamera/Camera.c

@@ -261,7 +261,7 @@ static mp_obj_t espcamera_camera_reconfigure(mp_uint_t n_args, const mp_obj_t *p
         args[ARG_grab_mode].u_obj != MP_ROM_NONE
         ?  validate_grab_mode(args[ARG_grab_mode].u_obj, MP_QSTR_grab_mode)
         : common_hal_espcamera_camera_get_grab_mode(self);
-    bool framebuffer_count =
+    mp_int_t framebuffer_count =
         args[ARG_framebuffer_count].u_obj != MP_ROM_NONE
         ?  mp_obj_get_int(args[ARG_framebuffer_count].u_obj)
         : common_hal_espcamera_camera_get_framebuffer_count(self);

ports/espressif/boards/lilygo_tdongle_s3/mpconfigboard.h

@@ -11,5 +11,8 @@
 #define MICROPY_HW_BOARD_NAME       "LILYGO T-Dongle S3"
 #define MICROPY_HW_MCU_NAME         "ESP32S3"
 
-#define DEFAULT_UART_BUS_RX         (&pin_GPIO44)
-#define DEFAULT_UART_BUS_TX         (&pin_GPIO43)
+#define MICROPY_HW_APA102_MOSI   (&pin_GPIO40)
+#define MICROPY_HW_APA102_SCK    (&pin_GPIO39)
+
+#define DEFAULT_I2C_BUS_SCL  (&pin_GPIO44)
+#define DEFAULT_I2C_BUS_SDA  (&pin_GPIO43)

shared-bindings/_bleio/PacketBuffer.h

@@ -25,7 +25,7 @@ void common_hal_bleio_packet_buffer_construct(
 void _common_hal_bleio_packet_buffer_construct(
     bleio_packet_buffer_obj_t *self, bleio_characteristic_obj_t *characteristic,
     uint32_t *incoming_buffer, size_t incoming_buffer_size,
-    uint32_t *outgoing_buffer1, uint32_t *outgoing_buffer2, size_t outgoing_buffer_size,
+    uint32_t *outgoing_buffer1, uint32_t *outgoing_buffer2, size_t max_packet_size,
     ble_event_handler_t *static_handler_entry);
 #endif
 mp_int_t common_hal_bleio_packet_buffer_write(bleio_packet_buffer_obj_t *self, const uint8_t *data, size_t len, uint8_t *header, size_t header_len);

shared-bindings/time/__init__.c

@@ -22,12 +22,12 @@
 //|
 //|
 //| def monotonic() -> float:
-//|     """Returns an always increasing value of time with an unknown reference
+//|     """Returns an always increasing value of time, in fractional seconds, with an unknown reference
 //|     point. Only use it to compare against other values from `time.monotonic()`
 //|     during the same code run.
 //|
 //|     On most boards, `time.monotonic()` converts a 64-bit millisecond tick counter
-//|     to a float. Floats on most boards are encoded in 30 bits internally, with
+//|     to seconds, as a float. Floats on most boards are encoded in 30 bits internally, with
 //|     effectively 22 bits of precision. The float returned by `time.monotonic()` will
 //|     accurately represent time to millisecond precision only up to 2**22 milliseconds
 //|     (about 1.165 hours).

shared-module/jpegio/JpegDecoder.c

@@ -46,7 +46,7 @@ static void check_jresult(JRESULT j) {
             msg = MP_ERROR_TEXT("Right format but not supported");
             break;
         case JDR_FMT3:
-            msg = MP_ERROR_TEXT("Not supported JPEG standard");
+            msg = MP_ERROR_TEXT("Unsupported JPEG (may be progressive)");
             break;
     }
     mp_raise_RuntimeError(msg);