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

ArduCopter/sensors.pde

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