Skip to content

Commit bce769b

Browse files
committed
Merge branch 'refactor/update_cam_sensor_driver_dependency' into 'master'
feat(esp_cam_sensor): Update driver dependency See merge request espressif/esp-video-components!325
2 parents 5ec37af + 2d44bad commit bce769b

File tree

6 files changed

+9
-10
lines changed

6 files changed

+9
-10
lines changed

esp_cam_sensor/CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
# Changelog
22

3-
## Unreleased
3+
## 1.4.0
44

5+
- Update driver dependency, not rely on old `driver` component anymore
56
- Added line exposure time info in camera drivers.
67
- Added OS02N10 MIPI camera sensor driver.
78
- Added exposure value to "esp_cam_sensor_gh_exp_gain_t" to let the application set the exposure value instead of the exposure time
89
- Added detect delay in DVP camera sensors driver.
10+
- Changed `ledc_timer_t` to `ledc_channel_t` in `xclk_generator_ledc_t`.
911

1012
## 1.3.0
1113
- Changed YUV422 sequence for SC030IOT, SC101IOT, GC0308, and BF3A03 sensors to depend on CONFIG_CAMERA_SENSOR_SWAP_PIXEL_BYTE_ORDER

esp_cam_sensor/CMakeLists.txt

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@ if(CONFIG_SPIRAM)
77
endif()
88

99
set(include_dirs "include")
10-
set(requires "driver" "esp_sccb_intf" "esp_driver_cam")
11-
set(priv_requires "esp_driver_gpio" "esp_timer")
12-
13-
if(CONFIG_CAMERA_XCLK_USE_LEDC)
14-
list(APPEND requires "esp_driver_ledc")
15-
endif()
10+
set(requires "esp_sccb_intf" "esp_driver_cam" "esp_driver_gpio" "esp_driver_ledc" "esp_driver_spi")
11+
set(priv_requires "esp_timer")
1612

1713
if(CONFIG_CAMERA_OV2640)
1814
list(APPEND srcs "sensors/ov2640/ov2640.c")

esp_cam_sensor/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "1.3.0"
1+
version: "1.4.0"
22
description: "Espressif camera sensor drivers, it is recommended to use with esp_video"
33
targets:
44
- esp32p4

esp_cam_sensor/src/esp_cam_sensor_xclk.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ struct esp_cam_sensor_xclk {
5353
* @brief XCLK generator instance type implemented by LEDC
5454
*/
5555
typedef struct xclk_generator_ledc_t {
56-
ledc_timer_t ledc_channel;
56+
ledc_channel_t ledc_channel;
5757
esp_cam_sensor_xclk_t base;
5858
} xclk_generator_ledc_t;
5959

esp_video/CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
- Add the second SPI video device
44
- Improve AEC controller time precision
55
- Fix the CSI video device initializes twice when starting up
6+
- Update to use esp_cam_sensor v1.4.x
67

78
## 1.2.0
89

esp_video/idf_component.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ dependencies:
2222
rules:
2323
- if: "target in [esp32p4, esp32s3]"
2424
esp_cam_sensor:
25-
version: "1.3.*"
25+
version: "1.4.*"
2626
override_path: ../esp_cam_sensor
2727
esp_ipa:
2828
version: "~1.1.0"

0 commit comments

Comments
 (0)