Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Compass: fixes for merge with master

This commit is contained in:
Andrew Tridgell 2017-06-08 15:12:15 +10:00
parent 04430457d5
commit bcd305c821
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Compass/AP_Compass_MMC3416.cpp
View File

@ -112,7 +112,7 @@ bool AP_Compass_MMC3416::init()
// call timer() at 100Hz
dev->register_periodic_callback(10000,
FUNCTOR_BIND_MEMBER(&AP_Compass_MMC3416::timer, bool));
FUNCTOR_BIND_MEMBER(&AP_Compass_MMC3416::timer, void));
// wait 250ms for the compass to make it's initial readings
hal.scheduler->delay(250);
@ -120,7 +120,7 @@ bool AP_Compass_MMC3416::init()
return true;
}
bool AP_Compass_MMC3416::timer()
void AP_Compass_MMC3416::timer()
{
const uint16_t measure_count_limit = 50;
const uint16_t zero_offset = 32768; // 16 bit mode
@ -280,8 +280,6 @@ bool AP_Compass_MMC3416::timer()
break;
}
}
return true;
}
/*

2
libraries/AP_Compass/AP_Compass_MMC3416.h
View File

@ -58,7 +58,7 @@ private:
* Device periodic callback to read data from the sensor.
*/
bool init();
bool timer();
void timer();
void accumulate_field(Vector3f &field);
uint8_t compass_instance;