Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rover: fix for HAL_SITL rename

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

4
APMrover2/APMrover2.pde
View File

@ -103,7 +103,7 @@
#include <AP_Frsky_Telem.h> #include <AP_Frsky_Telem.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_VRBRAIN.h> #include <AP_HAL_VRBRAIN.h>
#include <AP_HAL_FLYMAPLE.h> #include <AP_HAL_FLYMAPLE.h>
@ -242,7 +242,7 @@ AP_Mission mission(ahrs, &start_command, &verify_command, &exit_mission);
static OpticalFlow optflow; static OpticalFlow optflow;
#if CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
SITL sitl; SITL sitl;
#endif #endif

2
APMrover2/GCS_Mavlink.pde
View File

@ -312,7 +312,7 @@ static void NOINLINE send_vfr_hud(mavlink_channel_t chan)
// 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);
#endif #endif
} }

2
APMrover2/Parameters.pde
View File

@ -471,7 +471,7 @@ const AP_Param::Info var_info[] PROGMEM = {
// @Path: ../libraries/AP_InertialSensor/AP_InertialSensor.cpp // @Path: ../libraries/AP_InertialSensor/AP_InertialSensor.cpp
GOBJECT(ins, "INS_", AP_InertialSensor), GOBJECT(ins, "INS_", AP_InertialSensor),
#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),

2
APMrover2/config.h
View File

@ -64,7 +64,7 @@
#elif CONFIG_HAL_BOARD == HAL_BOARD_APM2 #elif CONFIG_HAL_BOARD == HAL_BOARD_APM2
# define BATTERY_PIN_1 1 # define BATTERY_PIN_1 1
# define CURRENT_PIN_1 2 # define CURRENT_PIN_1 2
#elif CONFIG_HAL_BOARD == HAL_BOARD_AVR_SITL #elif CONFIG_HAL_BOARD == HAL_BOARD_SITL
# define BATTERY_PIN_1 1 # define BATTERY_PIN_1 1
# define CURRENT_PIN_1 2 # define CURRENT_PIN_1 2
#elif CONFIG_HAL_BOARD == HAL_BOARD_PX4 #elif CONFIG_HAL_BOARD == HAL_BOARD_PX4