resolving conflicts

ArduPilot · Feb 20, 2024 · c65fe18 · c65fe18
1 parent b75a2a9
commit c65fe18
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/libraries/AC_CustomControl/AC_CustomControl.cpp b/libraries/AC_CustomControl/AC_CustomControl.cpp
@@ -4,7 +4,6 @@
 
 #if AP_CUSTOMCONTROL_ENABLED
 
-
 #include "AC_CustomControl_Backend.h"
 // #include "AC_CustomControl_Empty.h"
 #include "AC_CustomControl_PID.h"
@@ -123,30 +122,30 @@ void AC_CustomControl::set_custom_controller(bool enabled)
 
     // don't allow accidental main controller reset without active custom controller
     if (_controller_type == CustomControlType::CONT_NONE) {
-        gcs().send_text(MAV_SEVERITY_INFO, "Custom controller is not enabled");
+        GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Custom controller is not enabled");
         return;
     }
 
     // controller type is out of range
     if (_controller_type > CUSTOMCONTROL_MAX_TYPES) {
-        gcs().send_text(MAV_SEVERITY_INFO, "Custom controller type is out of range");
+        GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Custom controller type is out of range");
         return;
     }
 
     // backend is not created
     if (_backend == nullptr) {
-        gcs().send_text(MAV_SEVERITY_INFO, "Reboot to enable selected custom controller");
+        GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Reboot to enable selected custom controller");
         return;
     }
 
     if (_custom_controller_mask == 0 && enabled) {
-        gcs().send_text(MAV_SEVERITY_INFO, "Axis mask is not set");
+        GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Axis mask is not set");
         return;
     }
 
     // reset main controller
     if (!enabled) {
-        gcs().send_text(MAV_SEVERITY_INFO, "Custom controller is OFF");
+        GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Custom controller is OFF");
         // don't reset if the empty backend is selected
         if (_controller_type > CustomControlType::CONT_EMPTY) {
             reset_main_att_controller();
@@ -156,7 +155,7 @@ void AC_CustomControl::set_custom_controller(bool enabled)
     if (enabled && _controller_type > CustomControlType::CONT_NONE) {
         // reset custom controller filter, integrator etc.
         _backend->reset();
-        gcs().send_text(MAV_SEVERITY_INFO, "Custom controller is ON");
+        GCS_SEND_TEXT(MAV_SEVERITY_INFO, "Custom controller is ON");
     }
 
     _custom_controller_active = enabled;
@@ -193,4 +192,4 @@ void AC_CustomControl::set_notch_sample_rate(float sample_rate)
 #endif
 }
 
-#endif
+#endif  // AP_CUSTOMCONTROL_ENABLED
diff --git a/libraries/AC_CustomControl/AC_CustomControl.h b/libraries/AC_CustomControl/AC_CustomControl.h
@@ -3,15 +3,17 @@
 /// @file    AC_CustomControl.h
 /// @brief   ArduCopter custom control library
 
+#include "AC_CustomControl_config.h"
+
+#if AP_CUSTOMCONTROL_ENABLED
+
 #include <AP_Common/AP_Common.h>
 #include <AP_Param/AP_Param.h>
 #include <AP_AHRS/AP_AHRS_View.h>
 #include <AC_AttitudeControl/AC_AttitudeControl.h>
 #include <AP_Motors/AP_MotorsMulticopter.h>
 #include <AP_Logger/AP_Logger.h>
 
-#if AP_CUSTOMCONTROL_ENABLED
-
 #ifndef CUSTOMCONTROL_MAX_TYPES
 #define CUSTOMCONTROL_MAX_TYPES 2
 #endif
@@ -72,4 +74,4 @@ class AC_CustomControl {
     AC_CustomControl_Backend *_backend;
 };
 
-#endif
+#endif  // AP_CUSTOMCONTROL_ENABLED
diff --git a/libraries/AC_CustomControl/AC_CustomControl_Backend.h b/libraries/AC_CustomControl/AC_CustomControl_Backend.h
@@ -1,9 +1,11 @@
 #pragma once
 
-#include "AC_CustomControl.h"
+#include "AC_CustomControl_config.h"
 
 #if AP_CUSTOMCONTROL_ENABLED
 
+#include "AC_CustomControl.h"
+
 class AC_CustomControl_Backend
 {
 public:
@@ -34,4 +36,4 @@ class AC_CustomControl_Backend
     AC_CustomControl& _frontend;
 };
 
-#endif
+#endif  // AP_CUSTOMCONTROL_ENABLED