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

Merge branch 'master' of https://code.google.com/p/ardupilot-mega

This commit is contained in:
Michael Oborne 2011-12-31 13:05:50 +08:00
parent 6a279138e9 c39ebde9de
commit 824fe055fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduCopter/sensors.pde
View File

@ -88,6 +88,8 @@ static void zero_airspeed(void)
} }
#endif // HIL_MODE != HIL_MODE_ATTITUDE
static void init_compass() static void init_compass()
{ {
compass.set_orientation(MAG_ORIENTATION); // set compass's orientation on aircraft compass.set_orientation(MAG_ORIENTATION); // set compass's orientation on aircraft
@ -110,8 +112,6 @@ static void init_optflow()
#endif #endif
} }
#endif // HIL_MODE != HIL_MODE_ATTITUDE
static void read_battery(void) static void read_battery(void)
{ {
battery_voltage1 = BATTERY_VOLTAGE(analogRead(BATTERY_PIN1)) * .1 + battery_voltage1 * .9; battery_voltage1 = BATTERY_VOLTAGE(analogRead(BATTERY_PIN1)) * .1 + battery_voltage1 * .9;