Browse Source

AntennaTracker: fix for HAL_SITL rename

master
Andrew Tridgell 10 years ago
parent
commit
429efc4d6c
  1. 4
      AntennaTracker/AntennaTracker.pde
  2. 2
      AntennaTracker/GCS_Mavlink.pde
  3. 2
      AntennaTracker/Parameters.pde

4
AntennaTracker/AntennaTracker.pde

@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
#include "GCS.h"
#include <AP_HAL_AVR.h>
#include <AP_HAL_AVR_SITL.h>
#include <AP_HAL_SITL.h>
#include <AP_HAL_PX4.h>
#include <AP_HAL_FLYMAPLE.h>
#include <AP_HAL_Linux.h>
@ -138,7 +138,7 @@ AP_AHRS_NavEKF ahrs(ins, barometer, gps, rng); @@ -138,7 +138,7 @@ AP_AHRS_NavEKF ahrs(ins, barometer, gps, rng);
AP_AHRS_DCM ahrs(ins, barometer, gps);
#endif
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
SITL sitl;
#endif

2
AntennaTracker/GCS_Mavlink.pde

@ -158,7 +158,7 @@ static void NOINLINE send_nav_controller_output(mavlink_channel_t chan) @@ -158,7 +158,7 @@ static void NOINLINE send_nav_controller_output(mavlink_channel_t chan)
// report simulator state
static void NOINLINE send_simstate(mavlink_channel_t chan)
{
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
sitl.simstate_send(chan);
#endif
}

2
AntennaTracker/Parameters.pde

@ -230,7 +230,7 @@ const AP_Param::Info var_info[] PROGMEM = { @@ -230,7 +230,7 @@ const AP_Param::Info var_info[] PROGMEM = {
// @Path: ../libraries/AP_AHRS/AP_AHRS.cpp
GOBJECT(ahrs, "AHRS_", AP_AHRS),
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL
// @Group: SIM_
// @Path: ../libraries/SITL/SITL.cpp
GOBJECT(sitl, "SIM_", SITL),

Loading…
Cancel
Save