onkelbeh/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-17 07:57:13 +02:00
Code Issues Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
J. Nick Koston 2025-10-14 21:04:36 -10:00
parent 22c60de986
commit a6db90017f
No known key found for this signature in database
5 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/components/camera/test.esp32-idf.yaml
View File

@ -1,4 +1,4 @@
packages:
camera: !include ../../test_build_components/common/camera/esp32-idf.yaml
i2c_camera: !include ../../test_build_components/common/i2c_camera/esp32-idf.yaml
<<: !include common.yaml

2
tests/components/camera_encoder/test.esp32-idf.yaml
View File

@ -1,4 +1,4 @@
packages:
camera: !include ../../test_build_components/common/camera/esp32-idf.yaml
i2c_camera: !include ../../test_build_components/common/i2c_camera/esp32-idf.yaml
<<: !include common.yaml

2
tests/components/esp32_camera/test.esp32-idf.yaml
View File

@ -1,4 +1,4 @@
packages:
camera: !include ../../test_build_components/common/camera/esp32-idf.yaml
i2c_camera: !include ../../test_build_components/common/i2c_camera/esp32-idf.yaml
<<: !include common.yaml

2
tests/components/esp32_camera_web_server/test.esp32-idf.yaml
View File

@ -1,4 +1,4 @@
packages:
camera: !include ../../test_build_components/common/camera/esp32-idf.yaml
i2c_camera: !include ../../test_build_components/common/i2c_camera/esp32-idf.yaml
<<: !include common.yaml

11
tests/test_build_components/common/camera/esp32-idf.yaml → tests/test_build_components/common/i2c_camera/esp32-idf.yaml
View File

@ -1,3 +1,10 @@
# I2C bus for camera sensor
i2c:
- id: i2c_camera_bus
sda: 25
scl: 23
frequency: 400kHz
esp32_camera:
name: ESP32 Camera
data_pins:
@ -15,9 +22,7 @@ esp32_camera:
external_clock:
pin: 27
frequency: 20MHz
i2c_pins:
sda: 25
scl: 23
i2c_id: i2c_camera_bus
reset_pin: 15
power_down_pin: 1
resolution: 640x480