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 byteorder and scaling

Browse source
This commit is contained in:
Daniel 2024-04-17 09:25:36 +03:00
parent 1cac91bbc2
commit 5dd5d57ce8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Software/src/battery/KIA-HYUNDAI-64-BATTERY.cpp
View file

@ -161,13 +161,13 @@ void update_values_battery() { //This function maps all the values fetched via
if (datalayer.battery.status.reported_soc == 10000) { // When scaled SOC is 100%, set allowed charge power to 0 if (datalayer.battery.status.reported_soc == 10000) { // When scaled SOC is 100%, set allowed charge power to 0
datalayer.battery.status.max_charge_power_W = 0; datalayer.battery.status.max_charge_power_W = 0;
} else { // Limit according to CAN value } else { // Limit according to CAN value
datalayer.battery.status.max_charge_power_W = allowedChargePower; datalayer.battery.status.max_charge_power_W = allowedChargePower * 10;
} }
if (datalayer.battery.status.reported_soc < 100) { // When scaled SOC is <1%, set allowed charge power to 0 if (datalayer.battery.status.reported_soc < 100) { // When scaled SOC is <1%, set allowed charge power to 0
datalayer.battery.status.max_discharge_power_W = 0; datalayer.battery.status.max_discharge_power_W = 0;
} else { // Limit according to CAN value } else { // Limit according to CAN value
datalayer.battery.status.max_discharge_power_W = allowedDischargePower; datalayer.battery.status.max_discharge_power_W = allowedDischargePower * 10;
} }
//Power in watts, Negative = charging batt //Power in watts, Negative = charging batt
@ -307,8 +307,8 @@ void receive_can_battery(CAN_frame_t rx_frame) {
SOC_Display = rx_frame.data.u8[0] * 5; //100% = 200 ( 200 * 5 = 1000 ) SOC_Display = rx_frame.data.u8[0] * 5; //100% = 200 ( 200 * 5 = 1000 )
break; break;
case 0x594: case 0x594:
allowedChargePower = ((rx_frame.data.u8[0] << 8) + rx_frame.data.u8[1]); allowedChargePower = ((rx_frame.data.u8[1] << 8) | rx_frame.data.u8[0]);
allowedDischargePower = ((rx_frame.data.u8[2] << 8) + rx_frame.data.u8[3]); allowedDischargePower = ((rx_frame.data.u8[3] << 8) | rx_frame.data.u8[2]);
SOC_BMS = rx_frame.data.u8[5] * 5; //100% = 200 ( 200 * 5 = 1000 ) SOC_BMS = rx_frame.data.u8[5] * 5; //100% = 200 ( 200 * 5 = 1000 )
break; break;
case 0x595: case 0x595: