Skip to content
Snippets Groups Projects
Commit 6d1571ed authored by Colton Glick's avatar Colton Glick
Browse files

Fixed naming from commit 278583d3

parent 50fc009d
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*
/**
* Log variables of attitude PID controller
*/
LOG_GROUP_START(s_pid_attitude)
LOG_GROUP_START(pid_attitude)
/**
* @brief Proportional output roll
*/
......@@ -213,12 +213,12 @@ LOG_ADD(LOG_FLOAT, yaw_outI, &pidYaw.outI)
* @brief Derivative output yaw
*/
LOG_ADD(LOG_FLOAT, yaw_outD, &pidYaw.outD)
LOG_GROUP_STOP(s_pid_attitude)
LOG_GROUP_STOP(pid_attitude)
/**
* Log variables of attitude rate PID controller
*/
LOG_GROUP_START(s_pid_rate)
LOG_GROUP_START(pid_rate)
/**
* @brief Proportional output roll rate
*/
......@@ -255,14 +255,14 @@ LOG_ADD(LOG_FLOAT, yaw_outI, &pidYawRate.outI)
* @brief Derivative output yaw rate
*/
LOG_ADD(LOG_FLOAT, yaw_outD, &pidYawRate.outD)
LOG_GROUP_STOP(s_pid_rate)
LOG_GROUP_STOP(pid_rate)
/**
* Tuning settings for the gains of the PID
* controller for the attitude of the Crazyflie which consists
* of the Yaw Pitch and Roll
*/
PARAM_GROUP_START(s_pid_attitude)
PARAM_GROUP_START(pid_attitude)
/**
* @brief Proportional gain for the PID roll controller
*/
......@@ -299,13 +299,13 @@ PARAM_ADD(PARAM_FLOAT, yaw_ki, &pidYaw.ki)
* @brief Derivative gain for the PID yaw controller
*/
PARAM_ADD(PARAM_FLOAT, yaw_kd, &pidYaw.kd)
PARAM_GROUP_STOP(s_pid_attitude)
PARAM_GROUP_STOP(pid_attitude)
/**
* 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
*/
PARAM_GROUP_START(s_pid_rate)
PARAM_GROUP_START(pid_rate)
/**
* @brief Proportional gain for the PID roll rate controller
*/
......@@ -342,4 +342,4 @@ PARAM_ADD(PARAM_FLOAT, yaw_ki, &pidYawRate.ki)
* @brief Derivative gain for the PID yaw rate controller
*/
PARAM_ADD(PARAM_FLOAT, yaw_kd, &pidYawRate.kd)
PARAM_GROUP_STOP(s_pid_rate)
PARAM_GROUP_STOP(pid_rate)
......@@ -191,7 +191,7 @@ void studentAttitudeControllerResetAllPID(void)
/**
* Log variables of attitude PID controller
*/
LOG_GROUP_START(pid_attitude)
LOG_GROUP_START(s_pid_attitude)
/**
* @brief Proportional output roll
*/
......@@ -228,12 +228,12 @@ LOG_ADD(LOG_FLOAT, yaw_outI, &pidYaw.outI)
* @brief Derivative output yaw
*/
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_GROUP_START(pid_rate)
LOG_GROUP_START(s_pid_rate)
/**
* @brief Proportional output roll rate
*/
......@@ -270,14 +270,14 @@ LOG_ADD(LOG_FLOAT, yaw_outI, &pidYawRate.outI)
* @brief Derivative output yaw rate
*/
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
* controller for the attitude of the Crazyflie which consists
* 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
*/
......@@ -314,13 +314,13 @@ PARAM_ADD(PARAM_FLOAT, yaw_ki, &pidYaw.ki)
* @brief Derivative gain for the PID yaw controller
*/
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
* 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
*/
......@@ -357,4 +357,4 @@ PARAM_ADD(PARAM_FLOAT, yaw_ki, &pidYawRate.ki)
* @brief Derivative gain for the PID yaw rate controller
*/
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