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

Compare commits

base: FaSTTUBe:a88f663afc3fbecc807a7452f4ebc5b7352e278d
Branches Tags
FaSTTUBe:main
FaSTTUBe:master-cleanup
FaSTTUBe:master-test
FaSTTUBe:master-test-new-logging
FaSTTUBe:lookup-test
FaSTTUBe:nucleo-test-fixed-crc
FaSTTUBe:nucleo-test
FaSTTUBe:old_code
FaSTTUBe:V1.0
FaSTTUBe:FT25-V1
FaSTTUBe:FT24_Master_final
..
compare: FaSTTUBe:b9c34c9f4974480252c343b66ec62a71af021f78
Branches Tags
FaSTTUBe:master-cleanup
FaSTTUBe:main
FaSTTUBe:master-test
FaSTTUBe:master-test-new-logging
FaSTTUBe:lookup-test
FaSTTUBe:nucleo-test-fixed-crc
FaSTTUBe:nucleo-test
FaSTTUBe:old_code
FaSTTUBe:V1.0
FaSTTUBe:FT25-V1
FaSTTUBe:FT24_Master_final

No commits in common. "a88f663afc3fbecc807a7452f4ebc5b7352e278d" and "b9c34c9f4974480252c343b66ec62a71af021f78" have entirely different histories.
a88f663afc ... b9c34c9f49

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

6
AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_Abstraction.c
View File

@ -31,9 +31,7 @@ HAL_StatusTypeDef amsReset() {
amsWakeUp(); amsWakeUp();
readCMD(SRST, CMD_EMPTY_BUFFER, 0); readCMD(SRST, CMD_EMPTY_BUFFER, 0);
amsWakeUp(); /* uint8_t sidbuffer[CMD_BUFFER_SIZE(SID_GROUP_SIZE)] = {};
uint8_t sidbuffer[CMD_BUFFER_SIZE(SID_GROUP_SIZE)] = {};
if (readCMD(RDSID, sidbuffer, SID_GROUP_SIZE) != HAL_OK) { if (readCMD(RDSID, sidbuffer, SID_GROUP_SIZE) != HAL_OK) {
bool nonzero = false; bool nonzero = false;
for (size_t i = 0; i < N_BMS; i++) { for (size_t i = 0; i < N_BMS; i++) {
@ -63,7 +61,7 @@ HAL_StatusTypeDef amsReset() {
} }
debug_log_cont(LOG_LEVEL_INFO, "0x%lx%lx ", (uint32_t)(id >> 32), (uint32_t)(id & 0xFFFFFFFF)); //newlib does not support %llu debug_log_cont(LOG_LEVEL_INFO, "0x%lx%lx ", (uint32_t)(id >> 32), (uint32_t)(id & 0xFFFFFFFF)); //newlib does not support %llu
} }
} } */
mcuDelay(10); mcuDelay(10);
amsWakeUp(); amsWakeUp();

14
AMS_Master_Code/Core/Src/main.c
View File

@ -114,22 +114,14 @@ int main(void)
/* Infinite loop */ /* Infinite loop */
/* USER CODE BEGIN WHILE */ /* USER CODE BEGIN WHILE */
int count = 0; int count = 0;
int error_count = 0;
while (1) while (1)
{ {
if (error_count > 10) {
debug_log(LOG_LEVEL_ERROR, "Too many errors, restarting BMS...");
status = AMS_Init(&hspi1);
if (status.status != ADBMS_NO_ERROR) {
debug_log(LOG_LEVEL_ERROR, "Failed to initialize BMS, AMS_Init returned %u (%s) on BMS %d", status.status, ADBMS_Status_ToString(status.status), status.bms_id);
HAL_Delay(2000);
continue;
}
}
status = AMS_Idle_Loop(); status = AMS_Idle_Loop();
if (status.status != ADBMS_NO_ERROR) { if (status.status != ADBMS_NO_ERROR) {
debug_log(LOG_LEVEL_ERROR, "AMS_Idle_Loop returned %u (%s) on BMS %d", status.status, ADBMS_Status_ToString(status.status), status.bms_id); debug_log(LOG_LEVEL_ERROR, "AMS_Idle_Loop returned %u (%s) on BMS %d", status.status, ADBMS_Status_ToString(status.status), status.bms_id);
error_count++; HAL_Delay(2000);
AMS_Init(&hspi1);
continue;
} }
if (count % 4 == 0) { if (count % 4 == 0) {
for (size_t i = 0; i < N_BMS; i++) { for (size_t i = 0; i < N_BMS; i++) {