Merge branch '10.0.x' into rm690b0

Author: ppsx

.github/workflows/build.yml

@@ -107,7 +107,7 @@ jobs:
       cp-version: ${{ needs.scheduler.outputs.cp-version }}
 
   mpy-cross-mac:
-    runs-on: macos-13
+    runs-on: macos-latest
     needs: scheduler
     if: needs.scheduler.outputs.ports != '{}'
     env:
@@ -131,33 +131,18 @@ jobs:
         gcc --version
         python3 --version
         msgfmt --version
-    - name: Build mpy-cross
-      run: make -C mpy-cross -j4
-    - uses: actions/upload-artifact@v4
-      with:
-        name: mpy-cross-macos-x64
-        path: mpy-cross/build/mpy-cross
     - name: Build mpy-cross (arm64)
       run: make -C mpy-cross -j4 -f Makefile.m1 V=2
     - uses: actions/upload-artifact@v4
       with:
         name: mpy-cross-macos-arm64
         path: mpy-cross/build-arm64/mpy-cross-arm64
-    - name: Make universal binary
-      run: lipo -create -output mpy-cross-macos-universal mpy-cross/build/mpy-cross mpy-cross/build-arm64/mpy-cross-arm64
-    - name: Upload artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: mpy-cross-macos-universal
-        path: mpy-cross-macos-universal
     - name: Upload to S3
       if: >-
           (github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository_owner == 'adafruit') ||
           (github.event_name == 'release' && (github.event.action == 'published' || github.event.action == 'rerequested'))
       run: |
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross-macos-universal s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-"${CP_VERSION}"-universal --no-progress --region us-east-1
         [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build-arm64/mpy-cross-arm64 s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-"${CP_VERSION}"-arm64 --no-progress --region us-east-1
-        [ -z "$AWS_ACCESS_KEY_ID" ] || aws s3 cp mpy-cross/build/mpy-cross s3://adafruit-circuit-python/bin/mpy-cross/macos/mpy-cross-macos-"${CP_VERSION}"-x64 --no-progress --region us-east-1
       env:
         AWS_PAGER: ''
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}

locale/circuitpython.pot

@@ -159,10 +159,6 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/runtime.c
-msgid "%q moved from %q to %q"
-msgstr ""
-
 #: py/argcheck.c
 msgid "%q must be %d"
 msgstr ""
@@ -1814,10 +1810,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
@@ -2581,6 +2573,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/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);