Skip to content

Commit 030a2d1

Browse files
Lzw655Lzw655
committed
lcd: add st7796, ili9341
1 parent 5df8781 commit 030a2d1

15 files changed

+767
-37
lines changed

‎.github/workflows/arduino_lint.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
workflow_dispatch:
55
pull_request:
66
types: [opened, reopened, synchronize]
7+
push:
8+
branches:
9+
- master
710

811
jobs:
912
lint:

‎.github/workflows/build_test.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
workflow_dispatch:
55
pull_request:
66
types: [opened, reopened, synchronize]
7+
push:
8+
branches:
9+
- master
710

811
jobs:
912
build:

‎.github/workflows/pre-commit.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@ on:
44
workflow_dispatch:
55
pull_request:
66
types: [opened, reopened, synchronize]
7+
push:
8+
branches:
9+
- master
710

811
jobs:
912
pre-commit:

‎ESP_Panel_Conf_Template.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,10 @@
3939
#define ESP_PANEL_USE_LCD (0)
4040
#if ESP_PANEL_USE_LCD
4141
/**
42-
* LCD controller name. Choose one of the following:
43-
* - ST7262
44-
* - ST7789
45-
* - GC9503
46-
* - GC9A01
42+
* LCD IC name. Choose one of the following:
43+
* - ILI9341
44+
* - GC9503, GC9A01
45+
* - ST7262, ST7789, ST7796
4746
*/
4847
#define ESP_PANEL_LCD_NAME ST7789
4948

@@ -167,8 +166,7 @@
167166
* LCD Touch IC name. Choose one of the following:
168167
* - CST816S
169168
* - FT5x06
170-
* - GT1151
171-
* - GT911
169+
* - GT1151, GT911
172170
* - TT21100
173171
* - STMPE610
174172
*/

‎README.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ The block diagram of esp-display-panel is shown in the figure below, it primaril
4949

5050
### LCD Controller
5151

52-
| **LCD Controller** | **Version** |
53-
| ------------------------------------------------------------------------------ | ----------- |
54-
| ST7262 | - |
55-
| ST7789 | - |
56-
| [GC9503](https://components.espressif.com/components/espressif/esp_lcd_gc9503) | 1.0.0 |
57-
| [GC9A01](https://components.espressif.com/components/espressif/esp_lcd_gc9a01) | 1.0.1 |
52+
| **LCD Controller** | **Version** |
53+
| -------------------------------------------------------------------------------- | ----------- |
54+
| [ILI9341](https://components.espressif.com/components/espressif/esp_lcd_ili9341) | 1.0.2 |
55+
| [GC9503](https://components.espressif.com/components/espressif/esp_lcd_gc9503) | 1.0.0 |
56+
| [GC9A01](https://components.espressif.com/components/espressif/esp_lcd_gc9a01) | 1.0.1 |
57+
| ST7262 | - |
58+
| ST7789 | - |
59+
| [ST7796](https://components.espressif.com/components/espressif/esp_lcd_st7796) | 1.0.0 |
5860

5961
### Touch Controller
6062

@@ -140,10 +142,9 @@ Since esp-display-panel library can only utilize the internally supported driver
140142
141143
/**
142144
* LCD controller name. Choose one of the following:
143-
* - ST7262
144-
* - ST7789
145-
* - GC9503
146-
* - GC9A01
145+
* - ILI9341
146+
* - GC9503, GC9A01
147+
* - ST7262, ST7789, ST7796
147148
*/
148149
#define ESP_PANEL_LCD_NAME ST7789
149150
@@ -205,8 +206,7 @@ Since esp-display-panel library can only utilize the internally supported driver
205206
* LCD Touch IC name. Choose one of the following:
206207
* - CST816S
207208
* - FT5x06
208-
* - GT1151
209-
* - GT911
209+
* - GT1151, GT911
210210
* - TT21100
211211
* - STMPE610
212212
*/

‎README_CN.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,14 @@ esp-display-panel 的功能框图如下所示，主要包含了以下功能：
4949

5050
### LCD 控制器
5151

52-
| **LCD 控制器** | **版本** |
53-
| ------------------------------------------------------------------------------ | -------- |
54-
| ST7262 | - |
55-
| ST7789 | - |
56-
| [GC9503](https://components.espressif.com/components/espressif/esp_lcd_gc9503) | 1.0.0 |
57-
| [GC9A01](https://components.espressif.com/components/espressif/esp_lcd_gc9a01) | 1.0.1 |
52+
| **LCD 控制器** | **版本** |
53+
| -------------------------------------------------------------------------------- | -------- |
54+
| [ILI9341](https://components.espressif.com/components/espressif/esp_lcd_ili9341) | 1.0.2 |
55+
| [GC9503](https://components.espressif.com/components/espressif/esp_lcd_gc9503) | 1.0.0 |
56+
| [GC9A01](https://components.espressif.com/components/espressif/esp_lcd_gc9a01) | 1.0.1 |
57+
| ST7262 | - |
58+
| ST7789 | - |
59+
| [ST7796](https://components.espressif.com/components/espressif/esp_lcd_st7796) | 1.0.0 |
5860

5961
### 触摸控制器
6062

@@ -140,10 +142,9 @@ Arduino
140142
141143
/**
142144
* LCD controller name. Choose one of the following:
143-
* - ST7262
144-
* - ST7789
145-
* - GC9503
146-
* - GC9A01
145+
* - ILI9341
146+
* - GC9503, GC9A01
147+
* - ST7262, ST7789, ST7796
147148
*/
148149
#define ESP_PANEL_LCD_NAME ST7789
149150
@@ -205,8 +206,7 @@ Arduino
205206
* LCD Touch IC name. Choose one of the following:
206207
* - CST816S
207208
* - FT5x06
208-
* - GT1151
209-
* - GT911
209+
* - GT1151, GT911
210210
* - TT21100
211211
* - STMPE610
212212
*/

‎src/ESP_Panel.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
#include "ESP_IOExpander.h"
1010

11-
#include "bus/all_support_bus.h"
12-
#include "lcd/all_support_lcd.h"
13-
#include "lcd_touch/all_support_lcd_touch.h"
11+
#include "bus/all_supported_bus.h"
12+
#include "lcd/all_supported_lcd.h"
13+
#include "lcd_touch/all_supported_lcd_touch.h"
1414
#include "ESP_PanelBus.h"
1515
#include "ESP_PanelLcd.h"
1616
#include "ESP_PanelLcdTouch.h"

‎src/ESP_Panel_Library.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
#ifndef ESP_PANEL_LIBRARY_H
88
#define ESP_PANEL_LIBRARY_H
99

10-
#include "bus/all_support_bus.h"
11-
#include "lcd/all_support_lcd.h"
12-
#include "lcd_touch/all_support_lcd_touch.h"
10+
#include "bus/all_supported_bus.h"
11+
#include "lcd/all_supported_lcd.h"
12+
#include "lcd_touch/all_supported_lcd_touch.h"
1313
#include "ESP_PanelBus.h"
1414
#include "ESP_PanelLcd.h"
1515
#include "ESP_PanelLcdTouch.h"

‎src/bus/all_support_bus.h renamed to ‎src/bus/all_supported_bus.h

File renamed without changes.

0 commit comments

Comments
 (0)