Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-18 06:38:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

removed some more unused defines

Browse Source 
mavlink is now the only choice for HIL and GCS
This commit is contained in:
Andrew Tridgell 2011-09-18 19:08:50 +10:00
parent 4437ff1046
commit e2ed1f1c56
5 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ArduPlane/APM_Config.h
View File

@ -5,7 +5,6 @@
// For example if you wanted the Port 3 baud rate to be 38400 you would add a statement like the one below (uncommented) // For example if you wanted the Port 3 baud rate to be 38400 you would add a statement like the one below (uncommented)
//#define SERIAL3_BAUD 38400 //#define SERIAL3_BAUD 38400
//#define GCS_PROTOCOL GCS_PROTOCOL_NONE
// You may also put an include statement here to point at another configuration file. This is convenient if you maintain // You may also put an include statement here to point at another configuration file. This is convenient if you maintain

8
ArduPlane/APM_Config_mavlink_hil.h
View File

@ -13,9 +13,6 @@
#define FLIGHT_MODE_5 STABILIZE #define FLIGHT_MODE_5 STABILIZE
#define FLIGHT_MODE_6 MANUAL #define FLIGHT_MODE_6 MANUAL
// Hardware in the loop protocol
#define HIL_PROTOCOL HIL_PROTOCOL_MAVLINK
// HIL_MODE SELECTION // HIL_MODE SELECTION
// //
// Mavlink supports // Mavlink supports
@ -23,11 +20,6 @@
// 2. HIL_MODE_SENSORS: full sensor simulation // 2. HIL_MODE_SENSORS: full sensor simulation
#define HIL_MODE HIL_MODE_ATTITUDE #define HIL_MODE HIL_MODE_ATTITUDE
// You can set your gps protocol here for your actual
// hardware and leave it without affecting the hardware
// in the loop simulation
#define GPS_PROTOCOL GPS_PROTOCOL_MTK
// Sensors // Sensors
// All sensors are supported in all modes. // All sensors are supported in all modes.
// The magnetometer is not used in // The magnetometer is not used in

5
ArduPlane/GCS.h
View File

@ -99,7 +99,6 @@ protected:
/// @class GCS_MAVLINK /// @class GCS_MAVLINK
/// @brief The mavlink protocol for qgroundcontrol /// @brief The mavlink protocol for qgroundcontrol
/// ///
#if GCS_PROTOCOL == GCS_PROTOCOL_MAVLINK || HIL_PROTOCOL == HIL_PROTOCOL_MAVLINK
class GCS_MAVLINK : public GCS_Class class GCS_MAVLINK : public GCS_Class
{ {
public: public:
@ -163,10 +162,6 @@ private:
AP_Int16 streamRateExtra1; AP_Int16 streamRateExtra1;
AP_Int16 streamRateExtra2; AP_Int16 streamRateExtra2;
AP_Int16 streamRateExtra3; AP_Int16 streamRateExtra3;
}; };
#endif // GCS_PROTOCOL_MAVLINK
#endif // __GCS_H #endif // __GCS_H

11
ArduPlane/config.h
View File

@ -111,17 +111,6 @@
# define GPS_PROTOCOL GPS_PROTOCOL_AUTO # define GPS_PROTOCOL GPS_PROTOCOL_AUTO
#endif #endif
//////////////////////////////////////////////////////////////////////////////
// GCS_PROTOCOL
// GCS_PORT
//
#ifndef GCS_PROTOCOL
# define GCS_PROTOCOL GCS_PROTOCOL_MAVLINK
#endif
#ifndef GCS_PORT
# define GCS_PORT 3
#endif
#ifndef MAV_SYSTEM_ID #ifndef MAV_SYSTEM_ID
# define MAV_SYSTEM_ID 1 # define MAV_SYSTEM_ID 1
#endif #endif

11
ArduPlane/defines.h
View File

@ -51,21 +51,10 @@
#define CH_YAW CH_4 #define CH_YAW CH_4
// HIL enumerations // HIL enumerations
#define HIL_PROTOCOL_XPLANE 1
#define HIL_PROTOCOL_MAVLINK 2
#define HIL_MODE_DISABLED 0 #define HIL_MODE_DISABLED 0
#define HIL_MODE_ATTITUDE 1 #define HIL_MODE_ATTITUDE 1
#define HIL_MODE_SENSORS 2 #define HIL_MODE_SENSORS 2
// GCS enumeration
#define GCS_PROTOCOL_STANDARD 0 // standard APM protocol
#define GCS_PROTOCOL_LEGACY 1 // legacy ArduPilot protocol
#define GCS_PROTOCOL_XPLANE 2 // X-Plane HIL simulation
#define GCS_PROTOCOL_DEBUGTERMINAL 3 //Human-readable debug interface for use with a dumb terminal
#define GCS_PROTOCOL_MAVLINK 4 // binary protocol for qgroundcontrol
#define GCS_PROTOCOL_NONE -1 // No GCS output
// Auto Pilot modes // Auto Pilot modes
// ---------------- // ----------------
#define MANUAL 0 #define MANUAL 0