aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_Logger: add AUX switch to pause logging of streamed entries

Browse Source
This commit is contained in:
Henry Wurzburg 2022-07-26 18:41:04 -05:00 committed by Andrew Tridgell
parent f9f0f60815
commit a395b3d2a8
5 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Logger/AP_Logger.h
View File

@ -250,6 +250,12 @@ public:
void set_num_types(uint8_t num_types) { _num_types = num_types; } void set_num_types(uint8_t num_types) { _num_types = num_types; }
bool CardInserted(void); bool CardInserted(void);
bool _log_pause;
// pause logging if aux switch is active and log rate limit enabled
void log_pause(bool value) {
_log_pause = value;
}
// erase handling // erase handling
void EraseAll(); void EraseAll();

9
libraries/AP_Logger/AP_Logger_Backend.cpp
View File

@ -658,9 +658,8 @@ AP_Logger_RateLimiter::AP_Logger_RateLimiter(const AP_Logger &_front, const AP_F
*/ */
bool AP_Logger_RateLimiter::should_log_streaming(uint8_t msgid) bool AP_Logger_RateLimiter::should_log_streaming(uint8_t msgid)
{ {
if (rate_limit_hz <= 0) { if (front._log_pause) {
// no limiting (user changed the parameter) return false;
return true;
} }
const uint16_t now = AP_HAL::millis16(); const uint16_t now = AP_HAL::millis16();
uint16_t delta_ms = now - last_send_ms[msgid]; uint16_t delta_ms = now - last_send_ms[msgid];
@ -678,8 +677,8 @@ bool AP_Logger_RateLimiter::should_log_streaming(uint8_t msgid)
*/ */
bool AP_Logger_RateLimiter::should_log(uint8_t msgid, bool writev_streaming) bool AP_Logger_RateLimiter::should_log(uint8_t msgid, bool writev_streaming)
{ {
if (rate_limit_hz <= 0) { if (rate_limit_hz <= 0 && !front._log_pause) {
// no limiting (user changed the parameter) // no rate limiting if not paused and rate is zero(user changed the parameter)
return true; return true;
} }
if (last_send_ms[msgid] == 0 && !writev_streaming) { if (last_send_ms[msgid] == 0 && !writev_streaming) {

4
libraries/AP_Logger/AP_Logger_Block.cpp
View File

@ -307,8 +307,8 @@ void AP_Logger_Block::periodic_1Hz()
{ {
AP_Logger_Backend::periodic_1Hz(); AP_Logger_Backend::periodic_1Hz();
if (rate_limiter == nullptr && _front._params.blk_ratemax > 0) { if (rate_limiter == nullptr && (_front._params.blk_ratemax > 0 || _front._log_pause)) {
// setup rate limiting // setup rate limiting if log rate max > 0Hz or log pause of streaming entries is requested
rate_limiter = new AP_Logger_RateLimiter(_front, _front._params.blk_ratemax); rate_limiter = new AP_Logger_RateLimiter(_front, _front._params.blk_ratemax);
} }

4
libraries/AP_Logger/AP_Logger_File.cpp
View File

@ -153,8 +153,8 @@ void AP_Logger_File::periodic_1Hz()
} }
} }
if (rate_limiter == nullptr && _front._params.file_ratemax > 0) { if (rate_limiter == nullptr && (_front._params.file_ratemax > 0 || _front._log_pause)) {
// setup rate limiting // setup rate limiting if log rate max > 0Hz or log pause of streaming entries is requested
rate_limiter = new AP_Logger_RateLimiter(_front, _front._params.file_ratemax); rate_limiter = new AP_Logger_RateLimiter(_front, _front._params.file_ratemax);
} }
} }

4
libraries/AP_Logger/AP_Logger_MAVLink.cpp
View File

@ -524,8 +524,8 @@ void AP_Logger_MAVLink::periodic_10Hz(const uint32_t now)
} }
void AP_Logger_MAVLink::periodic_1Hz() void AP_Logger_MAVLink::periodic_1Hz()
{ {
if (rate_limiter == nullptr && _front._params.mav_ratemax > 0) { if (rate_limiter == nullptr && (_front._params.mav_ratemax > 0 || _front._log_pause)) {
// setup rate limiting // setup rate limiting if log rate max > 0Hz or log pause of streaming entries is requested
rate_limiter = new AP_Logger_RateLimiter(_front, _front._params.mav_ratemax); rate_limiter = new AP_Logger_RateLimiter(_front, _front._params.mav_ratemax);
} }