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

More lbm can-fixes

This commit is contained in:
Benjamin Vedder 2022-10-10 17:06:49 +02:00
parent bea4d63b7a
commit 43f525ba30
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
comm/comm_can.c
View File

@ -1295,18 +1295,26 @@ static THD_FUNCTION(cancom_process_thread, arg) {
}
if (rxmsg.IDE == CAN_IDE_STD) {
bool sid_cb_used = false;
if (sid_callback) {
sid_callback(rxmsg.SID, rxmsg.data8, rxmsg.DLC);
sid_cb_used = sid_callback(rxmsg.SID, rxmsg.data8, rxmsg.DLC);
}
} else {
if (eid_callback) {
eid_callback(rxmsg.EID, rxmsg.data8, rxmsg.DLC);
}
}
#ifdef USE_LISPBM
lispif_process_can(rxmsg.EID, rxmsg.data8, rxmsg.DLC, true);
if (!sid_cb_used) {
lispif_process_can(rxmsg.SID, rxmsg.data8, rxmsg.DLC, false);
}
#endif
} else {
bool eid_cb_used = false;
if (eid_callback) {
eid_cb_used = eid_callback(rxmsg.EID, rxmsg.data8, rxmsg.DLC);
}
#ifdef USE_LISPBM
if (!eid_cb_used) {
lispif_process_can(rxmsg.EID, rxmsg.data8, rxmsg.DLC, true);
}
#endif
}
}
continue;
}
@ -1341,7 +1349,7 @@ static THD_FUNCTION(cancom_process_thread, arg) {
#ifdef USE_LISPBM
if (!sid_cb_used) {
lispif_process_can(rxmsg.EID, rxmsg.data8, rxmsg.DLC, false);
lispif_process_can(rxmsg.SID, rxmsg.data8, rxmsg.DLC, false);
}
#endif
}

2
conf_general.h
View File

@ -24,7 +24,7 @@
#define FW_VERSION_MAJOR 6
#define FW_VERSION_MINOR 00
// Set to 0 for building a release and iterate during beta test builds
#define FW_TEST_VERSION_NUMBER 65
#define FW_TEST_VERSION_NUMBER 66
#include "datatypes.h"