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

AP_RangeFinder: use typename SIM instead of SITL as it conflicts with namespace name

Browse Source
This commit is contained in:
bugobliterator 2021-07-30 16:11:47 +05:30 committed by Andrew Tridgell
parent 62b6350af1
commit e51d358552
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_RangeFinder/AP_RangeFinder.cpp
View File

@ -556,7 +556,7 @@ void RangeFinder::detect_instance(uint8_t instance, uint8_t& serial_instance)
} }
break; break;
case Type::SITL: case Type::SIM:
#if CONFIG_HAL_BOARD == HAL_BOARD_SITL #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
_add_backend(new AP_RangeFinder_SITL(state[instance], params[instance], instance), instance); _add_backend(new AP_RangeFinder_SITL(state[instance], params[instance], instance), instance);
#endif #endif

2
libraries/AP_RangeFinder/AP_RangeFinder.h
View File

@ -88,7 +88,7 @@ public:
GYUS42v2 = 31, GYUS42v2 = 31,
MSP = 32, MSP = 32,
USD1_CAN = 33, USD1_CAN = 33,
SITL = 100, SIM = 100,
}; };
enum class Function { enum class Function {