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
c96b1359
Commit
c96b1359
authored
Apr 27, 2014
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Follow through with mission to loiter switch renaming
parent
b5920a35
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
QGCPX4VehicleConfig.cc
src/ui/QGCPX4VehicleConfig.cc
+4
-4
QGCPX4VehicleConfig.h
src/ui/QGCPX4VehicleConfig.h
+1
-1
No files found.
src/ui/QGCPX4VehicleConfig.cc
View file @
c96b1359
...
@@ -50,7 +50,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
...
@@ -50,7 +50,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
rcThrottle
(
0.0
f
),
rcThrottle
(
0.0
f
),
rcMode
(
0.0
f
),
rcMode
(
0.0
f
),
rcAssist
(
0.0
f
),
rcAssist
(
0.0
f
),
rc
Mission
(
0.0
f
),
rc
Loiter
(
0.0
f
),
rcReturn
(
0.0
f
),
rcReturn
(
0.0
f
),
rcFlaps
(
0.0
f
),
rcFlaps
(
0.0
f
),
rcAux1
(
0.0
f
),
rcAux1
(
0.0
f
),
...
@@ -72,7 +72,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
...
@@ -72,7 +72,7 @@ QGCPX4VehicleConfig::QGCPX4VehicleConfig(QWidget *parent) :
channelNames
<<
"Throttle"
;
channelNames
<<
"Throttle"
;
channelNames
<<
"Main Mode Switch"
;
channelNames
<<
"Main Mode Switch"
;
channelNames
<<
"Assist Switch"
;
channelNames
<<
"Assist Switch"
;
channelNames
<<
"
Mission
Switch"
;
channelNames
<<
"
Loiter
Switch"
;
channelNames
<<
"Return Switch"
;
channelNames
<<
"Return Switch"
;
channelNames
<<
"Flaps"
;
channelNames
<<
"Flaps"
;
channelNames
<<
"Aux1"
;
channelNames
<<
"Aux1"
;
...
@@ -1484,7 +1484,7 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval)
...
@@ -1484,7 +1484,7 @@ void QGCPX4VehicleConfig::remoteControlChannelRawChanged(int chan, float fval)
rcAssist
=
normalized
;
// ASSIST SWITCH
rcAssist
=
normalized
;
// ASSIST SWITCH
}
}
else
if
(
chan
==
rcMapping
[
6
])
{
else
if
(
chan
==
rcMapping
[
6
])
{
rc
Mission
=
normalized
;
// MISSION
SWITCH
rc
Loiter
=
normalized
;
// LOITER
SWITCH
}
}
else
if
(
chan
==
rcMapping
[
7
])
{
else
if
(
chan
==
rcMapping
[
7
])
{
rcReturn
=
normalized
;
// RETURN SWITCH
rcReturn
=
normalized
;
// RETURN SWITCH
...
@@ -1948,7 +1948,7 @@ void QGCPX4VehicleConfig::updateRcChanLabels()
...
@@ -1948,7 +1948,7 @@ void QGCPX4VehicleConfig::updateRcChanLabels()
}
}
if
(
rcValue
[
rcMapping
[
6
]]
!=
UINT16_MAX
)
{
if
(
rcValue
[
rcMapping
[
6
]]
!=
UINT16_MAX
)
{
ui
->
missionSwChanLabel
->
setText
(
labelForRcValue
(
rc
Mission
));
ui
->
missionSwChanLabel
->
setText
(
labelForRcValue
(
rc
Loiter
));
}
}
else
{
else
{
ui
->
missionSwChanLabel
->
setText
(
blankLabel
);
ui
->
missionSwChanLabel
->
setText
(
blankLabel
);
...
...
src/ui/QGCPX4VehicleConfig.h
View file @
c96b1359
...
@@ -306,7 +306,7 @@ protected:
...
@@ -306,7 +306,7 @@ protected:
float
rcThrottle
;
///< PPM input channel used as throttle control input
float
rcThrottle
;
///< PPM input channel used as throttle control input
float
rcMode
;
///< PPM input channel used as mode switch control input
float
rcMode
;
///< PPM input channel used as mode switch control input
float
rcAssist
;
///< PPM input channel used as assist switch control input
float
rcAssist
;
///< PPM input channel used as assist switch control input
float
rc
Mission
;
///< PPM input channel used as mission
switch control input
float
rc
Loiter
;
///< PPM input channel used as loiter
switch control input
float
rcReturn
;
///< PPM input channel used as return switch control input
float
rcReturn
;
///< PPM input channel used as return switch control input
float
rcFlaps
;
///< PPM input channel used as flaps control input
float
rcFlaps
;
///< PPM input channel used as flaps control input
float
rcAux1
;
///< PPM input channel used as aux 1 input
float
rcAux1
;
///< PPM input channel used as aux 1 input
...
...
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