Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-22 00:28:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_RangeFinder: JRE rename data_buff_ofs

Browse Source
This commit is contained in:
Randy Mackay 2023-11-15 09:30:11 +09:00
parent 6bd7024274
commit da6f31d5c7
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libraries/AP_RangeFinder/AP_RangeFinder_JRE_Serial.cpp
View File

@ -31,7 +31,7 @@
void AP_RangeFinder_JRE_Serial::move_preamble_in_buffer(uint8_t search_start_pos) void AP_RangeFinder_JRE_Serial::move_preamble_in_buffer(uint8_t search_start_pos)
{ {
uint8_t i; uint8_t i;
for (i=search_start_pos; i<data_buff_idx; i++) { for (i=search_start_pos; i<data_buff_ofs; i++) {
if (data_buff[i] == FRAME_HEADER_1) { if (data_buff[i] == FRAME_HEADER_1) {
break; break;
} }
@ -39,8 +39,8 @@ void AP_RangeFinder_JRE_Serial::move_preamble_in_buffer(uint8_t search_start_pos
if (i == 0) { if (i == 0) {
return; return;
} }
memmove(data_buff, &data_buff[i], data_buff_idx-i); memmove(data_buff, &data_buff[i], data_buff_ofs-i);
data_buff_idx = data_buff_idx - i; data_buff_ofs = data_buff_ofs - i;
} }
bool AP_RangeFinder_JRE_Serial::get_reading(float &reading_m) bool AP_RangeFinder_JRE_Serial::get_reading(float &reading_m)
@ -61,8 +61,8 @@ bool AP_RangeFinder_JRE_Serial::get_reading(float &reading_m)
while (bytes_available > 0) { while (bytes_available > 0) {
// fill buffer // fill buffer
const auto num_bytes_to_read = MIN(bytes_available, ARRAY_SIZE(data_buff) - data_buff_idx); const auto num_bytes_to_read = MIN(bytes_available, ARRAY_SIZE(data_buff) - data_buff_ofs);
const auto num_bytes_read = uart->read(&data_buff[data_buff_idx], num_bytes_to_read); const auto num_bytes_read = uart->read(&data_buff[data_buff_ofs], num_bytes_to_read);
if (num_bytes_read == 0) { if (num_bytes_read == 0) {
break; break;
} }
@ -71,13 +71,13 @@ bool AP_RangeFinder_JRE_Serial::get_reading(float &reading_m)
break; break;
} }
bytes_available -= num_bytes_read; bytes_available -= num_bytes_read;
data_buff_idx += num_bytes_read; data_buff_ofs += num_bytes_read;
// move header frame header in buffer // move header frame header in buffer
move_preamble_in_buffer(0); move_preamble_in_buffer(0);
// ensure we have a packet type: // ensure we have a packet type:
if (data_buff_idx < 2) { if (data_buff_ofs < 2) {
continue; continue;
} }
@ -99,7 +99,7 @@ bool AP_RangeFinder_JRE_Serial::get_reading(float &reading_m)
} }
// check there are enough bytes for message type // check there are enough bytes for message type
if (data_buff_idx < packet_length) { if (data_buff_ofs < packet_length) {
continue; continue;
} }

2
libraries/AP_RangeFinder/AP_RangeFinder_JRE_Serial.h
View File

@ -95,7 +95,7 @@ private:
void move_preamble_in_buffer(uint8_t search_start_pos); void move_preamble_in_buffer(uint8_t search_start_pos);
uint8_t data_buff[48 * 3]; // 48 is longest possible packet uint8_t data_buff[48 * 3]; // 48 is longest possible packet
uint8_t data_buff_idx; uint8_t data_buff_ofs; // index where next item will be added in data_buff
bool no_signal; // true if the latest read attempt found no valid distances bool no_signal; // true if the latest read attempt found no valid distances
}; };