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

Fix code formatting

Browse source
This commit is contained in:
mvgalen 2025-01-13 22:11:02 +01:00
parent 5db3eaa7f8
commit 8e118a75cd
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -730,7 +730,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
BMS_16A954A6_counter = (rx_frame.data.u8[1] & 0x0F); // Can be used to check CAN signal integrity later on BMS_16A954A6_counter = (rx_frame.data.u8[1] & 0x0F); // Can be used to check CAN signal integrity later on
isolation_fault = (rx_frame.data.u8[2] & 0xE0) >> 5; isolation_fault = (rx_frame.data.u8[2] & 0xE0) >> 5;
isolation_status = (rx_frame.data.u8[2] & 0x1E) >> 1; isolation_status = (rx_frame.data.u8[2] & 0x1E) >> 1;
if (isolation_fault != 0){ if (isolation_fault != 0) {
actual_temperature_highest_C = rx_frame.data.u8[3]; //*0,5 -40 actual_temperature_highest_C = rx_frame.data.u8[3]; //*0,5 -40
actual_temperature_lowest_C = rx_frame.data.u8[4]; //*0,5 -40 actual_temperature_lowest_C = rx_frame.data.u8[4]; //*0,5 -40
actual_cellvoltage_highest_mV = (((rx_frame.data.u8[6] & 0x0F) << 8) | rx_frame.data.u8[5]); actual_cellvoltage_highest_mV = (((rx_frame.data.u8[6] & 0x0F) << 8) | rx_frame.data.u8[5]);
@ -1603,7 +1603,7 @@ void transmit_can_battery() {
if (MEB_503.data.u8[3] == BMS_TARGET_HV_OFF) { if (MEB_503.data.u8[3] == BMS_TARGET_HV_OFF) {
logging.printf("MEB Requesting HV\n"); logging.printf("MEB Requesting HV\n");
} }
MEB_503.data.u8[1] = MEB_503.data.u8[1] =
0x30 | (datalayer.battery.status.bms_status == ACTIVE ? 0x00 : 0x80); // Disable precharing if ACTIVE 0x30 | (datalayer.battery.status.bms_status == 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

2
Software/src/communication/can/obd.cpp
View file

@ -140,7 +140,7 @@ void transmit_obd_can_frame(unsigned int address, int interface) {
OBD_frame.data.u8[2] = 0x1C; OBD_frame.data.u8[2] = 0x1C;
transmit_can_frame(&OBD_frame, interface); // DTC TP-ISO transmit_can_frame(&OBD_frame, interface); // DTC TP-ISO
break; break;
} }
cnt++; cnt++;
if (cnt == 3600) if (cnt == 3600)
cnt = 0; cnt = 0;

3
Software/src/devboard/webserver/advanced_battery_html.cpp
View file

@ -982,7 +982,8 @@ String advanced_battery_processor(const String& var) {
content += "<h4>Cell overvoltage: " + String(rt_enum[datalayer_extended.meb.rt_cell_overvolt & 0x03]) + "</h4>"; content += "<h4>Cell overvoltage: " + String(rt_enum[datalayer_extended.meb.rt_cell_overvolt & 0x03]) + "</h4>";
content += "<h4>Cell undervoltage: " + String(rt_enum[datalayer_extended.meb.rt_cell_undervol & 0x03]) + "</h4>"; content += "<h4>Cell undervoltage: " + String(rt_enum[datalayer_extended.meb.rt_cell_undervol & 0x03]) + "</h4>";
content += "<h4>Cell imbalance: " + String(rt_enum[datalayer_extended.meb.rt_cell_imbalance & 0x03]) + "</h4>"; content += "<h4>Cell imbalance: " + String(rt_enum[datalayer_extended.meb.rt_cell_imbalance & 0x03]) + "</h4>";
content += "<h4>Battery unathorized: " + String(rt_enum[datalayer_extended.meb.rt_battery_unathorized & 0x03]) + "</h4>"; content +=
"<h4>Battery unathorized: " + String(rt_enum[datalayer_extended.meb.rt_battery_unathorized & 0x03]) + "</h4>";
#endif //MEB_BATTERY #endif //MEB_BATTERY
#ifdef RENAULT_ZOE_GEN2_BATTERY #ifdef RENAULT_ZOE_GEN2_BATTERY