Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
B
Baitboat
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
OpenSource
Baitboat
Commits
5d7c571f
Commit
5d7c571f
authored
13 years ago
by
Andrew Tridgell
Browse files
Options
Downloads
Patches
Plain Diff
ACM: fixed the build on the 1280
parent
16f094a1
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
ArduCopter/Attitude.pde
+4
-0
4 additions, 0 deletions
ArduCopter/Attitude.pde
with
4 additions
and
0 deletions
ArduCopter/Attitude.pde
+
4
−
0
View file @
5d7c571f
...
...
@@ -89,6 +89,7 @@ get_stabilize_yaw(int32_t target_angle)
output
=
get_rate_yaw
(
target_rate
)
+
i_term
;
#endif
#if LOGGING_ENABLED == ENABLED
// log output if PID logging is on and we are tuning the yaw
if
(
g
.
log_bitmask
&
MASK_LOG_PID
&&
(
g
.
radio_tuning
==
CH6_YAW_KP
||
g
.
radio_tuning
==
CH6_YAW_RATE_KP
)
)
{
log_counter
++
;
...
...
@@ -97,6 +98,7 @@ get_stabilize_yaw(int32_t target_angle)
Log_Write_PID
(
CH6_YAW_KP
,
angle_error
,
target_rate
,
i_term
,
0
,
output
,
g
.
pi_stabilize_yaw
.
kP
());
}
}
#endif
// ensure output does not go beyond barries of what an int16_t can hold
return
constrain
(
output
,
-
32000
,
32000
);
...
...
@@ -210,6 +212,7 @@ get_rate_yaw(int32_t target_rate)
// constrain output
output
=
constrain
(
output
,
-
yaw_limit
,
yaw_limit
);
#if LOGGING_ENABLED == ENABLED
// log output if PID loggins is on and we are tuning the yaw
if
(
g
.
log_bitmask
&
MASK_LOG_PID
&&
(
g
.
radio_tuning
==
CH6_YAW_KP
||
g
.
radio_tuning
==
CH6_YAW_RATE_KP
)
)
{
log_counter
++
;
...
...
@@ -218,6 +221,7 @@ get_rate_yaw(int32_t target_rate)
Log_Write_PID
(
CH6_YAW_RATE_KP
,
rate_error
,
p
,
i
,
d
,
output
,
g
.
pid_rate_yaw
.
kP
());
}
}
#endif
// constrain output
return
output
;
...
...
This diff is collapsed.
Click to expand it.
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