souko/Kettenoeler
souko/Kettenoeler
1
0
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

Compare commits

base: souko:e3392d92c46b58ff8c52889030fb4b09ec195690
Branches Tags
souko:master
souko:PCB_Rev_1.4
souko:Firmware_1.4
souko:PCB_Rev_1.3
souko:PCB_Rev_1.2
souko:PCB_Rev_1.1
souko:PCB_Proto_1
..
compare: souko:c8f5cda4ba2c760b2d9ef8ba191ae6cfc7f6032d
Branches Tags
souko:master
souko:PCB_Rev_1.4
souko:Firmware_1.4
souko:PCB_Rev_1.3
souko:PCB_Rev_1.2
souko:PCB_Rev_1.1
souko:PCB_Proto_1

No commits in common. "e3392d92c46b58ff8c52889030fb4b09ec195690" and "c8f5cda4ba2c760b2d9ef8ba191ae6cfc7f6032d" have entirely different histories.
e3392d92c4 ... c8f5cda4ba

2 changed files with 2 additions and 4 deletions
Show Stats Expand all files Collapse all files

2
Software/src/can.cpp
View File

@ -39,7 +39,7 @@ uint32_t Process_CAN_WheelSpeed()
milimeters_to_add = (RWP_millimeter_per_second * timesincelast) / 1000; milimeters_to_add = (RWP_millimeter_per_second * timesincelast) / 1000;
} }
if (lastRecTimestamp > 1000) if (lastRecTimestamp != 0)
{ {
MaintainDTC(DTC_NO_CAN_SIGNAL, DTC_CRITICAL, (millis() > lastRecTimestamp + 10000 ? true : false)); MaintainDTC(DTC_NO_CAN_SIGNAL, DTC_CRITICAL, (millis() > lastRecTimestamp + 10000 ? true : false));
} }

4
Software/src/debugger.cpp
View File

@ -305,8 +305,6 @@ void Debug_ShowDTCs()
char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx char buff_timestamp[16]; // Format: DD-hh:mm:ss:xxx
char buff_active[9]; char buff_active[9];
Debug_pushMessage("\n timestamp | DTC-Nr. | status | severity\n");
for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++) for (uint32_t i = 0; i < MAX_DTC_STORAGE; i++)
{ {
if (DTCStorage[i].Number < DTC_LAST_DTC) if (DTCStorage[i].Number < DTC_LAST_DTC)
@ -325,7 +323,7 @@ void Debug_ShowDTCs()
else else
strcpy(buff_active, "none"); strcpy(buff_active, "none");
Debug_pushMessage("%s %7d %8s %8d\n", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].severity); Debug_pushMessage("%s \t %6d \t %s \t %d\n", buff_timestamp, DTCStorage[i].Number, buff_active, DTCStorage[i].severity);
} }
} }
} }