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

moving serial CAN to EXT 

only:small-can-board
This commit is contained in:
rusefillc 2024-04-07 09:34:34 -04:00
parent 2f6f733803
commit 9b28e46592
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/config/boards/hellen/small-can-board/meta-info-small-can-board.env
View File

@ -1,5 +1,6 @@
SHORT_BOARD_NAME=small-can-board
PROJECT_CPU=ARCH_STM32F4
# see '*OPENBLT_CAN*' in board.mk for CAN BLT
USE_OPENBLT=yes
# reminder that 'only:small-can-board' in commit message is the way to definitely build a specific target!
SKIP_RATE=50

5
firmware/config/boards/hellen/small-can-board/prepend.txt
View File

@ -2,7 +2,8 @@
#define CAN_ECU_SERIAL_RX_ID 0x300100
#define CAN_ECU_SERIAL_TX_ID 0x300102
#define ts_show_egt false
#define ts_show_engine_control false
@ -12,4 +13,4 @@
#define show_small_can_board_presets true
!#define LUA_SCRIPT_SIZE 30000
!#define LUA_SCRIPT_SIZE 30000

12
firmware/console/binary/serial_can.cpp
View File

@ -39,8 +39,8 @@ static CanTsListener listener;
int CanStreamerState::sendFrame(const IsoTpFrameHeader & header, const uint8_t *data, int num, can_sysinterval_t timeout) {
int dlc = 8; // standard 8 bytes
CanTxMessage txmsg(CanCategory::SERIAL, CAN_ECU_SERIAL_TX_ID, dlc, 0, false);
CanTxMessage txmsg(CanCategory::SERIAL, CAN_ECU_SERIAL_TX_ID, dlc, /*bus*/0, IS_EXT_RANGE_ID(CAN_ECU_SERIAL_TX_ID));
// fill the frame data according to the CAN-TP protocol (ISO 15765-2)
txmsg[0] = (uint8_t)((header.frameType & 0xf) << 4);
int offset, maxNumBytes;
@ -73,7 +73,7 @@ int CanStreamerState::sendFrame(const IsoTpFrameHeader & header, const uint8_t *
// bad frame type
return 0;
}
int numBytes = minI(maxNumBytes, num);
// copy the contents
if (data != nullptr) {
@ -141,7 +141,7 @@ int CanStreamerState::receiveFrame(CANRxFrame *rxmsg, uint8_t *buf, int num, can
memcpy(tmpRxBuf + sizeof(uint16_t), srcBuf, numBytesAvailable);
// copy the crc to the end
memcpy(tmpRxBuf + sizeof(uint16_t) + numBytesAvailable, crcBuffer, sizeof(crcBuffer));
// use the reconstructed tmp buffer as a source buffer
srcBuf = tmpRxBuf;
// we added the 16-bit size & 32-bit crc bytes
@ -296,7 +296,7 @@ can_msg_t CanStreamerState::streamAddToTxTimeout(size_t *np, const uint8_t *txbu
offset += numBytesToAdd;
numBytes -= numBytesToAdd;
}
if (engineConfiguration->verboseIsoTp) {
PRINT("*** INFO: streamAddToTxTimeout remaining goes to buffer %d" PRINT_EOL, numBytes);
}
@ -318,7 +318,7 @@ can_msg_t CanStreamerState::streamFlushTx(can_sysinterval_t timeout) {
//warning(ObdCode::CUSTOM_ERR_CAN_COMMUNICATION, "CAN sendDataTimeout() problems");
}
txFifoBuf.clear();
return CAN_MSG_OK;
}

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

@ -43,6 +43,9 @@ enum class CanInterval : uint16_t {
_MAX_Cycle = _1000ms,
};
// 11 bit (CAN 2.0A)
#define IS_EXT_RANGE_ID(id) ((id) >= 2048)
class CanListener;
class CanSensorBase;