Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-05 07:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Plane: fix for HAL_SITL rename

Browse Source
This commit is contained in:
Andrew Tridgell 2015-05-04 16:18:55 +10:00
parent 5a36b9955e
commit a299fdacdf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ArduPlane/ArduPlane.pde
View File

@ -103,7 +103,7 @@ static AP_Vehicle::FixedWing aparm;
#include "Parameters.h" #include "Parameters.h"
#include <AP_HAL_AVR.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_PX4.h>
#include <AP_HAL_FLYMAPLE.h> #include <AP_HAL_FLYMAPLE.h>
#include <AP_HAL_Linux.h> #include <AP_HAL_Linux.h>
@ -220,7 +220,7 @@ static AP_PitchController pitchController(ahrs, aparm, DataFlash);
static AP_YawController yawController(ahrs, aparm); static AP_YawController yawController(ahrs, aparm);
static AP_SteerController steerController(ahrs); static AP_SteerController steerController(ahrs);
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
SITL sitl; SITL sitl;
#endif #endif

2
ArduPlane/GCS_Mavlink.pde
View File

@ -429,7 +429,7 @@ static mavlink_hil_state_t last_hil_state;
// report simulator state // report simulator state
static void NOINLINE send_simstate(mavlink_channel_t chan) 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); sitl.simstate_send(chan);
#else #else
if (g.hil_mode == 1) { if (g.hil_mode == 1) {

2
ArduPlane/Log.pde
View File

@ -186,7 +186,7 @@ static void Log_Write_Attitude(void)
#endif #endif
DataFlash.Log_Write_AHRS2(ahrs); DataFlash.Log_Write_AHRS2(ahrs);
#endif #endif
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
sitl.Log_Write_SIMSTATE(DataFlash); sitl.Log_Write_SIMSTATE(DataFlash);
#endif #endif
} }

2
ArduPlane/Parameters.pde
View File

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