From da1c330d99dd157c7a57e1f8b7cee9dc7a1a826b Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 6 Dec 2021 08:40:54 -0500 Subject: [PATCH 1/3] formatting updates for updated black --- tests/extmod/utimeq1.py | 1 - tools/pydfu.py | 1 - 2 files changed, 2 deletions(-) diff --git a/tests/extmod/utimeq1.py b/tests/extmod/utimeq1.py index 234d7a31dd..ddbc969afb 100644 --- a/tests/extmod/utimeq1.py +++ b/tests/extmod/utimeq1.py @@ -17,7 +17,6 @@ if DEBUG: def dprint(*v): print(*v) - else: def dprint(*v): diff --git a/tools/pydfu.py b/tools/pydfu.py index 26e40f5613..ce34b08a58 100755 --- a/tools/pydfu.py +++ b/tools/pydfu.py @@ -83,7 +83,6 @@ if "length" in inspect.getfullargspec(usb.util.get_string).args: def get_string(dev, index): return usb.util.get_string(dev, 255, index) - else: # PyUSB 1.0.0.b2 dropped the length argument def get_string(dev, index): From c43e0bd2db03d4f3b03e7512f044b8fa0f45b3f6 Mon Sep 17 00:00:00 2001 From: Dan Halbert Date: Mon, 6 Dec 2021 09:54:15 -0500 Subject: [PATCH 2/3] uncrustify fixes --- ports/broadcom/qstrdefsport.h | 3 +++ ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ports/broadcom/qstrdefsport.h b/ports/broadcom/qstrdefsport.h index ca01f8037c..6b44d1062b 100644 --- a/ports/broadcom/qstrdefsport.h +++ b/ports/broadcom/qstrdefsport.h @@ -26,6 +26,9 @@ // qstrs specific to this port, only needed if they aren't auto-generated +// Prevent uncrustify from modifying these lines. +// *FORMAT-OFF* + // Entries for sys.path Q(/sd) Q(/sd/lib) diff --git a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c index adc4ae1b01..c6d9b581b3 100644 --- a/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c +++ b/ports/espressif/boards/adafruit_feather_esp32s2_tft/board.c @@ -86,7 +86,7 @@ void board_init(void) { common_hal_busio_spi_never_reset(spi); - displayio_fourwire_obj_t* bus = &displays[0].fourwire_bus; + displayio_fourwire_obj_t *bus = &displays[0].fourwire_bus; bus->base.type = &displayio_fourwire_type; common_hal_displayio_fourwire_construct( @@ -99,7 +99,7 @@ void board_init(void) { 0, // polarity 0 // phase ); - displayio_display_obj_t* display = &displays[0].display; + displayio_display_obj_t *display = &displays[0].display; display->base.type = &displayio_display_type; // workaround as board_init() is called before reset_port() in main.c