Fix handling of stereo audio within audiodelays when freq_shift=True

.pre-commit-config.yaml

@@ -10,9 +10,9 @@ repos:
     hooks:
     -   id: check-yaml
     -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/mimxrt10xx/sdk|ports/raspberrypi/sdk|lib/tinyusb)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/raspberrypi/sdk|lib/tinyusb)'
     -   id: trailing-whitespace
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|ports/mimxrt10xx/sdk|lib/tinyusb)'
+        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|lib/mbedtls_errors/generate_errors.diff|ports/raspberrypi/sdk|lib/tinyusb)'
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.2.4
     hooks:
@@ -59,4 +59,3 @@ repos:
   rev: "v2.5.0"
   hooks:
     - id: pyproject-fmt
-      exclude: '^(ports/mimxrt10xx/sdk)'

docs/library/errno.rst

@@ -7,7 +7,7 @@
 |see_cpython_module| :mod:`python:errno`.
 
 This module provides access to symbolic error codes for `OSError` exception.
-Some codes are not available on the smallest CircuitPython builds, such as SAMD21, for space reasons.
+The codes available may vary per CircuitPython build.
 
 Constants
 ---------

main.c

@@ -131,9 +131,9 @@ static uint8_t *_allocate_memory(safe_mode_t safe_mode, const char *env_key, siz
     *final_size = default_size;
     #if CIRCUITPY_OS_GETENV
     if (safe_mode == SAFE_MODE_NONE) {
-        mp_int_t size;
-        if (common_hal_os_getenv_int(env_key, &size) == GETENV_OK && size > 0) {
-            *final_size = size;
+        (void)common_hal_os_getenv_int(env_key, (mp_int_t *)final_size);
+        if (*final_size < 0) {
+            *final_size = default_size;
         }
     }
     #endif

ports/atmel-samd/common-hal/audioio/AudioOut.c

@@ -79,9 +79,6 @@ static void ramp_value(uint16_t start, uint16_t end) {
 // Caller validates that pins are free.
 void common_hal_audioio_audioout_construct(audioio_audioout_obj_t *self,
     const mcu_pin_obj_t *left_channel, const mcu_pin_obj_t *right_channel, uint16_t quiescent_value) {
-
-    // The case of left_channel == right_channel is already disallowed in shared-bindings.
-
     #ifdef SAM_D5X_E5X
     bool dac_clock_enabled = hri_mclk_get_APBDMASK_DAC_bit(MCLK);
     #endif
@@ -110,6 +107,10 @@ void common_hal_audioio_audioout_construct(audioio_audioout_obj_t *self,
     if (right_channel != NULL && right_channel != &pin_PA02 && right_channel != &pin_PA05) {
         raise_ValueError_invalid_pin_name(MP_QSTR_right_channel);
     }
+    if (right_channel == left_channel) {
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("%q and %q must be different"),
+            MP_QSTR_left_channel, MP_QSTR_right_channel);
+    }
     claim_pin(left_channel);
     if (right_channel != NULL) {
         claim_pin(right_channel);

ports/espressif/boards/heltec_esp32s3_wifi_lora_v3/mpconfigboard.mk

@@ -26,3 +26,4 @@ CIRCUITPY_DISPLAYIO = 1
 
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Shapes
 FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Display_Text
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_RFM9x

ports/espressif/boards/waveshare_esp32_s3_geek/board.c

@@ -30,9 +30,18 @@ uint8_t display_init_sequence[] = {
 };
 
 static void display_init(void) {
+
     busio_spi_obj_t *spi = common_hal_board_create_spi(0);
     fourwire_fourwire_obj_t *bus = &allocate_display_bus()->fourwire_bus;
 
+    common_hal_busio_spi_construct(
+        spi,
+        &pin_GPIO12,    // CLK
+        &pin_GPIO11,    // MOSI
+        NULL,           // MISO not connected
+        false);         // Not half-duplex
+
+
     bus->base.type = &fourwire_fourwire_type;
 
     common_hal_fourwire_fourwire_construct(

ports/espressif/boards/waveshare_esp32_s3_geek/mpconfigboard.h

@@ -17,6 +17,6 @@
 #define DEFAULT_I2C_BUS_SCL (&pin_GPIO17)
 #define DEFAULT_I2C_BUS_SDA (&pin_GPIO16)
 
-#define CIRCUITPY_BOARD_SPI         (2)
-#define CIRCUITPY_BOARD_SPI_PIN     {{.clock = &pin_GPIO12, .mosi = &pin_GPIO11}, \
-                                     {.clock = &pin_GPIO36, .mosi = &pin_GPIO35, .miso = &pin_GPIO37}}
+#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
+#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
+#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)

ports/espressif/boards/waveshare_esp32_s3_geek/pins.c

@@ -5,10 +5,8 @@
 // SPDX-License-Identifier: MIT
 
 #include "shared-bindings/board/__init__.h"
-#include "shared-module/displayio/__init__.h"
-
-CIRCUITPY_BOARD_BUS_SINGLETON(sd_spi, spi, 1)
 
+#include "shared-module/displayio/__init__.h"
 static const mp_rom_map_elem_t board_module_globals_table[] = {
     CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
 
@@ -66,11 +64,11 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
 
     // SD Card
-    { MP_ROM_QSTR(MP_QSTR_SD_SCK),  MP_ROM_PTR(&pin_GPIO36) },
-    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO35) },
-    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO37) },
-    { MP_ROM_QSTR(MP_QSTR_SD_CS),   MP_ROM_PTR(&pin_GPIO34) },
-    { MP_ROM_QSTR(MP_QSTR_SD_SPI), MP_ROM_PTR(&board_sd_spi_obj) },
+    { MP_ROM_QSTR(MP_QSTR_SD_SCK),  MP_ROM_PTR(&pin_GPIO36)},
+    { MP_ROM_QSTR(MP_QSTR_SD_MOSI), MP_ROM_PTR(&pin_GPIO35)},
+    { MP_ROM_QSTR(MP_QSTR_SD_MISO), MP_ROM_PTR(&pin_GPIO37)},
+    { MP_ROM_QSTR(MP_QSTR_SD_CS),   MP_ROM_PTR(&pin_GPIO34)},
+    { MP_ROM_QSTR(MP_QSTR_SD_SPI), MP_ROM_PTR(&board_spi_obj) },
     // Pin 38 is for the SDIO interface, and therefore not included in the SPI object
 
     // LCD
@@ -80,7 +78,6 @@ static const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_LCD_RST), MP_ROM_PTR(&pin_GPIO9) },
     { MP_ROM_QSTR(MP_QSTR_LCD_BACKLIGHT), MP_ROM_PTR(&pin_GPIO7) },
     { MP_ROM_QSTR(MP_QSTR_LCD_DC), MP_ROM_PTR(&pin_GPIO8) },
-    { MP_ROM_QSTR(MP_QSTR_LCD_SPI), MP_ROM_PTR(&board_spi_obj) },
     { MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
 
 };