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
a75c4ee2
Commit
a75c4ee2
authored
Apr 12, 2016
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "[WIP] add PX4 airspeed mode" (#3220)
parent
b612e4cd
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
6 deletions
+0
-6
PX4AutoPilotPlugin.cc
src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
+0
-1
PX4FirmwarePlugin.cc
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
+0
-3
PX4FirmwarePlugin.h
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h
+0
-1
MockLink.cc
src/comm/MockLink.cc
+0
-1
No files found.
src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
View file @
a75c4ee2
...
@@ -43,7 +43,6 @@ enum PX4_CUSTOM_MAIN_MODE {
...
@@ -43,7 +43,6 @@ enum PX4_CUSTOM_MAIN_MODE {
PX4_CUSTOM_MAIN_MODE_ACRO
,
PX4_CUSTOM_MAIN_MODE_ACRO
,
PX4_CUSTOM_MAIN_MODE_OFFBOARD
,
PX4_CUSTOM_MAIN_MODE_OFFBOARD
,
PX4_CUSTOM_MAIN_MODE_STABILIZED
,
PX4_CUSTOM_MAIN_MODE_STABILIZED
,
PX4_CUSTOM_MAIN_MODE_AIRSPD
,
PX4_CUSTOM_MAIN_MODE_RATTITUDE
PX4_CUSTOM_MAIN_MODE_RATTITUDE
};
};
...
...
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc
View file @
a75c4ee2
...
@@ -38,7 +38,6 @@ enum PX4_CUSTOM_MAIN_MODE {
...
@@ -38,7 +38,6 @@ enum PX4_CUSTOM_MAIN_MODE {
PX4_CUSTOM_MAIN_MODE_ACRO
,
PX4_CUSTOM_MAIN_MODE_ACRO
,
PX4_CUSTOM_MAIN_MODE_OFFBOARD
,
PX4_CUSTOM_MAIN_MODE_OFFBOARD
,
PX4_CUSTOM_MAIN_MODE_STABILIZED
,
PX4_CUSTOM_MAIN_MODE_STABILIZED
,
PX4_CUSTOM_MAIN_MODE_AIRSPD
,
PX4_CUSTOM_MAIN_MODE_RATTITUDE
PX4_CUSTOM_MAIN_MODE_RATTITUDE
};
};
...
@@ -75,7 +74,6 @@ const char* PX4FirmwarePlugin::acroFlightMode = "Acro";
...
@@ -75,7 +74,6 @@ const char* PX4FirmwarePlugin::acroFlightMode = "Acro";
const
char
*
PX4FirmwarePlugin
::
stabilizedFlightMode
=
"Stabilized"
;
const
char
*
PX4FirmwarePlugin
::
stabilizedFlightMode
=
"Stabilized"
;
const
char
*
PX4FirmwarePlugin
::
rattitudeFlightMode
=
"Rattitude"
;
const
char
*
PX4FirmwarePlugin
::
rattitudeFlightMode
=
"Rattitude"
;
const
char
*
PX4FirmwarePlugin
::
altCtlFlightMode
=
"Altitude Control"
;
const
char
*
PX4FirmwarePlugin
::
altCtlFlightMode
=
"Altitude Control"
;
const
char
*
PX4FirmwarePlugin
::
airSpdFlightMode
=
"Airspeed"
;
const
char
*
PX4FirmwarePlugin
::
posCtlFlightMode
=
"Position Control"
;
const
char
*
PX4FirmwarePlugin
::
posCtlFlightMode
=
"Position Control"
;
const
char
*
PX4FirmwarePlugin
::
offboardFlightMode
=
"Offboard Control"
;
const
char
*
PX4FirmwarePlugin
::
offboardFlightMode
=
"Offboard Control"
;
const
char
*
PX4FirmwarePlugin
::
readyFlightMode
=
"Ready"
;
const
char
*
PX4FirmwarePlugin
::
readyFlightMode
=
"Ready"
;
...
@@ -95,7 +93,6 @@ static const struct Modes2Name rgModes2Name[] = {
...
@@ -95,7 +93,6 @@ static const struct Modes2Name rgModes2Name[] = {
{
PX4_CUSTOM_MAIN_MODE_STABILIZED
,
0
,
PX4FirmwarePlugin
::
stabilizedFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_STABILIZED
,
0
,
PX4FirmwarePlugin
::
stabilizedFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_RATTITUDE
,
0
,
PX4FirmwarePlugin
::
rattitudeFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_RATTITUDE
,
0
,
PX4FirmwarePlugin
::
rattitudeFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_ALTCTL
,
0
,
PX4FirmwarePlugin
::
altCtlFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_ALTCTL
,
0
,
PX4FirmwarePlugin
::
altCtlFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_AIRSPD
,
0
,
PX4FirmwarePlugin
::
airSpdFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_POSCTL
,
0
,
PX4FirmwarePlugin
::
posCtlFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_POSCTL
,
0
,
PX4FirmwarePlugin
::
posCtlFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_OFFBOARD
,
0
,
PX4FirmwarePlugin
::
offboardFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_OFFBOARD
,
0
,
PX4FirmwarePlugin
::
offboardFlightMode
,
true
},
{
PX4_CUSTOM_MAIN_MODE_AUTO
,
PX4_CUSTOM_SUB_MODE_AUTO_READY
,
PX4FirmwarePlugin
::
readyFlightMode
,
false
},
{
PX4_CUSTOM_MAIN_MODE_AUTO
,
PX4_CUSTOM_SUB_MODE_AUTO_READY
,
PX4FirmwarePlugin
::
readyFlightMode
,
false
},
...
...
src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h
View file @
a75c4ee2
...
@@ -65,7 +65,6 @@ public:
...
@@ -65,7 +65,6 @@ public:
static
const
char
*
stabilizedFlightMode
;
static
const
char
*
stabilizedFlightMode
;
static
const
char
*
rattitudeFlightMode
;
static
const
char
*
rattitudeFlightMode
;
static
const
char
*
altCtlFlightMode
;
static
const
char
*
altCtlFlightMode
;
static
const
char
*
airSpdFlightMode
;
static
const
char
*
posCtlFlightMode
;
static
const
char
*
posCtlFlightMode
;
static
const
char
*
offboardFlightMode
;
static
const
char
*
offboardFlightMode
;
static
const
char
*
readyFlightMode
;
static
const
char
*
readyFlightMode
;
...
...
src/comm/MockLink.cc
View file @
a75c4ee2
...
@@ -47,7 +47,6 @@ enum PX4_CUSTOM_MAIN_MODE {
...
@@ -47,7 +47,6 @@ enum PX4_CUSTOM_MAIN_MODE {
PX4_CUSTOM_MAIN_MODE_ACRO
,
PX4_CUSTOM_MAIN_MODE_ACRO
,
PX4_CUSTOM_MAIN_MODE_OFFBOARD
,
PX4_CUSTOM_MAIN_MODE_OFFBOARD
,
PX4_CUSTOM_MAIN_MODE_STABILIZED
,
PX4_CUSTOM_MAIN_MODE_STABILIZED
,
PX4_CUSTOM_MAIN_MODE_AIRSPD
,
PX4_CUSTOM_MAIN_MODE_RATTITUDE
PX4_CUSTOM_MAIN_MODE_RATTITUDE
};
};
...
...
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