feedc0de/bobbycar-controller-firmware
1
0
Fork 0
Code Issues 8 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Fixed compiler warnings

Browse Source
This commit is contained in:
0xFEEDC0DE64
2021-06-28 10:47:14 +02:00
parent abe066df79
commit c21ad44f9c
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bobbycar-protocol

Submodule bobbycar-protocol updated: 964acb82f0...2e0f97d6dd

35
main.cpp
View File

@ -109,6 +109,8 @@ CAN_HandleTypeDef CanHandle;
#define CANx_RX_IRQHandler USB_LP_CAN1_RX0_IRQHandler
#define CANx_TX_IRQn USB_HP_CAN1_TX_IRQn
#define CANx_TX_IRQHandler USB_HP_CAN1_TX_IRQHandler
constexpr bool doDelayWithCanPoll = false;
#endif
#ifdef LOG_TO_SERIAL
@ -360,23 +362,27 @@ int main()
while (true)
{
#ifdef FEATURE_CAN
constexpr auto DELAY_WITH_CAN_POLL = [](uint32_t Delay){
uint32_t tickstart = HAL_GetTick();
uint32_t wait = Delay;
if constexpr (doDelayWithCanPoll)
{
constexpr auto DELAY_WITH_CAN_POLL = [](uint32_t Delay){
uint32_t tickstart = HAL_GetTick();
uint32_t wait = Delay;
/* Add a freq to guarantee minimum wait */
if (wait < HAL_MAX_DELAY)
{
wait += (uint32_t)(uwTickFreq);
}
/* Add a freq to guarantee minimum wait */
if (wait < HAL_MAX_DELAY)
{
wait += (uint32_t)(uwTickFreq);
}
while ((HAL_GetTick() - tickstart) < wait)
{
applyIncomingCanMessage();
}
};
while ((HAL_GetTick() - tickstart) < wait)
{
applyIncomingCanMessage();
}
};
//DELAY_WITH_CAN_POLL(5); //delay in ms
DELAY_WITH_CAN_POLL(5); //delay in ms
}
else
#endif
HAL_Delay(5); //delay in ms
@ -1364,6 +1370,7 @@ void poweroff()
}
#endif
[[maybe_unused]]
void communicationTimeout()
{
applyDefaultSettings();