mirror of
https://github.com/ArduPilot/ardupilot
synced 2025-01-10 18:08:30 -04:00
Compass: we don't need MAG_PROTOCOL any more
we only have one mag driver now git-svn-id: https://arducopter.googlecode.com/svn/trunk@3084 f9c3cf11-9bcb-44bc-f272-b75c42450872
This commit is contained in:
parent
c860fd736a
commit
88cd556c8d
@ -126,14 +126,8 @@ static AP_Int8 *flight_modes = &g.flight_mode1;
|
||||
// real sensors
|
||||
AP_ADC_ADS7844 adc;
|
||||
APM_BMP085_Class barometer;
|
||||
// MAG PROTOCOL
|
||||
#if MAG_PROTOCOL == MAG_PROTOCOL_5843
|
||||
AP_Compass_HMC5843 compass(Parameters::k_param_compass);
|
||||
#elif MAG_PROTOCOL == MAG_PROTOCOL_5883L
|
||||
AP_Compass_HMC5883L compass(Parameters::k_param_compass);
|
||||
#else
|
||||
#error Unrecognised MAG_PROTOCOL setting.
|
||||
#endif
|
||||
|
||||
#ifdef OPTFLOW_ENABLED
|
||||
AP_OpticalFlow_ADNS3080 optflow;
|
||||
#endif
|
||||
|
@ -202,9 +202,6 @@
|
||||
#ifndef MAG_ORIENTATION
|
||||
# define MAG_ORIENTATION AP_COMPASS_COMPONENTS_DOWN_PINS_FORWARD
|
||||
#endif
|
||||
#ifndef MAG_PROTOCOL
|
||||
# define MAG_PROTOCOL MAG_PROTOCOL_5843 // Default Setting
|
||||
#endif
|
||||
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////
|
||||
|
@ -9,11 +9,6 @@
|
||||
#define SONAR 0
|
||||
#define BARO 1
|
||||
|
||||
//MAGNETOMETER
|
||||
// ----------------------
|
||||
#define MAG_PROTOCOL_5843 0
|
||||
#define MAG_PROTOCOL_5883L 1
|
||||
|
||||
// CH 7 control
|
||||
#define DO_SET_HOVER 0
|
||||
#define DO_FLIP 1
|
||||
|
Loading…
Reference in New Issue
Block a user