fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 18:08:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #123 from UAVCAN/stm32-chibios-18

Browse Source 
STM32 ChibiOS 18 support
This commit is contained in:
Pavel Kirienko
2018-04-19 15:34:33 +03:00
committed by GitHub
parent 9a8b059e21 fca62242ba
commit dbd037b082
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libuavcan_drivers/stm32/driver/src/uc_stm32_can.cpp
+4
View File
@@ -551,7 +551,11 @@ bool CanIface::waitMsrINakBitStateChange(bool target_state)
::usleep(1000);
#endif
#if UAVCAN_STM32_CHIBIOS
#ifdef MS2ST
::chThdSleep(MS2ST(1));
#else
::chThdSleep(TIME_MS2I(1));
#endif
#endif
#if UAVCAN_STM32_FREERTOS
::osDelay(1);
libuavcan_drivers/stm32/driver/src/uc_stm32_thread.cpp
+3 -1
View File
@@ -34,8 +34,10 @@ bool BusEvent::wait(uavcan::MonotonicDuration duration)
{
# if (CH_KERNEL_MAJOR == 2)
ret = sem_.waitTimeout((msec > MaxDelayMSec) ? MS2ST(MaxDelayMSec) : MS2ST(msec));
# else // ChibiOS 3+
# elif defined(MS2ST) // ChibiOS 3+
ret = sem_.wait((msec > MaxDelayMSec) ? MS2ST(MaxDelayMSec) : MS2ST(msec));
# else // ChibiOS 17+
ret = sem_.wait(::systime_t((msec > MaxDelayMSec) ? TIME_MS2I(MaxDelayMSec) : TIME_MS2I(msec)));
# endif
}
# if (CH_KERNEL_MAJOR == 2)