Merge pull request #10215 from dhalbert/9.2.x

Merge 9.2.x (as of 9.2.7) into main

Author: dhalbert

.pre-commit-config.yaml

@@ -4,19 +4,33 @@
 
 # CIRCUITPY-CHANGE: CircuitPython-specific.
 
+# Note that by default, pre-commit hooks do not look inside submodules.
+# So you don't need to exclude submodules explicitly here.
+
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v5.0.0
     hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-        exclude: '^(tests/.*\.exp|tests/cmdline/.*|tests/.*/data/.*|ports/mimxrt10xx/sdk|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)'
--   repo: https://github.com/codespell-project/codespell
+      - id: check-yaml
+      - id: end-of-file-fixer
+        exclude: |
+          (?x)^(
+            tests/.*\.exp|
+            tests/cmdline/.*|
+            tests/.*/data/.*
+          )
+      - id: trailing-whitespace
+        exclude: |
+          (?x)^(
+            tests/.*\.exp|
+            tests/cmdline/.*|
+            tests/.*/data/.*|
+            lib/mbedtls_errors/generate_errors.diff
+          )
+  - repo: https://github.com/codespell-project/codespell
     rev: v2.2.4
     hooks:
-    -   id: codespell
+      - id: codespell
         args: [-w]
         exclude: |
           (?x)^(
@@ -25,38 +39,30 @@ repos:
             tests/unicode/data/utf-8_invalid.txt|
             tests/extmod/data/qr.pgm|
             tests/basics/bytearray_byte_operations.py|
-            ports/raspberrypi/sdk|
             ports/zephyr-cp/cptools/compat2driver.py
           )
--   repo: local
+  - repo: local
     hooks:
-    -   id: translations
+      - id: translations
         name: Translations
         entry: sh -c "if ! make check-translate; then make translate; fi"
         types: [c]
         pass_filenames: false
         language: system
-    -   id: formatting
+      - id: formatting
         name: Formatting
-        entry: python3 tools/codeformat.py
-        types: [c]
-        language: system
-        exclude: |
-          (?x)^(
-            lib/tinyusb|
-            ports/raspberrypi/sdk
-          )
-- repo: https://github.com/astral-sh/ruff-pre-commit
-  # Ruff version.
-  rev: v0.9.4
-  hooks:
-    # Run the linter.
-    - id: ruff
-      args: [ --fix ]
-    # Run the formatter.
-    - id: ruff-format
-- repo: https://github.com/tox-dev/pyproject-fmt
-  rev: "v2.5.0"
-  hooks:
-    - id: pyproject-fmt
-      exclude: '^(ports/mimxrt10xx/sdk)'
+        entry: python3 tools/codeformat.py -v -c
+        language: python
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.9.4
+    hooks:
+      # Run the linter.
+      - id: ruff
+        args: [ --fix ]
+      # Run the formatter.
+      - id: ruff-format
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: "v2.5.0"
+    hooks:
+      - id: pyproject-fmt

ports/espressif/boards/waveshare_esp32_c6_lcd_1_47/mpconfigboard.h

@@ -12,6 +12,7 @@
 #define MICROPY_HW_MCU_NAME         "ESP32-C6FH4"
 
 #define MICROPY_HW_NEOPIXEL (&pin_GPIO8)
+#define MICROPY_HW_NEOPIXEL_ORDER_GRB (1)
 
 // I2C
 #define CIRCUITPY_BOARD_I2C         (1)

ports/raspberrypi/common-hal/analogbufio/BufferedIn.c

@@ -15,16 +15,21 @@
 #include "hardware/dma.h"
 #include "pico/stdlib.h"
 
-#define ADC_FIRST_PIN_NUMBER 26
-#define ADC_PIN_COUNT 4
-
 #define ADC_CLOCK_INPUT 48000000
 #define ADC_MAX_CLOCK_DIV (1 << (ADC_DIV_INT_MSB - ADC_DIV_INT_LSB + 1))
 
 void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *self, const mcu_pin_obj_t *pin, uint32_t sample_rate) {
     // Make sure pin number is in range for ADC
-    if (pin->number < ADC_FIRST_PIN_NUMBER || pin->number >= (ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT)) {
-        raise_ValueError_invalid_pins();
+    if ((pin->number < ADC_BASE_PIN)
+        || (pin->number > ADC_BASE_PIN + NUM_ADC_CHANNELS - 1)
+        // On many boards with a CYW43 radio co-processor, CYW43_DEFAULT_PIN_WL_CLOCK (usually GPIO29),
+        // is both a voltage monitor and also SPI SCK to the CYW43.
+        // Disallow its use for BufferedIn.
+        #if defined(CIRCUITPY_CYW43) && defined(CYW43_DEFAULT_PIN_WL_CLOCK)
+        || (pin->number == CYW43_DEFAULT_PIN_WL_CLOCK)
+        #endif
+        ) {
+        raise_ValueError_invalid_pin();
     }
 
     // Validate sample rate here
@@ -35,7 +40,7 @@ void common_hal_analogbufio_bufferedin_construct(analogbufio_bufferedin_obj_t *s
     claim_pin(pin);
 
     // TODO: find a way to accept ADC4 for temperature
-    self->chan = pin->number - ADC_FIRST_PIN_NUMBER;
+    self->chan = pin->number - ADC_BASE_PIN;
 
     // Init GPIO for analogue use: hi-Z, no pulls, disable digital input buffer.
     // TODO: Make sure we share the ADC well. Right now we just assume it is

ports/raspberrypi/common-hal/analogio/AnalogIn.c

@@ -12,20 +12,12 @@
 
 #include "hardware/adc.h"
 
-#define ADC_PIN_COUNT (NUM_ADC_CHANNELS - 1)
-
-#if ADC_PIN_COUNT == 4
-#define ADC_FIRST_PIN_NUMBER 26
-#else
-#define ADC_FIRST_PIN_NUMBER 40
-#endif
-
-// Voltage monitor is special on Pico W, because this pin is shared between the
-// voltage monitor function and the wifi function. Special handling is required
-// to read the analog voltage.
+// On many boards with a CYW43 radio co-processor, CYW43_DEFAULT_PIN_WL_CLOCK (usually GPIO29),
+// is both a voltage monitor and also SPI SCK to the CYW43.
+// Special handling is required to read the analog voltage.
 #if CIRCUITPY_CYW43
 #include "bindings/cyw43/__init__.h"
-#define SPECIAL_PIN(pin) (pin->number == 29)
+#define SPECIAL_PIN(pin) (pin->number == CYW43_DEFAULT_PIN_WL_CLOCK)
 
 const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t obj) {
     return validate_obj_is_free_pin_or_gpio29(obj, MP_QSTR_pin);
@@ -35,7 +27,7 @@ const mcu_pin_obj_t *common_hal_analogio_analogin_validate_pin(mp_obj_t obj) {
 #endif
 
 void common_hal_analogio_analogin_construct(analogio_analogin_obj_t *self, const mcu_pin_obj_t *pin) {
-    if (pin->number < ADC_FIRST_PIN_NUMBER || pin->number > ADC_FIRST_PIN_NUMBER + ADC_PIN_COUNT) {
+    if (pin->number < ADC_BASE_PIN || pin->number > ADC_BASE_PIN + NUM_ADC_CHANNELS - 1) {
         raise_ValueError_invalid_pin();
     }
 
@@ -70,15 +62,15 @@ uint16_t common_hal_analogio_analogin_get_value(analogio_analogin_obj_t *self) {
         uint32_t old_pad = pads_bank0_hw->io[self->pin->number];
         uint32_t old_ctrl = io_bank0_hw->io[self->pin->number].ctrl;
         adc_gpio_init(self->pin->number);
-        adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
+        adc_select_input(self->pin->number - ADC_BASE_PIN);
         common_hal_mcu_delay_us(100);
         value = adc_read();
         gpio_init(self->pin->number);
         pads_bank0_hw->io[self->pin->number] = old_pad;
         io_bank0_hw->io[self->pin->number].ctrl = old_ctrl;
         common_hal_mcu_enable_interrupts();
     } else {
-        adc_select_input(self->pin->number - ADC_FIRST_PIN_NUMBER);
+        adc_select_input(self->pin->number - ADC_BASE_PIN);
         value = adc_read();
     }
     // Stretch 12-bit ADC reading to 16-bit range

shared-bindings/analogbufio/BufferedIn.c

@@ -40,7 +40,12 @@
 //|         """Create a `BufferedIn` on the given pin and given sample rate.
 //|
 //|         :param ~microcontroller.Pin pin: the pin to read from
-//|         :param ~int sample_rate: rate: sampling frequency, in samples per second"""
+//|         :param ~int sample_rate: rate: sampling frequency, in samples per second
+//|
+//|         **Limitations**: On many boards with a CYW43 radio module, such as Pico W,
+//|         GPIO29 (often ``board.A3``) is also used to control the CYW43,
+//|         and is therefore not available to use as the `BufferedIn` pin.
+//|         """
 //|         ...
 //|
 static mp_obj_t analogbufio_bufferedin_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {

shared-bindings/terminalio/Terminal.c

@@ -111,8 +111,7 @@ static mp_obj_t terminalio_terminal_make_new(const mp_obj_type_t *type, size_t n
         mp_raise_TypeError_varg(MP_ERROR_TEXT("unsupported %q type"), MP_QSTR_font);
     }
 
-    mp_arg_validate_int_min(scroll_area->width_in_tiles, 2, MP_QSTR_scroll_area_width);
-    mp_arg_validate_int_min(scroll_area->height_in_tiles, 2, MP_QSTR_scroll_area_height);
+    mp_arg_validate_int_min(scroll_area->width_in_tiles * scroll_area->height_in_tiles, 2, MP_QSTR_scroll_area_area);
 
     terminalio_terminal_obj_t *self = mp_obj_malloc(terminalio_terminal_obj_t, &terminalio_terminal_type);