mirror of
https://github.com/dalathegreat/Battery-Emulator.git
synced 2025-10-04 18:29:48 +02:00
Add WIP code
This commit is contained in:
Daniel Öster
parent
b5259da894
commit
a33677fc97
2 changed files with 254 additions and 20 deletions
|
|
@ -1,18 +1,17 @@
|
|||
#include "../include.h"
|
||||
#ifdef MG_5_BATTERY_H
|
||||
#ifdef MG_HS_PHEV_BATTERY_H
|
||||
#include "../communication/can/comm_can.h"
|
||||
#include "../datalayer/datalayer.h"
|
||||
#include "../devboard/utils/events.h"
|
||||
#include "MG-5-BATTERY.h"
|
||||
#include "MG-HS-PHEV-BATTERY.h"
|
||||
|
||||
/* TODO:
|
||||
/* TODO:
|
||||
- Get contactor closing working
|
||||
- Figure out which CAN messages need to be sent towards the battery to keep it alive
|
||||
- Map all values from battery CAN messages
|
||||
- Most important ones
|
||||
*/
|
||||
|
||||
void Mg5Battery::
|
||||
void MgHsPHEVBattery::
|
||||
update_values() { //This function maps all the values fetched via CAN to the correct parameters used for modbus
|
||||
|
||||
datalayer.battery.status.real_soc;
|
||||
|
|
@ -34,7 +33,7 @@ void Mg5Battery::
|
|||
datalayer.battery.status.temperature_max_dC;
|
||||
}
|
||||
|
||||
void Mg5Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
|
||||
void MgHsPHEVBattery::handle_incoming_can_frame(CAN_frame rx_frame) {
|
||||
datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
|
||||
switch (rx_frame.ID) {
|
||||
case 0x171: //Following messages were detected on a MG5 battery BMS
|
||||
|
|
@ -50,13 +49,14 @@ void Mg5Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
|
|||
break;
|
||||
case 0x297:
|
||||
break;
|
||||
case 0x29B:
|
||||
case 0x29B: //This ID is on the MG HS RX WITHOUT ANY TX PRESENT
|
||||
break;
|
||||
case 0x29C:
|
||||
break;
|
||||
case 0x2A0:
|
||||
break;
|
||||
case 0x2A2:
|
||||
case 0x2A2: //This ID is on the MG HS RX WITHOUT ANY TX PRESENT
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
break;
|
||||
case 0x322:
|
||||
break;
|
||||
|
|
@ -64,13 +64,13 @@ void Mg5Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
|
|||
break;
|
||||
case 0x33F:
|
||||
break;
|
||||
case 0x391:
|
||||
case 0x391: //This ID is on the MG HS RX WITHOUT ANY TX PRESENT
|
||||
break;
|
||||
case 0x393:
|
||||
break;
|
||||
case 0x3AB:
|
||||
case 0x3AB: //This ID is on the MG HS RX WITHOUT ANY TX PRESENT
|
||||
break;
|
||||
case 0x3AC:
|
||||
case 0x3AC: //This ID is on the MG HS RX WITHOUT ANY TX PRESENT
|
||||
break;
|
||||
case 0x3B8:
|
||||
break;
|
||||
|
|
@ -90,20 +90,254 @@ void Mg5Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
|
|||
break;
|
||||
case 0x418:
|
||||
break;
|
||||
case 0x44C:
|
||||
case 0x44C: //This ID is on the MG HS RX WITHOUT ANY TX PRESENT
|
||||
break;
|
||||
case 0x620:
|
||||
break; //This is the last on the list in the MG5 template.
|
||||
case 0x3a8: //This ID is on the MG HS RX WITHOUT ANY TX PRESENT
|
||||
break;
|
||||
case 0x508: //This ID is a new one MG HS RX WHEN TRANSMITTING 03 22 B0 41 00 00 00 00. Rx data is 00 00 00 00 00 00 00 00
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
break;
|
||||
case 0x7ED: //This ID is the battery BMS.
|
||||
// Serial.print(rx_frame.data.u8[1], HEX);
|
||||
// Serial.print(rx_frame.data.u8[1], DEC);
|
||||
|
||||
//Print CAN frames where they are valid
|
||||
if (rx_frame.data.u8[1] != 0x7F) {
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
}
|
||||
|
||||
//Process rx data for incoming responses to "Read data by ID" Tx
|
||||
if (rx_frame.data.u8[1] == 0x62) {
|
||||
if (rx_frame.data.u8[2] == 0xB0) { //Battery information
|
||||
if (rx_frame.data.u8[3] == 0x41 && rx_frame.data.u8[0] == 0x05) { // Battery bus voltage
|
||||
// Serial.print ("Battery Bus voltage frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
// datalayer.battery.status.PARAMETER = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]) * 2.5;
|
||||
// Serial.print ("Battery Bus Voltage = ");
|
||||
// Serial.println (datalayer.battery.status.PARAMETER);
|
||||
}
|
||||
if (rx_frame.data.u8[3] == 0x42 && rx_frame.data.u8[0] == 0x05) { // Battery voltage
|
||||
// Serial.print ("Battery voltage frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
datalayer.battery.status.voltage_dV = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]) * 2.5;
|
||||
// Serial.print ("Battery voltage = ");
|
||||
// Serial.println (datalayer.battery.status.voltage_dV);
|
||||
}
|
||||
if (rx_frame.data.u8[3] == 0x43 && rx_frame.data.u8[0] == 0x05) { // Battery current
|
||||
// Serial.print ("Battery current frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
datalayer.battery.status.current_dA = ((rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]) - 40000) / -4;
|
||||
// Serial.print ("Battery current = ");
|
||||
// Serial.println (datalayer.battery.status.current_dA);
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x45 && rx_frame.data.u8[0] == 0x05) { // Battery resistance
|
||||
// Serial.print ("Battery resistance frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
// datalayer.battery.status.PARAMETER = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]);
|
||||
// Serial.print ("Battery resistance = ");
|
||||
// Serial.println (datalayer.battery.status.PARAMETER);
|
||||
}
|
||||
if (rx_frame.data.u8[3] == 0x46 && rx_frame.data.u8[0] == 0x05) { // Battery SoC
|
||||
// Serial.print ("Battery SoC frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
datalayer.battery.status.real_soc = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]) * 10;
|
||||
// Serial.print ("Battery SoC = ");
|
||||
// Serial.println (datalayer.battery.status.real_soc);
|
||||
RealSoC = datalayer.battery.status.real_soc / 100; // For calculation of charge and discharge rates
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x47) { // && rx_frame.data.u8[0] == 0x05) { // BMS error code
|
||||
// Serial.print ("BMS error code frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
// datalayer.battery.status.PARAMETER = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]); // HOLD: What to do with this data
|
||||
// Serial.print ("Battery error = ");
|
||||
// Serial.println (datalayer.battery.status.PARAMETER);
|
||||
if (rx_frame.data.u8[4] !=
|
||||
0x04) { //Frame has changed from the persistent state of 0x04. It looks like we had 0x05 when first logged and now 0x04
|
||||
Serial.print(byteB0);
|
||||
Serial.print(byteB1);
|
||||
Serial.print(byteB2);
|
||||
Serial.print(byteB3);
|
||||
Serial.print(byteB4);
|
||||
Serial.print(byteB5);
|
||||
Serial.print(byteB6);
|
||||
Serial.println(byteB7);
|
||||
print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
}
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x48) { // && rx_frame.data.u8[0] == 0x05) { // BMS status code
|
||||
// Serial.print ("BMS status code frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
// datalayer.battery.status.PARAMETER = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]); // HOLD: What to do with this data
|
||||
// Serial.print ("Battery Status = ");
|
||||
// Serial.println (datalayer.battery.status.PARAMETER);
|
||||
if (rx_frame.data.u8[4] != 0x0F) { //Frame has changed from the persistent state of 0x0F
|
||||
Serial.print(byteB0);
|
||||
Serial.print(byteB1);
|
||||
Serial.print(byteB2);
|
||||
Serial.print(byteB3);
|
||||
Serial.print(byteB4);
|
||||
Serial.print(byteB5);
|
||||
Serial.print(byteB6);
|
||||
Serial.println(byteB7);
|
||||
print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
}
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x49) { // && rx_frame.data.u8[0] == 0x05) { // System main relay B status
|
||||
// Serial.print ("System main relay B status frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
// datalayer.battery.status.PARAMETER = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]); // HOLD: What to do with this data
|
||||
// Serial.print ("Main relay B status = ");
|
||||
// Serial.println (datalayer.battery.status.PARAMETER);
|
||||
if (rx_frame.data.u8[4] != 0x01) { //Frame has changed from the persistent state of 0x01
|
||||
Serial.print(byteB0);
|
||||
Serial.print(byteB1);
|
||||
Serial.print(byteB2);
|
||||
Serial.print(byteB3);
|
||||
Serial.print(byteB4);
|
||||
Serial.print(byteB5);
|
||||
Serial.print(byteB6);
|
||||
Serial.println(byteB7);
|
||||
print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
}
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x4A) { // && rx_frame.data.u8[0] == 0x05) { // System main relay G status
|
||||
// Serial.print ("System main relay G status frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
// datalayer.battery.status.PARAMETER = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]); // HOLD: What to do with this data
|
||||
// Serial.print ("Main relay G status = ");
|
||||
// Serial.println (datalayer.battery.status.PARAMETER);
|
||||
if (rx_frame.data.u8[4] != 0x01) { //Frame has changed from the persistent state of 0x01
|
||||
Serial.print(byteB0);
|
||||
Serial.print(byteB1);
|
||||
Serial.print(byteB2);
|
||||
Serial.print(byteB3);
|
||||
Serial.print(byteB4);
|
||||
Serial.print(byteB5);
|
||||
Serial.print(byteB6);
|
||||
Serial.println(byteB7);
|
||||
print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
}
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x52) { // && rx_frame.data.u8[0] == 0x05) { // System main relay P status
|
||||
// Serial.print ("System main relay P status frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
// datalayer.battery.status.PARAMETER = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]); // HOLD: What to do with this data
|
||||
// Serial.print ("BMain relay P status = ");
|
||||
// Serial.println (datalayer.battery.status.PARAMETER);
|
||||
if (rx_frame.data.u8[4] != 0x00) { //Frame has changed from the persistent state of 0x00
|
||||
Serial.print(byteB0);
|
||||
Serial.print(byteB1);
|
||||
Serial.print(byteB2);
|
||||
Serial.print(byteB3);
|
||||
Serial.print(byteB4);
|
||||
Serial.print(byteB5);
|
||||
Serial.print(byteB6);
|
||||
Serial.println(byteB7);
|
||||
print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
}
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x56 && rx_frame.data.u8[0] == 0x05) { // Max cell temperature
|
||||
// Serial.print ("Max cell temperature frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
datalayer.battery.status.temperature_max_dC =
|
||||
(((rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]) / 500) - 40) * 10;
|
||||
// Serial.print ("Max cell temperature = ");
|
||||
// Serial.println (datalayer.battery.status.temperature_max_dC);
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x57 && rx_frame.data.u8[0] == 0x05) { // Min cell temperature
|
||||
// Serial.print ("Min cell temperature frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
datalayer.battery.status.temperature_min_dC =
|
||||
(((rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]) / 500) - 40) * 10;
|
||||
// Serial.print ("Min cell temperature = ");
|
||||
// Serial.println (datalayer.battery.status.temperature_min_dC);
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x58 && rx_frame.data.u8[0] == 0x06) { // Max cell voltage
|
||||
// Serial.print ("Max cell voltage frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
datalayer.battery.status.cell_max_voltage_mV =
|
||||
(rx_frame.data.u8[4] << 16 | rx_frame.data.u8[5] << 8 | rx_frame.data.u8[6]) / 250;
|
||||
// Serial.print ("Max cell voltage = ");
|
||||
// Serial.println (datalayer.battery.status.cell_max_voltage_mV);
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x59 && rx_frame.data.u8[0] == 0x06) { // Min cell voltage
|
||||
// Serial.print ("Min cell voltage frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
datalayer.battery.status.cell_min_voltage_mV =
|
||||
(rx_frame.data.u8[4] << 16 | rx_frame.data.u8[5] << 8 | rx_frame.data.u8[6]) / 250;
|
||||
// Serial.print ("Min cell voltage = ");
|
||||
// Serial.println (datalayer.battery.status.cell_min_voltage_mV);
|
||||
}
|
||||
|
||||
if (rx_frame.data.u8[3] == 0x61 && rx_frame.data.u8[0] == 0x05) { // Battery SoH
|
||||
// Serial.print ("Battery SoH frame = ");
|
||||
// print_can_frame_MG5(rx_frame, frameDirection(MSG_RX));
|
||||
datalayer.battery.status.soh_pptt = (rx_frame.data.u8[4] << 8 | rx_frame.data.u8[5]);
|
||||
// Serial.print ("Battery SoH = ");
|
||||
// Serial.println (datalayer.battery.status.soh_pptt);
|
||||
}
|
||||
|
||||
} // data.u8[2]=0xB0
|
||||
} // data.u8[1] = 0x62)
|
||||
|
||||
//Set calculated and derived parameters
|
||||
|
||||
// Calculate the remaining capacity.
|
||||
tempfloat = datalayer.battery.info.total_capacity_Wh * (RealSoC - MinSoC) / 100;
|
||||
// Serial.print ("Remaining capacity calculated = ");
|
||||
// Serial.println (tempfloat);
|
||||
if (tempfloat > 0) {
|
||||
datalayer.battery.status.remaining_capacity_Wh = tempfloat;
|
||||
} else {
|
||||
datalayer.battery.status.remaining_capacity_Wh = 0;
|
||||
}
|
||||
|
||||
// Calculate the maximum charge power. Taper the charge power between 90% and 100% SoC, as 100% SoC is approached
|
||||
if (RealSoC < StartChargeTaper) {
|
||||
datalayer.battery.status.max_charge_power_W = MaxChargePower;
|
||||
} else if (RealSoC >= 100) {
|
||||
datalayer.battery.status.max_charge_power_W = TricklePower;
|
||||
} else {
|
||||
//Taper the charge to the Trickle value. The shape and start point of the taper is set by the constants
|
||||
datalayer.battery.status.max_charge_power_W =
|
||||
(MaxChargePower * pow(((100 - RealSoC) / (100 - StartChargeTaper)), ChargeTaperExponent)) + TricklePower;
|
||||
}
|
||||
|
||||
// Calculate the maximum discharge power. Taper the discharge power between 35% and Min% SoC, as Min% SoC is approached
|
||||
if (RealSoC > StartDischargeTaper) {
|
||||
datalayer.battery.status.max_discharge_power_W = MaxDischargePower;
|
||||
} else if (RealSoC < MinSoC) {
|
||||
datalayer.battery.status.max_discharge_power_W = TricklePower;
|
||||
} else {
|
||||
//Taper the charge to the Trickle value. The shape and start point of the taper is set by the constants
|
||||
datalayer.battery.status.max_discharge_power_W =
|
||||
(MaxDischargePower * pow(((RealSoC - MinSoC) / (StartDischargeTaper - MinSoC)), DischargeTaperExponent)) +
|
||||
TricklePower;
|
||||
}
|
||||
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
void Mg5Battery::transmit_can(unsigned long currentMillis) {
|
||||
void MgHsPHEVBattery::transmit_can(unsigned long currentMillis) {
|
||||
//Send 10ms message
|
||||
if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
|
||||
previousMillis10 = currentMillis;
|
||||
|
||||
transmit_can_frame(&MG_5_100, can_config.battery);
|
||||
//transmit_can_frame(&MG_5_100, can_config.battery);
|
||||
}
|
||||
// Send 100ms CAN Message
|
||||
if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
|
||||
|
|
@ -113,8 +347,8 @@ void Mg5Battery::transmit_can(unsigned long currentMillis) {
|
|||
}
|
||||
}
|
||||
|
||||
void Mg5Battery::setup(void) { // Performs one time setup at startup
|
||||
strncpy(datalayer.system.info.battery_protocol, "MG 5 battery", 63);
|
||||
void MgHsPHEVBattery::setup(void) { // Performs one time setup at startup
|
||||
strncpy(datalayer.system.info.battery_protocol, "MG HS PHEV 16.6kWh battery", 63);
|
||||
datalayer.system.info.battery_protocol[63] = '\0';
|
||||
datalayer.system.status.battery_allows_contactor_closing = true;
|
||||
datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_DV;
|
||||
|
|
|
|||
|
|
@ -28,10 +28,10 @@ class MgHsPHEVBattery : public CanBattery {
|
|||
int BMS_SOC = 0;
|
||||
|
||||
CAN_frame MG_HS_100 = {.FD = false,
|
||||
.ext_ID = false,
|
||||
.DLC = 8,
|
||||
.ID = 0x100,
|
||||
.data = {0x00, 0x00, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00}};
|
||||
.ext_ID = false,
|
||||
.DLC = 8,
|
||||
.ID = 0x100,
|
||||
.data = {0x00, 0x00, 0x00, 0x00, 0x80, 0x10, 0x00, 0x00}};
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue