Skip to content

Commit 9223861

Browse files
yusuhuayusuhua
andauthored
Fix LilyGo-T-CameraPlus-S3 Camera (#1295)
* 修改摄像头配置 * Fix lilygo-t-cameraplus-s3 camera --------- Co-authored-by: yusuhua <[email protected]>
1 parent c62ab7b commit 9223861

File tree

5 files changed

+53
-32
lines changed

5 files changed

+53
-32
lines changed

main/CMakeLists.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -317,6 +317,11 @@ elseif(CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3_V1_0_V1_1)
317317
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
318318
set(BUILTIN_ICON_FONT font_awesome_20_4)
319319
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
320+
elseif(CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3_V1_2)
321+
set(BOARD_TYPE "lilygo-t-cameraplus-s3")
322+
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
323+
set(BUILTIN_ICON_FONT font_awesome_20_4)
324+
set(DEFAULT_EMOJI_COLLECTION twemoji_64)
320325
elseif(CONFIG_BOARD_TYPE_LILYGO_T_DISPLAY_S3_PRO_MVSRLORA)
321326
set(BOARD_TYPE "lilygo-t-display-s3-pro-mvsrlora")
322327
set(BUILTIN_TEXT_FONT font_puhui_basic_20_4)
Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,47 @@
1-
# 编译配置命令
1+
## LILYGO T-CameraPlus-S3
22

3-
**配置编译目标为 ESP32S3:**
3+
T-CameraPlus-S3 is an intelligent camera module developed based on the ESP32S3 chip, equipped with a 240x240 TFT display, digital microphone, speaker, independent button, power control chip, SD card module, etc. It comes with a basic UI written based on LVGL, which can achieve functions such as file management, music playback, recording, and camera projection (if the factory does not write the program, you need to manually burn the UI program named "Lvgl_UI").
4+
5+
Official github: [T-CameraPlus-S3](https://github.com/Xinyuan-LilyGO/T-CameraPlus-S3)
6+
7+
## Configuration
8+
9+
**Set the compilation target to ESP32S3**
410

511
```bash
612
idf.py set-target esp32s3
713
```
814

9-
**打开 menuconfig**
15+
**Open menuconfig**
1016

1117
```bash
1218
idf.py menuconfig
1319
```
1420

15-
**选择板子:**
21+
**Select the board**
1622

1723
```
18-
Xiaozhi Assistant -> Board Type -> LILYGO T-CameraPlus-S3_V1_0_V1_1或LILYGO T-CameraPlus-S3_V1_2
24+
Xiaozhi Assistant -> Board Type -> LILYGO T-CameraPlus-S3_V1_0_V1_1
25+
Or
26+
Xiaozhi Assistant -> Board Type -> LILYGO T-CameraPlus-S3_V1_2
1927
```
2028

21-
**修改 psram 配置:**
29+
**Modify the psram configuration**
2230

2331
```
2432
Component config -> ESP PSRAM -> SPI RAM config -> Mode (QUAD/OCT) -> Quad Mode PSRAM
2533
```
2634

27-
**编译:**
2835

29-
```bash
30-
idf.py build
36+
**Select and set camera sensor**
37+
3138
```
39+
Component config -> Espressif Camera Sensors Configurations -> Camera Sensor Configuration -> Select and Set Camera Sensor -> OV2640 -> Select default output format for DVP interface -> YUV422 240x240 25fps, DVP 8-bit, 20M input
40+
```
41+
42+
43+
**Build**
3244

33-
<a href="https://github.com/Xinyuan-LilyGO/T-CameraPlus-S3" target="_blank" title="LILYGO T-CameraPlus-S3">LILYGO T-CameraPlus-S3</a>
45+
```bash
46+
idf.py build
47+
```

main/boards/lilygo-t-cameraplus-s3/config.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,28 @@
99

1010
#ifdef CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3_V1_0_V1_1
1111
#define AUDIO_INPUT_REFERENCE true
12-
#define AUDIO_MIC_I2S_GPIO_BCLK static_cast<gpio_num_t>(MSM261_BCLK)
13-
#define AUDIO_MIC_I2S_GPIO_WS static_cast<gpio_num_t>(MSM261_WS)
14-
#define AUDIO_MIC_I2S_GPIO_DATA static_cast<gpio_num_t>(MSM261_DATA)
12+
#define AUDIO_MIC_I2S_GPIO_BCLK MSM261_BCLK
13+
#define AUDIO_MIC_I2S_GPIO_WS MSM261_WS
14+
#define AUDIO_MIC_I2S_GPIO_DATA MSM261_DATA
1515
#elif defined CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3_V1_2
1616
#define AUDIO_INPUT_REFERENCE false
1717
#define AUDIO_MIC_I2S_GPIO_BCLK GPIO_NUM_NC
18-
#define AUDIO_MIC_I2S_GPIO_WS static_cast<gpio_num_t>(MP34DT05TR_LRCLK)
19-
#define AUDIO_MIC_I2S_GPIO_DATA static_cast<gpio_num_t>(MP34DT05TR_DATA)
18+
#define AUDIO_MIC_I2S_GPIO_WS MP34DT05TR_LRCLK
19+
#define AUDIO_MIC_I2S_GPIO_DATA MP34DT05TR_DATA
2020

21-
#define AUDIO_MIC_SPKR_EN static_cast<gpio_num_t>(MP34DT05TR_MAX98357_EN)
21+
#define AUDIO_MIC_SPKR_EN MP34DT05TR_MAX98357_EN
2222
#endif
2323

24-
#define AUDIO_SPKR_I2S_GPIO_BCLK static_cast<gpio_num_t>(MAX98357A_BCLK)
25-
#define AUDIO_SPKR_I2S_GPIO_LRCLK static_cast<gpio_num_t>(MAX98357A_LRCLK)
26-
#define AUDIO_SPKR_I2S_GPIO_DATA static_cast<gpio_num_t>(MAX98357A_DATA)
24+
#define AUDIO_SPKR_I2S_GPIO_BCLK MAX98357A_BCLK
25+
#define AUDIO_SPKR_I2S_GPIO_LRCLK MAX98357A_LRCLK
26+
#define AUDIO_SPKR_I2S_GPIO_DATA MAX98357A_DATA
2727

28-
#define TOUCH_I2C_SDA_PIN static_cast<gpio_num_t>(TP_SDA)
29-
#define TOUCH_I2C_SCL_PIN static_cast<gpio_num_t>(TP_SCL)
28+
#define TOUCH_I2C_SDA_PIN TP_SDA
29+
#define TOUCH_I2C_SCL_PIN TP_SCL
3030

3131
#define BUILTIN_LED_GPIO GPIO_NUM_NC
3232
#define BOOT_BUTTON_GPIO GPIO_NUM_0
33-
#define KEY1_BUTTON_GPIO static_cast<gpio_num_t>(KEY1)
33+
#define KEY1_BUTTON_GPIO KEY1
3434
#define VOLUME_UP_BUTTON_GPIO GPIO_NUM_NC
3535
#define VOLUME_DOWN_BUTTON_GPIO GPIO_NUM_NC
3636

@@ -41,7 +41,7 @@
4141
#define DISPLAY_DC LCD_DC
4242
#define DISPLAY_RST LCD_RST
4343
#define DISPLAY_CS LCD_CS
44-
#define DISPLAY_BL static_cast<gpio_num_t>(LCD_BL)
44+
#define DISPLAY_BL LCD_BL
4545
#define DISPLAY_MIRROR_X false
4646
#define DISPLAY_MIRROR_Y false
4747
#define DISPLAY_SWAP_XY false
@@ -52,6 +52,6 @@
5252
#define DISPLAY_BACKLIGHT_PIN DISPLAY_BL
5353
#define DISPLAY_BACKLIGHT_OUTPUT_INVERT false
5454

55-
#define AP1511B_GPIO static_cast<gpio_num_t>(AP1511B_FBC)
55+
#define AP1511B_GPIO AP1511B_FBC
5656

5757
#endif // _BOARD_CONFIG_H_

main/boards/lilygo-t-cameraplus-s3/config.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,19 @@
44
{
55
"name": "lilygo-t-cameraplus-s3",
66
"sdkconfig_append": [
7-
"CONFIG_SPIRAM_MODE_QUAD=y"
7+
"CONFIG_SPIRAM_MODE_QUAD=y",
8+
"CONFIG_CAMERA_OV2640=y",
9+
"CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
10+
"CONFIG_CAMERA_OV2640_DVP_YUV422_240X240_25FPS=y"
811
]
912
},
1013
{
1114
"name": "lilygo-t-cameraplus-s3_v1_2",
1215
"sdkconfig_append": [
13-
"CONFIG_SPIRAM_MODE_QUAD=y"
16+
"CONFIG_SPIRAM_MODE_QUAD=y",
17+
"CONFIG_CAMERA_OV2640=y",
18+
"CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
19+
"CONFIG_CAMERA_OV2640_DVP_YUV422_240X240_25FPS=y"
1420
]
1521
}
1622
]

main/boards/lilygo-t-cameraplus-s3/lilygo-t-cameraplus-s3.cc

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -244,12 +244,8 @@ class LilygoTCameraPlusS3Board : public WifiBoard {
244244

245245
esp_video_init_sccb_config_t sccb_config = {
246246
#ifdef CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3_V1_0_V1_1
247-
.init_sccb = true,
248-
.i2c_config = {
249-
.port = 0,
250-
.scl_pin = SIOC_GPIO_NUM,
251-
.sda_pin = GPIO_NUM_NC,
252-
},
247+
.init_sccb = false,
248+
.i2c_handle = i2c_bus_,
253249
#elif defined CONFIG_BOARD_TYPE_LILYGO_T_CAMERAPLUS_S3_V1_2
254250
.init_sccb = true,
255251
.i2c_config = {

0 commit comments

Comments
 (0)