Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_HAL_ChibiOS: fix dshot timeout bug where the elapsed pulse is longer than the send time 

dshot timeouts should be no longer than the pulse interval
use correct timestamp for dmar send time
This commit is contained in:
Andy Piper 2022-04-06 18:44:34 +01:00 committed by Andrew Tridgell
parent 11637e784f
commit f51b5dab84
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/AP_HAL_ChibiOS/RCOutput.cpp
View File

@ -239,17 +239,18 @@ void RCOutput::dshot_collect_dma_locks(uint32_t time_out_us)
const uint32_t pulse_elapsed_us = now - group.last_dmar_send_us; const uint32_t pulse_elapsed_us = now - group.last_dmar_send_us;
uint32_t wait_us = 0; uint32_t wait_us = 0;
if (now < time_out_us) { if (now < time_out_us) {
wait_us = MAX(time_out_us - now, group.dshot_pulse_send_time_us - pulse_elapsed_us); wait_us = time_out_us - now;
} else if (pulse_elapsed_us < group.dshot_pulse_send_time_us) { }
if (pulse_elapsed_us < group.dshot_pulse_send_time_us) {
// better to let the burst write in progress complete rather than cancelling mid way through // better to let the burst write in progress complete rather than cancelling mid way through
wait_us = group.dshot_pulse_send_time_us - pulse_elapsed_us; wait_us = MAX(wait_us, group.dshot_pulse_send_time_us - pulse_elapsed_us);
} }
// waiting for a very short period of time can cause a // waiting for a very short period of time can cause a
// timer wrap with ChibiOS timers. Use CH_CFG_ST_TIMEDELTA // timer wrap with ChibiOS timers. Use CH_CFG_ST_TIMEDELTA
// as minimum. Don't allow for a very long delay (over 1200us) // as minimum. Don't allow for a very long delay (over _dshot_period_us)
// to prevent bugs in handling timer wrap // to prevent bugs in handling timer wrap
const uint32_t max_delay_us = 1200; const uint32_t max_delay_us = _dshot_period_us;
const uint32_t min_delay_us = 10; // matches our CH_CFG_ST_TIMEDELTA const uint32_t min_delay_us = 10; // matches our CH_CFG_ST_TIMEDELTA
wait_us = constrain_uint32(wait_us, min_delay_us, max_delay_us); wait_us = constrain_uint32(wait_us, min_delay_us, max_delay_us);
mask = chEvtWaitOneTimeout(group.dshot_event_mask, chTimeUS2I(wait_us)); mask = chEvtWaitOneTimeout(group.dshot_event_mask, chTimeUS2I(wait_us));
@ -1546,7 +1547,7 @@ void RCOutput::send_pulses_DMAR(pwm_group &group, uint32_t buffer_length)
dmaStreamEnable(group.dma); dmaStreamEnable(group.dma);
// record when the transaction was started // record when the transaction was started
group.last_dmar_send_us = AP_HAL::micros64(); group.last_dmar_send_us = AP_HAL::micros();
#endif //#ifndef DISABLE_DSHOT #endif //#ifndef DISABLE_DSHOT
} }