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

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

diff --git a/Rover/Parameters.cpp b/Rover/Parameters.cpp
index 2b2863c2db..26c2458bcc 100644
--- a/Rover/Parameters.cpp
+++ b/Rover/Parameters.cpp
@@ -292,9 +292,9 @@ const AP_Param::Info Rover::var_info[] = {
     GOBJECT(ahrs,                   "AHRS_",    AP_AHRS),
 
 #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
 
 #if PRECISION_LANDING == ENABLED
diff --git a/Rover/system.cpp b/Rover/system.cpp
index 17cbf65ed0..c7a17b10d5 100644
--- a/Rover/system.cpp
+++ b/Rover/system.cpp
@@ -112,6 +112,11 @@ void Rover::init_ardupilot()
     camera_mount.init();
 #endif
 
+#if AP_CAMERA_ENABLED
+    // initialise camera
+    camera.init();
+#endif
+
 #if PRECISION_LANDING == ENABLED
     // initialise precision landing
     init_precland();