st7796

rzeldent · Mar 6, 2024 · acfa05c · acfa05c
1 parent 63f72a4
commit acfa05c
Show file tree

Hide file tree

Showing 8 changed files with 389 additions and 8 deletions.
diff --git a/include/esp_lcd_st7796.h → include/_esp_lcd_st7796.h b/include/esp_lcd_st7796.h → include/_esp_lcd_st7796.h
diff --git a/include/esp_lcd_gc9a01.h → include/esp_lcd_panel_gc9a01.h b/include/esp_lcd_gc9a01.h → include/esp_lcd_panel_gc9a01.h
diff --git a/include/esp_lcd_panel_st7796.h b/include/esp_lcd_panel_st7796.h
@@ -0,0 +1,16 @@
+#pragma once
+
+#include <esp_lcd.h>
+#include <esp_lcd_types.h>
+#include <esp_lcd_panel_vendor.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+esp_err_t esp_lcd_new_panel_gc9a01(const esp_lcd_panel_io_handle_t io, const esp_lcd_panel_dev_config_t *config, esp_lcd_panel_handle_t *handle);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/esp_lcd_st7796.c → src/_esp_lcd_st7796.c b/src/esp_lcd_st7796.c → src/_esp_lcd_st7796.c
@@ -1,4 +1,4 @@
-#ifdef LCD_ST7796_SPI
+#ifdef _LCD_ST7796_SPI
 
 /*
  * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD

diff --git a/src/esp_lcd_gc9a01.c → src/esp_lcd_panel_gc9a01.c b/src/esp_lcd_gc9a01.c → src/esp_lcd_panel_gc9a01.c
@@ -1,6 +1,6 @@
 #ifdef LCD_GC9A01_SPI
 
-#include <esp_lcd_gc9a01.h>
+#include <esp_lcd_panel_gc9a01.h>
 #include <esp32-hal-log.h>
 #include <esp_rom_gpio.h>
 #include <esp_heap_caps.h>
@@ -23,7 +23,7 @@ typedef struct
     const uint16_t cmds_size;
 } gc9a01_panel_t;
 
-const lcd_init_cmd_t vendor_specific_init_default[] = {
+const lcd_init_cmd_t gc9a01_vendor_specific_init_default[] = {
     // Enable Inter Register
     {0xfe, (const uint8_t[]){0x00}, 0, 0},
     {0xef, (const uint8_t[]){0x00}, 0, 0},
@@ -67,7 +67,7 @@ const lcd_init_cmd_t vendor_specific_init_default[] = {
     {0x67, (const uint8_t[]){0x00, 0x3C, 0x00, 0x00, 0x00, 0x01, 0x54, 0x10, 0x32, 0x98}, 10, 0},
     {0x74, (const uint8_t[]){0x10, 0x45, 0x80, 0x00, 0x00, 0x4E, 0x00}, 7, 0},
     {0x98, (const uint8_t[]){0x3e, 0x07}, 2, 0},
-    {0x99, (const uint8_t[]){0x3e, 0x07}, 2, 0},
+    {0x99, (const uint8_t[]){0x3e, 0x07}, 2, 0}
 };
 
 esp_err_t gc9a01_reset(esp_lcd_panel_t *panel)
@@ -139,8 +139,8 @@ esp_err_t gc9a01_init(esp_lcd_panel_t *panel)
         return res;
     }
 
-    const lcd_init_cmd_t *cmd = vendor_specific_init_default;
-    uint16_t cmds_size = sizeof(vendor_specific_init_default) / sizeof(lcd_init_cmd_t);
+    const lcd_init_cmd_t *cmd = gc9a01_vendor_specific_init_default;
+    uint16_t cmds_size = sizeof(gc9a01_vendor_specific_init_default) / sizeof(lcd_init_cmd_t);
     if (ph->cmd)
     {
         cmd = ph->cmd;