From d9795d35808e3788ad5c2abbd89c1d657998924b Mon Sep 17 00:00:00 2001
From: Randy Mackay <rmackay9@yahoo.com>
Date: Tue, 14 Feb 2023 13:03:56 +0900
Subject: [PATCH] Plane: integrate camera frontend/backend split

---
 ArduPlane/Parameters.cpp | 4 ++--
 ArduPlane/system.cpp     | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ArduPlane/Parameters.cpp b/ArduPlane/Parameters.cpp
index 5d2da97c1b..bdfbdd8f0d 100644
--- a/ArduPlane/Parameters.cpp
+++ b/ArduPlane/Parameters.cpp
@@ -745,9 +745,9 @@ const AP_Param::Info Plane::var_info[] = {
     GOBJECT(gps, "GPS", AP_GPS),
 
 #if AP_CAMERA_ENABLED
-    // @Group: CAM_
+    // @Group: CAM
     // @Path: ../libraries/AP_Camera/AP_Camera.cpp
-    GOBJECT(camera,                  "CAM_", AP_Camera),
+    GOBJECT(camera, "CAM", AP_Camera),
 #endif
 
     // @Group: ARMING_
diff --git a/ArduPlane/system.cpp b/ArduPlane/system.cpp
index 68f6be59fb..149aa273e3 100644
--- a/ArduPlane/system.cpp
+++ b/ArduPlane/system.cpp
@@ -101,6 +101,11 @@ void Plane::init_ardupilot()
     camera_mount.init();
 #endif
 
+#if AP_CAMERA_ENABLED
+    // initialise camera
+    camera.init();
+#endif
+
 #if AP_LANDINGGEAR_ENABLED
     // initialise landing gear position
     g2.landing_gear.init();