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

AP_RangeFinder: Rename function in TeraRanger driver

Browse Source
This commit is contained in:
pierre-louis.k 2018-08-03 16:42:20 +02:00 committed by Randy Mackay
parent b9af00e7dd
commit 5069540ad0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_RangeFinder/AP_RangeFinder_TeraRangerI2C.cpp
View File

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

2
libraries/AP_RangeFinder/AP_RangeFinder_TeraRangerI2C.h
View File

@ -27,7 +27,7 @@ private:
bool measure(void); bool measure(void);
bool collect_raw(uint16_t &raw_distance); 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); bool init(void);
void timer(void); void timer(void);