Skip to content

Commit b10e102

Browse files
committed
Rename battery_failure_level to battery_fail_level
Refactored all occurrences of the battery telemetry field from battery_failure_level to battery_fail_level in structs, BMS logic, BLE service, and debug code for consistency. No functional changes were made.
1 parent ac3c29f commit b10e102

5 files changed

Lines changed: 7 additions & 7 deletions

File tree

inc/sp140/structs.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ typedef struct {
100100
float lowest_temperature; // Lowest temperature reading (°C)
101101
float energy_cycle; // Energy per cycle (kWh)
102102
uint32_t battery_cycle; // Battery cycle count
103-
uint8_t battery_failure_level; // Battery failure status
103+
uint8_t battery_fail_level; // Battery failure status
104104
float voltage_differential; // Highest cell minus lowest cell voltage (V)
105105
unsigned long lastUpdateMs; // Timestamp of last telemetry update
106106
bool is_charging;
@@ -149,7 +149,7 @@ typedef struct {
149149
float highest_temperature; // Highest temperature (°C)
150150
float lowest_temperature; // Lowest temperature (°C)
151151
float voltage_differential; // Cell voltage differential (V)
152-
uint8_t battery_failure_level;// Battery failure status
152+
uint8_t battery_fail_level; // Battery failure status
153153
uint8_t is_charge_mos; // Charge MOSFET state (0/1)
154154
uint8_t is_discharge_mos; // Discharge MOSFET state (0/1)
155155
uint8_t is_charging; // Charging state (0/1)

src/sp140/ble/bms_service.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void updateBMSPackedTelemetry(const STR_BMS_TELEMETRY_140& telemetry, uint8_t bm
140140
packet.highest_temperature = telemetry.highest_temperature;
141141
packet.lowest_temperature = telemetry.lowest_temperature;
142142
packet.voltage_differential = telemetry.voltage_differential;
143-
packet.battery_failure_level = telemetry.battery_failure_level;
143+
packet.battery_fail_level = telemetry.battery_fail_level;
144144
packet.is_charge_mos = telemetry.is_charge_mos ? 1 : 0;
145145
packet.is_discharge_mos = telemetry.is_discharge_mos ? 1 : 0;
146146
packet.is_charging = telemetry.is_charging ? 1 : 0;
@@ -219,7 +219,7 @@ void updateBMSTelemetry(const STR_BMS_TELEMETRY_140& telemetry) {
219219
}
220220

221221
// Handle state-change characteristics - only notify on change
222-
setAndNotifyOnChange(pBMSFailureLevel, telemetry.battery_failure_level, lastFailureLevel);
222+
setAndNotifyOnChange(pBMSFailureLevel, telemetry.battery_fail_level, lastFailureLevel);
223223
setAndNotifyOnChange(pBMSChargeMos, static_cast<uint8_t>(telemetry.is_charge_mos ? 1 : 0), lastChargeMos);
224224
setAndNotifyOnChange(pBMSDischargeMos, static_cast<uint8_t>(telemetry.is_discharge_mos ? 1 : 0), lastDischargeMos);
225225

src/sp140/bms.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ void updateBMSData() {
5858
// Battery statistics
5959
bmsTelemetryData.battery_cycle = bms_can->getBatteryCycle();
6060
bmsTelemetryData.energy_cycle = bms_can->getEnergyCycle();
61-
bmsTelemetryData.battery_failure_level = bms_can->getBatteryFailureLevel();
61+
bmsTelemetryData.battery_fail_level = bms_can->getBatteryFailureLevel();
6262

6363
// Battery status
6464
bmsTelemetryData.is_charging = bms_can->isBatteryCharging();

src/sp140/debug.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void generateFakeTelemetry(STR_ESC_TELEMETRY_140& escTelemetry,
6464
bmsTelemetry.lowest_temperature = escTelemetry.mcu_temp;
6565
bmsTelemetry.energy_cycle = 3.5;
6666
bmsTelemetry.battery_cycle = 42;
67-
bmsTelemetry.battery_failure_level = 0;
67+
bmsTelemetry.battery_fail_level = 0;
6868
bmsTelemetry.voltage_differential = 0.2;
6969
bmsTelemetry.lastUpdateMs = now;
7070

src/sp140/system_monitors.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ extern bool bmpPresent;
1313
// Cached CPU temperature to avoid "tsens: Do not configure the temp sensor when it's running!" error
1414
static float cachedCpuTemp = 0.0f;
1515
static unsigned long lastCpuTempRead = 0;
16-
static const unsigned long CPU_TEMP_READ_INTERVAL = 1000; // Read every 1 second
16+
static const unsigned long CPU_TEMP_READ_INTERVAL = 1000; // Read every 1 second
1717

1818
float getCachedCpuTemperature() {
1919
unsigned long now = millis();

0 commit comments

Comments
 (0)