yetangitu/Battery-Emulator
1
0
Fork 0
mirror of https://github.com/dalathegreat/Battery-Emulator.git synced 2025-10-03 09:49:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Add more CAN findings

Browse source
This commit is contained in:
Daniel Öster 2025-03-15 16:03:09 +02:00
parent e285bdd492
commit 2c9ad0ee83
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Software/src/battery/CMFA-EV-BATTERY.cpp
View file

@ -54,6 +54,7 @@ static unsigned long previousMillis10ms = 0;
static uint8_t heartbeat = 0; //Alternates between 0x55 and 0xAA every 5th frame static uint8_t heartbeat = 0; //Alternates between 0x55 and 0xAA every 5th frame
static uint8_t heartbeat2 = 0; //Alternates between 0x55 and 0xAA every 5th frame static uint8_t heartbeat2 = 0; //Alternates between 0x55 and 0xAA every 5th frame
static uint8_t SOC = 0; static uint8_t SOC = 0;
static uint16_t pack_voltage = 2700;
void update_values_battery() { //This function maps all the values fetched via CAN to the correct parameters used for modbus void update_values_battery() { //This function maps all the values fetched via CAN to the correct parameters used for modbus
datalayer.battery.status.soh_pptt; datalayer.battery.status.soh_pptt;
@ -62,7 +63,7 @@ void update_values_battery() { //This function maps all the values fetched via
datalayer.battery.status.current_dA; datalayer.battery.status.current_dA;
datalayer.battery.status.voltage_dV; datalayer.battery.status.voltage_dV = pack_voltage;
//Calculate the remaining Wh amount from SOC% and max Wh value. //Calculate the remaining Wh amount from SOC% and max Wh value.
datalayer.battery.status.remaining_capacity_Wh = static_cast<uint32_t>( datalayer.battery.status.remaining_capacity_Wh = static_cast<uint32_t>(
@ -95,6 +96,7 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) {
break; break;
case 0x3D7: case 0x3D7:
datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE; datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;
pack_voltage = ((rx_frame.data.u8[6] << 4 | (rx_frame.data.u8[5] & 0x0F)));
break; break;
case 0x3D8: case 0x3D8:
datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE; datalayer.battery.status.CAN_battery_still_alive = CAN_STILL_ALIVE;