Skip to content

Commit b89b50a

Browse files
LlgokLlgok
committed
2 parents ba0e770 + c575445 commit b89b50a

File tree

9 files changed

+61
-28
lines changed

9 files changed

+61
-28
lines changed

‎README.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
- <a href="https://oshwhub.com/movecall/cuican-ai-pendant-lights-up-y" target="_blank" title="Movecall CuiCan ESP32S3">璀璨·AI吊坠</a>
6464
- <a href="https://github.com/WMnologo/xingzhi-ai" target="_blank" title="无名科技Nologo-星智-1.54">无名科技Nologo-星智-1.54TFT</a>
6565
- <a href="https://www.seeedstudio.com/SenseCAP-Watcher-W1-A-p-5979.html" target="_blank" title="SenseCAP Watcher">SenseCAP Watcher</a>
66+
- <a href="https://github.com/Xinyuan-LilyGO/T-Display-S3-Pro-MVSRLora" target="_blank" title="LILYGO T-Display-S3-Pro-MVSRLora">LILYGO T-Display-S3-Pro-MVSRLora</a>
6667
<div style="display: flex; justify-content: space-between;">
6768
<a href="docs/v1/lichuang-s3.jpg" target="_blank" title="立创·实战派 ESP32-S3 开发板">
6869
<img src="docs/v1/lichuang-s3.jpg" width="240" />
@@ -88,10 +89,6 @@
8889
<a href="docs/xmini-c3.jpg" target="_blank" title="虾哥 Mini C3">
8990
<img src="docs/xmini-c3.jpg" width="240" />
9091
</a>
91-
<<<<<<< HEAD
92-
<a href="docs/lilygo-t-circle-s3.jpg" target="_blank" title="LILYGO T-Circle-S3">
93-
<img src="docs/lilygo-t-circle-s3.jpg" width="240" />
94-
=======
9592
<a href="docs/v1/movecall-moji-esp32s3.jpg" target="_blank" title="Movecall Moji 小智AI衍生版">
9693
<img src="docs/v1/movecall-moji-esp32s3.jpg" width="240" />
9794
</a>
@@ -103,7 +100,9 @@
103100
</a>
104101
<a href="docs/v1/sensecap_watcher.jpg" target="_blank" title="SenseCAP Watcher">
105102
<img src="docs/v1/sensecap_watcher.jpg" width="240" />
106-
>>>>>>> abb594bddd4e16ac9197b1557a3a24fde1d33712
103+
</a>
104+
<a href="docs/lilygo-t-display-s3-pro-mvsrlora.jpg" target="_blank" title="LILYGO T-Display-S3-Pro-MVSRLora">
105+
<img src="docs/lilygo-t-display-s3-pro-mvsrlora.jpg" width="240" />
107106
</a>
108107
</div>
109108

‎README_en.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Breadboard demonstration:
6363
- <a href="https://oshwhub.com/movecall/cuican-ai-pendant-lights-up-y" target="_blank" title="Movecall CuiCan ESP32S3">CuiCan AI pendant</a>
6464
- <a href="https://github.com/WMnologo/xingzhi-ai" target="_blank" title="WMnologo-Xingzhi-1.54">WMnologo-Xingzhi-1.54TFT</a>
6565
- <a href="https://www.seeedstudio.com/SenseCAP-Watcher-W1-A-p-5979.html" target="_blank" title="SenseCAP Watcher">SenseCAP Watcher</a>
66+
- <a href="https://github.com/Xinyuan-LilyGO/T-Display-S3-Pro-MVSRLora" target="_blank" title="LILYGO T-Display-S3-Pro-MVSRLora">LILYGO T-Display-S3-Pro-MVSRLora</a>
6667

6768
<div style="display: flex; justify-content: space-between;">
6869
<a href="docs/v1/lichuang-s3.jpg" target="_blank" title="LiChuang ESP32-S3 Development Board">
@@ -92,10 +93,6 @@ Breadboard demonstration:
9293
<a href="docs/xmini-c3.jpg" target="_blank" title="Xmini C3">
9394
<img src="docs/xmini-c3.jpg" width="240" />
9495
</a>
95-
<<<<<<< HEAD
96-
<a href="docs/lilygo-t-circle-s3.jpg" target="_blank" title="LILYGO T-Circle-S3">
97-
<img src="docs/lilygo-t-circle-s3.jpg" width="240" />
98-
=======
9996
<a href="docs/v1/movecall-moji-esp32s3.jpg" target="_blank" title="Moji">
10097
<img src="docs/v1/movecall-moji-esp32s3.jpg" width="240" />
10198
</a>
@@ -107,7 +104,9 @@ Breadboard demonstration:
107104
</a>
108105
<a href="docs/v1/sensecap_watcher.jpg" target="_blank" title="SenseCAP Watcher">
109106
<img src="docs/v1/sensecap_watcher.jpg" width="240" />
110-
>>>>>>> abb594bddd4e16ac9197b1557a3a24fde1d33712
107+
</a>
108+
<a href="docs/lilygo-t-display-s3-pro-mvsrlora.jpg" target="_blank" title="LILYGO T-Display-S3-Pro-MVSRLora">
109+
<img src="docs/lilygo-t-display-s3-pro-mvsrlora.jpg" width="240" />
111110
</a>
112111
</div>
113112

‎README_ja.md‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ Feishu ドキュメントチュートリアルをご覧ください：
6363
- <a href="https://oshwhub.com/movecall/cuican-ai-pendant-lights-up-y" target="_blank" title="Movecall CuiCan ESP32S3">Cuican AI ペンダント</a>
6464
- <a href="https://github.com/WMnologo/xingzhi-ai" target="_blank" title="無名科技Nologo-星智-1.54">無名科技Nologo-星智-1.54TFT</a>
6565
- <a href="https://www.seeedstudio.com/SenseCAP-Watcher-W1-A-p-5979.html" target="_blank" title="SenseCAP Watcher">SenseCAP Watcher</a>
66+
- <a href="https://github.com/Xinyuan-LilyGO/T-Display-S3-Pro-MVSRLora" target="_blank" title="LILYGO T-Display-S3-Pro-MVSRLora">LILYGO T-Display-S3-Pro-MVSRLora</a>
6667

6768
<div style="display: flex; justify-content: space-between;">
6869
<a href="docs/v1/lichuang-s3.jpg" target="_blank" title="LiChuang ESP32-S3 開発ボード">
@@ -89,10 +90,6 @@ Feishu ドキュメントチュートリアルをご覧ください：
8990
<a href="docs/xmini-c3.jpg" target="_blank" title="Xmini C3">
9091
<img src="docs/xmini-c3.jpg" width="240" />
9192
</a>
92-
<<<<<<< HEAD
93-
<a href="docs/lilygo-t-circle-s3.jpg" target="_blank" title="LILYGO T-Circle-S3">
94-
<img src="docs/lilygo-t-circle-s3.jpg" width="240" />
95-
=======
9693
<a href="docs/v1/movecall-moji-esp32s3.jpg" target="_blank" title="Moji">
9794
<img src="docs/v1/movecall-moji-esp32s3.jpg" width="240" />
9895
</a>
@@ -104,7 +101,9 @@ Feishu ドキュメントチュートリアルをご覧ください：
104101
</a>
105102
<a href="docs/v1/sensecap_watcher.jpg" target="_blank" title="SenseCAP Watcher">
106103
<img src="docs/v1/sensecap_watcher.jpg" width="240" />
107-
>>>>>>> abb594bddd4e16ac9197b1557a3a24fde1d33712
104+
</a>
105+
<a href="docs/lilygo-t-display-s3-pro-mvsrlora.jpg" target="_blank" title="LILYGO T-Display-S3-Pro-MVSRLora">
106+
<img src="docs/lilygo-t-display-s3-pro-mvsrlora.jpg" width="240" />
108107
</a>
109108
</div>
110109

‎docs/lilygo-t-display-s3-pro-mvsrlora.jpg‎

49.6 KB
Loading

‎main/boards/lichuang-dev/lichuang_dev_board.cc‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
#include <driver/i2c_master.h>
1313
#include <driver/spi_common.h>
1414
#include <wifi_station.h>
15+
#include <esp_lcd_touch_ft5x06.h>
16+
#include <esp_lvgl_port.h>
17+
#include <lvgl.h>
18+
1519

1620
#define TAG "LichuangDevBoard"
1721

@@ -125,6 +129,41 @@ class LichuangDevBoard : public WifiBoard {
125129
});
126130
}
127131

132+
void InitializeTouch()
133+
{
134+
esp_lcd_touch_handle_t tp;
135+
esp_lcd_touch_config_t tp_cfg = {
136+
.x_max = DISPLAY_WIDTH,
137+
.y_max = DISPLAY_HEIGHT,
138+
.rst_gpio_num = GPIO_NUM_NC, // Shared with LCD reset
139+
.int_gpio_num = GPIO_NUM_NC,
140+
.levels = {
141+
.reset = 0,
142+
.interrupt = 0,
143+
},
144+
.flags = {
145+
.swap_xy = 1,
146+
.mirror_x = 1,
147+
.mirror_y = 0,
148+
},
149+
};
150+
esp_lcd_panel_io_handle_t tp_io_handle = NULL;
151+
esp_lcd_panel_io_i2c_config_t tp_io_config = ESP_LCD_TOUCH_IO_I2C_FT5x06_CONFIG();
152+
tp_io_config.scl_speed_hz = 400000;
153+
154+
esp_lcd_new_panel_io_i2c(i2c_bus_, &tp_io_config, &tp_io_handle);
155+
esp_lcd_touch_new_i2c_ft5x06(tp_io_handle, &tp_cfg, &tp);
156+
assert(tp);
157+
158+
/* Add touch input (for selected screen) */
159+
const lvgl_port_touch_cfg_t touch_cfg = {
160+
.disp = lv_display_get_default(),
161+
.handle = tp,
162+
};
163+
164+
lvgl_port_add_touch(&touch_cfg);
165+
}
166+
128167
// 物联网初始化，添加对 AI 可见设备
129168
void InitializeIot() {
130169
auto& thing_manager = iot::ThingManager::GetInstance();
@@ -137,6 +176,7 @@ class LichuangDevBoard : public WifiBoard {
137176
InitializeI2c();
138177
InitializeSpi();
139178
InitializeSt7789Display();
179+
InitializeTouch();
140180
InitializeButtons();
141181
InitializeIot();
142182
GetBacklight()->RestoreBrightness();

‎main/boards/lilygo-t-circle-s3/config.h‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
#ifndef _BOARD_CONFIG_H_
22
#define _BOARD_CONFIG_H_
33

4-
// M5Stack CoreS3 Board configuration
5-
64
#include <driver/gpio.h>
75
#include "pin_config.h"
86

‎main/boards/lilygo-t-circle-s3/lilygo-t-circle-s3.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class Cst816x : public I2cDevice {
3030

3131
Cst816x(i2c_master_bus_handle_t i2c_bus, uint8_t addr) : I2cDevice(i2c_bus, addr) {
3232
uint8_t chip_id = ReadReg(0xA7);
33-
ESP_LOGI(TAG, "Get chip ID: 0x%02X", chip_id);
33+
ESP_LOGI(TAG, "Get cst816x chip ID: 0x%02X", chip_id);
3434
read_buffer_ = new uint8_t[6];
3535
}
3636

@@ -233,8 +233,8 @@ class LilygoTCircleS3Board : public WifiBoard {
233233
LilygoTCircleS3Board() : boot_button_(BOOT_BUTTON_GPIO) {
234234
InitializePowerSaveTimer();
235235
InitI2c();
236-
InitCst816d();
237236
I2cDetect();
237+
InitCst816d();
238238
InitSpi();
239239
InitGc9d01nDisplay();
240240
InitializeButtons();

‎main/boards/lilygo-t-circle-s3/tcircles3_audio_codec.cc‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
#include <driver/i2c_master.h>
55
#include <driver/i2s_tdm.h>
66

7+
#include "config.h"
8+
79
static const char TAG[] = "Tcircles3AudioCodec";
810

911
Tcircles3AudioCodec::Tcircles3AudioCodec(int input_sample_rate, int output_sample_rate,
@@ -19,7 +21,7 @@ Tcircles3AudioCodec::Tcircles3AudioCodec(int input_sample_rate, int output_sampl
1921
CreateVoiceHardware(mic_bclk, mic_ws, mic_data, spkr_bclk, spkr_lrclk, spkr_data);
2022

2123
gpio_config_t config;
22-
config.pin_bit_mask = BIT64(45);
24+
config.pin_bit_mask = BIT64(AUDIO_SPKR_ENABLE);
2325
config.mode = GPIO_MODE_OUTPUT;
2426
config.pull_up_en = GPIO_PULLUP_DISABLE;
2527
config.pull_down_en = GPIO_PULLDOWN_ENABLE;
@@ -28,7 +30,7 @@ Tcircles3AudioCodec::Tcircles3AudioCodec(int input_sample_rate, int output_sampl
2830
config.hys_ctrl_mode = GPIO_HYS_SOFT_ENABLE;
2931
#endif
3032
gpio_config(&config);
31-
gpio_set_level(gpio_num_t(45), 0);
33+
gpio_set_level(gpio_num_t(AUDIO_SPKR_ENABLE), 0);
3234
ESP_LOGI(TAG, "Tcircles3AudioCodec initialized");
3335
}
3436

@@ -54,7 +56,7 @@ void Tcircles3AudioCodec::CreateVoiceHardware(gpio_num_t mic_bclk, gpio_num_t mi
5456

5557
i2s_std_config_t mic_config = {
5658
.clk_cfg = {
57-
.sample_rate_hz = (uint32_t)output_sample_rate_,
59+
.sample_rate_hz = static_cast<uint32_t>(input_sample_rate_),
5860
.clk_src = I2S_CLK_SRC_DEFAULT,
5961
.mclk_multiple = I2S_MCLK_MULTIPLE_256,
6062
#ifdef I2S_HW_VERSION_2
@@ -115,11 +117,7 @@ void Tcircles3AudioCodec::EnableInput(bool enable) {
115117
}
116118

117119
void Tcircles3AudioCodec::EnableOutput(bool enable) {
118-
if (enable){
119-
gpio_set_level(gpio_num_t(45), 1);
120-
}else{
121-
gpio_set_level(gpio_num_t(45), 0);
122-
}
120+
gpio_set_level(AUDIO_SPKR_ENABLE, enable);
123121
AudioCodec::EnableOutput(enable);
124122
}
125123

‎main/boards/lilygo-t-circle-s3/tcircles3_audio_codec.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Tcircles3AudioCodec : public AudioCodec {
1515
const audio_codec_if_t *in_codec_if_ = nullptr;
1616
const audio_codec_gpio_if_t *gpio_if_ = nullptr;
1717

18-
uint32_t volume_ = 70;
18+
uint32_t volume_ = 100;
1919

2020
void CreateVoiceHardware(gpio_num_t mic_bclk, gpio_num_t mic_ws, gpio_num_t mic_data,gpio_num_t spkr_bclk, gpio_num_t spkr_lrclk, gpio_num_t spkr_data);
2121

0 commit comments

Comments
 (0)