Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
MicroCART
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Distributed Autonomous Networked Control Lab
MicroCART
Commits
278583d3
Commit
278583d3
authored
3 years ago
by
C-Glick
Browse files
Options
Downloads
Patches
Plain Diff
Changed conflicting param group name
parent
4c34a994
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
crazyflie_software/crazyflie-firmware-2021.06/src/modules/src/attitude_pid_controller.c
+8
-8
8 additions, 8 deletions
...irmware-2021.06/src/modules/src/attitude_pid_controller.c
with
8 additions
and
8 deletions
crazyflie_software/crazyflie-firmware-2021.06/src/modules/src/attitude_pid_controller.c
+
8
−
8
View file @
278583d3
...
...
@@ -176,7 +176,7 @@ void attitudeControllerGetActuatorOutput(int16_t* roll, int16_t* pitch, int16_t*
/**
* Log variables of attitude PID controller
*/
LOG_GROUP_START
(
pid_attitude
)
LOG_GROUP_START
(
s_
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
(
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
*/
...
...
@@ -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
(
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
*/
...
...
@@ -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
(
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
*/
...
...
@@ -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
(
pid_rate
)
PARAM_GROUP_STOP
(
s_
pid_rate
)
This diff is collapsed.
Click to expand it.
Colton Glick
@crglick
mentioned in commit
6d1571ed
·
3 years ago
mentioned in commit
6d1571ed
mentioned in commit 6d1571edb640bb9d379f9ec13476d842dbdb8614
Toggle commit list
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment