Browse Source

SITL: fixed SIM_IMU_COUNT conflict

this came from merging two PRs which both changed SITL params
c415-sdk
Andrew Tridgell 5 years ago
parent
commit
b18928e28e
  1. 6
      libraries/SITL/SITL.cpp

6
libraries/SITL/SITL.cpp

@ -211,6 +211,9 @@ const AP_Param::GroupInfo SITL::var_info3[] = { @@ -211,6 +211,9 @@ const AP_Param::GroupInfo SITL::var_info3[] = {
AP_GROUPINFO("RATE_HZ", 22, SITL, loop_rate_hz, 1200),
// count of simulated IMUs
AP_GROUPINFO("IMU_COUNT", 23, SITL, imu_count, 2),
// @Path: ./SIM_RichenPower.cpp
AP_SUBGROUPINFO(richenpower_sim, "RICH_", 31, SITL, RichenPower),
@ -249,9 +252,6 @@ const AP_Param::GroupInfo SITL::var_info3[] = { @@ -249,9 +252,6 @@ const AP_Param::GroupInfo SITL::var_info3[] = {
// user settable common airspeed parameters
AP_GROUPINFO("ARSPD_SIGN", 62, SITL, arspd_signflip, 0),
// count of simulated IMUs
AP_GROUPINFO("IMU_COUNT", 36, SITL, imu_count, 2),
AP_GROUPEND
};

Loading…
Cancel
Save