Browse Source

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

gps-1.3.1
bugobliterator 4 years ago committed by Andrew Tridgell
parent
commit
e51d358552
  1. 2
      libraries/AP_RangeFinder/AP_RangeFinder.cpp
  2. 2
      libraries/AP_RangeFinder/AP_RangeFinder.h

2
libraries/AP_RangeFinder/AP_RangeFinder.cpp

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

2
libraries/AP_RangeFinder/AP_RangeFinder.h

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

Loading…
Cancel
Save