yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-05 02:39:57 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix code formatting.

Browse source
This commit is contained in:
mvgalen 2025-01-14 22:44:33 +01:00
parent d5228efe9f
commit 40fbdc5f73
3 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Software/src/battery/MEB-BATTERY.cpp
View file

@ -1544,7 +1544,7 @@ void transmit_can_battery() {
#endif #endif
can_msg_received = RX_DEFAULT; can_msg_received = RX_DEFAULT;
first_can_msg = 0; first_can_msg = 0;
if (datalayer.battery.status.real_bms_status != BMS_FAULT){ if (datalayer.battery.status.real_bms_status != BMS_FAULT) {
datalayer.battery.status.real_bms_status = BMS_DISCONNECTED; datalayer.battery.status.real_bms_status = BMS_DISCONNECTED;
datalayer.system.status.battery_allows_contactor_closing = false; datalayer.system.status.battery_allows_contactor_closing = false;
} }
@ -1617,8 +1617,9 @@ void transmit_can_battery() {
//HV request and DC/DC control lies in 0x503 //HV request and DC/DC control lies in 0x503
if (datalayer.battery.status.real_bms_status != BMS_FAULT && /*first_can_msg > 0 && currentMillis > first_can_msg + 2000*/ if (datalayer.battery.status.real_bms_status != BMS_FAULT &&
(datalayer.battery.status.real_bms_status == BMS_STANDBY || datalayer.battery.status.real_bms_status == BMS_ACTIVE) && (datalayer.battery.status.real_bms_status == BMS_STANDBY ||
datalayer.battery.status.real_bms_status == BMS_ACTIVE) &&
(labs(((int32_t)datalayer.battery.status.voltage_dV) - (labs(((int32_t)datalayer.battery.status.voltage_dV) -
((int32_t)datalayer_extended.meb.BMS_voltage_intermediate_dV)) < 200)) { ((int32_t)datalayer_extended.meb.BMS_voltage_intermediate_dV)) < 200)) {
#ifdef DEBUG_LOG #ifdef DEBUG_LOG
@ -1627,7 +1628,8 @@ void transmit_can_battery() {
} }
#endif #endif
MEB_503.data.u8[1] = MEB_503.data.u8[1] =
0x30 | (datalayer.battery.status.real_bms_status == BMS_ACTIVE ? 0x00 : 0x80); // Disable precharing if ACTIVE 0x30 |
(datalayer.battery.status.real_bms_status == BMS_ACTIVE ? 0x00 : 0x80); // Disable precharing if ACTIVE
MEB_503.data.u8[3] = BMS_TARGET_HV_ON; //TODO, should we try AC_2 or DC charging? MEB_503.data.u8[3] = BMS_TARGET_HV_ON; //TODO, should we try AC_2 or DC charging?
MEB_503.data.u8[5] = 0x82; // Bordnetz Active MEB_503.data.u8[5] = 0x82; // Bordnetz Active
MEB_503.data.u8[6] = 0xE0; // Request emergency shutdown HV system == 0, false MEB_503.data.u8[6] = 0xE0; // Request emergency shutdown HV system == 0, false

6
Software/src/communication/precharge_control/precharge_control.cpp
View file

@ -48,7 +48,8 @@ void handle_precharge_control() {
case PRECHARGE_IDLE: case PRECHARGE_IDLE:
if (datalayer.battery.status.bms_status != FAULT && datalayer.battery.status.real_bms_status == BMS_STANDBY && if (datalayer.battery.status.bms_status != FAULT && datalayer.battery.status.real_bms_status == BMS_STANDBY &&
datalayer.system.status.inverter_allows_contactor_closing && !datalayer.system.settings.equipment_stop_active) { datalayer.system.status.inverter_allows_contactor_closing &&
!datalayer.system.settings.equipment_stop_active) {
prechargeStatus = START_PRECHARGE; prechargeStatus = START_PRECHARGE;
} }
break; break;
@ -94,7 +95,8 @@ void handle_precharge_control() {
ledcWriteTone(PRECHARGE_PIN, freq); ledcWriteTone(PRECHARGE_PIN, freq);
} }
if ((datalayer.battery.status.real_bms_status != BMS_STANDBY && datalayer.battery.status.real_bms_status != BMS_ACTIVE) || if ((datalayer.battery.status.real_bms_status != BMS_STANDBY &&
datalayer.battery.status.real_bms_status != BMS_ACTIVE) ||
datalayer.battery.status.bms_status != ACTIVE || datalayer.system.settings.equipment_stop_active) { datalayer.battery.status.bms_status != ACTIVE || datalayer.system.settings.equipment_stop_active) {
pinMode(PRECHARGE_PIN, OUTPUT); pinMode(PRECHARGE_PIN, OUTPUT);
digitalWrite(PRECHARGE_PIN, LOW); digitalWrite(PRECHARGE_PIN, LOW);

6
Software/src/devboard/utils/logging.cpp
View file

@ -135,10 +135,10 @@ void Logging::printf(const char* fmt, ...) {
#endif // DEBUG_LOG #endif // DEBUG_LOG
} }
void Logging::log_bms_status(real_bms_status_enum bms_status, int battery_id){ void Logging::log_bms_status(real_bms_status_enum bms_status, int battery_id) {
static real_bms_status_enum previous_state = BMS_FAULT; static real_bms_status_enum previous_state = BMS_FAULT;
const char *id = ""; const char* id = "";
if (battery_id == 2){ if (battery_id == 2) {
id = "2"; id = "2";
} }
if (previous_state != bms_status) { if (previous_state != bms_status) {