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

changed function names

Browse Source
This commit is contained in:
Moritz Ruffer 2025-03-28 16:35:39 +01:00
parent de68618667
commit 0cb518c10d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
AMS_Master_Code/Core/Inc/NTC.h
View File

@ -20,7 +20,7 @@
// With R_T/R_0 and R_0 = R_T@25C // With R_T/R_0 and R_0 = R_T@25C
// R_T/R_0 = 1 / V_REF / ADC - 1 // R_T/R_0 = 1 / V_REF / ADC - 1
static inline uint16_t ntc_mv_to_celsius(int16_t adc_codes) { static inline uint16_t ntc_adc_to_celsius(int16_t adc_codes) {
// Calculate voltage from ADC // Calculate voltage from ADC
int16_t adc_mV = mV_from_ADBMS6830(adc_codes); int16_t adc_mV = mV_from_ADBMS6830(adc_codes);
@ -31,10 +31,10 @@ static inline uint16_t ntc_mv_to_celsius(int16_t adc_codes) {
#else #else
#include "tempTable.h" #include "tempTable.h"
static inline uint16_t ntc_mv_to_celsius(int16_t adc_codes) { static inline uint16_t ntc_adc_to_celsius(int16_t adc_codes) {
// Out of bounds checking --> done by OV/UV setting of the BMS? // Out of bounds checking --> done by OV/UV setting of the BMS?
if (adc_codes < -6355 || adc_codes > 4640) { if (adc_codes < -6355 || adc_codes > 4640) {
// not really a good idea, still working on it // should trigger overtemp, right?
return -1; return -1;
} }
return ADC2TEMP[adc_codes + 6355]; return ADC2TEMP[adc_codes + 6355];

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

@ -140,7 +140,7 @@ HAL_StatusTypeDef amsAuxAndStatusMeasurement(Cell_Module (*module)[N_BMS]) {
for (size_t i = 0; i < N_BMS; i++) { for (size_t i = 0; i < N_BMS; i++) {
size_t offset = BUFFER_BMS_OFFSET(i, auxGroupSizes[group]); size_t offset = BUFFER_BMS_OFFSET(i, auxGroupSizes[group]);
for (size_t j = 0; j < auxVoltagesPerGroup[group]; j++) { for (size_t j = 0; j < auxVoltagesPerGroup[group]; j++) {
(*module)[i].cellTemps[group * 3 + j] = ntc_mv_to_celsius(rxbuf[offset + j * 2] | (rxbuf[offset + j * 2 + 1] << 8)); (*module)[i].cellTemps[group * 3 + j] = ntc_adc_to_celsius(rxbuf[offset + j * 2] | (rxbuf[offset + j * 2 + 1] << 8));
// (*module)[i].auxVoltages[group * 3 + j] = mV_from_ADBMS6830(rxbuf[offset + j * 2] | (rxbuf[offset + j * 2 + 1] << 8)); // (*module)[i].auxVoltages[group * 3 + j] = mV_from_ADBMS6830(rxbuf[offset + j * 2] | (rxbuf[offset + j * 2 + 1] << 8));
// (*module)[i].cellTemps[group * 3 + j] = ntc_mv_to_celsius((*module)[i].auxVoltages[group * 3 + j]); // (*module)[i].cellTemps[group * 3 + j] = ntc_mv_to_celsius((*module)[i].auxVoltages[group * 3 + j]);
} }