Committing clang-format changes

Author: Clang Robot

src/Inkplate-LVGL.h

@@ -39,12 +39,12 @@ void display_flush_callback(lv_display_t *disp, const lv_area_t *area, uint8_t *
 class Inkplate : public InkplateBoardClass, public NetworkController
 {
   public:
-    #ifndef USE_COLOR_IMAGE
+#ifndef USE_COLOR_IMAGE
     Inkplate(uint8_t mode);
-    #else
+#else
     Inkplate();
-    #endif
-    void begin(lv_display_render_mode_t renderMode=LV_DISP_RENDER_MODE_FULL);
+#endif
+    void begin(lv_display_render_mode_t renderMode = LV_DISP_RENDER_MODE_FULL);
     void drawPixel(int16_t x, int16_t y, uint16_t color);
     void setRotation(uint8_t r);
     void enableDithering(bool state);

src/Inkplate.cpp

@@ -20,12 +20,12 @@
 #include "Inkplate-LVGL.h"
 
 #ifndef USE_COLOR_IMAGE
-Inkplate::Inkplate(uint8_t mode) 
+Inkplate::Inkplate(uint8_t mode)
 {
     _mode = mode;
 }
 #else
-Inkplate::Inkplate() 
+Inkplate::Inkplate()
 {
 }
 #endif
@@ -56,10 +56,10 @@ void Inkplate::begin(lv_display_render_mode_t renderMode)
     // Init low level driver for EPD.
     initDriver(this);
 
-    // Forward the display mode to the EPD driver
-    #ifndef USE_COLOR_IMAGE
+// Forward the display mode to the EPD driver
+#ifndef USE_COLOR_IMAGE
     selectDisplayMode(_mode);
-    #endif
+#endif
 
     // Clean frame buffers.
     clearDisplay();
@@ -116,74 +116,69 @@ uint8_t Inkplate::getRotation()
 void Inkplate::initLVGL(lv_display_render_mode_t renderMode)
 {
     Serial.println("Initializing LVGL...");
-    
+
     // Init the lvgl library itself
     lv_init();
 
-    // Define display resolution
-    #ifndef ARDUINO_INKPLATE2
+// Define display resolution
+#ifndef ARDUINO_INKPLATE2
     uint32_t screen_width = E_INK_WIDTH;
     uint32_t screen_height = E_INK_HEIGHT;
-    #else
+#else
     uint32_t screen_width = E_INK_HEIGHT;
     uint32_t screen_height = E_INK_WIDTH;
-    #endif
+#endif
     uint32_t buffer_size;
-    lv_color_t* buf_1;
-    lv_color_t* buf_2;
-
-    if(renderMode == LV_DISPLAY_RENDER_MODE_PARTIAL){
-        #define PARTIAL_ROWS 16
-        buf_1=(lv_color_t*)heap_caps_malloc( screen_width * PARTIAL_ROWS * (LV_COLOR_DEPTH / 8) , MALLOC_CAP_8BIT );
-        buf_2= (lv_color_t*)heap_caps_malloc( screen_width * PARTIAL_ROWS * (LV_COLOR_DEPTH / 8), MALLOC_CAP_8BIT );
-        buffer_size = screen_width*PARTIAL_ROWS*(LV_COLOR_DEPTH / 8);
+    lv_color_t *buf_1;
+    lv_color_t *buf_2;
+
+    if (renderMode == LV_DISPLAY_RENDER_MODE_PARTIAL)
+    {
+#define PARTIAL_ROWS 16
+        buf_1 = (lv_color_t *)heap_caps_malloc(screen_width * PARTIAL_ROWS * (LV_COLOR_DEPTH / 8), MALLOC_CAP_8BIT);
+        buf_2 = (lv_color_t *)heap_caps_malloc(screen_width * PARTIAL_ROWS * (LV_COLOR_DEPTH / 8), MALLOC_CAP_8BIT);
+        buffer_size = screen_width * PARTIAL_ROWS * (LV_COLOR_DEPTH / 8);
     }
     else
     {
-        buf_1=(lv_color_t*)heap_caps_malloc( screen_width * screen_height * (LV_COLOR_DEPTH / 8), MALLOC_CAP_8BIT );
-        buf_2= (lv_color_t*)heap_caps_malloc( screen_width * screen_height * (LV_COLOR_DEPTH / 8), MALLOC_CAP_8BIT );
-        buffer_size = screen_width*screen_height*(LV_COLOR_DEPTH / 8);
+        buf_1 = (lv_color_t *)heap_caps_malloc(screen_width * screen_height * (LV_COLOR_DEPTH / 8), MALLOC_CAP_8BIT);
+        buf_2 = (lv_color_t *)heap_caps_malloc(screen_width * screen_height * (LV_COLOR_DEPTH / 8), MALLOC_CAP_8BIT);
+        buffer_size = screen_width * screen_height * (LV_COLOR_DEPTH / 8);
     }
 
     // Create a display driver instance
     disp = lv_display_create(screen_width, screen_height);
-    if(disp == NULL) {
+    if (disp == NULL)
+    {
         Serial.println("ERROR: Failed to create LVGL display!");
         return;
     }
 
     lv_display_set_default(disp);
 
-    // Use 8-bit grayscale
-    #ifdef USE_COLOR_IMAGE
+// Use 8-bit grayscale
+#ifdef USE_COLOR_IMAGE
     lv_display_set_color_format(disp, LV_COLOR_FORMAT_RGB565);
-    #else
+#else
     lv_display_set_color_format(disp, LV_COLOR_FORMAT_L8);
-    #endif
+#endif
 
 
     // Attach the buffer
-    lv_display_set_buffers(
-        disp,
-        buf_1,
-        buf_2,
-        buffer_size,
-        renderMode
-    );
+    lv_display_set_buffers(disp, buf_1, buf_2, buffer_size, renderMode);
 
     // Store this Inkplate instance
     lv_display_set_user_data(disp, this);
 
     // Set flush callback
     lv_display_set_flush_cb(disp, display_flush_callback);
 
-    // Inkplate 2 doesn't have an SD Card reader
-    #ifndef ARDUINO_INKPLATE2
+// Inkplate 2 doesn't have an SD Card reader
+#ifndef ARDUINO_INKPLATE2
     lv_fs_init_sd();
-    #endif
+#endif
 
     Serial.println("LVGL initialization complete");
-    
 }
 
 void Inkplate::enableDithering(bool state)

src/boards/Inkplate10/Inkplate10BoardFile.h

@@ -24,7 +24,7 @@
 class InkplateBoardClass : public EPDDriver
 {
   public:
-    InkplateBoardClass(){};
+    InkplateBoardClass() {};
 };
 
 #endif

src/boards/Inkplate10/Inkplate10Driver.cpp

@@ -81,19 +81,19 @@ void EPDDriver::writePixelInternal(int16_t x, int16_t y, uint16_t color)
 }
 
 /**
- * @brief       display_flush_callback function is called whenever there is a change made on the current 
+ * @brief       display_flush_callback function is called whenever there is a change made on the current
  *              LVGL screen. The data is downscaled to 3 bit or 1 bit grayscale depending on the current display mode
  *              and stored in the EPD buffer for rendering
  *
  * @param       lv_display_t *disp
  *              A pointer to the created LVGL display instance
- * 
+ *
  * @param       lv_area_t *area
  *              A pointer to the area of the display which has changed
- * 
+ *
  * @param       uint8_t px_map
  *              An array of pixel values in L8 format
- * 
+ *
  */
 void IRAM_ATTR display_flush_callback(lv_display_t *disp, const lv_area_t *area, uint8_t *px_map)
 {
@@ -102,17 +102,16 @@ void IRAM_ATTR display_flush_callback(lv_display_t *disp, const lv_area_t *area,
     int32_t w = lv_area_get_width(area);
     int32_t h = lv_area_get_height(area);
 
-    if (w <= 0 || h <= 0 || px_map == nullptr ||
-        area->x1 < 0 || area->y1 < 0 ||
-        area->x2 >= E_INK_WIDTH || area->y2 >= E_INK_HEIGHT)
+    if (w <= 0 || h <= 0 || px_map == nullptr || area->x1 < 0 || area->y1 < 0 || area->x2 >= E_INK_WIDTH ||
+        area->y2 >= E_INK_HEIGHT)
     {
         lv_display_flush_ready(disp);
         return;
     }
 
     bool is3bit = (self->getDisplayMode() == INKPLATE_3BIT);
 
-    if(self->ditherEnabled)
+    if (self->ditherEnabled)
     {
         self->dither.ditherFramebuffer(px_map, E_INK_WIDTH, E_INK_HEIGHT, is3bit);
     }
@@ -125,7 +124,7 @@ void IRAM_ATTR display_flush_callback(lv_display_t *disp, const lv_area_t *area,
         const int width_bytes_3b = E_INK_WIDTH / 2;
 
         // Preload LUTs to local for faster access
-        const uint8_t *maskLUT  = pixelMaskLUT;
+        const uint8_t *maskLUT = pixelMaskLUT;
         const uint8_t *maskGLUT = pixelMaskGLUT;
 
         for (int32_t y = 0; y < h; y++)
@@ -140,15 +139,15 @@ void IRAM_ATTR display_flush_callback(lv_display_t *disp, const lv_area_t *area,
                 for (int32_t x = 0; x < w; x++)
                 {
                     int32_t screen_x = area->x1 + x;
-                    if (screen_x >= E_INK_WIDTH) break;
+                    if (screen_x >= E_INK_WIDTH)
+                        break;
 
                     uint8_t gray3 = src_row[x] >> 5;
                     int x_byte = screen_x / 2;
-                    int x_sub  = screen_x % 2;
+                    int x_sub = screen_x % 2;
 
                     uint8_t temp = dst_row[x_byte];
-                    uint8_t newv = (maskGLUT[x_sub] & temp) |
-                                (x_sub ? gray3 : (gray3 << 4));
+                    uint8_t newv = (maskGLUT[x_sub] & temp) | (x_sub ? gray3 : (gray3 << 4));
 
                     dst_row[x_byte] = newv;
                 }
@@ -160,30 +159,28 @@ void IRAM_ATTR display_flush_callback(lv_display_t *disp, const lv_area_t *area,
                 for (int32_t x = 0; x < w; x++)
                 {
                     int32_t screen_x = area->x1 + x;
-                    if (screen_x >= E_INK_WIDTH) break;
+                    if (screen_x >= E_INK_WIDTH)
+                        break;
 
                     uint8_t gray = src_row[x];
                     uint8_t bit = (gray < 128) ? 1 : 0;
 
                     int x_byte = screen_x / 8;
-                    int x_sub  = screen_x % 8;
+                    int x_sub = screen_x % 8;
 
                     uint8_t temp = dst_row[x_byte];
                     // Preserve other bits using original mask logic
-                    dst_row[x_byte] = (~maskLUT[x_sub] & temp) |
-                                    (bit ? maskLUT[x_sub] : 0);
+                    dst_row[x_byte] = (~maskLUT[x_sub] & temp) | (bit ? maskLUT[x_sub] : 0);
                 }
             }
         }
-
     }
 
-    
+
     lv_display_flush_ready(disp);
 }
 
 
-
 /**
  * @brief       begin function initialize Inkplate object with predefined
  * settings
@@ -248,7 +245,6 @@ void EPDDriver::calculateLUTs()
 }
 
 
-
 /**
  * @brief       vscan_start starts writing new frame and skips first two lines
  * that are invisible on screen
@@ -316,7 +312,7 @@ void EPDDriver::clearDisplay()
     }
     // Clear 3 bit per pixel display buffer
     else if (_inkplate->getDisplayMode() == 1)
-    memset(DMemory4Bit, 0xFF, E_INK_WIDTH * E_INK_HEIGHT / 2);
+        memset(DMemory4Bit, 0xFF, E_INK_WIDTH * E_INK_HEIGHT / 2);
 }
 
 /**
@@ -351,14 +347,14 @@ void IRAM_ATTR EPDDriver::display3b(bool leaveOn)
 {
     if (!einkOn())
         return;
-        clean(1, 1);
-        clean(0, 10);
-        clean(2, 1);
-        clean(1, 10);
-        clean(2, 1);
-        clean(0, 10);
-        clean(2, 1);
-        clean(1, 10);
+    clean(1, 1);
+    clean(0, 10);
+    clean(2, 1);
+    clean(1, 10);
+    clean(2, 1);
+    clean(0, 10);
+    clean(2, 1);
+    clean(1, 10);
 
     for (int k = 0; k < 9; k++)
     {
@@ -960,7 +956,7 @@ uint8_t EPDDriver::initializeFramebuffers()
     if (DMemoryNew == NULL || _partial == NULL || _pBuffer == NULL || DMemory4Bit == NULL || GLUT == NULL ||
         GLUT2 == NULL)
     {
-       return 0;
+        return 0;
     }
     // Set all the framebuffers to White at start
     memset(DMemoryNew, 0, E_INK_WIDTH * E_INK_HEIGHT / 8);
@@ -1187,6 +1183,5 @@ void EPDDriver::checkWaveformID()
     {
         memcpy(waveform3Bit, waveformEEPROM.waveform, sizeof(waveform3Bit));
     }
-
 }
 #endif

src/boards/Inkplate2/Inkplate2BoardFile.h

@@ -24,7 +24,7 @@
 class InkplateBoardClass : public EPDDriver
 {
   public:
-    InkplateBoardClass(){};
+    InkplateBoardClass() {};
 };
 
 #endif