UDisplay Modular Refactoring, adding DSI for P4 (#24107)

Author: Staars

lib/lib_display/UDisplay/uDisplay.cpp

@@ -7,14 +7,54 @@
 #include <SPI.h>
 
 #ifdef ESP32
+#if __has_include("soc/soc_caps.h")
+# include "soc/soc_caps.h"
+#else
+# error "No ESP capability header found"
+#endif
+#if (SOC_LCDCAM_I80_NUM_BUSES && !SOC_PARLIO_GROUPS)
+  #define UDISPLAY_I80
+  #include "uDisplay_I80_panel.h"
+#endif
+
+#if defined(SOC_LCD_RGB_SUPPORTED)
+  #include "uDisplay_RGB_panel.h"
+#endif
+#if SOC_MIPI_DSI_SUPPORTED
+    #include "uDisplay_DSI_panel.h"
+#endif
+
 #ifdef CONFIG_IDF_TARGET_ESP32S3
 #define USE_ESP32_S3
 #endif
 #include "soc/gpio_periph.h"
 #include <rom/gpio.h>
-#include "driver/spi_master.h"
+// #include "driver/spi_master.h"
 #endif
 
+#include "uDisplay_SPI_controller.h"
+#include "uDisplay_I2C_panel.h"
+#include "uDisplay_EPD_panel.h"
+#include "uDisplay_SPI_panel.h"
+
+// ===== Panel Config Union =====
+// Union to hold any panel configuration type
+// Only one config is active at a time based on interface type
+union PanelConfigUnion {
+    SPIPanelConfig spi;
+    I2CPanelConfig i2c;
+    EPDPanelConfig epd;
+#ifdef UDISPLAY_I80
+    I80PanelConfig i80;
+#endif
+#if SOC_LCD_RGB_SUPPORTED
+    esp_lcd_rgb_panel_config_t rgb;  // ESP-IDF native config
+#endif
+#if SOC_MIPI_DSI_SUPPORTED
+    DSIPanelConfig dsi;
+#endif
+};
+
 enum {
   UT_RD,UT_RDM,UT_CP,UT_RTF,UT_MV,UT_MVB,UT_RT,UT_RTT,UT_RDW,UT_RDWM,UT_WR,UT_WRW,UT_CPR,UT_AND,UT_SCALE,UT_LIM,UT_DBG,UT_GSRT,UT_XPT,UT_CPM,UT_END
 };
@@ -24,37 +64,20 @@ enum {
 #define UDSP_READ_STATUS 0xf2
 
 
-#define SIMPLERS_XP par_dbl[1]
-#define SIMPLERS_XM par_cs
-#define SIMPLERS_YP par_rs
-#define SIMPLERS_YM par_dbl[0]
-
-#ifdef USE_ESP32_S3
-#include <esp_lcd_panel_io.h>
-#include "esp_private/gdma.h"
-#include <hal/gpio_ll.h>
-#include <hal/lcd_hal.h>
-#include <soc/lcd_cam_reg.h>
-#include <soc/lcd_cam_struct.h>
-#include "esp_lcd_panel_interface.h"
-#include "esp_lcd_panel_rgb.h"
-#include "esp_pm.h"
-#include "esp_lcd_panel_ops.h"
-#include <hal/dma_types.h>
-#include <rom/cache.h>
-#include "esp_rom_lldesc.h"
-#endif // USE_ESP32_S3
+// Simple resistive touch pin mapping (I80 only):
+// XP = data_pins_low[1], XM = cs_pin, YP = dc_pin, YM = data_pins_low[0]
 
 #define _UDSP_I2C 1
 #define _UDSP_SPI 2
 #define _UDSP_PAR8 3
 #define _UDSP_PAR16 4
 #define _UDSP_RGB 5
+#define _UDSP_DSI 6
 
 #define UDISP1_WHITE 1
 #define UDISP1_BLACK 0
 
-#define MAX_LUTS 5
+// #define MAX_LUTS 5
 
 #define DISPLAY_INIT_MODE 0
 #define DISPLAY_INIT_PARTIAL 1
@@ -95,14 +118,25 @@ class uDisplay : public Renderer {
 
 private:
     uint8_t *frame_buffer;
-    uint8_t *lut_full;
-    uint8_t *lut_partial;
-    uint8_t *lut_array[MAX_LUTS];
+    // uint8_t *lut_full;  // MOVED to EPDPanelConfig.lut_full_data
+    // uint8_t *lut_partial;  // MOVED to EPDPanelConfig.lut_partial_data
+    // uint8_t *lut_array[MAX_LUTS];  // MOVED to EPDPanelConfig.lut_array_data
+#if SOC_MIPI_DSI_SUPPORTED
+    uint8_t dsp_cmds[1024]; // for DSI, does not hurt for ESP32
+#else
     uint8_t dsp_cmds[256];
+#endif
     char dname[16];
-    SPIClass *uspi;
+
+    SPIController *spiController;
     TwoWire *wire;
-    SPISettings spiSettings;
+    UniversalPanel* universal_panel = nullptr;
+    
+    // ===== Panel Configuration Union =====
+    // Heap-allocated union holding the active panel config
+    // Allocated after parsing :H line, populated during INI parsing
+    PanelConfigUnion* panel_config = nullptr;
+
 
     uint16_t x_addr_offs[4];
     uint16_t y_addr_offs[4];
@@ -117,8 +151,8 @@ class uDisplay : public Renderer {
     uint16_t seta_xp2;
     uint16_t seta_yp1;
     uint16_t seta_yp2;
-    uint16_t lutptime;
-    uint16_t lut3time;
+    // uint16_t lutptime;  // MOVED to EPDPanelConfig.lut_partial_time
+    // uint16_t lut3time;  // MOVED to EPDPanelConfig.update_time
     uint16_t lut_num;
 
     uint8_t bpp;
@@ -129,14 +163,14 @@ class uDisplay : public Renderer {
     uint8_t i2c_col_end;
     uint8_t i2c_page_start;
     uint8_t i2c_page_end;
-    uint8_t dsp_ncmds;
+    uint16_t dsp_ncmds;
     uint8_t dsp_on;
     uint8_t dsp_off;
     uint8_t allcmd_mode;
     uint8_t splash_size;
     uint8_t dimmer8;
     uint8_t spi_speed;
-    uint8_t spi_nr;
+    // uint8_t spi_nr;
     uint8_t rot[4];
     uint8_t rot_t[4];
     uint8_t madctrl;
@@ -150,19 +184,19 @@ class uDisplay : public Renderer {
     uint8_t inv_off;
     uint8_t sa_mode;
     uint8_t dim_op;
-    uint8_t lutfsize;
-    uint8_t lutpsize;
-    uint8_t lut_siz_full;
-    uint8_t lut_siz_partial;
-    uint8_t epcoffs_full;
-    uint8_t epc_full_cnt;
-    uint8_t epcoffs_part;
-    uint8_t epc_part_cnt;
-    uint8_t lut_cnt[MAX_LUTS];
-    uint8_t lut_cmd[MAX_LUTS];
-    uint8_t lut_siz[MAX_LUTS];
+    // uint8_t lutfsize;  // MOVED to EPDPanelConfig.lutfsize
+    // uint8_t lutpsize;  // MOVED to EPDPanelConfig.lutpsize
+    // uint8_t lut_siz_full;  // Local variable only
+    // uint8_t lut_siz_partial;  // Local variable only
+    // uint8_t epcoffs_full;  // MOVED to EPDPanelConfig.epcoffs_full
+    // uint8_t epc_full_cnt;  // MOVED to EPDPanelConfig.epc_full_cnt
+    // uint8_t epcoffs_part;  // MOVED to EPDPanelConfig.epcoffs_part
+    // uint8_t epc_part_cnt;  // MOVED to EPDPanelConfig.epc_part_cnt
+    // uint8_t lut_cnt[MAX_LUTS];  // MOVED to EPDPanelConfig.lut_cnt_data
+    // uint8_t lut_cmd[MAX_LUTS];  // MOVED to EPDPanelConfig.lut_cmd
+    // uint8_t lut_siz[MAX_LUTS];  // MOVED to EPDPanelConfig.lut_siz
     uint8_t ep_mode;
-    uint8_t ep_update_mode;
+    // uint8_t ep_update_mode;  // MOVED to EPDPanel.update_mode
     uint8_t sspi;
 
     int8_t spec_init;
@@ -172,64 +206,29 @@ class uDisplay : public Renderer {
     int8_t reset;
     int8_t splash_font;
     int8_t bpmode;
-    int8_t spi_cs;
-    int8_t spi_clk;
-    int8_t spi_mosi;
-    int8_t spi_dc;
+    // int8_t spi_cs;
+    // int8_t spi_clk;
+    // int8_t spi_mosi;
+    // int8_t spi_dc;
     int8_t bpanel;
-    int8_t spi_miso;
-    int8_t busy_pin;
+    // int8_t spi_miso;
+    // int8_t busy_pin;  // MOVED to EPDPanelConfig.busy_pin (EPD-only)
 
-    int16_t lutftime;
+    // int16_t lutftime;  // MOVED to EPDPanelConfig.lut_full_time
     int16_t rotmap_xmin;
     int16_t rotmap_xmax;
     int16_t rotmap_ymin;
     int16_t rotmap_ymax;
 
-    void beginTransaction(SPISettings s);
-    void endTransaction(void);
     void setAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1, uint16_t y1);
     void drawPixel(int16_t x, int16_t y, uint16_t color);
     void drawFastHLine(int16_t x, int16_t y, int16_t w, uint16_t color);
     void drawFastVLine(int16_t x, int16_t y, int16_t h, uint16_t color);
     uint32_t str2c(char **sp, char *vp, uint32_t len);
+
     void i2c_command(uint8_t val);
-    void ulcd_command_one(uint8_t val);
-    void ulcd_command(uint8_t val);
-    void ulcd_data8(uint8_t val);
-    void ulcd_data16(uint16_t val);
-    void ulcd_data32(uint32_t val);
-    void write8(uint8_t val);
-    void write8_slow(uint8_t val);
-    void write9(uint8_t val, uint8_t dc);
-    void write9_slow(uint8_t val, uint8_t dc);
-    void hw_write9(uint8_t val, uint8_t dc);
-    void write16(uint16_t val);
-    void write32(uint32_t val);
-    void spi_data9(uint8_t d, uint8_t dc);
-    uint8_t readData(void);
-    uint8_t readStatus(void);
-    uint8_t writeReg16(uint8_t reg, uint16_t wval);
-    void WriteColor(uint16_t color);
-    void SetLut(const unsigned char* lut);
-    void SetLuts(void);
-    void DisplayFrame_29(void);
-    void Updateframe_EPD();
-    void SetFrameMemory(const unsigned char* image_buffer);
-    void SetFrameMemory(const unsigned char* image_buffer, uint16_t x, uint16_t y, uint16_t image_width, uint16_t image_height);
-    void SetMemoryArea(int x_start, int y_start, int x_end, int y_end);
-    void SetMemoryPointer(int x, int y);
-    void DrawAbsolutePixel(int x, int y, int16_t color);
-    void drawPixel_EPD(int16_t x, int16_t y, uint16_t color);
-    void fillRect_EPD(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color);
-    void drawFastVLine_EPD(int16_t x, int16_t y, int16_t h, uint16_t color);
-    void drawFastHLine_EPD(int16_t x, int16_t y, int16_t w, uint16_t color);
-    void Init_EPD(int8_t p);
-    void spi_command_EPD(uint8_t val);
-    void spi_data8_EPD(uint8_t val);
-    void ClearFrameMemory(unsigned char color);
-    void ClearFrame_42(void);
-    void DisplayFrame_42(void);
+
+
     uint8_t strlen_ln(char *str);
     int32_t next_val(char **sp);
     uint32_t next_hex(char **sp);
@@ -238,82 +237,11 @@ class uDisplay : public Renderer {
     void delay_sync(int32_t time);
     void reset_pin(int32_t delayl, int32_t delayh);
     void delay_arg(uint32_t arg);
-    void Send_EP_Data(void);
+
     void send_spi_cmds(uint16_t cmd_offset, uint16_t cmd_size);
     void send_spi_icmds(uint16_t cmd_size);
 
 
-#ifdef USE_ESP32_S3
-   int8_t par_cs;
-   int8_t par_rs;
-   int8_t par_wr;
-   int8_t par_rd;
-
-   int8_t par_dbl[8];
-   int8_t par_dbh[8];
-
-   int8_t de;
-   int8_t vsync;
-   int8_t hsync;
-   int8_t pclk;
-
-   uint16_t hsync_polarity;
-   uint16_t hsync_front_porch;
-   uint16_t hsync_pulse_width;
-   uint16_t hsync_back_porch;
-   uint16_t vsync_polarity;
-   uint16_t vsync_front_porch;
-   uint16_t vsync_pulse_width;
-   uint16_t vsync_back_porch;
-   uint16_t pclk_active_neg;
-
-   esp_lcd_panel_handle_t _panel_handle = NULL;
-
-   esp_lcd_i80_bus_handle_t _i80_bus = nullptr;
-   gdma_channel_handle_t _dma_chan;
-   lldesc_t *_dmadesc = nullptr;
-   uint32_t _dmadesc_size = 0;
-   uint32_t _clock_reg_value;
-   void calcClockDiv(uint32_t* div_a, uint32_t* div_b, uint32_t* div_n, uint32_t* clkcnt, uint32_t baseClock, uint32_t targetFreq);
-   void _alloc_dmadesc(size_t len);
-   void _setup_dma_desc_links(const uint8_t *data, int32_t len);
-   void pb_beginTransaction(void);
-   void pb_endTransaction(void);
-   void pb_wait(void);
-   bool pb_busy(void);
-   void _pb_init_pin(bool);
-   bool pb_writeCommand(uint32_t data, uint_fast8_t bit_length);
-   void pb_writeData(uint32_t data, uint_fast8_t bit_length);
-   void pb_pushPixels(uint16_t* data, uint32_t length, bool swap_bytes, bool use_dma);
-   void pb_writeBytes(const uint8_t* data, uint32_t length, bool use_dma);
-   void _send_align_data(void);
-   volatile lcd_cam_dev_t* _dev;
-   uint32_t* _cache_flip;
-   static constexpr size_t CACHE_SIZE = 256;
-   uint32_t _cache[2][CACHE_SIZE / sizeof(uint32_t)];
-   bool _has_align_data;
-   uint8_t _align_data;
-   void cs_control(bool level);
-   uint32_t get_sr_touch(uint32_t xp, uint32_t xm, uint32_t yp, uint32_t ym);
-   void drawPixel_RGB(int16_t x, int16_t y, uint16_t color);
-#endif
-
-#ifdef ESP32
-   // dma section
-   bool DMA_Enabled = false;
-   uint8_t  spiBusyCheck = 0;
-   spi_transaction_t trans;
-   spi_device_handle_t dmaHAL;
-   spi_host_device_t spi_host = VSPI_HOST;
-   // spi_host_device_t spi_host = VSPI_HOST;
-   bool initDMA(int32_t ctrl_cs);
-   void deInitDMA(void);
-   bool dmaBusy(void);
-   void dmaWait(void);
-   void pushPixelsDMA(uint16_t* image, uint32_t len);
-   void pushPixels3DMA(uint8_t* image, uint32_t len);
-#endif // ESP32
-
 #ifdef USE_UNIVERSAL_TOUCH
 // universal touch driver
   void ut_trans(char **sp, uint8_t **ut_code);