From 6f05fea0b8288ec82fadd5488b600ce9685650c6 Mon Sep 17 00:00:00 2001 From: Jack Rubacha Date: Fri, 31 Jan 2025 19:47:16 -0500 Subject: [PATCH] fixies fix --- Core/Src/main.c | 4 ++-- Core/Src/shep_tasks.c | 18 +++++++++--------- Drivers/adbms | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Core/Src/main.c b/Core/Src/main.c index 8c1a7b2..4a7e2e3 100644 --- a/Core/Src/main.c +++ b/Core/Src/main.c @@ -198,7 +198,7 @@ const void print_bms_stats(acc_data_t *acc_data) uint8_t num_cells = get_num_cells(&acc_data->chip_data[c]); for(uint8_t cell = 0; cell < num_cells; cell++) { - printf("%d\t", acc_data->chips[c].cell.c_codes[cell]); + printf("%d\t", acc_data->chip_data[chip].cell_voltages[cell]); } printf("\n"); } @@ -210,7 +210,7 @@ const void print_bms_stats(acc_data_t *acc_data) uint8_t num_cells = get_num_cells(&acc_data->chip_data[c]); for(uint8_t cell = 0; cell < num_cells; cell++) { - printf("%.3f\t", getVoltage(acc_data->chips[c].fcell.fc_codes[cell])); + printf("%.3f\t", acc_data->chip_data[c].cell_voltages[cell]); } printf("\n"); } diff --git a/Core/Src/shep_tasks.c b/Core/Src/shep_tasks.c index adce2b3..c25d375 100644 --- a/Core/Src/shep_tasks.c +++ b/Core/Src/shep_tasks.c @@ -135,14 +135,14 @@ void vDebugMode(void *pv_params) bmsdata->chip_data[chip].cell_temp[cell], 10000 * getVoltage( - bmsdata->chips[chip] - .cell - .c_codes[cell]), + bmsdata->chip_data[chip] + .cell_voltages + [cell]), 10000 * getVoltage( - bmsdata->chips[chip] - .cell - .c_codes[cell + + bmsdata->chip_data[chip] + .cell_voltages + [cell + 1]), chip, @@ -167,9 +167,9 @@ void vDebugMode(void *pv_params) bmsdata->chip_data[chip] .cell_temp[10]), 10000 * getVoltage( - bmsdata->chips[chip] - .cell - .c_codes[10]), + bmsdata->chip_data[chip] + .cell_voltages + [10]), NER_GET_BIT( bmsdata->chips[chip].tx_cfgb.dcc, 10), diff --git a/Drivers/adbms b/Drivers/adbms index eef63db..c0e54fe 160000 --- a/Drivers/adbms +++ b/Drivers/adbms @@ -1 +1 @@ -Subproject commit eef63db194526432e4c004820283badae4034e04 +Subproject commit c0e54fe0f2280b90ea6176444d1e3cdbfbc2164e