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

AP_HAL: fixed get_size() on ObjectBuffer to be consistent with set_size()

Browse Source
This commit is contained in:
Andrew Tridgell 2021-01-15 09:57:06 +11:00 committed by Peter Barker
parent 3d03979b16
commit 90aed6f338
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/AP_HAL/utility/RingBuffer.h
View File

@ -128,7 +128,10 @@ public:
} }
// return size of ringbuffer // return size of ringbuffer
uint32_t get_size(void) const { return buffer->get_size() / sizeof(T); } uint32_t get_size(void) const {
uint32_t size = buffer->get_size() / sizeof(T);
return size>0?size-1:0;
}
// set size of ringbuffer, caller responsible for locking // set size of ringbuffer, caller responsible for locking
bool set_size(uint32_t size) { return buffer->set_size(((size+1) * sizeof(T))); } bool set_size(uint32_t size) { return buffer->set_size(((size+1) * sizeof(T))); }
@ -288,7 +291,8 @@ public:
// return size of ringbuffer // return size of ringbuffer
uint32_t get_size(void) { uint32_t get_size(void) {
WITH_SEMAPHORE(sem); WITH_SEMAPHORE(sem);
return buffer->get_size() / sizeof(T); uint32_t size = buffer->get_size() / sizeof(T);
return size>0?size-1:0;
} }
// set size of ringbuffer, caller responsible for locking // set size of ringbuffer, caller responsible for locking