FaSTTUBe/ams-master
56
1
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

fix: data PEC calculation

Browse Source
This commit is contained in:
Kilian Bracher 2025-03-25 19:28:44 +01:00
parent e4566b0cee
commit 2ace1dd04c
1 changed files with 26 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c
View File

@ -83,13 +83,8 @@ static uint8_t checkCommandPEC(uint8_t* data, uint8_t datalen) {
static uint16_t computeCRC10(const uint8_t* data, size_t length, bool rx_cmd) { static uint16_t computeCRC10(const uint8_t* data, size_t length, bool rx_cmd) {
uint16_t remainder = INITIAL_DATA_PEC; uint16_t remainder = INITIAL_DATA_PEC;
const uint16_t poly = 0x8F; const uint16_t poly = 0x8F;
size_t limit = length;
if (rx_cmd && (length > 0)) { for (size_t i = 0; i < length; i++) {
limit = length - 1;
}
for (size_t i = 0; i < limit; i++) {
remainder ^= (uint16_t)(data[i] << 2); remainder ^= (uint16_t)(data[i] << 2);
for (int b = 0; b < 8; b++) { for (int b = 0; b < 8; b++) {
if (remainder & 0x200) { if (remainder & 0x200) {
@ -100,9 +95,9 @@ static uint16_t computeCRC10(const uint8_t* data, size_t length, bool rx_cmd) {
} }
} }
// If receiving a command, handle leftover bits // Handle last bits of the last byte if rx_cmd is true
if (rx_cmd && (length > 0)) { if (rx_cmd) {
remainder ^= (uint16_t)((data[length - 1] & 0xFC) << 2); remainder ^= (uint16_t)((data[length] & 0xFC) << 2);
for (int b = 0; b < 6; b++) { for (int b = 0; b < 6; b++) {
if (remainder & 0x200) { if (remainder & 0x200) {
remainder = (uint16_t)((remainder << 1) ^ poly); remainder = (uint16_t)((remainder << 1) ^ poly);
@ -188,6 +183,8 @@ HAL_StatusTypeDef ___writeCMD(uint16_t command, uint8_t * args, size_t arglen) {
calculateCommandPEC(args, 4); calculateCommandPEC(args, 4);
for (size_t i = 0; i < N_BMS; i++) { for (size_t i = 0; i < N_BMS; i++) {
args[BUFFER_BMS_OFFSET(i, arglen) + arglen] = 0; // zero out the PEC
args[BUFFER_BMS_OFFSET(i, arglen) + arglen + 1] = 0;
calculateDataPEC(&args[4 + (i * (arglen + 2))], arglen + 2); //DPEC is calculated over the data, not the command, and placed at the end of the data calculateDataPEC(&args[4 + (i * (arglen + 2))], arglen + 2); //DPEC is calculated over the data, not the command, and placed at the end of the data
} }