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

Add CRC handling. Add 0x0EE pedal position message

Browse source
This commit is contained in:
Daniel Öster 2025-08-14 14:59:42 +03:00
parent 3fff2bde2b
commit 2dff7c62af
2 changed files with 71 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

48
Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.cpp
View file

@ -22,6 +22,14 @@ https://github.com/ljames28/Renault-Zoe-PH2-ZE50-Canbus-LBC-Information?tab=read
https://github.com/fesch/CanZE/tree/master/app/src/main/assets/ZOE_Ph2
*/
uint8_t RenaultZoeGen2Battery::calculate_crc_zoe(CAN_frame& rx_frame, uint8_t crc_xor) {
uint8_t crc = 0; //init value 0x00
for (uint8_t j = 0; j < 7; j++) {
crc = crctable[(crc ^ static_cast<uint8_t>(rx_frame.data.u8[j])) & 0xFF];
}
return crc ^ crc_xor;
}
void RenaultZoeGen2Battery::update_values() {
datalayer_battery->status.soh_pptt = battery_soh;
@ -113,9 +121,34 @@ void RenaultZoeGen2Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
case 0x0F8:
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
battery_interlock = (rx_frame.data.u8[0] << 8) | rx_frame.data.u8[1]; //Expected FF FE
battery_pack_voltage_periodic_dV = ((rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5]) / 8;
battery_pack_voltage_periodic_dV = ((rx_frame.data.u8[2] << 8) | rx_frame.data.u8[3]) / 8;
//battery_pack_current_periodic_dA = ((rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5]) / 8; //4-5-6 current related
break;
case 0x381:
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
//frame0 - 373 Related
//frame1 - 373 Related
//frame2 - Maximum_Available_Power_related
//frame3 - Maximum_Available_Power_related/was charge complete or partial
//frame4 - max power/SOC_related
//frame5-6 - SOC_related
//frame7 - Unknown status
break;
case 0x382:
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
//Frame0-2 Max gen power
//frame6 cooling temp OK
//frame7 max temp OK
break;
case 0x387:
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
break;
case 0x388: //Blower/Cooling/Maxpower
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
break;
case 0x3EF:
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
break;
case 0x4AE:
case 0x4AF:
case 0x4DB:
@ -141,7 +174,6 @@ void RenaultZoeGen2Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
case 0x5F4:
case 0x5F7:
case 0x612:
case 0x387:
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
break;
@ -702,6 +734,18 @@ void RenaultZoeGen2Battery::transmit_can(unsigned long currentMillis) {
// Send NVROL reset frames
transmit_reset_nvrol_frames();
}
// Send 10ms CAN Message
if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
previousMillis10 = currentMillis;
counter_10ms = (counter_10ms + 1) % 16;
ZOE_0EE.data.u8[6] = counter_10ms;
ZOE_0EE.data.u8[7] = calculate_crc_zoe(ZOE_0EE, 0xAC);
transmit_can_frame(&ZOE_0EE); //Pedal position
}
// Send 100ms CAN Message
if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
previousMillis100 = currentMillis;

26
Software/src/battery/RENAULT-ZOE-GEN2-BATTERY.h
View file

@ -39,6 +39,8 @@ class RenaultZoeGen2Battery : public CanBattery {
BatteryHtmlRenderer& get_status_renderer() { return renderer; }
uint8_t calculate_crc_zoe(CAN_frame& frame, uint8_t crc_xor);
private:
RenaultZoeGen2HtmlRenderer renderer;
@ -243,6 +245,27 @@ class RenaultZoeGen2Battery : public CanBattery {
1614454107; // Production timestamp in seconds since January 1, 1970. Production timestamp used: February 25, 2021 at 8:08:27 AM GMT
bool battery_balancing_shunts[96];
const uint8_t crctable[256] = {
0x00, 0x1D, 0x3A, 0x27, 0x74, 0x69, 0x4E, 0x53, 0xE8, 0xF5, 0xD2, 0xCF, 0x9C, 0x81, 0xA6, 0xBB, 0xCD, 0xD0, 0xF7,
0xEA, 0xB9, 0xA4, 0x83, 0x9E, 0x25, 0x38, 0x1F, 0x02, 0x51, 0x4C, 0x6B, 0x76, 0x87, 0x9A, 0xBD, 0xA0, 0xF3, 0xEE,
0xC9, 0xD4, 0x6F, 0x72, 0x55, 0x48, 0x1B, 0x06, 0x21, 0x3C, 0x4A, 0x57, 0x70, 0x6D, 0x3E, 0x23, 0x04, 0x19, 0xA2,
0xBF, 0x98, 0x85, 0xD6, 0xCB, 0xEC, 0xF1, 0x13, 0x0E, 0x29, 0x34, 0x67, 0x7A, 0x5D, 0x40, 0xFB, 0xE6, 0xC1, 0xDC,
0x8F, 0x92, 0xB5, 0xA8, 0xDE, 0xC3, 0xE4, 0xF9, 0xAA, 0xB7, 0x90, 0x8D, 0x36, 0x2B, 0x0C, 0x11, 0x42, 0x5F, 0x78,
0x65, 0x94, 0x89, 0xAE, 0xB3, 0xE0, 0xFD, 0xDA, 0xC7, 0x7C, 0x61, 0x46, 0x5B, 0x08, 0x15, 0x32, 0x2F, 0x59, 0x44,
0x63, 0x7E, 0x2D, 0x30, 0x17, 0x0A, 0xB1, 0xAC, 0x8B, 0x96, 0xC5, 0xD8, 0xFF, 0xE2, 0x26, 0x3B, 0x1C, 0x01, 0x52,
0x4F, 0x68, 0x75, 0xCE, 0xD3, 0xF4, 0xE9, 0xBA, 0xA7, 0x80, 0x9D, 0xEB, 0xF6, 0xD1, 0xCC, 0x9F, 0x82, 0xA5, 0xB8,
0x03, 0x1E, 0x39, 0x24, 0x77, 0x6A, 0x4D, 0x50, 0xA1, 0xBC, 0x9B, 0x86, 0xD5, 0xC8, 0xEF, 0xF2, 0x49, 0x54, 0x73,
0x6E, 0x3D, 0x20, 0x07, 0x1A, 0x6C, 0x71, 0x56, 0x4B, 0x18, 0x05, 0x22, 0x3F, 0x84, 0x99, 0xBE, 0xA3, 0xF0, 0xED,
0xCA, 0xD7, 0x35, 0x28, 0x0F, 0x12, 0x41, 0x5C, 0x7B, 0x66, 0xDD, 0xC0, 0xE7, 0xFA, 0xA9, 0xB4, 0x93, 0x8E, 0xF8,
0xE5, 0xC2, 0xDF, 0x8C, 0x91, 0xB6, 0xAB, 0x10, 0x0D, 0x2A, 0x37, 0x64, 0x79, 0x5E, 0x43, 0xB2, 0xAF, 0x88, 0x95,
0xC6, 0xDB, 0xFC, 0xE1, 0x5A, 0x47, 0x60, 0x7D, 0x2E, 0x33, 0x14, 0x09, 0x7F, 0x62, 0x45, 0x58, 0x0B, 0x16, 0x31,
0x2C, 0x97, 0x8A, 0xAD, 0xB0, 0xE3, 0xFE, 0xD9, 0xC4};
CAN_frame ZOE_0EE = {//Pedal position
.FD = false,
.ext_ID = false,
.DLC = 8,
.ID = 0x0EE,
.data = {0x32, 0x3, 0x20, 0xAA, 0x00, 0x00, 0x00, 0x00}};
CAN_frame ZOE_373 = {//HEVC sender
.FD = false,
.ext_ID = false,
@ -457,7 +480,8 @@ class RenaultZoeGen2Battery : public CanBattery {
uint8_t poll_index = 0;
uint16_t currentpoll = POLL_SOC;
uint16_t reply_poll = 0;
uint8_t counter_10ms = 0;
unsigned long previousMillis10 = 0; // will store last time a 10ms CAN Message was sent
unsigned long previousMillis100 = 0; // will store last time a 100ms CAN Message was sent
unsigned long previousMillis200 = 0; // will store last time a 200ms CAN Message was sent
unsigned long previousMillis1000 = 0; // will store last time a 1000ms CAN Message was sent