AP_Camera: allow compilation with HAL_LOGGING_ENABLED false

libraries/AP_Camera/AP_Camera_Backend.cpp

@@ -140,7 +140,9 @@ bool AP_Camera_Backend::take_picture()
         image_index++;
         last_picture_time_ms = now_ms;
         IGNORE_RETURN(AP::ahrs().get_location(last_location));
+#if HAL_LOGGING_ENABLED
         log_picture();
+#endif
         return true;
     }
 
@@ -358,16 +360,20 @@ void AP_Camera_Backend::feedback_pin_timer()
 void AP_Camera_Backend::check_feedback()
 {
     if (feedback_trigger_logged_count != feedback_trigger_count) {
+#if HAL_LOGGING_ENABLED
         const uint32_t timestamp32 = feedback_trigger_timestamp_us;
+#endif
         feedback_trigger_logged_count = feedback_trigger_count;
 
         // we should consider doing this inside the ISR and pin_timer
         prep_mavlink_msg_camera_feedback(feedback_trigger_timestamp_us);
 
+#if HAL_LOGGING_ENABLED
         // log camera message
         uint32_t tdiff = AP_HAL::micros() - timestamp32;
         uint64_t timestamp = AP_HAL::micros64();
         Write_Camera(timestamp - tdiff);
+#endif
     }
 }
 
@@ -386,6 +392,7 @@ void AP_Camera_Backend::prep_mavlink_msg_camera_feedback(uint64_t timestamp_us)
     GCS_SEND_MESSAGE(MSG_CAMERA_FEEDBACK);
 }
 
+#if HAL_LOGGING_ENABLED
 // log picture
 void AP_Camera_Backend::log_picture()
 {
@@ -404,5 +411,6 @@ void AP_Camera_Backend::log_picture()
         Write_Trigger();
     }
 }
+#endif
 
 #endif // AP_CAMERA_ENABLED

libraries/AP_Camera/AP_Camera_Logging.cpp

@@ -1,7 +1,8 @@
 #include "AP_Camera_Backend.h"
 #include <AP_Mount/AP_Mount.h>
+#include <AP_Logger/AP_Logger_config.h>
 
-#if AP_CAMERA_ENABLED
+#if AP_CAMERA_ENABLED && HAL_LOGGING_ENABLED
 
 #include <AP_Logger/AP_Logger.h>
 #include <AP_GPS/AP_GPS.h>
@@ -85,4 +86,4 @@ void AP_Camera_Backend::Write_Trigger()
     Write_CameraInfo(LOG_TRIGGER_MSG, 0);
 }
 
-#endif
+#endif  // AP_CAMERA_ENABLED && HAL_LOGGING_ENABLED