From b79661d6310618f6057464498f8ed26d2b2d12cd Mon Sep 17 00:00:00 2001 From: Scott Shawcroft Date: Thu, 23 Feb 2023 14:34:54 -0800 Subject: [PATCH] Alphabetize, fix typo and remove incorrect comment --- .../espruino_banglejs2/mpconfigboard.mk | 20 +++++++++---------- py/obj.h | 2 +- shared-module/displayio/EPaperDisplay.c | 4 +--- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk b/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk index 483c5b95e4..106b85cd75 100644 --- a/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk +++ b/ports/nrf/boards/espruino_banglejs2/mpconfigboard.mk @@ -5,23 +5,21 @@ MCU_CHIP = nrf52840 SPI_FLASH_FILESYSTEM = 1 EXTERNAL_FLASH_DEVICES = "XT25F64B,GD25Q64C" -CIRCUITPY_USB = 0 - CIRCUITPY_FULL_BUILD = 1 + +# Modules that aren't useful on the board. +CIRCUITPY_AESIO = 0 CIRCUITPY_AUDIOBUSIO = 0 +CIRCUITPY_AUDIOCORE = 0 +CIRCUITPY_AUDIOMIXER = 0 CIRCUITPY_AUDIOPWMIO = 0 CIRCUITPY_COUNTIO = 0 CIRCUITPY_NEOPIXEL_WRITE = 0 -CIRCUITPY_ROTARYIO = 0 -CIRCUITPY_SYNTHIO = 0 -CIRCUITPY_AESIO = 0 -CIRCUITPY_ANALOGIO = 1 -CIRCUITPY_AUDIOCORE = 0 -CIRCUITPY_AUDIOMIXER = 0 +CIRCUITPY_ONEWIREIO = 0 CIRCUITPY_RAINBOWIO = 0 CIRCUITPY_RGBMATRIX = 0 -CIRCUITPY_ONEWIREIO = 0 +CIRCUITPY_ROTARYIO = 0 +CIRCUITPY_SYNTHIO = 0 +CIRCUITPY_USB = 0 CIRCUITPY_BUILD_EXTENSIONS = espruino.zip - -CIRCUITPY_DISPLAYIO = 1 diff --git a/py/obj.h b/py/obj.h index b7e76a1106..86fbe5155f 100644 --- a/py/obj.h +++ b/py/obj.h @@ -419,7 +419,7 @@ typedef struct _mp_rom_obj_t { mp_const_obj_t o; } mp_rom_obj_t; // Declare a module as a builtin, processed by makemoduledefs.py // param module_name: MP_QSTR_ // param obj_module: mp_obj_module_t instance -// prarm enabled_define: used as `#if (enabled_define) around entry` +// param enabled_define: used as `#if (enabled_define) around entry` #define MP_REGISTER_MODULE(module_name, obj_module, enabled_define) diff --git a/shared-module/displayio/EPaperDisplay.c b/shared-module/displayio/EPaperDisplay.c index 869bb6c358..289fc47a68 100644 --- a/shared-module/displayio/EPaperDisplay.c +++ b/shared-module/displayio/EPaperDisplay.c @@ -388,8 +388,6 @@ STATIC bool _clean_area(displayio_epaperdisplay_obj_t *self) { uint16_t width = displayio_display_core_get_width(&self->core); uint16_t height = displayio_display_core_get_height(&self->core); - // Allocated and shared as a uint32_t array so the compiler knows the - // alignment everywhere. uint8_t buffer[width / 2]; memset(buffer, 0x77, width / 2); @@ -403,7 +401,7 @@ STATIC bool _clean_area(displayio_epaperdisplay_obj_t *self) { // Can't acquire display bus; skip the rest of the data. Try next display. return false; } - self->core.send(self->core.bus, DISPLAY_DATA, self->chip_select, (uint8_t *)buffer, width / 2); + self->core.send(self->core.bus, DISPLAY_DATA, self->chip_select, buffer, width / 2); displayio_display_core_end_transaction(&self->core); // TODO(tannewt): Make refresh displays faster so we don't starve other