andreika-git
/
rusefi
mirror of https://github.com/andreika-git/rusefi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

only:resetCanWriteCycle

This commit is contained in:
rusefillc 2024-07-25 18:35:36 -04:00 committed by Andrey
parent 30b597e1c4
commit df1dce9ade
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
firmware/controllers/can/can.h
View File

@ -40,6 +40,8 @@ enum class CanInterval : uint16_t {
_MAX_Cycle = _1000ms, _MAX_Cycle = _1000ms,
}; };
void resetCanWriteCycle();
// 11 bit (CAN 2.0A) // 11 bit (CAN 2.0A)
#define IS_EXT_RANGE_ID(id) ((id) >= 2048) #define IS_EXT_RANGE_ID(id) ((id) >= 2048)

15
firmware/controllers/can/can_tx.cpp
View File

@ -30,14 +30,19 @@ PUBLIC_API_WEAK bool boardEnableSendWidebandInfo() { return true; }
extern bool withHwQcActivity; extern bool withHwQcActivity;
static uint16_t m_cycleCount = 0;
void resetCanWriteCycle() {
m_cycleCount = 0;
}
void CanWrite::PeriodicTask(efitick_t nowNt) { void CanWrite::PeriodicTask(efitick_t nowNt) {
UNUSED(nowNt); UNUSED(nowNt);
static uint16_t cycleCount = 0; CanCycle cycle(m_cycleCount);
CanCycle cycle(cycleCount);
//in case we have Verbose Can enabled, we should keep user configured period //in case we have Verbose Can enabled, we should keep user configured period
if (engineConfiguration->enableVerboseCanTx && !engine->pauseCANdueToSerial) { if (engineConfiguration->enableVerboseCanTx && !engine->pauseCANdueToSerial) {
uint16_t cycleCountsPeriodMs = cycleCount * CAN_CYCLE_PERIOD; uint16_t cycleCountsPeriodMs = m_cycleCount * CAN_CYCLE_PERIOD;
if (0 != engineConfiguration->canSleepPeriodMs) { if (0 != engineConfiguration->canSleepPeriodMs) {
if (cycleCountsPeriodMs % engineConfiguration->canSleepPeriodMs) { if (cycleCountsPeriodMs % engineConfiguration->canSleepPeriodMs) {
void sendCanVerbose(); void sendCanVerbose();
@ -54,7 +59,7 @@ void CanWrite::PeriodicTask(efitick_t nowNt) {
if (cycle.isInterval(CI::_MAX_Cycle)) { if (cycle.isInterval(CI::_MAX_Cycle)) {
//we now reset cycleCount since we reached max cycle count //we now reset cycleCount since we reached max cycle count
cycleCount = 0; m_cycleCount = 0;
} }
updateDash(cycle); updateDash(cycle);
@ -78,7 +83,7 @@ void CanWrite::PeriodicTask(efitick_t nowNt) {
} }
#endif #endif
cycleCount++; m_cycleCount++;
} }
CanInterval CanCycle::computeFlags(uint32_t cycleCount) { CanInterval CanCycle::computeFlags(uint32_t cycleCount) {