From d6d2b41c399283dacfb2e5103a2e81cbdb7ae7ad Mon Sep 17 00:00:00 2001
From: Silvan Fuhrer <silvan@auterion.com>
Date: Wed, 3 Apr 2024 08:53:03 +0200
Subject: [PATCH] Commander/FW rate controller: move trim params to fw rate c

Signed-off-by: Silvan Fuhrer <silvan@auterion.com>
---
 src/modules/commander/commander_params.c      | 42 -------------------
 .../fw_rate_control/fw_rate_control_params.c  | 42 +++++++++++++++++++
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/src/modules/commander/commander_params.c b/src/modules/commander/commander_params.c
index 8f2c3d51ce..10d44dbb46 100644
--- a/src/modules/commander/commander_params.c
+++ b/src/modules/commander/commander_params.c
@@ -41,48 +41,6 @@
  * @author Julian Oes <julian@px4.io>
  */
 
-/**
- * Roll trim
- *
- * The trim value is the actuator control value the system needs
- * for straight and level flight.
- *
- * @group Radio Calibration
- * @min -0.5
- * @max 0.5
- * @decimal 2
- * @increment 0.01
- */
-PARAM_DEFINE_FLOAT(TRIM_ROLL, 0.0f);
-
-/**
- * Pitch trim
- *
- * The trim value is the actuator control value the system needs
- * for straight and level flight.
- *
- * @group Radio Calibration
- * @min -0.5
- * @max 0.5
- * @decimal 2
- * @increment 0.01
- */
-PARAM_DEFINE_FLOAT(TRIM_PITCH, 0.0f);
-
-/**
- * Yaw trim
- *
- * The trim value is the actuator control value the system needs
- * for straight and level flight.
- *
- * @group Radio Calibration
- * @min -0.5
- * @max 0.5
- * @decimal 2
- * @increment 0.01
- */
-PARAM_DEFINE_FLOAT(TRIM_YAW, 0.0f);
-
 /**
  * GCS connection loss time threshold
  *
diff --git a/src/modules/fw_rate_control/fw_rate_control_params.c b/src/modules/fw_rate_control/fw_rate_control_params.c
index 8493f11c72..b1fa496e15 100644
--- a/src/modules/fw_rate_control/fw_rate_control_params.c
+++ b/src/modules/fw_rate_control/fw_rate_control_params.c
@@ -454,3 +454,45 @@ PARAM_DEFINE_INT32(FW_SPOILERS_MAN, 0);
  * @group FW Rate Control
  */
 PARAM_DEFINE_INT32(FW_ACRO_YAW_EN, 0);
+
+/**
+ * Roll trim
+ *
+ * The trim value is the actuator control value the system needs
+ * for straight and level flight.
+ *
+ * @group FW Rate Control
+ * @min -0.5
+ * @max 0.5
+ * @decimal 2
+ * @increment 0.01
+ */
+PARAM_DEFINE_FLOAT(TRIM_ROLL, 0.0f);
+
+/**
+ * Pitch trim
+ *
+ * The trim value is the actuator control value the system needs
+ * for straight and level flight.
+ *
+ * @group FW Rate Control
+ * @min -0.5
+ * @max 0.5
+ * @decimal 2
+ * @increment 0.01
+ */
+PARAM_DEFINE_FLOAT(TRIM_PITCH, 0.0f);
+
+/**
+ * Yaw trim
+ *
+ * The trim value is the actuator control value the system needs
+ * for straight and level flight.
+ *
+ * @group FW Rate Control
+ * @min -0.5
+ * @max 0.5
+ * @decimal 2
+ * @increment 0.01
+ */
+PARAM_DEFINE_FLOAT(TRIM_YAW, 0.0f);