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 bugs and add missing values to renault twizy battery protocol found during testing with a real battery

Browse source
This commit is contained in:
Jakob Löw 2024-10-15 15:42:47 +02:00
parent b95e8fe04b
commit 9bfead931f
No known key found for this signature in database
GPG key ID: B77685F55C7C46C6
4 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Software/USER_SETTINGS.h
View file

@ -22,7 +22,7 @@
//#define PYLON_BATTERY
//#define RJXZS_BMS
//#define RENAULT_KANGOO_BATTERY
#define RENAULT_TWIZY_BATTERY
//#define RENAULT_TWIZY_BATTERY
//#define RENAULT_ZOE_GEN1_BATTERY
//#define RENAULT_ZOE_GEN2_BATTERY
//#define SANTA_FE_PHEV_BATTERY

30
Software/src/battery/RENAULT-TWIZY.cpp
View file

@ -7,15 +7,16 @@
/* Do not change code below unless you are sure what you are doing */
static int16_t cell_temperatures_dC[8] = {0};
static int16_t cell_temperatures_dC[7] = {0};
static int16_t current_dA = 0;
static uint16_t voltage_dV = 0;
static int16_t cellvoltages_mV[14] = {0};
static int16_t max_discharge_power = 0;
static int16_t max_recup_power = 0;
static int16_t max_charge_power = 0;
static uint8_t SOC = 0;
static uint8_t SOH = 0;
static uint16_t SOC = 0;
static uint16_t SOH = 0;
static uint16_t remaining_capacity_Wh = 0;
int16_t max_value(int16_t* entries, size_t len) {
int result = INT16_MIN;
@ -39,13 +40,11 @@ int16_t min_value(int16_t* entries, size_t len) {
void update_values_battery() {
datalayer.battery.status.real_soc = (SOC * 100); //increase SOC range from 0-100 -> 100.00
datalayer.battery.status.soh_pptt = (SOH * 100); //Increase decimals from 100% -> 100.00%
datalayer.battery.status.real_soc = SOC;
datalayer.battery.status.soh_pptt = SOH;
datalayer.battery.status.voltage_dV = voltage_dV; //value is *10 (3700 = 370.0)
datalayer.battery.status.current_dA = current_dA; //value is *10 (150 = 15.0) , invert the sign
datalayer.battery.status.current_dA = current_dA; //value is *10 (150 = 15.0)
datalayer.battery.status.remaining_capacity_Wh = remaining_capacity_Wh;
datalayer.battery.status.active_power_W = //Power in watts, Negative = charging batt
((datalayer.battery.status.voltage_dV * datalayer.battery.status.current_dA) / 100);
@ -73,23 +72,25 @@ void receive_can_battery(CAN_frame rx_frame) {
datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
switch (rx_frame.ID) {
case 0x155:
// max charge power is in steps of 300W from 0 to 7
max_charge_power = (uint16_t)rx_frame.data.u8[0] * 300;
// current is encoded as a 12 bit integer with Amps = value / 4 - 500
current_dA = (((rx_frame.data.u8[1] << 8) | rx_frame.data.u8[2]) & 0xfff) * 10 / 4 - 5000;
// SOC is encoded as 16 bit integer with SOC% = value / 400
SOC = ((rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5]) / 4;
SOC = (((uint16_t)rx_frame.data.u8[4] << 8) | (uint16_t)rx_frame.data.u8[5]) / 4;
break;
case 0x424:
max_recup_power = rx_frame.data.u8[2] * 500;
max_discharge_power = rx_frame.data.u8[3] * 500;
SOH = rx_frame.data.u8[5];
SOH = (uint16_t)rx_frame.data.u8[5] * 100;
break;
case 0x425:
// rx_frame.data.u8[1] / 10 contains the current stored energy in kWh
// TODO: can we store this kWh value somewhere in datalayer?
remaining_capacity_Wh = (uint16_t)rx_frame.data.u8[1] * 100;
break;
case 0x554:
for (int i = 0; i < 8; i++)
for (int i = 0; i < 7; i++)
cell_temperatures_dC[i] = (int16_t)rx_frame.data.u8[i] * 10 - 400;
break;
case 0x556:
@ -143,6 +144,7 @@ void setup_battery(void) { // Performs one time setup at startup
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.min_cell_voltage_mV = MIN_CELL_VOLTAGE_MV;
datalayer.battery.info.total_capacity_Wh = 6600;
}
#endif

2
Software/src/devboard/safety/safety.cpp
View file

@ -97,7 +97,7 @@ void update_machineryprotection() {
clear_event(EVENT_SOH_LOW);
}
#ifndef PYLON_BATTERY
#if !defined(PYLON_BATTERY) && !defined(RENAULT_TWIZY_BATTERY)
// Check if SOC% is plausible
if (datalayer.battery.status.voltage_dV >
(datalayer.battery.info.max_design_voltage_dV -

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

@ -549,6 +549,9 @@ String processor(const String& var) {
#ifdef RENAULT_KANGOO_BATTERY
content += "Renault Kangoo";
#endif // RENAULT_KANGOO_BATTERY
#ifdef RENAULT_TWIZY_BATTERY
content += "Renault Twizy";
#endif // RENAULT_TWIZY_BATTERY
#ifdef RENAULT_ZOE_GEN1_BATTERY
content += "Renault Zoe Gen1 22/40";
#endif // RENAULT_ZOE_GEN1_BATTERY