Skip to content
Snippets Groups Projects
Commit 278583d3 authored by C-Glick's avatar C-Glick
Browse files

Changed conflicting param group name

parent 4c34a994
No related branches found
No related tags found
No related merge requests found
...@@ -176,7 +176,7 @@ void attitudeControllerGetActuatorOutput(int16_t* roll, int16_t* pitch, int16_t* ...@@ -176,7 +176,7 @@ void attitudeControllerGetActuatorOutput(int16_t* roll, int16_t* pitch, int16_t*
/** /**
* Log variables of attitude PID controller * Log variables of attitude PID controller
*/ */
LOG_GROUP_START(pid_attitude) LOG_GROUP_START(s_pid_attitude)
/** /**
* @brief Proportional output roll * @brief Proportional output roll
*/ */
...@@ -213,12 +213,12 @@ LOG_ADD(LOG_FLOAT, yaw_outI, &pidYaw.outI) ...@@ -213,12 +213,12 @@ LOG_ADD(LOG_FLOAT, yaw_outI, &pidYaw.outI)
* @brief Derivative output yaw * @brief Derivative output yaw
*/ */
LOG_ADD(LOG_FLOAT, yaw_outD, &pidYaw.outD) LOG_ADD(LOG_FLOAT, yaw_outD, &pidYaw.outD)
LOG_GROUP_STOP(pid_attitude) LOG_GROUP_STOP(s_pid_attitude)
/** /**
* Log variables of attitude rate PID controller * Log variables of attitude rate PID controller
*/ */
LOG_GROUP_START(pid_rate) LOG_GROUP_START(s_pid_rate)
/** /**
* @brief Proportional output roll rate * @brief Proportional output roll rate
*/ */
...@@ -255,14 +255,14 @@ LOG_ADD(LOG_FLOAT, yaw_outI, &pidYawRate.outI) ...@@ -255,14 +255,14 @@ LOG_ADD(LOG_FLOAT, yaw_outI, &pidYawRate.outI)
* @brief Derivative output yaw rate * @brief Derivative output yaw rate
*/ */
LOG_ADD(LOG_FLOAT, yaw_outD, &pidYawRate.outD) LOG_ADD(LOG_FLOAT, yaw_outD, &pidYawRate.outD)
LOG_GROUP_STOP(pid_rate) LOG_GROUP_STOP(s_pid_rate)
/** /**
* Tuning settings for the gains of the PID * Tuning settings for the gains of the PID
* controller for the attitude of the Crazyflie which consists * controller for the attitude of the Crazyflie which consists
* of the Yaw Pitch and Roll * of the Yaw Pitch and Roll
*/ */
PARAM_GROUP_START(pid_attitude) PARAM_GROUP_START(s_pid_attitude)
/** /**
* @brief Proportional gain for the PID roll controller * @brief Proportional gain for the PID roll controller
*/ */
...@@ -299,13 +299,13 @@ PARAM_ADD(PARAM_FLOAT, yaw_ki, &pidYaw.ki) ...@@ -299,13 +299,13 @@ PARAM_ADD(PARAM_FLOAT, yaw_ki, &pidYaw.ki)
* @brief Derivative gain for the PID yaw controller * @brief Derivative gain for the PID yaw controller
*/ */
PARAM_ADD(PARAM_FLOAT, yaw_kd, &pidYaw.kd) PARAM_ADD(PARAM_FLOAT, yaw_kd, &pidYaw.kd)
PARAM_GROUP_STOP(pid_attitude) PARAM_GROUP_STOP(s_pid_attitude)
/** /**
* Tuning settings for the gains of the PID controller for the rate angles of * Tuning settings for the gains of the PID controller for the rate angles of
* the Crazyflie, which consists of the yaw, pitch and roll rates * the Crazyflie, which consists of the yaw, pitch and roll rates
*/ */
PARAM_GROUP_START(pid_rate) PARAM_GROUP_START(s_pid_rate)
/** /**
* @brief Proportional gain for the PID roll rate controller * @brief Proportional gain for the PID roll rate controller
*/ */
...@@ -342,4 +342,4 @@ PARAM_ADD(PARAM_FLOAT, yaw_ki, &pidYawRate.ki) ...@@ -342,4 +342,4 @@ PARAM_ADD(PARAM_FLOAT, yaw_ki, &pidYawRate.ki)
* @brief Derivative gain for the PID yaw rate controller * @brief Derivative gain for the PID yaw rate controller
*/ */
PARAM_ADD(PARAM_FLOAT, yaw_kd, &pidYawRate.kd) PARAM_ADD(PARAM_FLOAT, yaw_kd, &pidYawRate.kd)
PARAM_GROUP_STOP(pid_rate) PARAM_GROUP_STOP(s_pid_rate)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment