Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion main/boards/esp32-s3-touch-lcd-3.5/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
{
"name": "esp32-s3-touch-lcd-3.5",
"sdkconfig_append": [
"CONFIG_USE_WECHAT_MESSAGE_STYLE=y"
"CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
"CONFIG_CAMERA_OV2640=y",
"CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
"CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
"CONFIG_CAMERA_OV2640_DVP_IF_FORMAT_INDEX_DEFAULT=1",
"CONFIG_CAMERA_OV5640=y",
"CONFIG_CAMERA_OV5640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
"CONFIG_CAMERA_OV5640_DVP_YUV422_800X600_10FPS=y",
"CONFIG_CAMERA_OV5640_DVP_IF_FORMAT_INDEX_DEFAULT=0"
]
}
]
Expand Down
12 changes: 4 additions & 8 deletions main/boards/esp32-s3-touch-lcd-3.5/esp32-s3-touch-lcd-3.5.cc
Original file line number Diff line number Diff line change
Expand Up @@ -193,21 +193,17 @@ class CustomBoard : public WifiBoard {
};

esp_video_init_sccb_config_t sccb_config = {
.init_sccb = true,
.i2c_config = {
.port = I2C_NUM_0,
.scl_pin = CAM_PIN_SIOC,
.sda_pin = CAM_PIN_SIOD,
},
.freq = 100000,
.init_sccb = false, // 不初始化新的 SCCB,使用现有的 I2C 总线
.i2c_handle = i2c_bus_, // 使用现有的 I2C 总线句柄
.freq = 100000, // 100kHz
};

esp_video_init_dvp_config_t dvp_config = {
.sccb_config = sccb_config,
.reset_pin = CAM_PIN_RESET,
.pwdn_pin = CAM_PIN_PWDN,
.dvp_pin = dvp_pin_config,
.xclk_freq = 10000000,
.xclk_freq = 12000000,
};

esp_video_init_config_t video_config = {
Expand Down
12 changes: 11 additions & 1 deletion main/boards/waveshare-s3-audio-board/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,17 @@
"builds": [
{
"name": "waveshare-s3-audio-board",
"sdkconfig_append": []
"sdkconfig_append": [
"CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
"CONFIG_CAMERA_OV2640=y",
"CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
"CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
"CONFIG_CAMERA_OV2640_DVP_IF_FORMAT_INDEX_DEFAULT=1",
"CONFIG_CAMERA_OV5640=y",
"CONFIG_CAMERA_OV5640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
"CONFIG_CAMERA_OV5640_DVP_YUV422_800X600_10FPS=y",
"CONFIG_CAMERA_OV5640_DVP_IF_FORMAT_INDEX_DEFAULT=0"
]
}
]
}
16 changes: 6 additions & 10 deletions main/boards/waveshare-s3-audio-board/esp32-s3-audio_board.cc
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "led/circular_strip.h"
#include "esp_lcd_jd9853.h"

#define TAG "waveshare_lcd_1_85c"
#define TAG "waveshare_s3_audio_board"

#define LCD_OPCODE_WRITE_CMD (0x02ULL)
#define LCD_OPCODE_READ_CMD (0x0BULL)
Expand Down Expand Up @@ -175,29 +175,25 @@ class CustomBoard : public WifiBoard {
};

esp_video_init_sccb_config_t sccb_config = {
.init_sccb = true,
.i2c_config = {
.port = 0,
.scl_pin = CAMERA_PIN_SIOC,
.sda_pin = CAMERA_PIN_SIOD,
},
.freq = 100000,
.init_sccb = false, // 不初始化新的 SCCB,使用现有的 I2C 总线
.i2c_handle = i2c_bus_, // 使用现有的 I2C 总线句柄
.freq = 100000, // 100kHz
};

esp_video_init_dvp_config_t dvp_config = {
.sccb_config = sccb_config,
.reset_pin = CAMERA_PIN_RESET,
.pwdn_pin = CAMERA_PIN_PWDN,
.dvp_pin = dvp_pin_config,
.xclk_freq = XCLK_FREQ_HZ,
.xclk_freq = 12000000,
};

esp_video_init_config_t video_config = {
.dvp = &dvp_config,
};

camera_ = new Esp32Camera(video_config);
camera_->SetVFlip(1);

}
public:
CustomBoard() :
Expand Down
10 changes: 9 additions & 1 deletion main/boards/waveshare-s3-touch-lcd-3.5b/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,15 @@
{
"name": "waveshare-s3-touch-lcd-3.5b",
"sdkconfig_append": [
"CONFIG_USE_WECHAT_MESSAGE_STYLE=y"
"CONFIG_USE_WECHAT_MESSAGE_STYLE=y",
"CONFIG_CAMERA_OV2640=y",
"CONFIG_CAMERA_OV2640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
"CONFIG_CAMERA_OV2640_DVP_YUV422_640X480_6FPS=y",
"CONFIG_CAMERA_OV2640_DVP_IF_FORMAT_INDEX_DEFAULT=1",
"CONFIG_CAMERA_OV5640=y",
"CONFIG_CAMERA_OV5640_AUTO_DETECT_DVP_INTERFACE_SENSOR=y",
"CONFIG_CAMERA_OV5640_DVP_YUV422_800X600_10FPS=y",
"CONFIG_CAMERA_OV5640_DVP_IF_FORMAT_INDEX_DEFAULT=0"
]
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -196,21 +196,17 @@ class CustomBoard : public WifiBoard {
};

esp_video_init_sccb_config_t sccb_config = {
.init_sccb = true,
.i2c_config = {
.port = I2C_NUM_0,
.scl_pin = CAM_PIN_SIOC,
.sda_pin = CAM_PIN_SIOD,
},
.freq = 100000,
.init_sccb = false, // 不初始化新的 SCCB,使用现有的 I2C 总线
.i2c_handle = i2c_bus_, // 使用现有的 I2C 总线句柄
.freq = 100000, // 100kHz
};

esp_video_init_dvp_config_t dvp_config = {
.sccb_config = sccb_config,
.reset_pin = CAM_PIN_RESET,
.pwdn_pin = CAM_PIN_PWDN,
.dvp_pin = dvp_pin_config,
.xclk_freq = 10000000,
.xclk_freq = 12000000,
};

esp_video_init_config_t video_config = {
Expand Down
2 changes: 1 addition & 1 deletion main/idf_component.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ dependencies:
espressif/button: ~4.1.3
espressif/knob: ^1.0.0
espressif/esp_video:
version: '==1.2.0' # for compatibility. update version may need to modify this project code.
version: '==1.3.1' # for compatibility. update version may need to modify this project code.
rules:
- if: target not in [esp32]
espressif/esp_lcd_touch_ft5x06: ~1.0.7
Expand Down