Fixes after the review

Author: ppsx

locale/circuitpython.pot

@@ -647,10 +647,6 @@ msgstr ""
 msgid "Baudrate not supported by peripheral"
 msgstr ""
 
-#: ports/espressif/common-hal/qspibus/QSPIBus.c
-msgid "Begin transaction first"
-msgstr ""
-
 #: shared-module/busdisplay/BusDisplay.c
 #: shared-module/framebufferio/FramebufferDisplay.c
 msgid "Below minimum frame rate"
@@ -717,10 +713,6 @@ msgstr ""
 msgid "Buffer too small"
 msgstr ""
 
-#: ports/espressif/common-hal/qspibus/QSPIBus.c
-msgid "Bus in display transaction"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/paralleldisplaybus/ParallelBus.c
 #: ports/espressif/common-hal/paralleldisplaybus/ParallelBus.c
 #: ports/nordic/common-hal/paralleldisplaybus/ParallelBus.c
@@ -1253,6 +1245,7 @@ msgstr ""
 msgid "Internal define error"
 msgstr ""
 
+#: ports/espressif/common-hal/qspibus/QSPIBus.c
 #: shared-bindings/pwmio/PWMOut.c supervisor/shared/settings.c
 msgid "Internal error"
 msgstr ""
@@ -1611,10 +1604,6 @@ msgstr ""
 msgid "No out in program"
 msgstr ""
 
-#: ports/espressif/common-hal/qspibus/QSPIBus.c
-msgid "No pending command"
-msgstr ""
-
 #: ports/atmel-samd/common-hal/busio/I2C.c
 #: ports/espressif/common-hal/busio/I2C.c
 #: ports/mimxrt10xx/common-hal/busio/I2C.c ports/nordic/common-hal/busio/I2C.c

ports/espressif/boards/waveshare_esp32_s3_amoled_241/board.c

@@ -5,6 +5,7 @@
 #include "supervisor/board.h"
 #include "mpconfigboard.h"
 #include "shared-bindings/microcontroller/Pin.h"
+#include "shared-bindings/digitalio/DigitalInOut.h"
 
 #include "shared-bindings/qspibus/QSPIBus.h"
 #include "shared-bindings/busdisplay/BusDisplay.h"
@@ -42,6 +43,15 @@ static uint8_t display_init_sequence[] = {
 };
 
 void board_init(void) {
+    // 0. Enable display power before any bus/display init.
+    digitalio_digitalinout_obj_t power_pin;
+    power_pin.base.type = &digitalio_digitalinout_type;
+    common_hal_digitalio_digitalinout_construct(&power_pin, CIRCUITPY_LCD_POWER);
+    common_hal_digitalio_digitalinout_set_value(&power_pin, true);
+    common_hal_digitalio_digitalinout_never_reset(&power_pin);
+    // Allow power rail to settle before reset/init.
+    mp_hal_delay_ms(200);
+
     // 1. Allocate and construct QSPI bus
     qspibus_qspibus_obj_t *bus = &allocate_display_bus_or_raise()->qspi_bus;
     bus->base.type = &qspibus_qspibus_type;

ports/espressif/boards/waveshare_esp32_s3_amoled_241/mpconfigboard.h

@@ -7,19 +7,13 @@
 #define MICROPY_HW_BOARD_NAME "Waveshare ESP32-S3-Touch-AMOLED-2.41"
 #define MICROPY_HW_MCU_NAME   "ESP32S3"
 
-// USB identifiers
-#define USB_VID 0x303A
-#define USB_PID 0x8278
-#define USB_MANUFACTURER "Waveshare"
-#define USB_PRODUCT "ESP32-S3-Touch-AMOLED-2.41"
-
 // I2C bus - Disabled on boot to avoid conflicts. User must manually initialize I2C.
 #define CIRCUITPY_BOARD_I2C         (0)
 #define CIRCUITPY_BOARD_I2C_PIN     {{.scl = &pin_GPIO48, .sda = &pin_GPIO47}}
 
-// QSPI display refresh buffer: 2048 uint32_t words = 8KB on stack.
+// Display refresh buffer: 2048 uint32_t words = 8KB on stack.
 // ESP32-S3 main task stack is 24KB; verified safe with this board.
-#define CIRCUITPY_QSPI_DISPLAY_AREA_BUFFER_SIZE (2048)
+#define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (2048)
 
 // AMOLED Display (displayio + qspibus path) - initialized in board_init()
 #define CIRCUITPY_BOARD_DISPLAY      (1)
@@ -31,7 +25,6 @@
 #define CIRCUITPY_LCD_D3             (&pin_GPIO14)
 #define CIRCUITPY_LCD_RESET          (&pin_GPIO21)
 #define CIRCUITPY_LCD_POWER          (&pin_GPIO16)
-#define CIRCUITPY_LCD_POWER_ON_LEVEL (1)  // GPIO level: 1=high, 0=low
 
 // No default SPI bus — SD card uses SDIO, display uses QSPI.
 #define CIRCUITPY_BOARD_SPI         (0)

ports/espressif/boards/waveshare_esp32_s3_amoled_241/mpconfigboard.mk

@@ -2,9 +2,6 @@
 # SPDX-FileCopyrightText: Copyright (c) 2026 Przemyslaw Patrick Socha
 # SPDX-License-Identifier: MIT
 
-CIRCUITPY_CREATOR_ID  = 0x57415645  # 'WAVE' (Waveshare)
-CIRCUITPY_CREATION_ID = 0x41323431  # 'A241' (AMOLED 2.41)
-
 USB_VID = 0x303A
 USB_PID = 0x8278
 USB_MANUFACTURER = "Waveshare"

ports/espressif/boards/waveshare_esp32_s3_amoled_241/sdkconfig

@@ -1,39 +1,3 @@
 #
 # Configuration file for the Waveshare ESP32-S3 Touch AMOLED 2.41
 #
-
-# PSRAM Configuration
-CONFIG_SPIRAM=y
-CONFIG_SPIRAM_BOOT_INIT=y
-CONFIG_SPIRAM_USE_MALLOC=y
-CONFIG_SPIRAM_MODE_OCT=y
-CONFIG_SPIRAM_FETCH_INSTRUCTIONS=y
-CONFIG_SPIRAM_RODATA=y
-CONFIG_SPIRAM_SPEED_80M=y
-CONFIG_SPIRAM_MEMTEST=n
-CONFIG_SPIRAM_CLK_IO=39
-CONFIG_SPIRAM_CS_IO=38
-
-# Performance and Cache
-CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ_240=y
-CONFIG_ESP32S3_DATA_CACHE_LINE_64B=y
-
-# Default flash settings for this board
-CONFIG_ESPTOOLPY_FLASHSIZE_16MB=y
-CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="esp-idf-config/partitions-16MB.csv"
-CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-16MB.csv"
-
-# Networking
-CONFIG_LWIP_LOCAL_HOSTNAME="waveshare-esp32-s3-amoled"
-
-# Disable USB-Serial/JTAG console - CircuitPython uses TinyUSB (USB OTG) for REPL
-CONFIG_ESP_CONSOLE_USB_SERIAL_JTAG=n
-
-# Workaround: NimBLE BLE_STATIC_TO_DYNAMIC=y (default in IDF 5.5.3) causes
-# ble_gap_vars to be a dynamically allocated pointer (NULL before ble_gap_init).
-# CircuitPython calls ble_gap_adv_active() before NimBLE init → NULL deref → bootloop.
-# Reverting to static allocation avoids the crash.
-CONFIG_BT_NIMBLE_STATIC_TO_DYNAMIC=n
-
-# Enable .app_desc structure
-CONFIG_APP_RETRIEVE_LEN_ELF_SHA=16

ports/espressif/common-hal/qspibus/QSPIBus.c

@@ -25,14 +25,6 @@
 #define QSPI_DMA_BUFFER_COUNT (2U)
 #define QSPI_DMA_BUFFER_SIZE (16U * 1024U)
 #define QSPI_COLOR_TIMEOUT_MS (1000U)
-#if defined(CIRCUITPY_LCD_POWER)
-#define CIRCUITPY_QSPIBUS_PANEL_POWER_PIN CIRCUITPY_LCD_POWER
-#endif
-
-#ifndef CIRCUITPY_LCD_POWER_ON_LEVEL
-#define CIRCUITPY_LCD_POWER_ON_LEVEL (1)
-#endif
-
 static void qspibus_release_dma_buffers(qspibus_qspibus_obj_t *self) {
     for (size_t i = 0; i < QSPI_DMA_BUFFER_COUNT; i++) {
         if (self->dma_buffer[i] != NULL) {
@@ -279,7 +271,6 @@ void common_hal_qspibus_qspibus_construct(
     self->cs_pin = cs->number;
     self->dcx_pin = (dcx != NULL) ? dcx->number : -1;
     self->reset_pin = (reset != NULL) ? reset->number : -1;
-    self->power_pin = -1;
     self->frequency = frequency;
     self->bus_initialized = false;
     self->in_transaction = false;
@@ -319,7 +310,7 @@ void common_hal_qspibus_qspibus_construct(
         qspibus_release_dma_buffers(self);
         vSemaphoreDelete(self->transfer_done_sem);
         self->transfer_done_sem = NULL;
-        mp_raise_OSError_msg_varg(MP_ERROR_TEXT("%q failure: %d"), MP_QSTR_SPI, (int)err);
+        mp_raise_ValueError_varg(MP_ERROR_TEXT("%q in use"), MP_QSTR_SPI);
     }
 
     const esp_lcd_panel_io_spi_config_t io_config = {
@@ -358,21 +349,6 @@ void common_hal_qspibus_qspibus_construct(
         gpio_set_level((gpio_num_t)self->dcx_pin, 1);
     }
 
-    #ifdef CIRCUITPY_QSPIBUS_PANEL_POWER_PIN
-    const mcu_pin_obj_t *power = CIRCUITPY_QSPIBUS_PANEL_POWER_PIN;
-    if (power != NULL) {
-        if (!common_hal_mcu_pin_is_free(power)) {
-            mp_raise_ValueError_varg(MP_ERROR_TEXT("%q in use"), MP_QSTR_LCD_POWER);
-        }
-        self->power_pin = power->number;
-        claim_pin(power);
-        gpio_set_direction((gpio_num_t)self->power_pin, GPIO_MODE_OUTPUT);
-        gpio_set_level((gpio_num_t)self->power_pin, CIRCUITPY_LCD_POWER_ON_LEVEL ? 1 : 0);
-        // Panel power rail needs extra settle time before reset/init commands.
-        vTaskDelay(pdMS_TO_TICKS(200));
-    }
-    #endif
-
     if (reset != NULL) {
         claim_pin(reset);
 
@@ -420,9 +396,6 @@ void common_hal_qspibus_qspibus_deinit(qspibus_qspibus_obj_t *self) {
     if (self->dcx_pin >= 0) {
         reset_pin_number(self->dcx_pin);
     }
-    if (self->power_pin >= 0) {
-        reset_pin_number(self->power_pin);
-    }
     if (self->reset_pin >= 0) {
         reset_pin_number(self->reset_pin);
     }
@@ -446,7 +419,7 @@ void common_hal_qspibus_qspibus_write_command(
         raise_deinited_error();
     }
     if (self->in_transaction) {
-        mp_raise_RuntimeError(MP_ERROR_TEXT("Bus in display transaction"));
+        mp_raise_RuntimeError(MP_ERROR_TEXT("Internal error"));
     }
 
     // If caller stages command-only operations repeatedly, flush the previous
@@ -467,7 +440,7 @@ void common_hal_qspibus_qspibus_write_data(
         raise_deinited_error();
     }
     if (self->in_transaction) {
-        mp_raise_RuntimeError(MP_ERROR_TEXT("Bus in display transaction"));
+        mp_raise_RuntimeError(MP_ERROR_TEXT("Internal error"));
     }
     if (len == 0) {
         if (self->has_pending_command) {
@@ -477,7 +450,7 @@ void common_hal_qspibus_qspibus_write_data(
         return;
     }
     if (!self->has_pending_command) {
-        mp_raise_ValueError(MP_ERROR_TEXT("No pending command"));
+        mp_raise_RuntimeError(MP_ERROR_TEXT("Internal error"));
     }
 
     if (qspibus_is_color_payload_command(self->pending_command)) {
@@ -545,7 +518,7 @@ void common_hal_qspibus_qspibus_send(
         raise_deinited_error();
     }
     if (!self->in_transaction) {
-        mp_raise_RuntimeError(MP_ERROR_TEXT("Begin transaction first"));
+        mp_raise_RuntimeError(MP_ERROR_TEXT("Internal error"));
     }
 
     if (data_type == DISPLAY_COMMAND) {
@@ -564,7 +537,7 @@ void common_hal_qspibus_qspibus_send(
             // Zero-length data write after a no-data command is benign.
             return;
         }
-        mp_raise_ValueError(MP_ERROR_TEXT("No pending command"));
+        mp_raise_RuntimeError(MP_ERROR_TEXT("Internal error"));
     }
 
     if (data_length == 0) {
@@ -593,6 +566,16 @@ void common_hal_qspibus_qspibus_end_transaction(mp_obj_t obj) {
     self->in_transaction = false;
 }
 
+void common_hal_qspibus_qspibus_flush(mp_obj_t obj) {
+    qspibus_qspibus_obj_t *self = MP_OBJ_TO_PTR(obj);
+    if (!self->bus_initialized) {
+        return;
+    }
+    if (!qspibus_wait_all_transfers_done(self, pdMS_TO_TICKS(QSPI_COLOR_TIMEOUT_MS))) {
+        qspibus_reset_transfer_state(self);
+    }
+}
+
 void common_hal_qspibus_qspibus_collect_ptrs(mp_obj_t obj) {
     (void)obj;
 }

ports/espressif/common-hal/qspibus/QSPIBus.h

@@ -33,7 +33,6 @@ typedef struct {
     int8_t cs_pin;
     int8_t dcx_pin;   // -1 when optional DCX line is not provided.
     int8_t reset_pin; // -1 when reset line is not provided.
-    int8_t power_pin; // -1 when board has no explicit display power pin.
 
     uint32_t frequency;
     bool bus_initialized;

py/circuitpy_mpconfig.h

@@ -394,25 +394,13 @@ typedef long mp_off_t;
 #define CIRCUITPY_DISPLAY_LIMIT (1)
 #endif
 
-// Framebuffer area size in bytes. Rounded down to power of four for alignment.
+// Display area buffer size in uint32_t words for _refresh_area() VLA.
+// Allocated on stack; boards with larger displays can override per-board.
+// Default 128 words = 512 bytes.
 #ifndef CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE
 #define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (128)
 #endif
 
-// QSPI display buffer size in uint32_t words for _refresh_area() VLA.
-// Allocated on stack; boards should verify sufficient stack headroom.
-// Default 512 words = 2KB. Override per-board for larger buffers.
-#ifndef CIRCUITPY_QSPI_DISPLAY_AREA_BUFFER_SIZE
-#define CIRCUITPY_QSPI_DISPLAY_AREA_BUFFER_SIZE (512)
-#endif
-
-// Port-level upper bound for the QSPI display buffer (uint32_t words).
-// The _Static_assert in BusDisplay.c enforces this at compile time.
-// Ports with larger stacks can raise this in mpconfigport.h.
-#ifndef CIRCUITPY_QSPI_DISPLAY_AREA_BUFFER_SIZE_MAX
-#define CIRCUITPY_QSPI_DISPLAY_AREA_BUFFER_SIZE_MAX (2048)
-#endif
-
 #else
 #define CIRCUITPY_DISPLAY_LIMIT (0)
 #define CIRCUITPY_DISPLAY_AREA_BUFFER_SIZE (0)

shared-bindings/displayio/__init__.h

@@ -49,4 +49,5 @@ typedef bool (*display_bus_begin_transaction)(mp_obj_t bus);
 typedef void (*display_bus_send)(mp_obj_t bus, display_byte_type_t byte_type,
     display_chip_select_behavior_t chip_select, const uint8_t *data, uint32_t data_length);
 typedef void (*display_bus_end_transaction)(mp_obj_t bus);
+typedef void (*display_bus_flush)(mp_obj_t bus);
 typedef void (*display_bus_collect_ptrs)(mp_obj_t bus);

shared-bindings/qspibus/QSPIBus.h

@@ -49,4 +49,5 @@ void common_hal_qspibus_qspibus_send(
     const uint8_t *data,
     uint32_t data_length);
 void common_hal_qspibus_qspibus_end_transaction(mp_obj_t obj);
+void common_hal_qspibus_qspibus_flush(mp_obj_t obj);
 void common_hal_qspibus_qspibus_collect_ptrs(mp_obj_t obj);