remove camera isolation

script/analyze_component_buses.py

@@ -71,10 +71,6 @@ BASE_BUS_COMPONENTS = {
 # NOTE: This should be kept in sync with both test_build_components and split_components_for_ci.py
 ISOLATED_COMPONENTS = {
     "animation": "Has display lambda in common.yaml that requires existing display platform - breaks when merged without display",
-    "camera_encoder": "Multiple definition errors: esp32-camera IDF component conflicts with ESPHome camera component",
-    "camera": "Uses relative include paths that break when merged with other components",
-    "esp32_camera": "Auto-loads camera which causes source path conflicts, and leaks config into other components",
-    "esp32_camera_web_server": "Leaks config into other components",
     "esphome": "Defines devices/areas in esphome: section that are referenced in other sections - breaks when merged",
     "ethernet": "Defines ethernet: which conflicts with wifi: used by most components",
     "ethernet_info": "Related to ethernet component which conflicts with wifi",

tests/components/camera/common.yaml

@@ -1,29 +1,2 @@
-esp32_camera:
+# Camera is a base component auto-loaded by esp32_camera
-  name: ESP32 Camera
+# The hardware configuration comes from the camera package
-  data_pins:
-    - number: 17
-    - number: 35
-    - number: 34
-    - number: 5
-    - number: 39
-    - number: 18
-    - number: 36
-    - number: 19
-  vsync_pin: 22
-  href_pin: 26
-  pixel_clock_pin: 21
-  external_clock:
-    pin: 27
-    frequency: 20MHz
-  i2c_pins:
-    sda: 25
-    scl: 23
-  reset_pin: 15
-  power_down_pin: 1
-  resolution: 640x480
-  jpeg_quality: 10
-  frame_buffer_location: PSRAM
-  on_image:
-    then:
-      - lambda: |-
-          ESP_LOGD("main", "image len=%d, data=%c", image.length, image.data[0]);

tests/components/camera/test.esp32-idf.yaml

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

tests/components/camera_encoder/test.esp32-idf.yaml

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

tests/components/esp32_camera/common.yaml

@@ -1,29 +1 @@
-esp32_camera:
+# ESP32 camera hardware configuration comes from the camera package
-  name: ESP32 Camera
-  data_pins:
-    - number: 17
-    - number: 35
-    - number: 34
-    - number: 5
-    - number: 39
-    - number: 18
-    - number: 36
-    - number: 19
-  vsync_pin: 22
-  href_pin: 26
-  pixel_clock_pin: 21
-  external_clock:
-    pin: 27
-    frequency: 20MHz
-  i2c_pins:
-    sda: 25
-    scl: 23
-  reset_pin: 15
-  power_down_pin: 1
-  resolution: 640x480
-  jpeg_quality: 10
-  frame_buffer_location: PSRAM
-  on_image:
-    then:
-      - lambda: |-
-          ESP_LOGD("main", "image len=%d, data=%c", image.length, image.data[0]);

tests/components/esp32_camera/test.esp32-idf.yaml

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

tests/components/esp32_camera_web_server/common.yaml

@@ -1,32 +1,3 @@
-esp32_camera:
-  name: ESP32 Camera
-  data_pins:
-    - number: 17
-    - number: 35
-    - number: 34
-    - number: 5
-    - number: 39
-    - number: 18
-    - number: 36
-    - number: 19
-  vsync_pin: 22
-  href_pin: 26
-  pixel_clock_pin: 21
-  external_clock:
-    pin: 27
-    frequency: 20MHz
-  i2c_pins:
-    sda: 25
-    scl: 23
-  reset_pin: 15
-  power_down_pin: 1
-  resolution: 640x480
-  jpeg_quality: 10
-  on_image:
-    then:
-      - lambda: |-
-          ESP_LOGD("main", "image len=%d, data=%c", image.length, image.data[0]);
-
 esp32_camera_web_server:
   - port: 8080
     mode: stream

tests/components/esp32_camera_web_server/test.esp32-idf.yaml

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

tests/test_build_components/common/camera/esp32-idf.yaml

@@ -0,0 +1,29 @@
+esp32_camera:
+  name: ESP32 Camera
+  data_pins:
+    - number: 17
+    - number: 35
+    - number: 34
+    - number: 5
+    - number: 39
+    - number: 18
+    - number: 36
+    - number: 19
+  vsync_pin: 22
+  href_pin: 26
+  pixel_clock_pin: 21
+  external_clock:
+    pin: 27
+    frequency: 20MHz
+  i2c_pins:
+    sda: 25
+    scl: 23
+  reset_pin: 15
+  power_down_pin: 1
+  resolution: 640x480
+  jpeg_quality: 10
+  frame_buffer_location: PSRAM
+  on_image:
+    then:
+      - lambda: |-
+          ESP_LOGD("main", "image len=%d, data=%c", image.length, image.data[0]);