aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compass: we don't need MAG_PROTOCOL any more

Browse Source 
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:
tridge60@gmail.com 2011-08-13 05:10:19 +00:00
parent c860fd736a
commit 88cd556c8d
3 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduCopterMega/ArduCopterMega.pde
View File

@ -126,14 +126,8 @@ static AP_Int8 *flight_modes = &g.flight_mode1;
// real sensors // real sensors
AP_ADC_ADS7844 adc; AP_ADC_ADS7844 adc;
APM_BMP085_Class barometer; APM_BMP085_Class barometer;
// MAG PROTOCOL
#if MAG_PROTOCOL == MAG_PROTOCOL_5843
AP_Compass_HMC5843 compass(Parameters::k_param_compass); 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 #ifdef OPTFLOW_ENABLED
AP_OpticalFlow_ADNS3080 optflow; AP_OpticalFlow_ADNS3080 optflow;
#endif #endif

3
ArduCopterMega/config.h
View File

@ -202,9 +202,6 @@
#ifndef MAG_ORIENTATION #ifndef MAG_ORIENTATION
# define MAG_ORIENTATION AP_COMPASS_COMPONENTS_DOWN_PINS_FORWARD # define MAG_ORIENTATION AP_COMPASS_COMPONENTS_DOWN_PINS_FORWARD
#endif #endif
#ifndef MAG_PROTOCOL
# define MAG_PROTOCOL MAG_PROTOCOL_5843 // Default Setting
#endif
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////

5
ArduCopterMega/defines.h
View File

@ -9,11 +9,6 @@
#define SONAR 0 #define SONAR 0
#define BARO 1 #define BARO 1
//MAGNETOMETER
// ----------------------
#define MAG_PROTOCOL_5843 0
#define MAG_PROTOCOL_5883L 1
// CH 7 control // CH 7 control
#define DO_SET_HOVER 0 #define DO_SET_HOVER 0
#define DO_FLIP 1 #define DO_FLIP 1