From a75c4ee2234c4aa921abc2e76837c6e7d532318a Mon Sep 17 00:00:00 2001 From: Daniel Agar Date: Tue, 12 Apr 2016 23:19:59 -0400 Subject: [PATCH] Revert "[WIP] add PX4 airspeed mode" (#3220) --- src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc | 1 - src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc | 3 --- src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h | 1 - src/comm/MockLink.cc | 1 - 4 files changed, 6 deletions(-) diff --git a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc index 9d81842..5afedc3 100644 --- a/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc +++ b/src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc @@ -43,7 +43,6 @@ enum PX4_CUSTOM_MAIN_MODE { PX4_CUSTOM_MAIN_MODE_ACRO, PX4_CUSTOM_MAIN_MODE_OFFBOARD, PX4_CUSTOM_MAIN_MODE_STABILIZED, - PX4_CUSTOM_MAIN_MODE_AIRSPD, PX4_CUSTOM_MAIN_MODE_RATTITUDE }; diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc index c159ef0..d28f8b6 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc @@ -38,7 +38,6 @@ enum PX4_CUSTOM_MAIN_MODE { PX4_CUSTOM_MAIN_MODE_ACRO, PX4_CUSTOM_MAIN_MODE_OFFBOARD, PX4_CUSTOM_MAIN_MODE_STABILIZED, - PX4_CUSTOM_MAIN_MODE_AIRSPD, PX4_CUSTOM_MAIN_MODE_RATTITUDE }; @@ -75,7 +74,6 @@ const char* PX4FirmwarePlugin::acroFlightMode = "Acro"; const char* PX4FirmwarePlugin::stabilizedFlightMode = "Stabilized"; const char* PX4FirmwarePlugin::rattitudeFlightMode = "Rattitude"; const char* PX4FirmwarePlugin::altCtlFlightMode = "Altitude Control"; -const char* PX4FirmwarePlugin::airSpdFlightMode = "Airspeed"; const char* PX4FirmwarePlugin::posCtlFlightMode = "Position Control"; const char* PX4FirmwarePlugin::offboardFlightMode = "Offboard Control"; const char* PX4FirmwarePlugin::readyFlightMode = "Ready"; @@ -95,7 +93,6 @@ static const struct Modes2Name rgModes2Name[] = { { PX4_CUSTOM_MAIN_MODE_STABILIZED, 0, PX4FirmwarePlugin::stabilizedFlightMode, true }, { PX4_CUSTOM_MAIN_MODE_RATTITUDE, 0, PX4FirmwarePlugin::rattitudeFlightMode, 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_OFFBOARD, 0, PX4FirmwarePlugin::offboardFlightMode, true }, { PX4_CUSTOM_MAIN_MODE_AUTO, PX4_CUSTOM_SUB_MODE_AUTO_READY, PX4FirmwarePlugin::readyFlightMode, false }, diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h index fd06859..2185809 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h @@ -65,7 +65,6 @@ public: static const char* stabilizedFlightMode; static const char* rattitudeFlightMode; static const char* altCtlFlightMode; - static const char* airSpdFlightMode; static const char* posCtlFlightMode; static const char* offboardFlightMode; static const char* readyFlightMode; diff --git a/src/comm/MockLink.cc b/src/comm/MockLink.cc index d71af6f..a0aa47d 100644 --- a/src/comm/MockLink.cc +++ b/src/comm/MockLink.cc @@ -47,7 +47,6 @@ enum PX4_CUSTOM_MAIN_MODE { PX4_CUSTOM_MAIN_MODE_ACRO, PX4_CUSTOM_MAIN_MODE_OFFBOARD, PX4_CUSTOM_MAIN_MODE_STABILIZED, - PX4_CUSTOM_MAIN_MODE_AIRSPD, PX4_CUSTOM_MAIN_MODE_RATTITUDE };