Skip to content

Commit a063b67

Browse files
Lzw655Lzw655
committed
feat: update
1 parent 265765c commit a063b67

32 files changed

+254
-67
lines changed

‎.gitlab/ci/build.yml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,22 @@ build_test_apps_panel:
9191
variables:
9292
EXAMPLE_DIR: test_apps/panel
9393

94+
build_test_apps_touch_i2c:
95+
extends:
96+
- .build_examples_template
97+
- .build_idf_active_release_version
98+
- .rules:build:test_apps_touch_i2c
99+
variables:
100+
EXAMPLE_DIR: test_apps/touch/i2c
101+
102+
build_test_apps_touch_spi:
103+
extends:
104+
- .build_examples_template
105+
- .build_idf_active_release_version
106+
- .rules:build:test_apps_touch_spi
107+
variables:
108+
EXAMPLE_DIR: test_apps/touch/spi
109+
94110
# Examples
95111
# build_example_esp_brookesia_phone_m5stace_core_s3:
96112
# extends:

‎examples/Panel/PanelTest/PanelTest.ino‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ IRAM_ATTR bool onRefreshFinishCallback(void *user_data)
6161
}
6262
#endif
6363

64-
#if EXAMPLE_TOUCH_ENABLE_ATTACH_CALLBACK
64+
#if TEST_TOUCH_ENABLE_ATTACH_CALLBACK && (ESP_PANEL_TOUCH_IO_INT >= 0)
6565
IRAM_ATTR bool onTouchInterruptCallback(void *user_data)
6666
{
6767
esp_rom_printf("Touch interrupt callback\n");
@@ -107,15 +107,15 @@ void setup()
107107
backlight->on();
108108
}
109109

110-
if (touch != nullptr) {
110+
if ((touch != nullptr) && touch->isInterruptEnabled()) {
111111
#if EXAMPLE_TOUCH_ENABLE_ATTACH_CALLBACK
112-
touch->attachInterruptCallback(onTouchInterruptCallback, NULL);
112+
touch->attachInterruptCallback(onTouchInterruptCallback, NULL);
113113
#endif
114+
Serial.println("Reading touch_device point...");
114115
} else {
115116
Serial.println("Touch is not available");
117+
Serial.println("Panel test example end");
116118
}
117-
118-
Serial.println("Panel test example end");
119119
}
120120

121121
void loop()

‎src/board/m5stack/M5CORE2.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
#define ESP_PANEL_BEGIN_END_FUNCTION( panel ) \
195195
{ \
196196
static const uint8_t AXP_ADDR = 0x34; \
197-
static const uint8_t I2C_MASTER_TIMEOUT_MS = 1000; \
197+
static const uint32_t I2C_MASTER_TIMEOUT_MS = 1000; \
198198
static i2c_port_t i2c_master_port = I2C_NUM_0; \
199199
\
200200
uint8_t device_id = 0; \

‎src/board/m5stack/M5CORES3.h‎

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
*/
66

77
#pragma once
8-
#include <Arduino.h>
98
#include <ESP_Panel_Library.h>
109
// *INDENT-OFF*
1110

@@ -76,18 +75,20 @@
7675
* 2. Formatter: ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(delay_ms, command, { data0, data1, ... }) and
7776
* ESP_PANEL_LCD_CMD_WITH_NONE_PARAM(delay_ms, command)
7877
*/
79-
// #define ESP_PANEL_LCD_VENDOR_INIT_CMD() \
80-
// { \
81-
// {0xFF, (uint8_t []){0x77, 0x01, 0x00, 0x00, 0x10}, 5, 0}, \
82-
// {0xC0, (uint8_t []){0x3B, 0x00}, 2, 0}, \
83-
// {0xC1, (uint8_t []){0x0D, 0x02}, 2, 0}, \
84-
// {0x29, (uint8_t []){0x00}, 0, 120}, \
85-
// or \
86-
// ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xFF, {0x77, 0x01, 0x00, 0x00, 0x10}), \
87-
// ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xC0, {0x3B, 0x00}), \
88-
// ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xC1, {0x0D, 0x02}), \
89-
// ESP_PANEL_LCD_CMD_WITH_NONE_PARAM(120, 0x29), \
90-
// }
78+
/*
79+
#define ESP_PANEL_LCD_VENDOR_INIT_CMD() \
80+
{ \
81+
{0xFF, (uint8_t []){0x77, 0x01, 0x00, 0x00, 0x10}, 5, 0}, \
82+
{0xC0, (uint8_t []){0x3B, 0x00}, 2, 0}, \
83+
{0xC1, (uint8_t []){0x0D, 0x02}, 2, 0}, \
84+
{0x29, (uint8_t []){0x00}, 0, 120}, \
85+
or \
86+
ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xFF, {0x77, 0x01, 0x00, 0x00, 0x10}), \
87+
ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xC0, {0x3B, 0x00}), \
88+
ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xC1, {0x0D, 0x02}), \
89+
ESP_PANEL_LCD_CMD_WITH_NONE_PARAM(120, 0x29), \
90+
}
91+
*/
9192

9293
/* LCD Color Settings */
9394
/* LCD color depth in bits */
@@ -186,7 +187,7 @@
186187
#define ESP_PANEL_BEGIN_START_FUNCTION( panel ) \
187188
{ \
188189
const uint8_t AXP_ADDR = 0x34; \
189-
const uint8_t I2C_MASTER_TIMEOUT_MS = 1000; \
190+
const uint32_t I2C_MASTER_TIMEOUT_MS = 1000; \
190191
const i2c_port_t i2c_master_port = I2C_NUM_0; \
191192
\
192193
uint8_t read_value = 0; \

‎src/board/waveshare/ESP32_S3_Touch_LCD_1_85.h‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -73,18 +73,20 @@
7373
* 2. Formatter: ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(delay_ms, command, { data0, data1, ... }) and
7474
* ESP_PANEL_LCD_CMD_WITH_NONE_PARAM(delay_ms, command)
7575
*/
76-
// #define ESP_PANEL_LCD_VENDOR_INIT_CMD() \
77-
// { \
78-
// {0xFF, (uint8_t []){0x77, 0x01, 0x00, 0x00, 0x10}, 5, 0}, \
79-
// {0xC0, (uint8_t []){0x3B, 0x00}, 2, 0}, \
80-
// {0xC1, (uint8_t []){0x0D, 0x02}, 2, 0}, \
81-
// {0x29, (uint8_t []){0x00}, 0, 120}, \
82-
// or \
83-
// ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xFF, {0x77, 0x01, 0x00, 0x00, 0x10}), \
84-
// ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xC0, {0x3B, 0x00}), \
85-
// ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xC1, {0x0D, 0x02}), \
86-
// ESP_PANEL_LCD_CMD_WITH_NONE_PARAM(120, 0x29), \
87-
// }
76+
/*
77+
#define ESP_PANEL_LCD_VENDOR_INIT_CMD() \
78+
{ \
79+
{0xFF, (uint8_t []){0x77, 0x01, 0x00, 0x00, 0x10}, 5, 0}, \
80+
{0xC0, (uint8_t []){0x3B, 0x00}, 2, 0}, \
81+
{0xC1, (uint8_t []){0x0D, 0x02}, 2, 0}, \
82+
{0x29, (uint8_t []){0x00}, 0, 120}, \
83+
or \
84+
ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xFF, {0x77, 0x01, 0x00, 0x00, 0x10}), \
85+
ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xC0, {0x3B, 0x00}), \
86+
ESP_PANEL_LCD_CMD_WITH_8BIT_PARAM(0, 0xC1, {0x0D, 0x02}), \
87+
ESP_PANEL_LCD_CMD_WITH_NONE_PARAM(120, 0x29), \
88+
}
89+
*/
8890

8991
/* LCD Color Settings */
9092
/* LCD color depth in bits */

‎src/bus/I2C.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,13 @@ bool ESP_PanelBus_I2C::begin(void)
113113
ESP_LOGD(TAG, "Init host[%d]", (int)host_id);
114114
}
115115

116+
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(5, 1, 0)
116117
ESP_PANEL_CHECK_ERR_RET(esp_lcd_new_panel_io_i2c((esp_lcd_i2c_bus_handle_t)host_id, &io_config, &handle), false,
117118
"Create panel io failed");
119+
#else
120+
ESP_PANEL_CHECK_ERR_RET(esp_lcd_new_panel_io_i2c_v1((esp_lcd_i2c_bus_handle_t)host_id, &io_config, &handle), false,
121+
"Create panel io failed");
122+
#endif
118123
ESP_LOGD(TAG, "Panel IO @%p created", handle);
119124

120125
return true;

‎src/lcd/ESP_PanelLcd.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,13 @@
77
#include <memory>
88
#include "cstring"
99
#include "ESP_PanelLog.h"
10+
#include "soc/soc_caps.h"
1011
#include "esp_heap_caps.h"
1112
#include "esp_lcd_panel_ops.h"
1213
#include "esp_lcd_panel_io.h"
14+
#if SOC_LCD_RGB_SUPPORTED
1315
#include "esp_lcd_panel_rgb.h"
16+
#endif
1417
#include "esp_memory_utils.h"
1518
#include "freertos/FreeRTOS.h"
1619
#include "freertos/semphr.h"

‎src/lcd/ESP_PanelLcd.h‎

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

99
#include <memory>
1010
#include <functional>
11+
#include "soc/soc_caps.h"
1112
#include "esp_lcd_panel_ops.h"
1213
#include "esp_lcd_panel_vendor.h"
14+
#if SOC_LCD_RGB_SUPPORTED
1315
#include "esp_lcd_panel_rgb.h"
16+
#endif
1417
#include "freertos/FreeRTOS.h"
1518
#include "freertos/semphr.h"
1619
#include "soc/soc_caps.h"

‎src/lcd/base/esp_lcd_custom_types.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@
66

77
#pragma once
88

9+
#include "soc/soc_caps.h"
10+
#if SOC_LCD_RGB_SUPPORTED
911
#include "esp_lcd_panel_rgb.h"
12+
#endif
1013
#include "soc/soc_caps.h"
1114
#include "sdkconfig.h"
1215

‎test_apps/panel/main/test_app_main.c‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,24 +40,24 @@ void tearDown(void)
4040
void app_main(void)
4141
{
4242
/**
43-
* ______ _______ ______ __ ______ _______
44-
* / \ | \| \ | \ / \ | \
45-
* | $$$$$$\| $$$$$$$\\$$$$$$ | $$ | $$$$$$\| $$$$$$$\
46-
* | $$___\$$| $$__/ $$ | $$ | $$ | $$ \$$| $$ | $$
47-
* \$$ \ | $$ $$ | $$ | $$ | $$ | $$ | $$
48-
* _\$$$$$$\| $$$$$$$ | $$ | $$ | $$ __ | $$ | $$
49-
* | \__| $$| $$ _| $$_ | $$_____| $$__/ \| $$__/ $$
50-
* \$$ $$| $$ | $$ \ | $$ \\$$ $$| $$ $$
51-
* \$$$$$$ \$$ \$$$$$$ \$$$$$$$$ \$$$$$$ \$$$$$$$
43+
* _______ ______ __ __ ________ __
44+
* | \ / \ | \ | \| \| \
45+
* | $$$$$$$\| $$$$$$\| $$\ | $$| $$$$$$$$| $$
46+
* | $$__/ $$| $$__| $$| $$$\| $$| $$__ | $$
47+
* | $$ $$| $$ $$| $$$$\ $$| $$ \ | $$
48+
* | $$$$$$$ | $$$$$$$$| $$\$$ $$| $$$$$ | $$
49+
* | $$ | $$ | $$| $$ \$$$$| $$_____ | $$_____
50+
* | $$ | $$ | $$| $$ \$$$| $$ \| $$ \
51+
* \$$ \$$ \$$ \$$ \$$ \$$$$$$$$ \$$$$$$$$
5252
*/
53-
printf(" ______ _______ ______ __ ______ _______\r\n");
54-
printf(" / \\ | \\| \\ | \\ / \\ | \\\r\n");
55-
printf("| $$$$$$\\| $$$$$$$\\\\$$$$$$ | $$ | $$$$$$\\| $$$$$$$\\\r\n");
56-
printf("| $$___\\$$| $$__/ $$ | $$ | $$ | $$ \\$$| $$ | $$\r\n");
57-
printf(" \\$$ \\ | $$ $$ | $$ | $$ | $$ | $$ | $$\r\n");
58-
printf(" _\\$$$$$$\\| $$$$$$$ | $$ | $$ | $$ __ | $$ | $$\r\n");
59-
printf("| \\__| $$| $$ _| $$_ | $$_____| $$__/ \\| $$__/ $$\r\n");
60-
printf(" \\$$ $$| $$ | $$ \\ | $$ \\\\$$ $$| $$ $$\r\n");
61-
printf(" \\$$$$$$ \\$$ \\$$$$$$ \\$$$$$$$$ \\$$$$$$ \\$$$$$$$\r\n");
53+
printf(" _______ ______ __ __ ________ __\r\n");
54+
printf("| \\ / \\ | \\ | \\| \\| \\\r\n");
55+
printf("| $$$$$$$\\| $$$$$$\\| $$\\ | $$| $$$$$$$$| $$\r\n");
56+
printf("| $$__/ $$| $$__| $$| $$$\\| $$| $$__ | $$\r\n");
57+
printf("| $$ $$| $$ $$| $$$$\\ $$| $$ \\ | $$\r\n");
58+
printf("| $$$$$$$ | $$$$$$$$| $$\\$$ $$| $$$$$ | $$\r\n");
59+
printf("| $$ | $$ | $$| $$ \\$$$$| $$_____ | $$_____\r\n");
60+
printf("| $$ | $$ | $$| $$ \\$$$| $$ \\| $$ \\\r\n");
61+
printf(" \\$$ \\$$ \\$$ \\$$ \\$$ \\$$$$$$$$ \\$$$$$$$$\r\n");
6262
unity_run_menu();
6363
}

0 commit comments

Comments
 (0)