Revert "Merge branch 'adafruit:main' into audiodelays_stereo_freq_shift_fix"

This reverts commit db3a47d, reversing
changes made to b4698a5.

Author: relic-se

.github/pull_request_template.md

@@ -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)'

.pre-commit-config.yaml

@@ -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
 ---------

docs/library/errno.rst

@@ -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

lib/tinyusb

@@ -15,6 +15,32 @@
 
 // #include "peripherals/periph.h"
 
+static const qstr os_uname_info_fields[] = {
+    MP_QSTR_sysname, MP_QSTR_nodename,
+    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
+};
+static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "max32");
+static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "max32");
+
+static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
+static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
+static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+
+static MP_DEFINE_ATTRTUPLE(
+    os_uname_info_obj,
+    os_uname_info_fields,
+    5,
+    (mp_obj_t)&os_uname_info_sysname_obj,
+    (mp_obj_t)&os_uname_info_nodename_obj,
+    (mp_obj_t)&os_uname_info_release_obj,
+    (mp_obj_t)&os_uname_info_version_obj,
+    (mp_obj_t)&os_uname_info_machine_obj
+    );
+
+mp_obj_t common_hal_os_uname(void) {
+    return (mp_obj_t)&os_uname_info_obj;
+}
+
 bool common_hal_os_urandom(uint8_t *buffer, uint32_t length) {
     #if (HAS_TRNG)
     // todo (low prior): implement

main.c

@@ -9,6 +9,9 @@
 
 #include <stdint.h>
 
+#define MICROPY_PY_FUNCTION_ATTRS                (1)
+#define MICROPY_PY_REVERSE_SPECIAL_METHODS       (1)
+
 // 24KiB stack
 #define CIRCUITPY_DEFAULT_STACK_SIZE            0x6000
 

ports/analog/common-hal/os/__init__.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/analog/mpconfigport.h

@@ -16,6 +16,38 @@
 #include "hal/include/hal_rand_sync.h"
 #endif
 
+static const qstr os_uname_info_fields[] = {
+    MP_QSTR_sysname, MP_QSTR_nodename,
+    MP_QSTR_release, MP_QSTR_version, MP_QSTR_machine
+};
+#ifdef SAMD21
+static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "samd21");
+static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "samd21");
+#endif
+#ifdef SAM_D5X_E5X
+static const MP_DEFINE_STR_OBJ(os_uname_info_sysname_obj, "samd51");
+static const MP_DEFINE_STR_OBJ(os_uname_info_nodename_obj, "samd51");
+#endif
+static const MP_DEFINE_STR_OBJ(os_uname_info_release_obj, MICROPY_VERSION_STRING);
+static const MP_DEFINE_STR_OBJ(os_uname_info_version_obj, MICROPY_GIT_TAG " on " MICROPY_BUILD_DATE);
+static const MP_DEFINE_STR_OBJ(os_uname_info_machine_obj, MICROPY_HW_BOARD_NAME " with " MICROPY_HW_MCU_NAME);
+
+
+static MP_DEFINE_ATTRTUPLE(
+    os_uname_info_obj,
+    os_uname_info_fields,
+    5,
+    (mp_obj_t)&os_uname_info_sysname_obj,
+    (mp_obj_t)&os_uname_info_nodename_obj,
+    (mp_obj_t)&os_uname_info_release_obj,
+    (mp_obj_t)&os_uname_info_version_obj,
+    (mp_obj_t)&os_uname_info_machine_obj
+    );
+
+mp_obj_t common_hal_os_uname(void) {
+    return (mp_obj_t)&os_uname_info_obj;
+}
+
 bool common_hal_os_urandom(uint8_t *buffer, mp_uint_t length) {
     #ifdef SAM_D5X_E5X
     hri_mclk_set_APBCMASK_TRNG_bit(MCLK);

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

@@ -68,7 +68,8 @@
 #define MICROPY_PY_SYS_PLATFORM                     "MicroChip SAME54"
 #endif
 #define SPI_FLASH_MAX_BAUDRATE 24000000
-
+#define MICROPY_PY_BUILTINS_NOTIMPLEMENTED          (1)
+#define MICROPY_PY_FUNCTION_ATTRS                   (1)
 //      MICROPY_PY_ERRNO_LIST - Use the default
 
 #endif // SAM_D5X_E5X