From 58cf7825fd034e6ded9745c58175c63b05fa8284 Mon Sep 17 00:00:00 2001
From: moononournation <moononournation@gmail.com>
Date: Thu, 20 Jul 2023 22:34:11 +0800
Subject: [PATCH] bugfix

---
 src/databus/Arduino_ESP32LCD8.cpp | 352 ++++++++++++++++++++++--------
 src/databus/Arduino_ESP32LCD8.h   |  25 +--
 2 files changed, 269 insertions(+), 108 deletions(-)

diff --git a/src/databus/Arduino_ESP32LCD8.cpp b/src/databus/Arduino_ESP32LCD8.cpp
index afd3280b..fe2f3e8a 100644
--- a/src/databus/Arduino_ESP32LCD8.cpp
+++ b/src/databus/Arduino_ESP32LCD8.cpp
@@ -8,6 +8,22 @@
 
 #define WAIT_LCD_NOT_BUSY while (LCD_CAM.lcd_user.val & LCD_CAM_LCD_START)
 
+/**
+ * @brief Construct a new Arduino_ESP32LCD8::Arduino_ESP32LCD8 object
+ *
+ * @param dc
+ * @param cs
+ * @param wr
+ * @param rd
+ * @param d0
+ * @param d1
+ * @param d2
+ * @param d3
+ * @param d4
+ * @param d5
+ * @param d6
+ * @param d7
+ */
 Arduino_ESP32LCD8::Arduino_ESP32LCD8(
     int8_t dc, int8_t cs, int8_t wr, int8_t rd,
     int8_t d0, int8_t d1, int8_t d2, int8_t d3, int8_t d4, int8_t d5, int8_t d6, int8_t d7)
@@ -16,6 +32,14 @@ Arduino_ESP32LCD8::Arduino_ESP32LCD8(
 {
 }
 
+/**
+ * @brief begin
+ *
+ * @param speed
+ * @param dataMode
+ * @return true
+ * @return false
+ */
 bool Arduino_ESP32LCD8::begin(int32_t speed, int8_t dataMode)
 {
   if (speed == GFX_NOT_DEFINED)
@@ -135,6 +159,10 @@ bool Arduino_ESP32LCD8::begin(int32_t speed, int8_t dataMode)
   return true;
 }
 
+/**
+ * @brief beginWrite
+ *
+ */
 void Arduino_ESP32LCD8::beginWrite()
 {
   CS_LOW();
@@ -144,6 +172,10 @@ void Arduino_ESP32LCD8::beginWrite()
   LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG;
 }
 
+/**
+ * @brief endWrite
+ *
+ */
 void Arduino_ESP32LCD8::endWrite()
 {
   WAIT_LCD_NOT_BUSY;
@@ -151,6 +183,11 @@ void Arduino_ESP32LCD8::endWrite()
   CS_HIGH();
 }
 
+/**
+ * @brief writeCommand
+ *
+ * @param c
+ */
 void Arduino_ESP32LCD8::writeCommand(uint8_t c)
 {
   LCD_CAM.lcd_misc.val = LCD_CAM_LCD_CD_IDLE_EDGE | LCD_CAM_LCD_CD_CMD_SET;
@@ -162,6 +199,11 @@ void Arduino_ESP32LCD8::writeCommand(uint8_t c)
   LCD_CAM.lcd_misc.val = LCD_CAM_LCD_CD_IDLE_EDGE;
 }
 
+/**
+ * @brief writeCommand16
+ *
+ * @param c
+ */
 void Arduino_ESP32LCD8::writeCommand16(uint16_t c)
 {
   LCD_CAM.lcd_misc.val = LCD_CAM_LCD_CD_IDLE_EDGE | LCD_CAM_LCD_CD_CMD_SET;
@@ -177,6 +219,11 @@ void Arduino_ESP32LCD8::writeCommand16(uint16_t c)
   LCD_CAM.lcd_misc.val = LCD_CAM_LCD_CD_IDLE_EDGE;
 }
 
+/**
+ * @brief write
+ *
+ * @param d
+ */
 void Arduino_ESP32LCD8::write(uint8_t d)
 {
   LCD_CAM.lcd_cmd_val.lcd_cmd_value = d;
@@ -184,6 +231,11 @@ void Arduino_ESP32LCD8::write(uint8_t d)
   LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
 }
 
+/**
+ * @brief write16
+ *
+ * @param d
+ */
 void Arduino_ESP32LCD8::write16(uint16_t d)
 {
   _data16.value = d;
@@ -195,76 +247,12 @@ void Arduino_ESP32LCD8::write16(uint16_t d)
   LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
 }
 
-void Arduino_ESP32LCD8::writeRepeat(uint16_t p, uint32_t len)
-{
-  if (len > USE_DMA_THRESHOLD)
-  {
-    uint32_t bufLen = (len < LCD_MAX_PIXELS_AT_ONCE) ? len : LCD_MAX_PIXELS_AT_ONCE;
-    uint32_t xferLen, l;
-    uint32_t c32;
-    MSB_32_16_16_SET(c32, p, p);
-
-    l = (bufLen + 1) / 2;
-    for (uint32_t i = 0; i < l; i++)
-    {
-      _buffer32[i] = c32;
-    }
-
-    _data16.value = p;
-    _data32.value = 0;
-    _data32.lsb = _data16.msb;
-    _data32.lsb_2 = _data16.lsb;
-
-    while (len > USE_DMA_THRESHOLD)
-    {
-      xferLen = (bufLen <= len) ? bufLen : len; // How many this pass?
-
-      LCD_CAM.lcd_cmd_val.val = _data32.value;
-      WAIT_LCD_NOT_BUSY;
-      LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
-
-      l = xferLen - 2;
-      l <<= 1;
-      *(uint32_t *)_dmadesc = ((l + 3) & (~3)) | l << 12 | 0xC0000000;
-      _dmadesc->buffer = _buffer;
-      _dmadesc->next = nullptr;
-      gdma_start(_dma_chan, (intptr_t)(_dmadesc));
-      LCD_CAM.lcd_cmd_val.val = _data32.value;
-      LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG;
-
-      len -= xferLen;
-
-      WAIT_LCD_NOT_BUSY;
-      LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_START;
-    }
-  }
-
-  while (len--)
-  {
-    _data16.value = p;
-    LCD_CAM.lcd_cmd_val.lcd_cmd_value = _data16.msb;
-    WAIT_LCD_NOT_BUSY;
-    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
-    LCD_CAM.lcd_cmd_val.lcd_cmd_value = _data16.lsb;
-    WAIT_LCD_NOT_BUSY;
-    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
-  }
-}
-
-void Arduino_ESP32LCD8::writePixels(uint16_t *data, uint32_t len)
-{
-  while (len--)
-  {
-    _data16.value = *data++;
-    LCD_CAM.lcd_cmd_val.lcd_cmd_value = _data16.msb;
-    WAIT_LCD_NOT_BUSY;
-    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
-    LCD_CAM.lcd_cmd_val.lcd_cmd_value = _data16.lsb;
-    WAIT_LCD_NOT_BUSY;
-    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
-  }
-}
-
+/**
+ * @brief writeC8D8
+ *
+ * @param c
+ * @param d
+ */
 void Arduino_ESP32LCD8::writeC8D8(uint8_t c, uint8_t d)
 {
   LCD_CAM.lcd_misc.val = LCD_CAM_LCD_CD_IDLE_EDGE | LCD_CAM_LCD_CD_CMD_SET;
@@ -280,6 +268,12 @@ void Arduino_ESP32LCD8::writeC8D8(uint8_t c, uint8_t d)
   LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
 }
 
+/**
+ * @brief writeC8D16
+ *
+ * @param c
+ * @param d
+ */
 void Arduino_ESP32LCD8::writeC8D16(uint8_t c, uint16_t d)
 {
   LCD_CAM.lcd_misc.val = LCD_CAM_LCD_CD_IDLE_EDGE | LCD_CAM_LCD_CD_CMD_SET;
@@ -295,6 +289,13 @@ void Arduino_ESP32LCD8::writeC8D16(uint8_t c, uint16_t d)
   LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
 }
 
+/**
+ * @brief writeC8D16D16
+ *
+ * @param c
+ * @param d1
+ * @param d2
+ */
 void Arduino_ESP32LCD8::writeC8D16D16(uint8_t c, uint16_t d1, uint16_t d2)
 {
   LCD_CAM.lcd_misc.val = LCD_CAM_LCD_CD_IDLE_EDGE | LCD_CAM_LCD_CD_CMD_SET;
@@ -322,6 +323,13 @@ void Arduino_ESP32LCD8::writeC8D16D16(uint8_t c, uint16_t d1, uint16_t d2)
   LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
 }
 
+/**
+ * @brief writeC8D16D16Split
+ *
+ * @param c
+ * @param d1
+ * @param d2
+ */
 void Arduino_ESP32LCD8::writeC8D16D16Split(uint8_t c, uint16_t d1, uint16_t d2)
 {
   LCD_CAM.lcd_misc.val = LCD_CAM_LCD_CD_IDLE_EDGE | LCD_CAM_LCD_CD_CMD_SET;
@@ -353,39 +361,173 @@ void Arduino_ESP32LCD8::writeC8D16D16Split(uint8_t c, uint16_t d1, uint16_t d2)
   LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
 }
 
-void Arduino_ESP32LCD8::writeBytes(uint8_t *data, uint32_t len)
+/**
+ * @brief writeRepeat
+ *
+ * @param p
+ * @param len
+ */
+void Arduino_ESP32LCD8::writeRepeat(uint16_t p, uint32_t len)
 {
-  uint32_t xferLen, l;
-
-  while (len > USE_DMA_THRESHOLD * 2) // While pixels remain
+  if (len > USE_DMA_THRESHOLD)
   {
-    xferLen = (len < LCD_MAX_PIXELS_AT_ONCE) ? len : LCD_MAX_PIXELS_AT_ONCE; // How many this pass?
+    uint32_t bufLen = (len < LCD_MAX_PIXELS_AT_ONCE) ? len : LCD_MAX_PIXELS_AT_ONCE;
+    uint32_t xferLen, l;
+    uint32_t c32;
+    MSB_32_16_16_SET(c32, p, p);
 
+    l = (bufLen + 1) / 2;
+    for (uint32_t i = 0; i < l; i++)
+    {
+      _buffer32[i] = c32;
+    }
+
+    _data16.value = p;
     _data32.value = 0;
-    _data32.lsb = *data++;
-    _data32.lsb_2 = *data++;
+    _data32.lsb = _data16.msb;
+    _data32.lsb_2 = _data16.lsb;
 
-    LCD_CAM.lcd_cmd_val.val = _data32.value;
-    WAIT_LCD_NOT_BUSY;
-    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
+    while (len > USE_DMA_THRESHOLD)
+    {
+      xferLen = (bufLen <= len) ? bufLen : len; // How many this pass?
 
-    _data32.value = 0;
-    _data32.lsb = *data++;
-    _data32.lsb_2 = *data++;
+      LCD_CAM.lcd_cmd_val.val = _data32.value;
+      WAIT_LCD_NOT_BUSY;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
+
+      l = xferLen - 2;
+      l <<= 1;
+      *(uint32_t *)_dmadesc = ((l + 3) & (~3)) | l << 12 | 0xC0000000;
+      _dmadesc->buffer = _buffer;
+      _dmadesc->next = nullptr;
+      gdma_start(_dma_chan, (intptr_t)(_dmadesc));
+      LCD_CAM.lcd_cmd_val.val = _data32.value;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG;
+
+      len -= xferLen;
 
-    l = xferLen - 4;
-    *(uint32_t *)_dmadesc = ((l + 3) & (~3)) | l << 12 | 0xC0000000;
-    _dmadesc->buffer = data;
-    _dmadesc->next = nullptr;
-    gdma_start(_dma_chan, (intptr_t)(_dmadesc));
-    LCD_CAM.lcd_cmd_val.val = _data32.value;
-    LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG;
+      WAIT_LCD_NOT_BUSY;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_START;
+    }
+  }
 
-    data += xferLen - 4;
-    len -= xferLen;
+  while (len--)
+  {
+    _data16.value = p;
+    LCD_CAM.lcd_cmd_val.lcd_cmd_value = _data16.msb;
+    WAIT_LCD_NOT_BUSY;
+    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
+    LCD_CAM.lcd_cmd_val.lcd_cmd_value = _data16.lsb;
+    WAIT_LCD_NOT_BUSY;
+    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
+  }
+}
 
+/**
+ * @brief writePixels
+ *
+ * @param data
+ * @param len
+ */
+void Arduino_ESP32LCD8::writePixels(uint16_t *data, uint32_t len)
+{
+  while (len--)
+  {
+    _data16.value = *data++;
+    LCD_CAM.lcd_cmd_val.lcd_cmd_value = _data16.msb;
+    WAIT_LCD_NOT_BUSY;
+    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
+    LCD_CAM.lcd_cmd_val.lcd_cmd_value = _data16.lsb;
     WAIT_LCD_NOT_BUSY;
-    LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_START;
+    LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
+  }
+}
+
+/**
+ * @brief writeBytes
+ *
+ * @param data
+ * @param len
+ */
+void Arduino_ESP32LCD8::writeBytes(uint8_t *data, uint32_t len)
+{
+  uint32_t xferLen, l, m;
+
+  if (esp_ptr_dma_capable(data))
+  {
+    while (len > (USE_DMA_THRESHOLD << 1)) // While pixels remain
+    {
+      xferLen = (len >= LCD_MAX_PIXELS_AT_ONCE << 1) ? (LCD_MAX_PIXELS_AT_ONCE << 1) : len; // How many this pass?
+
+      _data32.value = 0;
+      _data32.lsb = *data++;
+      _data32.lsb_2 = *data++;
+
+      LCD_CAM.lcd_cmd_val.val = _data32.value;
+      WAIT_LCD_NOT_BUSY;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
+
+      _data32.value = 0;
+      _data32.lsb = *data++;
+      _data32.lsb_2 = *data++;
+
+      l = xferLen - 4;
+      *(uint32_t *)_dmadesc = ((l + 3) & (~3)) | l << 12 | 0xC0000000;
+      _dmadesc->buffer = data;
+      _dmadesc->next = nullptr;
+      gdma_start(_dma_chan, (intptr_t)(_dmadesc));
+      LCD_CAM.lcd_cmd_val.val = _data32.value;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG;
+
+      data += xferLen - 4;
+      len -= xferLen;
+
+      WAIT_LCD_NOT_BUSY;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_START;
+    }
+  }
+  else
+  {
+    uint32_t l4;
+    uint32_t *p;
+    while (len > (USE_DMA_THRESHOLD << 1)) // While pixels remain
+    {
+      xferLen = (len >= LCD_MAX_PIXELS_AT_ONCE << 1) ? (LCD_MAX_PIXELS_AT_ONCE << 1) : len; // How many this pass?
+
+      _data32.value = 0;
+      _data32.lsb = *data++;
+      _data32.lsb_2 = *data++;
+
+      LCD_CAM.lcd_cmd_val.val = _data32.value;
+      WAIT_LCD_NOT_BUSY;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG | LCD_CAM_LCD_START;
+
+      _data32.value = 0;
+      _data32.lsb = *data++;
+      _data32.lsb_2 = *data++;
+
+      l = xferLen - 4;
+
+      l4 = (l + 3) >> 2;
+      p = (uint32_t *)data;
+      for (uint32_t i = 0; i < l4; i++)
+      {
+        _buffer32[i] = *p++;
+      }
+
+      *(uint32_t *)_dmadesc = ((l + 3) & (~3)) | l << 12 | 0xC0000000;
+      _dmadesc->buffer = _buffer32;
+      _dmadesc->next = nullptr;
+      gdma_start(_dma_chan, (intptr_t)(_dmadesc));
+      LCD_CAM.lcd_cmd_val.val = _data32.value;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_UPDATE_REG;
+
+      data += xferLen - 4;
+      len -= xferLen;
+
+      WAIT_LCD_NOT_BUSY;
+      LCD_CAM.lcd_user.val = LCD_CAM_LCD_ALWAYS_OUT_EN | LCD_CAM_LCD_DOUT | LCD_CAM_LCD_CMD | LCD_CAM_LCD_CMD_2_CYCLE_EN | LCD_CAM_LCD_START;
+    }
   }
 
   while (len)
@@ -411,6 +553,13 @@ void Arduino_ESP32LCD8::writeBytes(uint8_t *data, uint32_t len)
   }
 }
 
+/**
+ * @brief writeIndexedPixels
+ *
+ * @param data
+ * @param idx
+ * @param len
+ */
 void Arduino_ESP32LCD8::writeIndexedPixels(uint8_t *data, uint16_t *idx, uint32_t len)
 {
   if (len > USE_DMA_THRESHOLD)
@@ -476,6 +625,13 @@ void Arduino_ESP32LCD8::writeIndexedPixels(uint8_t *data, uint16_t *idx, uint32_
   }
 }
 
+/**
+ * @brief writeIndexedPixelsDouble
+ *
+ * @param data
+ * @param idx
+ * @param len
+ */
 void Arduino_ESP32LCD8::writeIndexedPixelsDouble(uint8_t *data, uint16_t *idx, uint32_t len)
 {
   while (len--)
@@ -498,6 +654,11 @@ void Arduino_ESP32LCD8::writeIndexedPixelsDouble(uint8_t *data, uint16_t *idx, u
 
 /******** low level bit twiddling **********/
 
+/**
+ * @brief CS_HIGH
+ *
+ * @return INLINE
+ */
 INLINE void Arduino_ESP32LCD8::CS_HIGH(void)
 {
   if (_cs != GFX_NOT_DEFINED)
@@ -506,6 +667,11 @@ INLINE void Arduino_ESP32LCD8::CS_HIGH(void)
   }
 }
 
+/**
+ * @brief CS_LOW
+ *
+ * @return INLINE
+ */
 INLINE void Arduino_ESP32LCD8::CS_LOW(void)
 {
   if (_cs != GFX_NOT_DEFINED)
diff --git a/src/databus/Arduino_ESP32LCD8.h b/src/databus/Arduino_ESP32LCD8.h
index 1af13699..11ef7783 100644
--- a/src/databus/Arduino_ESP32LCD8.h
+++ b/src/databus/Arduino_ESP32LCD8.h
@@ -1,14 +1,9 @@
-/*
- * start rewrite from:
- * https://github.com/lovyan03/LovyanGFX/blob/master/src/lgfx/v0/platforms/LGFX_PARALLEL_ESP32.hpp
- */
+#pragma once
+
 #include "Arduino_DataBus.h"
 
 #if defined(ESP32) && (CONFIG_IDF_TARGET_ESP32S3)
 
-#ifndef _ARDUINO_ESP32LCD8_H_
-#define _ARDUINO_ESP32LCD8_H_
-
 #define LCD_MAX_PIXELS_AT_ONCE 2046
 #define USE_DMA_THRESHOLD 6
 
@@ -26,29 +21,31 @@ class Arduino_ESP32LCD8 : public Arduino_DataBus
   void writeCommand16(uint16_t) override;
   void write(uint8_t) override;
   void write16(uint16_t) override;
-  void writeRepeat(uint16_t p, uint32_t len) override;
-  void writePixels(uint16_t *data, uint32_t len) override;
 
   void writeC8D8(uint8_t c, uint8_t d) override;
   void writeC8D16(uint8_t c, uint16_t d) override;
   void writeC8D16D16(uint8_t c, uint16_t d1, uint16_t d2) override;
   void writeC8D16D16Split(uint8_t c, uint16_t d1, uint16_t d2) override;
+
+  void writeRepeat(uint16_t p, uint32_t len) override;
+  void writePixels(uint16_t *data, uint32_t len) override;
+
   void writeBytes(uint8_t *data, uint32_t len) override;
 
   void writeIndexedPixels(uint8_t *data, uint16_t *idx, uint32_t len) override;
   void writeIndexedPixelsDouble(uint8_t *data, uint16_t *idx, uint32_t len) override;
 
 protected:
+private:
   INLINE void CS_HIGH(void);
   INLINE void CS_LOW(void);
 
-private:
   int8_t _dc, _cs, _wr, _rd;
   int8_t _d0, _d1, _d2, _d3, _d4, _d5, _d6, _d7;
 
-  PORTreg_t _csPortSet; ///< PORT register SET
-  PORTreg_t _csPortClr; ///< PORT register CLEAR
-  uint32_t _csPinMask;  ///< Bitmask
+  PORTreg_t _csPortSet; ///< PORT register for chip select SET
+  PORTreg_t _csPortClr; ///< PORT register for chip select CLEAR
+  uint32_t _csPinMask;  ///< Bitmask for chip select
 
   esp_lcd_i80_bus_handle_t _i80_bus = nullptr;
   dma_descriptor_t *_dmadesc = nullptr;
@@ -79,6 +76,4 @@ class Arduino_ESP32LCD8 : public Arduino_DataBus
   };
 };
 
-#endif // _ARDUINO_ESP32LCD8_H_
-
 #endif // #if defined(ESP32) && (CONFIG_IDF_TARGET_ESP32S3)