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

Merge branch 'main' into feature/event-log

Browse source
This commit is contained in:
Cabooman 2024-02-07 11:11:40 +01:00
commit cfc2c6a439
3 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Software/src/battery/TESLA-MODEL-3-BATTERY.cpp
View file

@ -314,13 +314,9 @@ void update_values_tesla_model_3_battery() { //This function maps all the value
Serial.print("Battery values: ");
Serial.print("Real SOC: ");
Serial.print(soc_vi);
Serial.print(soc_vi / 10.0, 1);
print_int_with_units(", Battery voltage: ", volts, "V");
print_int_with_units(", Battery current: ", (amps * 0.1), "A");
Serial.println("");
print_int_with_units("Discharge limit battery: ", discharge_limit, "kW");
Serial.print(", ");
print_int_with_units("Charge limit battery: ", regenerative_limit, "kW");
print_int_with_units(", Battery HV current: ", (amps * 0.1), "A");
Serial.print(", Fully charged?: ");
if (full_charge_complete)
Serial.print("YES, ");
@ -346,7 +342,7 @@ void update_values_tesla_model_3_battery() { //This function maps all the value
Serial.print(", ");
print_int_with_units("Low Voltage: ", low_voltage, "V");
Serial.println("");
print_int_with_units("Current Output: ", output_current, "A");
print_int_with_units("DC/DC 12V current: ", output_current, "A");
Serial.println("");
Serial.println("Values passed to the inverter: ");
@ -355,9 +351,9 @@ void update_values_tesla_model_3_battery() { //This function maps all the value
Serial.print(", ");
print_int_with_units(" Max charge power: ", max_target_charge_power, "W");
Serial.println("");
print_int_with_units(" Max temperature: ", (temperature_max * 0.1), "°C");
print_int_with_units(" Max temperature: ", ((int16_t)temperature_max * 0.1), "°C");
Serial.print(", ");
print_int_with_units(" Min temperature: ", (temperature_min * 0.1), "°C");
print_int_with_units(" Min temperature: ", ((int16_t)temperature_min * 0.1), "°C");
Serial.println("");
#endif
}

9
Software/src/inverter/BYD-CAN.cpp
View file

@ -109,8 +109,9 @@ CAN_frame_t BYD_210 = {.FIR = {.B =
static int discharge_current = 0;
static int charge_current = 0;
static int initialDataSent = 0;
static int temperature_average = 0;
static int16_t temperature_average = 0;
static int16_t temp_min = 0;
static int16_t temp_max = 0;
static int inverter_voltage = 0;
static int inverter_SOC = 0;
static long inverter_timestamp = 0;
@ -134,7 +135,9 @@ void update_values_can_byd() { //This function maps all the values fetched from
MAXDISCHARGEAMP; //Cap the value to the max allowed Amp. Some inverters cannot handle large values.
}
temperature_average = ((temperature_max + temperature_min) / 2);
temp_min = temperature_min; //Convert from unsigned to signed
temp_max = temperature_max;
temperature_average = ((temp_max + temp_min) / 2);
//Map values to CAN messages
//Maxvoltage (eg 400.0V = 4000 , 16bits long)