mirror of
https://github.com/dalathegreat/Battery-Emulator.git
synced 2025-10-03 17:59:27 +02:00
Merge pull request #967 from dalathegreat/feature/double-pylon
Feture: Add double Pylon battery support
This commit is contained in:
Daniel Öster
GitHub
commit
63222b4c77
2 changed files with 151 additions and 1 deletions
|
|
@ -43,7 +43,7 @@
|
||||||
//#define VOLVO_SPA_BATTERY
|
//#define VOLVO_SPA_BATTERY
|
||||||
//#define VOLVO_SPA_HYBRID_BATTERY
|
//#define VOLVO_SPA_HYBRID_BATTERY
|
||||||
//#define TEST_FAKE_BATTERY
|
//#define TEST_FAKE_BATTERY
|
||||||
//#define DOUBLE_BATTERY //Enable this line if you use two identical batteries at the same time (requires CAN_ADDON setup)
|
//#define DOUBLE_BATTERY //Enable this line if you use two identical batteries at the same time (requires separate CAN setup)
|
||||||
|
|
||||||
/* Select inverter communication protocol. See Wiki for which to use with your inverter: https://github.com/dalathegreat/Battery-Emulator/wiki */
|
/* Select inverter communication protocol. See Wiki for which to use with your inverter: https://github.com/dalathegreat/Battery-Emulator/wiki */
|
||||||
//#define AFORE_CAN //Enable this line to emulate an "Afore battery" over CAN bus
|
//#define AFORE_CAN //Enable this line to emulate an "Afore battery" over CAN bus
|
||||||
|
|
|
||||||
|
|
@ -170,12 +170,153 @@ void transmit_can_battery() {
|
||||||
transmit_can_frame(&PYLON_8200, can_config.battery); // Control device quit sleep status
|
transmit_can_frame(&PYLON_8200, can_config.battery); // Control device quit sleep status
|
||||||
transmit_can_frame(&PYLON_8210, can_config.battery); // Charge command
|
transmit_can_frame(&PYLON_8210, can_config.battery); // Charge command
|
||||||
|
|
||||||
|
#ifdef DOUBLE_BATTERY
|
||||||
|
transmit_can_frame(&PYLON_3010, can_config.battery_double); // Heartbeat
|
||||||
|
transmit_can_frame(&PYLON_4200, can_config.battery_double); // Ensemble OR System equipment info, depends on frame0
|
||||||
|
transmit_can_frame(&PYLON_8200, can_config.battery_double); // Control device quit sleep status
|
||||||
|
transmit_can_frame(&PYLON_8210, can_config.battery_double); // Charge command
|
||||||
|
#endif //DOUBLE_BATTERY
|
||||||
|
|
||||||
if (ensemble_info_ack) {
|
if (ensemble_info_ack) {
|
||||||
PYLON_4200.data.u8[0] = 0x00; //Request system equipment info
|
PYLON_4200.data.u8[0] = 0x00; //Request system equipment info
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef DOUBLE_BATTERY
|
||||||
|
|
||||||
|
static int16_t battery2_celltemperature_max_dC = 0;
|
||||||
|
static int16_t battery2_celltemperature_min_dC = 0;
|
||||||
|
static int16_t battery2_current_dA = 0;
|
||||||
|
static uint16_t battery2_voltage_dV = 0;
|
||||||
|
static uint16_t battery2_cellvoltage_max_mV = 3700;
|
||||||
|
static uint16_t battery2_cellvoltage_min_mV = 3700;
|
||||||
|
static uint16_t battery2_charge_cutoff_voltage = 0;
|
||||||
|
static uint16_t battery2_discharge_cutoff_voltage = 0;
|
||||||
|
static int16_t battery2_max_charge_current = 0;
|
||||||
|
static int16_t battery2_max_discharge_current = 0;
|
||||||
|
static uint8_t battery2_ensemble_info_ack = 0;
|
||||||
|
static uint8_t battery2_module_quantity = 0;
|
||||||
|
static uint8_t battery2_modules_in_series = 0;
|
||||||
|
static uint8_t battery2_cell_quantity_in_module = 0;
|
||||||
|
static uint8_t battery2_voltage_level = 0;
|
||||||
|
static uint8_t battery2_ah_number = 0;
|
||||||
|
static uint8_t battery2_SOC = 0;
|
||||||
|
static uint8_t battery2_SOH = 0;
|
||||||
|
static uint8_t battery2_charge_forbidden = 0;
|
||||||
|
static uint8_t battery2_discharge_forbidden = 0;
|
||||||
|
|
||||||
|
void update_values_battery2() {
|
||||||
|
|
||||||
|
datalayer.battery2.status.real_soc = (battery2_SOC * 100); //increase SOC range from 0-100 -> 100.00
|
||||||
|
|
||||||
|
datalayer.battery2.status.soh_pptt = (battery2_SOH * 100); //Increase decimals from 100% -> 100.00%
|
||||||
|
|
||||||
|
datalayer.battery2.status.voltage_dV = battery2_voltage_dV; //value is *10 (3700 = 370.0)
|
||||||
|
|
||||||
|
datalayer.battery2.status.current_dA = battery2_current_dA; //value is *10 (150 = 15.0) , invert the sign
|
||||||
|
|
||||||
|
datalayer.battery2.status.max_charge_power_W = (battery2_max_charge_current * (battery2_voltage_dV / 10));
|
||||||
|
|
||||||
|
datalayer.battery2.status.max_discharge_power_W = (-battery2_max_discharge_current * (battery2_voltage_dV / 10));
|
||||||
|
|
||||||
|
datalayer.battery2.status.remaining_capacity_Wh = static_cast<uint32_t>(
|
||||||
|
(static_cast<double>(datalayer.battery2.status.real_soc) / 10000) * datalayer.battery2.info.total_capacity_Wh);
|
||||||
|
|
||||||
|
datalayer.battery2.status.cell_max_voltage_mV = battery2_cellvoltage_max_mV;
|
||||||
|
datalayer.battery2.status.cell_voltages_mV[0] = battery2_cellvoltage_max_mV;
|
||||||
|
|
||||||
|
datalayer.battery2.status.cell_min_voltage_mV = battery2_cellvoltage_min_mV;
|
||||||
|
datalayer.battery2.status.cell_voltages_mV[1] = battery2_cellvoltage_min_mV;
|
||||||
|
|
||||||
|
datalayer.battery2.status.temperature_min_dC = battery2_celltemperature_min_dC;
|
||||||
|
|
||||||
|
datalayer.battery2.status.temperature_max_dC = battery2_celltemperature_max_dC;
|
||||||
|
|
||||||
|
datalayer.battery2.info.max_design_voltage_dV = battery2_charge_cutoff_voltage;
|
||||||
|
|
||||||
|
datalayer.battery2.info.min_design_voltage_dV = battery2_discharge_cutoff_voltage;
|
||||||
|
|
||||||
|
datalayer.battery2.info.number_of_cells = datalayer.battery.info.number_of_cells;
|
||||||
|
}
|
||||||
|
|
||||||
|
void handle_incoming_can_frame_battery2(CAN_frame rx_frame) {
|
||||||
|
datalayer.battery2.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
|
||||||
|
switch (rx_frame.ID) {
|
||||||
|
case 0x7310:
|
||||||
|
case 0x7311:
|
||||||
|
battery2_ensemble_info_ack = true;
|
||||||
|
// This message contains software/hardware version info. No interest to us
|
||||||
|
break;
|
||||||
|
case 0x7320:
|
||||||
|
case 0x7321:
|
||||||
|
battery2_ensemble_info_ack = true;
|
||||||
|
battery2_module_quantity = rx_frame.data.u8[0];
|
||||||
|
battery2_modules_in_series = rx_frame.data.u8[2];
|
||||||
|
battery2_cell_quantity_in_module = rx_frame.data.u8[3];
|
||||||
|
battery2_voltage_level = rx_frame.data.u8[4];
|
||||||
|
battery2_ah_number = rx_frame.data.u8[6];
|
||||||
|
break;
|
||||||
|
case 0x4210:
|
||||||
|
case 0x4211:
|
||||||
|
battery2_voltage_dV = ((rx_frame.data.u8[1] << 8) | rx_frame.data.u8[0]);
|
||||||
|
battery2_current_dA = ((rx_frame.data.u8[3] << 8) | rx_frame.data.u8[2]) - 30000;
|
||||||
|
battery2_SOC = rx_frame.data.u8[6];
|
||||||
|
battery2_SOH = rx_frame.data.u8[7];
|
||||||
|
break;
|
||||||
|
case 0x4220:
|
||||||
|
case 0x4221:
|
||||||
|
battery2_charge_cutoff_voltage = ((rx_frame.data.u8[1] << 8) | rx_frame.data.u8[0]);
|
||||||
|
battery2_discharge_cutoff_voltage = ((rx_frame.data.u8[3] << 8) | rx_frame.data.u8[2]);
|
||||||
|
battery2_max_charge_current = (((rx_frame.data.u8[5] << 8) | rx_frame.data.u8[4]) * 0.1) - 3000;
|
||||||
|
battery2_max_discharge_current = (((rx_frame.data.u8[7] << 8) | rx_frame.data.u8[6]) * 0.1) - 3000;
|
||||||
|
break;
|
||||||
|
case 0x4230:
|
||||||
|
case 0x4231:
|
||||||
|
battery2_cellvoltage_max_mV = ((rx_frame.data.u8[1] << 8) | rx_frame.data.u8[0]);
|
||||||
|
battery2_cellvoltage_min_mV = ((rx_frame.data.u8[3] << 8) | rx_frame.data.u8[2]);
|
||||||
|
break;
|
||||||
|
case 0x4240:
|
||||||
|
case 0x4241:
|
||||||
|
battery2_celltemperature_max_dC = ((rx_frame.data.u8[1] << 8) | rx_frame.data.u8[0]) - 1000;
|
||||||
|
battery2_celltemperature_min_dC = ((rx_frame.data.u8[3] << 8) | rx_frame.data.u8[2]) - 1000;
|
||||||
|
break;
|
||||||
|
case 0x4250:
|
||||||
|
case 0x4251:
|
||||||
|
//Byte0 Basic Status
|
||||||
|
//Byte1-2 Cycle Period
|
||||||
|
//Byte3 Error
|
||||||
|
//Byte4-5 Alarm
|
||||||
|
//Byte6-7 Protection
|
||||||
|
break;
|
||||||
|
case 0x4260:
|
||||||
|
case 0x4261:
|
||||||
|
//Byte0-1 Module Max Voltage
|
||||||
|
//Byte2-3 Module Min Voltage
|
||||||
|
//Byte4-5 Module Max. Voltage Number
|
||||||
|
//Byte6-7 Module Min. Voltage Number
|
||||||
|
break;
|
||||||
|
case 0x4270:
|
||||||
|
case 0x4271:
|
||||||
|
//Byte0-1 Module Max. Temperature
|
||||||
|
//Byte2-3 Module Min. Temperature
|
||||||
|
//Byte4-5 Module Max. Temperature Number
|
||||||
|
//Byte6-7 Module Min. Temperature Number
|
||||||
|
break;
|
||||||
|
case 0x4280:
|
||||||
|
case 0x4281:
|
||||||
|
battery2_charge_forbidden = rx_frame.data.u8[0];
|
||||||
|
battery2_discharge_forbidden = rx_frame.data.u8[1];
|
||||||
|
break;
|
||||||
|
case 0x4290:
|
||||||
|
case 0x4291:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif //DOUBLE_BATTERY
|
||||||
|
|
||||||
void setup_battery(void) { // Performs one time setup at startup
|
void setup_battery(void) { // Performs one time setup at startup
|
||||||
strncpy(datalayer.system.info.battery_protocol, "Pylon compatible battery", 63);
|
strncpy(datalayer.system.info.battery_protocol, "Pylon compatible battery", 63);
|
||||||
datalayer.system.info.battery_protocol[63] = '\0';
|
datalayer.system.info.battery_protocol[63] = '\0';
|
||||||
|
|
@ -184,6 +325,15 @@ void setup_battery(void) { // Performs one time setup at startup
|
||||||
datalayer.battery.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_DV;
|
datalayer.battery.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_DV;
|
||||||
datalayer.battery.info.max_cell_voltage_mV = MAX_CELL_VOLTAGE_MV;
|
datalayer.battery.info.max_cell_voltage_mV = MAX_CELL_VOLTAGE_MV;
|
||||||
datalayer.battery.info.min_cell_voltage_mV = MIN_CELL_VOLTAGE_MV;
|
datalayer.battery.info.min_cell_voltage_mV = MIN_CELL_VOLTAGE_MV;
|
||||||
|
|
||||||
|
#ifdef DOUBLE_BATTERY
|
||||||
|
datalayer.battery2.info.number_of_cells = datalayer.battery.info.number_of_cells;
|
||||||
|
datalayer.battery2.info.max_design_voltage_dV = datalayer.battery.info.max_design_voltage_dV;
|
||||||
|
datalayer.battery2.info.min_design_voltage_dV = datalayer.battery.info.min_design_voltage_dV;
|
||||||
|
datalayer.battery2.info.max_cell_voltage_mV = datalayer.battery.info.max_cell_voltage_mV;
|
||||||
|
datalayer.battery2.info.min_cell_voltage_mV = datalayer.battery.info.min_cell_voltage_mV;
|
||||||
|
datalayer.battery2.info.max_cell_voltage_deviation_mV = datalayer.battery.info.max_cell_voltage_deviation_mV;
|
||||||
|
#endif //DOUBLE_BATTERY
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue