Browse Source

AP_RangeFinder: Rename function in TeraRanger driver

master
pierre-louis.k 7 years ago committed by Randy Mackay
parent
commit
b6f1647c31
  1. 4
      libraries/AP_RangeFinder/AP_RangeFinder_TeraRangerI2C.cpp
  2. 2
      libraries/AP_RangeFinder/AP_RangeFinder_TeraRangerI2C.h

4
libraries/AP_RangeFinder/AP_RangeFinder_TeraRangerI2C.cpp

@ -131,7 +131,7 @@ bool AP_RangeFinder_TeraRangerI2C::collect_raw(uint16_t &raw_distance) @@ -131,7 +131,7 @@ bool AP_RangeFinder_TeraRangerI2C::collect_raw(uint16_t &raw_distance)
}
// Checks for error code and if correct converts to cm
bool AP_RangeFinder_TeraRangerI2C::check_measure(uint16_t raw_distance, uint16_t &output_distance_cm)
bool AP_RangeFinder_TeraRangerI2C::process_raw_measure(uint16_t raw_distance, uint16_t &output_distance_cm)
{
// Check for error codes
if (raw_distance == 0xFFFF) {
@ -160,7 +160,7 @@ void AP_RangeFinder_TeraRangerI2C::timer(void) @@ -160,7 +160,7 @@ void AP_RangeFinder_TeraRangerI2C::timer(void)
uint16_t _distance_cm = 0;
if (collect_raw(_raw_distance) && _sem->take(HAL_SEMAPHORE_BLOCK_FOREVER)) {
if(check_measure(_raw_distance, _distance_cm)){
if(process_raw_measure(_raw_distance, _distance_cm)){
accum.sum += _distance_cm;
accum.count++;
}

2
libraries/AP_RangeFinder/AP_RangeFinder_TeraRangerI2C.h

@ -27,7 +27,7 @@ private: @@ -27,7 +27,7 @@ private:
bool measure(void);
bool collect_raw(uint16_t &raw_distance);
bool check_measure(uint16_t raw_distance, uint16_t &distance_cm);
bool process_raw_measure(uint16_t raw_distance, uint16_t &distance_cm);
bool init(void);
void timer(void);

Loading…
Cancel
Save