Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
189dc1cf
Unverified
Commit
189dc1cf
authored
6 years ago
by
Don Gagne
Committed by
GitHub
6 years ago
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #6315 from DonLakeFlyer/Tuning
PID tuning fixes
parents
73cfd557
a1ab4e89
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
6 deletions
+10
-6
PX4TuningComponentCopter.qml
src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml
+7
-3
Vehicle.cc
src/Vehicle/Vehicle.cc
+3
-3
No files found.
src/AutoPilotPlugins/PX4/PX4TuningComponentCopter.qml
View file @
189dc1cf
...
...
@@ -123,6 +123,7 @@ SetupPage {
property
real
_valueRateSetpoint
readonly
property
int
_tickSeparation
:
5
readonly
property
int
_maxTickSections
:
10
readonly
property
int
_tuneListRollIndex
:
0
readonly
property
int
_tuneListPitchIndex
:
1
readonly
property
int
_tuneListYawIndex
:
2
...
...
@@ -267,7 +268,7 @@ SetupPage {
min
:
0
max
:
10
titleText
:
"
deg
"
tickCount
:
((
max
-
min
)
/
_tickSeparation
)
+
1
tickCount
:
Math
.
min
(((
max
-
min
)
/
_tickSeparation
),
_maxTickSections
)
+
1
}
ValueAxis
{
...
...
@@ -275,12 +276,12 @@ SetupPage {
min
:
0
max
:
10
titleText
:
"
deg/s
"
tickCount
:
((
max
-
min
)
/
_tickSeparation
)
+
1
tickCount
:
Math
.
min
(((
max
-
min
)
/
_tickSeparation
),
_maxTickSections
)
+
1
}
Timer
{
id
:
dataTimer
interval
:
5
0
interval
:
1
0
running
:
false
repeat
:
true
...
...
@@ -308,6 +309,8 @@ SetupPage {
adjustYAxisMax
(
_valueRateYAxis
,
_valueRateSetpoint
)
_msecs
+=
interval
/*
Testing with just start/stop for now. No time limit.
if (valueSeries.count > _maxPointCount) {
valueSeries.remove(0)
valueSetpointSeries.remove(0)
...
...
@@ -316,6 +319,7 @@ SetupPage {
valueXAxis.min = valueSeries.at(0).x
valueRateXAxis.min = valueSeries.at(0).x
}
*/
}
property
var
_activeVehicle
:
QGroundControl
.
multiVehicleManager
.
activeVehicle
...
...
This diff is collapsed.
Click to expand it.
src/Vehicle/Vehicle.cc
View file @
189dc1cf
...
...
@@ -841,9 +841,9 @@ void Vehicle::_handleAttitudeTarget(mavlink_message_t& message)
float
roll
,
pitch
,
yaw
;
mavlink_quaternion_to_euler
(
attitudeTarget
.
q
,
&
roll
,
&
pitch
,
&
yaw
);
_setpointFactGroup
.
roll
()
->
setRawValue
(
roll
);
_setpointFactGroup
.
pitch
()
->
setRawValue
(
pitch
);
_setpointFactGroup
.
yaw
()
->
setRawValue
(
yaw
);
_setpointFactGroup
.
roll
()
->
setRawValue
(
qRadiansToDegrees
(
roll
)
);
_setpointFactGroup
.
pitch
()
->
setRawValue
(
qRadiansToDegrees
(
pitch
)
);
_setpointFactGroup
.
yaw
()
->
setRawValue
(
qRadiansToDegrees
(
yaw
)
);
_setpointFactGroup
.
rollRate
()
->
setRawValue
(
qRadiansToDegrees
(
attitudeTarget
.
body_roll_rate
));
_setpointFactGroup
.
pitchRate
()
->
setRawValue
(
qRadiansToDegrees
(
attitudeTarget
.
body_pitch_rate
));
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment