Merge branch 'micropython:master' into esp32_bitstream

Author: ricksorensen

.github/workflows/ports_qemu.yml

@@ -20,13 +20,20 @@ concurrency:
 
 jobs:
   build_and_test_arm:
+    strategy:
+      fail-fast: false
+      matrix:
+        ci_func:  # names are functions in ci.sh
+          - bigendian
+          - sabrelite
+          - thumb
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
     - name: Install packages
       run: source tools/ci.sh && ci_qemu_setup_arm
-    - name: Build and run test suite
-      run: source tools/ci.sh && ci_qemu_build_arm
+    - name: Build and run test suite ci_qemu_build_arm_${{ matrix.ci_func }}
+      run: source tools/ci.sh && ci_qemu_build_arm_${{ matrix.ci_func }}
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures

.github/workflows/ports_unix.yml

@@ -262,3 +262,43 @@ jobs:
     - name: Print failures
       if: failure()
       run: tests/run-tests.py --print-failures
+
+  sanitize_address:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_coverage_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_sanitize_address_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_sanitize_address_run_tests
+    - name: Test merging .mpy files
+      run: source tools/ci.sh && ci_unix_coverage_run_mpy_merge_tests
+    - name: Build native mpy modules
+      run: source tools/ci.sh && ci_native_mpy_modules_build
+    - name: Test importing .mpy generated by mpy_ld.py
+      run: source tools/ci.sh && ci_unix_coverage_run_native_mpy_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures
+
+  sanitize_undefined:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Install packages
+      run: source tools/ci.sh && ci_unix_coverage_setup
+    - name: Build
+      run: source tools/ci.sh && ci_unix_sanitize_undefined_build
+    - name: Run main test suite
+      run: source tools/ci.sh && ci_unix_sanitize_undefined_run_tests
+    - name: Test merging .mpy files
+      run: source tools/ci.sh && ci_unix_coverage_run_mpy_merge_tests
+    - name: Build native mpy modules
+      run: source tools/ci.sh && ci_native_mpy_modules_build
+    - name: Test importing .mpy generated by mpy_ld.py
+      run: source tools/ci.sh && ci_unix_coverage_run_native_mpy_tests
+    - name: Print failures
+      if: failure()
+      run: tests/run-tests.py --print-failures

.github/workflows/ports_windows.yml

@@ -28,37 +28,36 @@ jobs:
         visualstudio: ['2017', '2019', '2022']
         include:
         - visualstudio: '2017'
-          runner: windows-latest
           vs_version: '[15, 16)'
         - visualstudio: '2019'
-          runner: windows-2019
           vs_version: '[16, 17)'
         - visualstudio: '2022'
-          runner: windows-2022
           vs_version: '[17, 18)'
         # trim down the number of jobs in the matrix
         exclude:
         - variant: standard
           configuration: Debug
         - visualstudio: '2019'
           configuration: Debug
+    runs-on: windows-latest
     env:
       CI_BUILD_CONFIGURATION: ${{ matrix.configuration }}
-    runs-on: ${{ matrix.runner }}
     steps:
     - name: Install Visual Studio 2017
       if: matrix.visualstudio == '2017'
       run: |
         choco install visualstudio2017buildtools
         choco install visualstudio2017-workload-vctools
         choco install windows-sdk-8.1
+    - name: Install Visual Studio 2019
+      if: matrix.visualstudio == '2019'
+      run: |
+        choco install visualstudio2019buildtools
+        choco install visualstudio2019-workload-vctools
+        choco install windows-sdk-8.1
     - uses: microsoft/setup-msbuild@v2
       with:
         vs-version: ${{ matrix.vs_version }}
-    - uses: actions/setup-python@v5
-      if: matrix.runner == 'windows-2019'
-      with:
-        python-version: '3.9'
     - uses: actions/checkout@v4
     - name: Build mpy-cross.exe
       run: msbuild mpy-cross\mpy-cross.vcxproj -maxcpucount -property:Configuration=${{ matrix.configuration }} -property:Platform=${{ matrix.platform }}
@@ -103,7 +102,7 @@ jobs:
             env: i686
           - sys: mingw64
             env: x86_64
-    runs-on: windows-2022
+    runs-on: windows-latest
     env:
       CHERE_INVOKING: enabled_from_arguments
     defaults:

docs/library/esp32.rst

@@ -18,23 +18,31 @@ Functions
     Configure whether or not a touch will wake the device from sleep.
     *wake* should be a boolean value.
 
+    .. note:: This is only available for boards that have touch sensor support.
+
 .. function:: wake_on_ulp(wake)
 
     Configure whether or not the Ultra-Low-Power co-processor can wake the
     device from sleep. *wake* should be a boolean value.
 
+    .. note:: This is only available for boards that have ULP coprocessor support.
+
 .. function:: wake_on_ext0(pin, level)
 
     Configure how EXT0 wakes the device from sleep.  *pin* can be ``None``
     or a valid Pin object.  *level* should be ``esp32.WAKEUP_ALL_LOW`` or
     ``esp32.WAKEUP_ANY_HIGH``.
 
+    .. note:: This is only available for boards that have ext0 support.
+
 .. function:: wake_on_ext1(pins, level)
 
     Configure how EXT1 wakes the device from sleep.  *pins* can be ``None``
     or a tuple/list of valid Pin objects.  *level* should be ``esp32.WAKEUP_ALL_LOW``
     or ``esp32.WAKEUP_ANY_HIGH``.
 
+    .. note:: This is only available for boards that have ext1 support.
+
 .. function:: gpio_deep_sleep_hold(enable)
 
     Configure whether non-RTC GPIO pin configuration is retained during

docs/rp2/quickref.rst

@@ -135,6 +135,12 @@ Use the :mod:`machine.Timer` class::
     tim = Timer(period=5000, mode=Timer.ONE_SHOT, callback=lambda t:print(1))
     tim.init(period=2000, mode=Timer.PERIODIC, callback=lambda t:print(2))
 
+By default, timer callbacks run as soft IRQs so they can allocate but
+are prone to GC jitter and delays. Pass ``hard=True`` to the ``Timer()``
+constructor or ``init()`` method to run the callback in hard-IRQ context
+instead. This reduces delay and jitter, but see :ref:`isr_rules` for the
+restrictions that apply to hard-IRQ handlers.
+
 
 .. _rp2_Pins_and_GPIO:
 

drivers/esp-hosted/esp_hosted_bthci_uart.c

@@ -72,7 +72,7 @@ int esp_hosted_hci_cmd(int ogf, int ocf, size_t param_len, const uint8_t *param_
     // Receive HCI event packet, initially reading 3 bytes (HCI Event, Event code, Plen).
     for (mp_uint_t start = mp_hal_ticks_ms(), size = 3, i = 0; i < size;) {
         while (!mp_bluetooth_hci_uart_any()) {
-            MICROPY_EVENT_POLL_HOOK
+            mp_event_wait_ms(1);
             // Timeout.
             if ((mp_hal_ticks_ms() - start) > HCI_COMMAND_TIMEOUT) {
                 error_printf("timeout waiting for HCI packet\n");
@@ -126,7 +126,7 @@ int mp_bluetooth_hci_controller_init(void) {
         if (mp_bluetooth_hci_uart_any()) {
             mp_bluetooth_hci_uart_readchar();
         }
-        MICROPY_EVENT_POLL_HOOK
+        mp_event_wait_ms(1);
     }
 
     #ifdef MICROPY_HW_BLE_UART_BAUDRATE_SECONDARY

drivers/esp-hosted/esp_hosted_wifi.c

@@ -243,7 +243,7 @@ static int esp_hosted_request(CtrlMsgId msg_id, void *ctrl_payload) {
 
 static CtrlMsg *esp_hosted_response(CtrlMsgId msg_id, uint32_t timeout) {
     CtrlMsg *ctrl_msg = NULL;
-    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_hal_delay_ms(10)) {
+    for (mp_uint_t start = mp_hal_ticks_ms(); ; mp_event_wait_ms(10)) {
         if (!esp_hosted_stack_empty(&esp_state.stack)) {
             ctrl_msg = esp_hosted_stack_pop(&esp_state.stack, true);
             if (ctrl_msg->msg_id == msg_id) {
@@ -264,8 +264,6 @@ static CtrlMsg *esp_hosted_response(CtrlMsgId msg_id, uint32_t timeout) {
         if ((mp_hal_ticks_ms() - start) >= timeout) {
             return NULL;
         }
-
-        MICROPY_EVENT_POLL_HOOK
     }
 
     // If message type is a response, check the response struct's return value.

examples/natmod/random/Makefile

@@ -14,4 +14,9 @@ ifeq ($(ARCH),xtensa)
 MPY_EXTERN_SYM_FILE=$(MPY_DIR)/ports/esp8266/boards/eagle.rom.addr.v6.ld
 endif
 
+ifeq ($(ARCH),$(filter $(ARCH),armv6m armv7m))
+# Link with libm.a for soft-float helper functions
+LINK_RUNTIME = 1
+endif
+
 include $(MPY_DIR)/py/dynruntime.mk

extmod/machine_pulse.c

@@ -30,20 +30,35 @@
 
 #if MICROPY_PY_MACHINE_PULSE
 
-MP_WEAK mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us) {
+mp_uint_t machine_time_pulse_us(mp_hal_pin_obj_t pin, int pulse_level, mp_uint_t timeout_us) {
+    mp_uint_t nchanges = 2;
     mp_uint_t start = mp_hal_ticks_us();
-    while (mp_hal_pin_read(pin) != pulse_level) {
-        if ((mp_uint_t)(mp_hal_ticks_us() - start) >= timeout_us) {
-            return (mp_uint_t)-2;
-        }
-    }
-    start = mp_hal_ticks_us();
-    while (mp_hal_pin_read(pin) == pulse_level) {
-        if ((mp_uint_t)(mp_hal_ticks_us() - start) >= timeout_us) {
-            return (mp_uint_t)-1;
+    for (;;) {
+        // Sample ticks and pin as close together as possible, and always in the same
+        // order each time around the loop.  This gives the most accurate measurement.
+        mp_uint_t t = mp_hal_ticks_us();
+        int pin_value = mp_hal_pin_read(pin);
+
+        if (pin_value == pulse_level) {
+            // Pin is at desired value.  Flip desired value and see if we are done.
+            pulse_level = 1 - pulse_level;
+            if (--nchanges == 0) {
+                return t - start;
+            }
+            start = t;
+        } else {
+            // Pin hasn't changed yet, check for timeout.
+            mp_uint_t dt = t - start;
+            if (dt >= timeout_us) {
+                return -nchanges;
+            }
+
+            // Allow a port to perform background task processing if needed.
+            #ifdef MICROPY_PY_MACHINE_TIME_PULSE_US_HOOK
+            MICROPY_PY_MACHINE_TIME_PULSE_US_HOOK(dt);
+            #endif
         }
     }
-    return mp_hal_ticks_us() - start;
 }
 
 static mp_obj_t machine_time_pulse_us_(size_t n_args, const mp_obj_t *args) {

extmod/modlwip.c

@@ -825,6 +825,12 @@ static mp_uint_t lwip_tcp_receive(lwip_socket_obj_t *socket, byte *buf, mp_uint_
     // Check for any pending errors
     STREAM_ERROR_CHECK(socket);
 
+    if (socket->state == STATE_LISTENING) {
+        // original socket in listening state, not the accepted connection.
+        *_errno = MP_ENOTCONN;
+        return -1;
+    }
+
     if (socket->incoming.tcp.pbuf == NULL) {
 
         // Non-blocking socket or flag