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

Merge branch 'master' into esp_now_substr_fix

Browse Source
This commit is contained in:
Peter Pötzi
2021-12-29 05:38:16 +01:00
committed by GitHub
parent 6f1a69432d d9f41eb016
commit dfd2f45828
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main/can.cpp
View File

@ -282,6 +282,10 @@ void parseCanInput()
void sendCanCommands()
{
static uint32_t can_total_error_cnt = 0;
static uint32_t can_sequential_error_cnt = 0;
constexpr auto send = [](uint32_t addr, auto value){
twai_message_t message;
message.identifier = addr;
@ -300,12 +304,11 @@ void sendCanCommands()
}
static uint32_t can_total_error_cnt = 0;
static uint32_t can_sequential_error_cnt = 0;
if (result == ESP_ERR_TIMEOUT) {
++can_sequential_error_cnt;
++can_total_error_cnt;
ESP_LOGW(TAG, "twai_transmit() took %lld ms, seq err: %d, total err: %d",
espchrono::ago(timestamp_before).count(),
can_sequential_error_cnt,
@ -318,11 +321,8 @@ void sendCanCommands()
if (can_sequential_error_cnt > 3) {
can_sequential_error_cnt = 0;
if (configs.canBusResetOnError.value) {
if (const auto err = twai_stop(); err != ESP_OK)
ESP_LOGE(TAG, "ERROR: twai_stop() failed with %s", esp_err_to_name(err));
if (const auto err = twai_start(); err != ESP_OK)
ESP_LOGE(TAG, "ERROR: twai_start() failed with %s", esp_err_to_name(err));
ESP_LOGE(TAG, "CAN BUS RESET: twai_stop(): %s", esp_err_to_name(twai_stop()));
ESP_LOGE(TAG, "CAN BUS RESET: twai_start(): %s", esp_err_to_name(twai_start()));
}
}