Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
0ec5bc8c
Commit
0ec5bc8c
authored
Apr 12, 2016
by
Daniel Agar
Browse files
add airspeed mode
parent
fdcfd3c0
Changes
4
Show whitespace changes
Inline
Side-by-side
src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
View file @
0ec5bc8c
...
@@ -43,6 +43,7 @@ enum PX4_CUSTOM_MAIN_MODE {
...
@@ -43,6 +43,7 @@ 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 @
0ec5bc8c
...
@@ -38,6 +38,7 @@ enum PX4_CUSTOM_MAIN_MODE {
...
@@ -38,6 +38,7 @@ 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
};
};
...
@@ -74,6 +75,7 @@ const char* PX4FirmwarePlugin::acroFlightMode = "Acro";
...
@@ -74,6 +75,7 @@ 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"
;
...
@@ -93,6 +95,7 @@ static const struct Modes2Name rgModes2Name[] = {
...
@@ -93,6 +95,7 @@ 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 @
0ec5bc8c
...
@@ -65,6 +65,7 @@ public:
...
@@ -65,6 +65,7 @@ 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 @
0ec5bc8c
...
@@ -47,6 +47,7 @@ enum PX4_CUSTOM_MAIN_MODE {
...
@@ -47,6 +47,7 @@ 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
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment