pre-commit fixes

Author: wyrdsec

locale/circuitpython.pot

@@ -153,7 +153,7 @@ msgstr ""
 msgid "%q length must be >= %d"
 msgstr ""
 
-#: py/objmodule.c py/runtime.c
+#: py/modsys.c py/objmodule.c py/runtime.c
 msgid "%q moved from %q to %q"
 msgstr ""
 
@@ -1207,6 +1207,11 @@ msgstr ""
 msgid "Invalid BSSID"
 msgstr ""
 
+#: shared-module/aurora_epaper/aurora_framebuffer.c
+#, c-format
+msgid "Invalid CoG id=%d"
+msgstr ""
+
 #: shared-bindings/wifi/Radio.c
 msgid "Invalid MAC address"
 msgstr ""
@@ -2154,6 +2159,14 @@ msgstr ""
 msgid "Unknown BLE error: %d"
 msgstr ""
 
+#: shared-module/aurora_epaper/aurora_framebuffer.c
+msgid "Unknown device size."
+msgstr ""
+
+#: shared-module/aurora_epaper/aurora_framebuffer.c
+msgid "Unknown display type!"
+msgstr ""
+
 #: ports/espressif/common-hal/max3421e/Max3421E.c
 #: ports/raspberrypi/common-hal/wifi/__init__.c
 #, c-format
@@ -2211,6 +2224,10 @@ msgstr ""
 msgid "Unsupported colorspace"
 msgstr ""
 
+#: shared-module/aurora_epaper/aurora_framebuffer.c
+msgid "Unsupported device size."
+msgstr ""
+
 #: shared-module/displayio/bus_core.c
 msgid "Unsupported display bus type"
 msgstr ""
@@ -2329,6 +2346,7 @@ msgid "You pressed the SW38 button at start up."
 msgstr ""
 
 #: ports/espressif/boards/hardkernel_odroid_go/mpconfigboard.h
+#: ports/espressif/boards/vidi_x/mpconfigboard.h
 msgid "You pressed the VOLUME button at start up."
 msgstr ""
 

shared-bindings/aurora_epaper/__init__.c

@@ -17,4 +17,4 @@ const mp_obj_module_t aurora_epaper_module = {
     .globals = (mp_obj_dict_t *)&aurora_epaper_globals,
 };
 
-MP_REGISTER_MODULE(MP_QSTR_aurora_epaper, aurora_epaper_module);
+MP_REGISTER_MODULE(MP_QSTR_aurora_epaper, aurora_epaper_module);

shared-bindings/aurora_epaper/__init__.h

@@ -1 +1 @@
-#pragma once
+#pragma once

shared-bindings/aurora_epaper/aurora_framebuffer.c

@@ -29,52 +29,52 @@
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-module/displayio/__init__.h"
 
-// | class AuroraMemoryFramebuffer:
-// |     """A framebuffer for Pervasive Displays Aurora E-paper displays. These displays are 2 color only.
-// |
-// |     This initializes a display and connects it to CircuitPython.
-// |
-// |     For Example::
-// |
-// |         import busio
-// |         import framebufferio
-// |         from aurora_epaper import AuroraMemoryFramebuffer
-// |         spi = busio.SPI(EINK_CLKS, EINK_MOSI, EINK_MISO)
-// |         aurora = AuroraMemoryFramebuffer(spi, EINK_CS, EINK_RST, EINK_BUSY, EINK_DISCHARGE, HEIGHT, WIDTH)
-// |         display = framebufferio.FramebufferDisplay(t, auto_refresh=False)
-// |         display.refresh()
-// |
-// |     For more information on how these displays are driven see:
-// |     <https://www.pervasivedisplays.com/wp-content/uploads/2023/02/4P018-00_04_G2_Aurora-Mb_COG_Driver_Interface_Timing_for_small-size_20231107.pdf>
-// |     """
-// |
-// |     def __init__(
-// |         self,
-// |         spi_bus: busio.SPI,
-// |         chip_select: microcontroller.Pin,
-// |         reset: microcontroller.Pin,
-// |         busy: microcontroller.Pin,
-// |         discharge: microcontroller.Pin,
-// |         width: int,
-// |         height: int,
-// |         power: Optional[microcontroller.Pin] = None,
-// |         free_bus: Optional[bool] = True,
-// |     ) -> None:
-// |     """Create a framebuffer for the Aurora CoG display.
-// |
-// |     .. note:: Displays of size 1.9" and 2.6" are not tested, and may exibit unexpected behavior.
-// |
-// |     :param busio.SPI spi_bus: The SPI bus that the display is connected to
-// |     :param microcontroller.Pin chip_select: The pin connected to the displays chip select input
-// |     :param microcontroller.Pin reset: The pin connected to the displays reset input
-// |     :param microcontroller.Pin busy: The pin connected to the displays busy output
-// |     :param microcontroller.Pin discharge: The pin connected to the displays discharge input
-// |     :param int width: The width of the display in pixels
-// |     :param int height: The height of the display in pixels
-// |     :param microcontroller.Pin power: The pin that controls power to the display (optional).
-// |     :param bool free_bus: Determines whether the SPI bus passed in will be freed when the frame buffer is freed.
-// |     """
-// |...
+//| class AuroraMemoryFramebuffer:
+//|     """A framebuffer for Pervasive Displays Aurora E-paper displays. These displays are 2 color only.
+//|
+//|     This initializes a display and connects it to CircuitPython.
+//|
+//|     For Example::
+//|
+//|         import busio
+//|         import framebufferio
+//|         from aurora_epaper import AuroraMemoryFramebuffer
+//|         spi = busio.SPI(EINK_CLKS, EINK_MOSI, EINK_MISO)
+//|         aurora = AuroraMemoryFramebuffer(spi, EINK_CS, EINK_RST, EINK_BUSY, EINK_DISCHARGE, HEIGHT, WIDTH)
+//|         display = framebufferio.FramebufferDisplay(t, auto_refresh=False)
+//|         display.refresh()
+//|
+//|     For more information on how these displays are driven see:
+//|     <https://www.pervasivedisplays.com/wp-content/uploads/2023/02/4P018-00_04_G2_Aurora-Mb_COG_Driver_Interface_Timing_for_small-size_20231107.pdf>
+//|     """
+//|
+//|     def __init__(
+//|         self,
+//|         spi_bus: busio.SPI,
+//|         chip_select: microcontroller.Pin,
+//|         reset: microcontroller.Pin,
+//|         busy: microcontroller.Pin,
+//|         discharge: microcontroller.Pin,
+//|         width: int,
+//|         height: int,
+//|         power: Optional[microcontroller.Pin] = None,
+//|         free_bus: Optional[bool] = True,
+//|     ) -> None:
+//|     """Create a framebuffer for the Aurora CoG display.
+//|
+//|     .. note:: Displays of size 1.9" and 2.6" are not tested, and may exibit unexpected behavior.
+//|
+//|     :param busio.SPI spi_bus: The SPI bus that the display is connected to
+//|     :param microcontroller.Pin chip_select: The pin connected to the displays chip select input
+//|     :param microcontroller.Pin reset: The pin connected to the displays reset input
+//|     :param microcontroller.Pin busy: The pin connected to the displays busy output
+//|     :param microcontroller.Pin discharge: The pin connected to the displays discharge input
+//|     :param int width: The width of the display in pixels
+//|     :param int height: The height of the display in pixels
+//|     :param microcontroller.Pin power: The pin that controls power to the display (optional).
+//|     :param bool free_bus: Determines whether the SPI bus passed in will be freed when the frame buffer is freed.
+//|     """
+//|...
 static mp_obj_t aurora_epaper_framebuffer_make_new(const mp_obj_type_t *type, size_t n_args, size_t n_kw, const mp_obj_t *all_args) {
     enum { ARG_spi_bus, ARG_chip_select, ARG_reset, ARG_busy, ARG_discharge, ARG_width, ARG_height, ARG_power, ARG_free_bus, NUM_ARGS };
     static const mp_arg_t allowed_args[] = {
@@ -117,11 +117,11 @@ static mp_int_t aurora_epaper_framebuffer_get_buffer(mp_obj_t self_in, mp_buffer
     return 0;
 }
 
-// |     def deinit(self) -> None:
-// |         """Free the resources (pins, timers, etc.) associated with this
-// |         AuroraMemoryFramebuffer instance.  After deinitialization, no further operations
-// |         may be performed."""
-// | ...
+//|     def deinit(self) -> None:
+//|         """Free the resources (pins, timers, etc.) associated with this
+//|         AuroraMemoryFramebuffer instance.  After deinitialization, no further operations
+//|         may be performed."""
+//| ...
 static mp_obj_t aurora_epaper_framebuffer_deinit(mp_obj_t self_in) {
     aurora_epaper_framebuffer_obj_t *self = (aurora_epaper_framebuffer_obj_t *)self_in;
     common_hal_aurora_epaper_framebuffer_deinit(self);
@@ -130,13 +130,13 @@ static mp_obj_t aurora_epaper_framebuffer_deinit(mp_obj_t self_in) {
 }
 static MP_DEFINE_CONST_FUN_OBJ_1(aurora_epaper_framebuffer_deinit_obj, aurora_epaper_framebuffer_deinit);
 
-// |     def set_temperature(
-// |         self, celsius: int
-// |     ) -> None:
-// |         """Set the ambient temperature (in celsius) for the display driver.
-// |         Higher temperature means faster update speed.
-// |         """
-// | ...
+//|     def set_temperature(
+//|         self, celsius: int
+//|     ) -> None:
+//|         """Set the ambient temperature (in celsius) for the display driver.
+//|         Higher temperature means faster update speed.
+//|         """
+//| ...
 static mp_obj_t aurora_epaper_frambuffer_set_temperature(mp_obj_t self_in, mp_obj_t temperature) {
     aurora_epaper_framebuffer_obj_t *self = (aurora_epaper_framebuffer_obj_t *)self_in;
 
@@ -146,10 +146,10 @@ static mp_obj_t aurora_epaper_frambuffer_set_temperature(mp_obj_t self_in, mp_ob
 }
 static MP_DEFINE_CONST_FUN_OBJ_2(aurora_epaper_frambuffer_set_temperature_obj, aurora_epaper_frambuffer_set_temperature);
 
-// |     free_bus: bool
-// |         """When True the spi bus passed into the device will be freed on deinit.
-// |         If you have multiple displays this could be used to keep the other active on soft reset."""
-// | ...
+//|     free_bus: bool
+//|         """When True the spi bus passed into the device will be freed on deinit.
+//|         If you have multiple displays this could be used to keep the other active on soft reset."""
+//| ...
 static mp_obj_t aurora_epaper_framebuffer_get_free_bus(mp_obj_t self_in) {
     aurora_epaper_framebuffer_obj_t *self = (aurora_epaper_framebuffer_obj_t *)self_in;
     return mp_obj_new_bool(self->free_bus);

shared-bindings/aurora_epaper/aurora_framebuffer.h

@@ -1,7 +1,7 @@
 /*
  * Copyright 2023 Cisco Systems, Inc. and its affiliates
  * Author: Wyrdsec
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a copy of
  * this software and associated documentation files (the "Software"), to deal in
  * the Software without restriction, including without limitation the rights to

shared-module/aurora_epaper/__init__.c

@@ -1,2 +1,2 @@
 
-// No module functions
+// No module functions

shared-module/aurora_epaper/__init__.h

@@ -1,2 +1,2 @@
 
-#pragma once
+#pragma once

shared-module/aurora_epaper/aurora_framebuffer.c

@@ -421,9 +421,9 @@ void common_hal_aurora_epaper_framebuffer_draw_line(aurora_epaper_framebuffer_ob
 
         uint32_t evenMap =
             (whiteMap << 2 | whiteMap) << 0 |
-            (whiteMap << 2 | blackMap) << 4 |
-            (blackMap << 2 | whiteMap) << 16 |
-            (blackMap << 2 | blackMap) << 20;
+                    (whiteMap << 2 | blackMap) << 4 |
+                    (blackMap << 2 | whiteMap) << 16 |
+                    (blackMap << 2 | blackMap) << 20;
 
         int stride = common_hal_aurora_epaper_framebuffer_get_row_stride(self);
 
@@ -449,9 +449,9 @@ void common_hal_aurora_epaper_framebuffer_draw_line(aurora_epaper_framebuffer_ob
 
         uint32_t oddMap =
             (whiteMap << 2 | whiteMap) << 0 |
-            (whiteMap << 2 | blackMap) << 16 |
-            (blackMap << 2 | whiteMap) << 4 |
-            (blackMap << 2 | blackMap) << 20;
+                    (whiteMap << 2 | blackMap) << 16 |
+                    (blackMap << 2 | whiteMap) << 4 |
+                    (blackMap << 2 | blackMap) << 20;
 
         // Odd bytes
         for (int x = 0; x < stride; x++) {
@@ -467,7 +467,7 @@ void common_hal_aurora_epaper_framebuffer_draw_line(aurora_epaper_framebuffer_ob
             common_hal_busio_spi_write(self->bus, &border, 1);
         }
 
-        #undef DO_MAP
+#undef DO_MAP
     }
     // This code is untested
     else if (self->type == SMALL_1_9 || self->type == LARGE_2_6) {
@@ -478,9 +478,9 @@ void common_hal_aurora_epaper_framebuffer_draw_line(aurora_epaper_framebuffer_ob
 
         uint32_t pixelMap =
             (whiteMap << 2 | whiteMap) << 0 |
-            (whiteMap << 2 | blackMap) << 4 |
-            (blackMap << 2 | whiteMap) << 8 |
-            (blackMap << 2 | blackMap) << 12;
+                    (whiteMap << 2 | blackMap) << 4 |
+                    (blackMap << 2 | whiteMap) << 8 |
+                    (blackMap << 2 | blackMap) << 12;
 
         int stride = common_hal_aurora_epaper_framebuffer_get_row_stride(self);
 
@@ -522,7 +522,7 @@ void common_hal_aurora_epaper_framebuffer_draw_line(aurora_epaper_framebuffer_ob
 
         common_hal_busio_spi_write(self->bus, &border, 1);
 
-        #undef DO_MAP
+#undef DO_MAP
     } else {
         mp_raise_TypeError(MP_ERROR_TEXT("Unknown device size."));
     }

shared-module/displayio/__init__.c

@@ -306,7 +306,7 @@ void reset_displays(void) {
                 common_hal_aurora_epaper_framebuffer_set_free_bus(false);
             }
             #endif
-            // Set to None, gets deinit'd up by display_base 
+            // Set to None, gets deinit'd up by display_base
             display_buses[i].bus_base.type = &mp_type_NoneType;
         #endif
         } else {