Skip to content

Commit 7aa03b3

Browse files
Lzw655Lzw655
committed
feat(modules): update
1 parent ce60dbd commit 7aa03b3

File tree

11 files changed

+342
-88
lines changed

11 files changed

+342
-88
lines changed

‎modules/ESP32_Display_Panel

Submodule ESP32_Display_Panel updated from d8e9273 to 5419f36

‎modules/ESP32_IO_Expander

‎modules/esp-lib-utils

‎modules/esp_memory/esp_memory.c

Lines changed: 0 additions & 36 deletions
This file was deleted.

‎modules/esp_memory/micropython.cmake

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎modules/esp_panel_board_supported.h

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#pragma once
8+
9+
/* Set to 1 if using a supported board */
10+
#define ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED (1) // 0/1
11+
12+
#if ESP_PANEL_BOARD_DEFAULT_USE_SUPPORTED
13+
/**
14+
* Uncomment one of the following macros to select an supported development board. If multiple macros are uncommented
15+
* at the same time, an error will be prompted during compilation.
16+
*
17+
*/
18+
19+
/*
20+
* Espressif Supported Boards (https://www.espressif.com/en/products/devkits):
21+
*
22+
* -BOARD_ESP32_C3_LCDKIT (ESP32-C3-LCDkit): https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32c3/esp32-c3-lcdkit/index.html
23+
* -BOARD_ESP32_S3_BOX (ESP32-S3-Box): https://github.com/espressif/esp-box/tree/master
24+
* -BOARD_ESP32_S3_BOX_3 (ESP32-S3-Box-3 & ESP32-S3-Box-3B): https://github.com/espressif/esp-box/tree/master
25+
* -BOARD_ESP32_S3_BOX_3_BETA (ESP32-S3-Box-3(beta)): https://github.com/espressif/esp-box/tree/c4c954888e11250423f083df0067d99e22d59fbe
26+
* -BOARD_ESP32_S3_BOX_LITE (ESP32-S3-Box-Lite): https://github.com/espressif/esp-box/tree/master
27+
* -BOARD_ESP32_S3_EYE (ESP32-S3-EYE): https://github.com/espressif/esp-who/blob/master/docs/en/get-started/ESP32-S3-EYE_Getting_Started_Guide.md
28+
* -BOARD_ESP32_S3_KORVO_2 (ESP32-S3-Korvo-2): https://docs.espressif.com/projects/esp-adf/en/latest/design-guide/dev-boards/user-guide-esp32-s3-korvo-2.html
29+
* -BOARD_ESP32_S3_LCD_EV_BOARD (ESP32-S3-LCD-EV-Board(v1.1-v1.4)): https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/esp32-s3-lcd-ev-board/user_guide_v1.4.html
30+
* -BOARD_ESP32_S3_LCD_EV_BOARD_V1_5 (ESP32-S3-LCD-EV-Board(v1.5)): https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/esp32-s3-lcd-ev-board/user_guide.html
31+
* -BOARD_ESP32_S3_LCD_EV_BOARD_2 (ESP32-S3-LCD-EV-Board-2(v1.1-v1.4))): https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/esp32-s3-lcd-ev-board/user_guide_v1.4.html
32+
* -BOARD_ESP32_S3_LCD_EV_BOARD_2_V1_5 (ESP32-S3-LCD-EV-Board-2(v1.5)): https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/esp32-s3-lcd-ev-board/user_guide.html
33+
* -BOARD_ESP32_S3_USB_OTG (ESP32-S3-USB-OTG): https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32s3/esp32-s3-usb-otg/index.html
34+
* -BOARD_ESP32_P4_FUNCTION_EV_BOARD (ESP32-P4-Function-EV-Board): https://docs.espressif.com/projects/esp-dev-kits/en/latest/esp32p4/esp32-p4-function-ev-board/index.html
35+
*
36+
*/
37+
// #define BOARD_ESP32_C3_LCDKIT
38+
// #define BOARD_ESP32_S3_BOX
39+
// #define BOARD_ESP32_S3_BOX_3
40+
// #define BOARD_ESP32_S3_BOX_3_BETA
41+
// #define BOARD_ESP32_S3_BOX_LITE
42+
// #define BOARD_ESP32_S3_EYE
43+
// #define BOARD_ESP32_S3_KORVO_2
44+
// #define BOARD_ESP32_S3_LCD_EV_BOARD
45+
#define BOARD_ESP32_S3_LCD_EV_BOARD_V1_5
46+
// #define BOARD_ESP32_S3_LCD_EV_BOARD_2
47+
// #define BOARD_ESP32_S3_LCD_EV_BOARD_2_V1_5
48+
// #define BOARD_ESP32_S3_USB_OTG
49+
// #define BOARD_ESP32_P4_FUNCTION_EV_BOARD
50+
51+
/*
52+
* Elecrow (https://www.elecrow.com):
53+
*
54+
* -BOARD_ELECROW_CROWPANEL_7_0 (ELECROW_CROWPANEL_7_0): https://www.elecrow.com/esp32-display-7-inch-hmi-display-rgb-tft-lcd-touch-screen-support-lvgl.html
55+
*/
56+
// #define BOARD_ELECROW_CROWPANEL_7_0
57+
58+
/*
59+
* M5Stack (https://m5stack.com/):
60+
*
61+
* -BOARD_M5STACK_M5CORE2 (M5STACK_M5CORE2): https://docs.m5stack.com/en/core/core2
62+
* -BOARD_M5STACK_M5DIAL (M5STACK_M5DIAL): https://docs.m5stack.com/en/core/M5Dial
63+
* -BOARD_M5STACK_M5CORES3 (M5STACK_M5CORES3): https://docs.m5stack.com/en/core/CoreS3
64+
*/
65+
// #define BOARD_M5STACK_M5CORE2
66+
// #define BOARD_M5STACK_M5DIAL
67+
// #define BOARD_M5STACK_M5CORES3
68+
69+
/*
70+
* Shenzhen Jingcai Intelligent Supported Boards (https://www.displaysmodule.com/):
71+
*
72+
* -BOARD_ESP32_4848S040C_I_Y_3 (ESP32-4848S040C_I_Y_3):
73+
* - https://www.displaysmodule.com/sale-41828962-experience-the-power-of-the-esp32-display-module-sku-esp32-4848s040c-i-y-3.html
74+
* - http://pan.jczn1688.com/directlink/1/ESP32%20module/4.0inch_ESP32-4848S040.zip
75+
*
76+
*/
77+
// #define BOARD_ESP32_4848S040C_I_Y_3
78+
79+
/*
80+
* Waveshare Supported Boards (https://www.waveshare.com/):
81+
*
82+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85 (ESP32_S3_Touch_LCD_1_85): https://www.waveshare.com/esp32-s3-touch-lcd-1.85.htm
83+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1 (ESP32_S3_Touch_LCD_2_1): https://www.waveshare.com/esp32-s3-touch-lcd-2.1.htm
84+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3 (ESP32_S3_Touch_LCD_4_3): https://www.waveshare.com/esp32-s3-touch-lcd-4.3.htm
85+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B (ESP32_S3_Touch_LCD_4_3_B): https://www.waveshare.com/esp32-s3-touch-lcd-4.3B.htm
86+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_5 (ESP32_S3_Touch_LCD_5): https://www.waveshare.com/esp32-s3-touch-lcd-5.htm?sku=28117
87+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_5_B (ESP32_S3_Touch_LCD_5_B): https://www.waveshare.com/esp32-s3-touch-lcd-5.htm?sku=28151
88+
* -BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_7 (ESP32_S3_Touch_LCD_7): https://www.waveshare.com/esp32-s3-touch-lcd-7.htm
89+
* -BOARD_WAVESHARE_ESP32_P4_NANO (ESP32_P4_NANO): https://www.waveshare.com/esp32-p4-nano.htm
90+
*/
91+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_1_85
92+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_2_1
93+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3
94+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_4_3_B
95+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_5
96+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_5_B
97+
// #define BOARD_WAVESHARE_ESP32_S3_TOUCH_LCD_7
98+
// #define BOARD_WAVESHARE_ESP32_P4_NANO
99+
100+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
101+
/////////////////////////////////////////////// File Version ///////////////////////////////////////////////////////////
102+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
103+
/**
104+
* Do not change the following versions, they are used to check if the configurations in this file are compatible with
105+
* the current version of `esp_panel_board_supported.h` in the library. The detailed rules are as follows:
106+
*
107+
* 1. If the major version is not consistent, then the configurations in this file are incompatible with the library
108+
* and must be replaced with the file from the library.
109+
* 2. If the minor version is not consistent, this file might be missing some new configurations, which will be set to
110+
* default values. It is recommended to replace it with the file from the library.
111+
* 3. If the patch version is not consistent, it will not affect normal functionality.
112+
*
113+
*/
114+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MAJOR 1
115+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_MINOR 0
116+
#define ESP_PANEL_BOARD_SUPPORTED_FILE_VERSION_PATCH 0
117+
118+
#endif

‎modules/esp_panel_conf.h

Lines changed: 159 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,159 @@
1+
/*
2+
* SPDX-FileCopyrightText: 2023-2024 Espressif Systems (Shanghai) CO LTD
3+
*
4+
* SPDX-License-Identifier: Apache-2.0
5+
*/
6+
7+
#pragma once
8+
9+
// *INDENT-OFF*
10+
11+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
12+
///////////////////////////////////////////// Driver: LCD Configurations ///////////////////////////////////////////////
13+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
14+
/**
15+
* The following configurations are used to enable the LCD drivers which are used in the board. Disable useless LCDs to
16+
* reduce the code size.
17+
*
18+
*/
19+
#define ESP_PANEL_CONF_LCD_ENABLE_AXS15231B (1)
20+
#define ESP_PANEL_CONF_LCD_ENABLE_EK9716B (1)
21+
#define ESP_PANEL_CONF_LCD_ENABLE_EK79007 (1)
22+
#define ESP_PANEL_CONF_LCD_ENABLE_GC9A01 (1)
23+
#define ESP_PANEL_CONF_LCD_ENABLE_GC9B71 (1)
24+
#define ESP_PANEL_CONF_LCD_ENABLE_GC9503 (1)
25+
#define ESP_PANEL_CONF_LCD_ENABLE_HX8399 (1)
26+
#define ESP_PANEL_CONF_LCD_ENABLE_ILI9341 (1)
27+
#define ESP_PANEL_CONF_LCD_ENABLE_ILI9881C (1)
28+
#define ESP_PANEL_CONF_LCD_ENABLE_JD9165 (1)
29+
#define ESP_PANEL_CONF_LCD_ENABLE_JD9365 (1)
30+
#define ESP_PANEL_CONF_LCD_ENABLE_NV3022B (1)
31+
#define ESP_PANEL_CONF_LCD_ENABLE_SH8601 (1)
32+
#define ESP_PANEL_CONF_LCD_ENABLE_SPD2010 (1)
33+
#define ESP_PANEL_CONF_LCD_ENABLE_ST7262 (1)
34+
#define ESP_PANEL_CONF_LCD_ENABLE_ST7701 (1)
35+
#define ESP_PANEL_CONF_LCD_ENABLE_ST7703 (1)
36+
#define ESP_PANEL_CONF_LCD_ENABLE_ST7789 (1)
37+
#define ESP_PANEL_CONF_LCD_ENABLE_ST7796 (1)
38+
#define ESP_PANEL_CONF_LCD_ENABLE_ST77903 (1)
39+
#define ESP_PANEL_CONF_LCD_ENABLE_ST77916 (1)
40+
#define ESP_PANEL_CONF_LCD_ENABLE_ST77922 (1)
41+
42+
/**
43+
* If set to 0, the code of disabled LCD drivers will be shielded to speed up compilation.
44+
*
45+
* Take ILI9341 as an example, there are four situations with `ESP_PANEL_CONF_LCD_ENABLE_ILI9341` (CONF1) and
46+
* `ESP_PANEL_CONF_LCD_COMPILE_DISABLED` (CONF2):
47+
*
48+
* | CONF1 | CONF2 | Is `esp_panel::LCD_ILI9341` available? | Can `esp_panel::Board` work with ILI9341? |
49+
* |-------|-------|---------------------------------------|--------------------------------------------|
50+
* | 0 | 0 | No | No |
51+
* | 1 | 0 | Yes | Yes |
52+
* | 0 | 1 | Yes | No |
53+
* | 1 | 1 | Yes | Yes |
54+
*
55+
*/
56+
#define ESP_PANEL_CONF_LCD_COMPILE_DISABLED (1)
57+
58+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
59+
//////////////////////////////////////////// Driver: Touch Configurations //////////////////////////////////////////////
60+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
61+
/* Maximum point number */
62+
#define ESP_PANEL_CONF_TOUCH_MAX_POINTS (5)
63+
/* Maximum button number */
64+
#define ESP_PANEL_CONF_TOUCH_MAX_BUTTONS (1)
65+
66+
/**
67+
* The following configurations are used to enable the touch drivers which are used in the board. Default disable them
68+
* to reduce the code size.
69+
*
70+
*/
71+
#define ESP_PANEL_CONF_TOUCH_ENABLE_AXS15231B (1)
72+
#define ESP_PANEL_CONF_TOUCH_ENABLE_CST816S (1)
73+
#define ESP_PANEL_CONF_TOUCH_ENABLE_FT5x06 (1)
74+
#define ESP_PANEL_CONF_TOUCH_ENABLE_GT911 (1)
75+
#define ESP_PANEL_CONF_TOUCH_ENABLE_GT1151 (1)
76+
#define ESP_PANEL_CONF_TOUCH_ENABLE_SPD2010 (1)
77+
#define ESP_PANEL_CONF_TOUCH_ENABLE_ST1633 (1)
78+
#define ESP_PANEL_CONF_TOUCH_ENABLE_ST7123 (1)
79+
#define ESP_PANEL_CONF_TOUCH_ENABLE_STMPE610 (1)
80+
#define ESP_PANEL_CONF_TOUCH_ENABLE_TT21100 (1)
81+
#define ESP_PANEL_CONF_TOUCH_ENABLE_XPT2046 (1)
82+
83+
/**
84+
* If set to 0, the code of disabled touch drivers will be shielded to speed up compilation.
85+
*
86+
* Take GT911 as an example, there are four situations with `ESP_PANEL_CONF_TOUCH_ENABLE_GT911` (CONF1) and
87+
* `ESP_PANEL_CONF_TOUCH_COMPILE_DISABLED` (CONF2):
88+
*
89+
* | CONF1 | CONF2 | Is `esp_panel::LCD_GT911` available? | Can `esp_panel::Board` work with GT911? |
90+
* |-------|-------|--------------------------------------|-----------------------------------------|
91+
* | 0 | 0 | No | No |
92+
* | 1 | 0 | Yes | Yes |
93+
* | 0 | 1 | Yes | No |
94+
* | 1 | 1 | Yes | Yes |
95+
*
96+
*/
97+
#define ESP_PANEL_CONF_TOUCH_COMPILE_DISABLED (1)
98+
99+
#if ESP_PANEL_CONF_TOUCH_ENABLE_XPT2046 || ESP_PANEL_CONF_TOUCH_COMPILE_DISABLED
100+
/**
101+
* Minimum Z pressure threshold
102+
*
103+
*/
104+
#define ESP_PANEL_CONF_TOUCH_XPT2046_Z_THRESHOLD (400)
105+
106+
/**
107+
* Enable Interrupt (PENIRQ) output, also called Full Power Mode.
108+
* Enable this to configure the XPT2046 to output low on the PENIRQ output if a touch is detected.
109+
* This mode uses more power when enabled. Note that this signal goes low normally when a read is active.
110+
*
111+
*/
112+
#define ESP_PANEL_CONF_TOUCH_XPT2046_INTERRUPT_MODE (0) // 0/1
113+
114+
/**
115+
* Keep internal Vref enabled.
116+
* Enable this to keep the internal Vref enabled between conversions. This uses slightly more power,
117+
* but requires fewer transactions when reading the battery voltage, aux voltage and temperature.
118+
*
119+
*/
120+
#define ESP_PANEL_CONF_TOUCH_XPT2046_VREF_ON_MODE (0) // 0/1
121+
122+
/**
123+
* Convert touch coordinates to screen coordinates.
124+
* When this option is enabled the raw ADC values will be converted from 0-4096 to 0-{screen width} or 0-{screen height}.
125+
* When this option is disabled the process_coordinates method will need to be used to convert the raw ADC values into a
126+
* screen coordinate.
127+
*
128+
*/
129+
#define ESP_PANEL_CONF_TOUCH_XPT2046_CONVERT_ADC_TO_COORDS (1) // 0/1
130+
131+
/**
132+
* Enable data structure locking.
133+
* By enabling this option the XPT2046 driver will lock the touch position data structures when reading values from the
134+
* XPT2046 and when reading position data via API.
135+
* WARNING: enabling this option may result in unintended crashes.
136+
*
137+
*/
138+
#define ESP_PANEL_CONF_TOUCH_XPT2046_ENABLE_LOCKING (0) // 0/1
139+
#endif // ESP_PANEL_TOUCH_ENABLE_XPT2046
140+
141+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
142+
/////////////////////////////////////////////// File Version ///////////////////////////////////////////////////////////
143+
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
144+
/**
145+
* Do not change the following versions, they are used to check if the configurations in this file are compatible with
146+
* the current version of `esp_panel_conf.h` in the library. The detailed rules are as follows:
147+
*
148+
* 1. If the major version is not consistent, then the configurations in this file are incompatible with the library
149+
* and must be replaced with the file from the library.
150+
* 2. If the minor version is not consistent, this file might be missing some new configurations, which will be set to
151+
* default values. It is recommended to replace it with the file from the library.
152+
* 3. Even if the patch version is not consistent, it will not affect normal functionality.
153+
*
154+
*/
155+
#define ESP_PANEL_CONF_FILE_VERSION_MAJOR 1
156+
#define ESP_PANEL_CONF_FILE_VERSION_MINOR 0
157+
#define ESP_PANEL_CONF_FILE_VERSION_PATCH 0
158+
159+
// *INDENT-OFF*

0 commit comments

Comments
 (0)