Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_SITL: Rename LORD to MicroStrain 

Signed-off-by: Ryan Friedman <ryanfriedman5410+github@gmail.com>
This commit is contained in:
Ryan Friedman 2023-08-04 15:32:03 -06:00 committed by Andrew Tridgell
parent 109c894929
commit e0b23ddf8f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libraries/AP_HAL_SITL/SITL_State.cpp
View File

@ -431,12 +431,12 @@ SITL::SerialDevice *SITL_State::create_serial_sim(const char *name, const char *
}
vectornav = new SITL::VectorNav();
return vectornav;
} else if (streq(name, "LORD")) {
if (lord != nullptr) {
AP_HAL::panic("Only one LORD at a time");
} else if (streq(name, "MicroStrain")) {
if (microstrain != nullptr) {
AP_HAL::panic("Only one MicroStrain at a time");
}
lord = new SITL::LORD();
return lord;
microstrain = new SITL::MicroStrain();
return microstrain;
#if HAL_SIM_AIS_ENABLED
} else if (streq(name, "AIS")) {
if (ais != nullptr) {
@ -716,8 +716,8 @@ void SITL_State::_fdm_input_local(void)
vectornav->update();
}
if (lord != nullptr) {
lord->update();
if (microstrain != nullptr) {
microstrain->update();
}
#if HAL_SIM_AIS_ENABLED

6
libraries/AP_HAL_SITL/SITL_State.h
View File

@ -47,7 +47,7 @@
#include <SITL/SIM_RF_MAVLink.h>
#include <SITL/SIM_RF_GYUS42v2.h>
#include <SITL/SIM_VectorNav.h>
#include <SITL/SIM_LORD.h>
#include <SITL/SIM_MicroStrain.h>
#include <SITL/SIM_AIS.h>
#include <SITL/SIM_GPS.h>
@ -281,8 +281,8 @@ private:
// simulated VectorNav system:
SITL::VectorNav *vectornav;
// simulated LORD Microstrain system
SITL::LORD *lord;
// simulated LORD MicroStrain system
SITL::MicroStrain *microstrain;
#if HAL_SIM_JSON_MASTER_ENABLED
// Ride along instances via JSON SITL backend