From 62d7fd1a2603c52b700adf37acf6cb367e16b068 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 19 Dec 2012 11:33:05 +1100 Subject: [PATCH] Plane: fixed HIL builds --- ArduPlane/ArduPlane.pde | 4 ++-- ArduPlane/Makefile | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ArduPlane/ArduPlane.pde b/ArduPlane/ArduPlane.pde index 4c5580991c..8b5aa31257 100644 --- a/ArduPlane/ArduPlane.pde +++ b/ArduPlane/ArduPlane.pde @@ -193,14 +193,14 @@ AP_AHRS_DCM ahrs(&ins, g_gps); // sensor emulators AP_Baro_BMP085_HIL barometer; AP_Compass_HIL compass; -AP_GPS_HIL g_gps_driver(NULL); +AP_GPS_HIL g_gps_driver; AP_InertialSensor_Stub ins; AP_AHRS_DCM ahrs(&ins, g_gps); #elif HIL_MODE == HIL_MODE_ATTITUDE AP_Baro_BMP085_HIL barometer; AP_Compass_HIL compass; -AP_GPS_HIL g_gps_driver(NULL); +AP_GPS_HIL g_gps_driver; AP_InertialSensor_Stub ins; AP_AHRS_HIL ahrs(&ins, g_gps); diff --git a/ArduPlane/Makefile b/ArduPlane/Makefile index 2502d3615f..28e611cefa 100644 --- a/ArduPlane/Makefile +++ b/ArduPlane/Makefile @@ -1,2 +1,5 @@ include ../mk/Arduino.mk include ../mk/targets.mk + +sitl-newcontrollers: EXTRAFLAGS += "-DAPM_CONTROL=ENABLED " +sitl-newcontrollers: sitl