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

Remove char_dis_status variable

Browse source
This commit is contained in:
Daniel 2024-02-16 12:31:05 +02:00
parent 1a5ef4d9b5
commit 699a1ac7ca
27 changed files with 30 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

17
Software/Software.ino
View file

@ -64,15 +64,14 @@ uint16_t capacity_Wh = BATTERY_WH_MAX; //Wh, 0-60000
uint16_t remaining_capacity_Wh = BATTERY_WH_MAX; //Wh, 0-60000
uint16_t max_target_discharge_power = 0; // 0W (0W > restricts to no discharge), Updates later on from CAN
uint16_t max_target_charge_power = 4312; // Init to 4.3kW, Updates later on from CAN
uint16_t temperature_max = 50; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
uint16_t temperature_min = 60; // Reads from battery later
uint8_t bms_char_dis_status = STANDBY; // 0 standby, 1 discharging, 2, charging
uint8_t bms_status = ACTIVE; // ACTIVE - [0..5]<>[STANDBY,INACTIVE,DARKSTART,ACTIVE,FAULT,UPDATING]
uint16_t stat_batt_power = 0; // Power going in/out of battery
uint16_t cell_max_voltage = 3700; // Stores the highest cell voltage value in the system
uint16_t cell_min_voltage = 3700; // Stores the minimum cell voltage value in the system
uint16_t cellvoltages[120]; // Stores all cell voltages
uint8_t nof_cellvoltages = 0; // Total number of cell voltages, set by each battery.
uint16_t temperature_max = 50; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
uint16_t temperature_min = 60; // Reads from battery later
uint8_t bms_status = ACTIVE; // ACTIVE - [0..5]<>[STANDBY,INACTIVE,DARKSTART,ACTIVE,FAULT,UPDATING]
uint16_t stat_batt_power = 0; // Power going in/out of battery
uint16_t cell_max_voltage = 3700; // Stores the highest cell voltage value in the system
uint16_t cell_min_voltage = 3700; // Stores the minimum cell voltage value in the system
uint16_t cellvoltages[120]; // Stores all cell voltages
uint8_t nof_cellvoltages = 0; // Total number of cell voltages, set by each battery.
bool LFP_Chemistry = false;
// Common charger parameters

1
Software/src/battery/BMW-I3-BATTERY.h
View file

@ -18,7 +18,6 @@ extern uint16_t capacity_Wh;
extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;

13
Software/src/battery/CHADEMO-BATTERY.cpp
View file

@ -118,19 +118,6 @@ void update_values_chademo_battery() { //This function maps all the values fetc
}
Serial.print("BMS Status (3=OK): ");
Serial.println(bms_status);
switch (bms_char_dis_status) {
case 0:
Serial.println("Battery Idle");
break;
case 1:
Serial.println("Battery Discharging");
break;
case 2:
Serial.println("Battery Charging");
break;
default:
break;
}
Serial.print("Max discharge power: ");
Serial.println(max_target_discharge_power);
Serial.print("Max charge power: ");

1
Software/src/battery/CHADEMO-BATTERY.h
View file

@ -19,7 +19,6 @@ extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_status;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;

1
Software/src/battery/IMIEV-CZERO-ION-BATTERY.h
View file

@ -18,7 +18,6 @@ extern uint16_t capacity_Wh;
extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;

1
Software/src/battery/KIA-HYUNDAI-64-BATTERY.h
View file

@ -20,7 +20,6 @@ extern uint16_t capacity_Wh; //Wh, 0-60000
extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

13
Software/src/battery/NISSAN-LEAF-BATTERY.cpp
View file

@ -392,19 +392,6 @@ void update_values_leaf_battery() { /* This function maps all the values fetched
} else {
Serial.print("FAULT, ");
}
switch (bms_char_dis_status) {
case 0:
Serial.print("Idle");
break;
case 1:
Serial.print("Discharging");
break;
case 2:
Serial.print("Charging");
break;
default:
break;
}
print_with_units(", Power: ", LB_Power, "W ");
Serial.println("");
Serial.println("Values from battery");

1
Software/src/battery/NISSAN-LEAF-BATTERY.h
View file

@ -18,7 +18,6 @@ extern uint16_t capacity_Wh; //Wh, 0-60000
extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/battery/RENAULT-KANGOO-BATTERY.h
View file

@ -23,7 +23,6 @@ extern uint16_t capacity_Wh; //Wh, 0-60000
extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/battery/RENAULT-ZOE-BATTERY.h
View file

@ -23,7 +23,6 @@ extern uint16_t capacity_Wh; //Wh, 0-60000
extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/battery/SANTA-FE-PHEV-BATTERY.h
View file

@ -18,7 +18,6 @@ extern uint16_t capacity_Wh;
extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;

17
Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp
View file

@ -37,14 +37,13 @@ void __getData() {
max_target_discharge_power = (uint16_t)dataLinkReceive.getReceivedData(6);
max_target_charge_power = (uint16_t)dataLinkReceive.getReceivedData(7);
uint16_t _bms_status = (uint16_t)dataLinkReceive.getReceivedData(8);
bms_char_dis_status = (uint16_t)dataLinkReceive.getReceivedData(9);
stat_batt_power = (uint16_t)dataLinkReceive.getReceivedData(10);
temperature_min = (uint16_t)dataLinkReceive.getReceivedData(11);
temperature_max = (uint16_t)dataLinkReceive.getReceivedData(12);
cell_max_voltage = (uint16_t)dataLinkReceive.getReceivedData(13);
cell_min_voltage = (uint16_t)dataLinkReceive.getReceivedData(14);
LFP_Chemistry = (bool)dataLinkReceive.getReceivedData(15);
batteryAllowsContactorClosing = (uint16_t)dataLinkReceive.getReceivedData(16);
stat_batt_power = (uint16_t)dataLinkReceive.getReceivedData(9);
temperature_min = (uint16_t)dataLinkReceive.getReceivedData(10);
temperature_max = (uint16_t)dataLinkReceive.getReceivedData(11);
cell_max_voltage = (uint16_t)dataLinkReceive.getReceivedData(12);
cell_min_voltage = (uint16_t)dataLinkReceive.getReceivedData(13);
LFP_Chemistry = (bool)dataLinkReceive.getReceivedData(14);
batteryAllowsContactorClosing = (uint16_t)dataLinkReceive.getReceivedData(15);
batteryFault = false;
if (_bms_status == FAULT) {
@ -194,8 +193,6 @@ void update_values_serial_link() {
Serial.print(max_target_charge_power);
Serial.print(" BMS status: ");
Serial.print(bms_status);
Serial.print(" BMS status dis/cha: ");
Serial.print(bms_char_dis_status);
Serial.print(" Power: ");
Serial.print(stat_batt_power);
Serial.print(" Temp min: ");

1
Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h
View file

@ -24,7 +24,6 @@ extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_status; //Enum, 0-5
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/battery/TESLA-MODEL-3-BATTERY.h
View file

@ -21,7 +21,6 @@ extern uint16_t capacity_Wh; //Wh, 0-60000
extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/battery/TEST-FAKE-BATTERY.h
View file

@ -19,7 +19,6 @@ extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_status; //Enum, 0-5
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

10
Software/src/devboard/webserver/webserver.cpp
View file

@ -515,12 +515,12 @@ String processor(const String& var) {
} else {
content += "<h4>BMS Status: FAULT </h4>";
}
if (bms_char_dis_status == 2) {
content += "<h4>Battery charging!</h4>";
} else if (bms_char_dis_status == 1) {
content += "<h4>Battery discharging!</h4>";
} else { //0 idle
if (battery_current == 0) {
content += "<h4>Battery idle</h4>";
} else if (battery_current > 32767) {
content += "<h4>Battery discharging!</h4>";
} else { // between 1-32767
content += "<h4>Battery charging!</h4>";
}
content += "<h4>Automatic contactor closing allowed:</h4>";
content += "<h4>Battery: ";

1
Software/src/devboard/webserver/webserver.h
View file

@ -26,7 +26,6 @@ extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_status; //Enum, 0-5
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/inverter/BYD-CAN.h
View file

@ -13,7 +13,6 @@ extern uint16_t capacity_Wh;
extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;

2
Software/src/inverter/BYD-MODBUS.cpp
View file

@ -56,6 +56,8 @@ void handle_update_data_modbusp201_byd() {
void handle_update_data_modbusp301_byd() {
// Store the data into the array
static uint16_t battery_data[24];
static uint8_t bms_char_dis_status = STANDBY;
if (battery_current == 0) {
bms_char_dis_status = STANDBY;
} else if (battery_current > 32767) { //Negative value = Discharging

1
Software/src/inverter/BYD-MODBUS.h
View file

@ -16,7 +16,6 @@ extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_status;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;

1
Software/src/inverter/LUNA2000-MODBUS.h
View file

@ -14,7 +14,6 @@ extern uint16_t capacity_Wh;
extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;

1
Software/src/inverter/PYLON-CAN.h
View file

@ -14,7 +14,6 @@ extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_status;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;

19
Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp
View file

@ -9,7 +9,7 @@
* Will transmit max 16 int variable - receive none
*/
#define BATTERY_SEND_NUM_VARIABLES 17
#define BATTERY_SEND_NUM_VARIABLES 16
#define BATTERY_RECV_NUM_VARIABLES 1
#ifdef BATTERY_RECV_NUM_VARIABLES
@ -138,14 +138,13 @@ void manageSerialLinkTransmitter() {
dataLinkTransmit.updateData(6, max_target_discharge_power);
dataLinkTransmit.updateData(7, max_target_charge_power);
dataLinkTransmit.updateData(8, bms_status);
dataLinkTransmit.updateData(9, bms_char_dis_status);
dataLinkTransmit.updateData(10, stat_batt_power);
dataLinkTransmit.updateData(11, temperature_min);
dataLinkTransmit.updateData(12, temperature_max);
dataLinkTransmit.updateData(13, cell_max_voltage);
dataLinkTransmit.updateData(14, cell_min_voltage);
dataLinkTransmit.updateData(15, (int16_t)LFP_Chemistry);
dataLinkTransmit.updateData(16, batteryAllowsContactorClosing);
dataLinkTransmit.updateData(9, stat_batt_power);
dataLinkTransmit.updateData(10, temperature_min);
dataLinkTransmit.updateData(11, temperature_max);
dataLinkTransmit.updateData(12, cell_max_voltage);
dataLinkTransmit.updateData(13, cell_min_voltage);
dataLinkTransmit.updateData(14, (int16_t)LFP_Chemistry);
dataLinkTransmit.updateData(15, batteryAllowsContactorClosing);
}
}
}
@ -170,8 +169,6 @@ void printSendingValues() {
Serial.print(max_target_charge_power);
Serial.print(" BMS status: ");
Serial.print(bms_status);
Serial.print(" BMS status dis/cha: ");
Serial.print(bms_char_dis_status);
Serial.print(" Power: ");
Serial.print(stat_batt_power);
Serial.print(" Temp min: ");

1
Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h
View file

@ -18,7 +18,6 @@ extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_status; //Enum, 0-5
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/inverter/SMA-CAN.h
View file

@ -13,7 +13,6 @@ extern uint16_t capacity_Wh; //Wh, 0-60000
extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/inverter/SOFAR-CAN.h
View file

@ -14,7 +14,6 @@ extern uint16_t capacity_Wh; //Wh, 0-60000
extern uint16_t remaining_capacity_Wh; //Wh, 0-60000
extern uint16_t max_target_discharge_power; //W, 0-60000
extern uint16_t max_target_charge_power; //W, 0-60000
extern uint8_t bms_char_dis_status; //Enum, 0-2
extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530)
extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)
extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385)

1
Software/src/inverter/SOLAX-CAN.h
View file

@ -16,7 +16,6 @@ extern uint16_t capacity_Wh;
extern uint16_t remaining_capacity_Wh;
extern uint16_t max_target_discharge_power;
extern uint16_t max_target_charge_power;
extern uint8_t bms_char_dis_status;
extern uint16_t stat_batt_power;
extern uint16_t temperature_min;
extern uint16_t temperature_max;