mirror of
https://github.com/dalathegreat/Battery-Emulator.git
synced 2025-10-05 19:42:08 +02:00
Merge pull request #1416 from dalathegreat/bugfix/nvrol-stop-streaming
Bugfix Zoe2: Improve NVROL streaming
This commit is contained in:
Daniel Öster
GitHub
commit
7fa65629e7
2 changed files with 212 additions and 58 deletions
|
|
@ -22,6 +22,19 @@ 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;
|
||||
}
|
||||
|
||||
bool RenaultZoeGen2Battery::is_message_corrupt(CAN_frame rx_frame, uint8_t crc_xor) {
|
||||
uint8_t crc = calculate_crc_zoe(rx_frame, crc_xor);
|
||||
return crc != rx_frame.data.u8[7];
|
||||
}
|
||||
|
||||
void RenaultZoeGen2Battery::update_values() {
|
||||
|
||||
datalayer_battery->status.soh_pptt = battery_soh;
|
||||
|
|
@ -32,7 +45,7 @@ void RenaultZoeGen2Battery::update_values() {
|
|||
datalayer_battery->status.real_soc = 0;
|
||||
}
|
||||
|
||||
datalayer_battery->status.voltage_dV = battery_pack_voltage;
|
||||
datalayer_battery->status.voltage_dV = battery_pack_voltage_periodic_dV;
|
||||
|
||||
datalayer_battery->status.current_dA = ((battery_current - 32640) * 0.3125);
|
||||
|
||||
|
|
@ -50,28 +63,32 @@ void RenaultZoeGen2Battery::update_values() {
|
|||
datalayer_battery->status.temperature_max_dC = ((battery_max_temp - 640) * 0.625);
|
||||
}
|
||||
|
||||
if ((battery_min_cell_voltage != 3700) && (battery_max_cell_voltage != 3700)) {
|
||||
datalayer_battery->status.cell_min_voltage_mV = (battery_min_cell_voltage * 0.976563);
|
||||
datalayer_battery->status.cell_max_voltage_mV = (battery_max_cell_voltage * 0.976563);
|
||||
}
|
||||
datalayer_battery->status.cell_min_voltage_mV = battery_minimum_cell_voltage_mV;
|
||||
datalayer_battery->status.cell_max_voltage_mV = battery_maximum_cell_voltage_mV;
|
||||
|
||||
if (battery_12v < 11000) { //11.000V
|
||||
set_event(EVENT_12V_LOW, battery_12v);
|
||||
}
|
||||
|
||||
if (battery_interlock != 0xFFFE) {
|
||||
set_event(EVENT_HVIL_FAILURE, 0);
|
||||
} else {
|
||||
clear_event(EVENT_HVIL_FAILURE);
|
||||
}
|
||||
|
||||
// Update webserver datalayer
|
||||
datalayer_extended.zoePH2.battery_soc = battery_soc;
|
||||
datalayer_extended.zoePH2.battery_usable_soc = battery_usable_soc;
|
||||
datalayer_extended.zoePH2.battery_soh = battery_soh;
|
||||
datalayer_extended.zoePH2.battery_pack_voltage = battery_pack_voltage;
|
||||
datalayer_extended.zoePH2.battery_max_cell_voltage = battery_max_cell_voltage;
|
||||
datalayer_extended.zoePH2.battery_min_cell_voltage = battery_min_cell_voltage;
|
||||
datalayer_extended.zoePH2.battery_pack_voltage = battery_pack_voltage_polled_dV;
|
||||
datalayer_extended.zoePH2.battery_max_cell_voltage = battery_max_cell_voltage_polled;
|
||||
datalayer_extended.zoePH2.battery_min_cell_voltage = battery_min_cell_voltage_polled;
|
||||
datalayer_extended.zoePH2.battery_12v = battery_12v;
|
||||
datalayer_extended.zoePH2.battery_avg_temp = battery_avg_temp;
|
||||
datalayer_extended.zoePH2.battery_min_temp = battery_min_temp;
|
||||
datalayer_extended.zoePH2.battery_max_temp = battery_max_temp;
|
||||
datalayer_extended.zoePH2.battery_max_power = battery_max_power;
|
||||
datalayer_extended.zoePH2.battery_interlock = battery_interlock;
|
||||
datalayer_extended.zoePH2.battery_interlock = battery_interlock_polled;
|
||||
datalayer_extended.zoePH2.battery_kwh = battery_kwh;
|
||||
datalayer_extended.zoePH2.battery_current = battery_current;
|
||||
datalayer_extended.zoePH2.battery_current_offset = battery_current_offset;
|
||||
|
|
@ -103,9 +120,78 @@ void RenaultZoeGen2Battery::update_values() {
|
|||
}
|
||||
|
||||
void RenaultZoeGen2Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
|
||||
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
|
||||
switch (rx_frame.ID) {
|
||||
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[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 0x36C:
|
||||
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
|
||||
if (is_message_corrupt(rx_frame, 0x01)) {
|
||||
datalayer_battery->status.CAN_error_counter++;
|
||||
}
|
||||
break;
|
||||
case 0x4DB:
|
||||
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
|
||||
battery_maximum_cell_voltage_mV = ((rx_frame.data.u8[0] << 4) | (rx_frame.data.u8[1] & 0xF0) >> 4) + 1000;
|
||||
battery_minimum_cell_voltage_mV = (((rx_frame.data.u8[1] & 0x0F) << 8) | (rx_frame.data.u8[2])) + 1000;
|
||||
break;
|
||||
case 0x4AE:
|
||||
case 0x4AF:
|
||||
case 0x5A1:
|
||||
case 0x5AC:
|
||||
case 0x5AD:
|
||||
case 0x5B4:
|
||||
case 0x5B5:
|
||||
case 0x5B7:
|
||||
case 0x5C9:
|
||||
case 0x5CB:
|
||||
case 0x5CC:
|
||||
case 0x5D6:
|
||||
case 0x5D7:
|
||||
case 0x5D9:
|
||||
case 0x5DC:
|
||||
case 0x5DD:
|
||||
case 0x5EA:
|
||||
case 0x5ED:
|
||||
case 0x5F0:
|
||||
case 0x5F1:
|
||||
case 0x5F2:
|
||||
case 0x5F4:
|
||||
case 0x5F7:
|
||||
case 0x612:
|
||||
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
|
||||
break;
|
||||
|
||||
case 0x18DAF1DB: // LBC Reply from active polling
|
||||
datalayer_battery->status.CAN_battery_still_alive = CAN_STILL_ALIVE;
|
||||
|
||||
if (rx_frame.data.u8[0] == 0x10) { //First frame of a group
|
||||
transmit_can_frame(&ZOE_POLL_FLOW_CONTROL);
|
||||
|
|
@ -128,18 +214,18 @@ void RenaultZoeGen2Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
|
|||
battery_soh = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
break;
|
||||
case POLL_PACK_VOLTAGE:
|
||||
battery_pack_voltage = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
battery_pack_voltage_polled_dV = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
break;
|
||||
case POLL_MAX_CELL_VOLTAGE:
|
||||
temporary_variable = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
if (temporary_variable > 500) { //Disregard messages with value unavailable
|
||||
battery_max_cell_voltage = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
battery_max_cell_voltage_polled = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
}
|
||||
break;
|
||||
case POLL_MIN_CELL_VOLTAGE:
|
||||
temporary_variable = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
if (temporary_variable > 500) { //Disregard messages with value unavailable
|
||||
battery_min_cell_voltage = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
battery_min_cell_voltage_polled = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
}
|
||||
break;
|
||||
case POLL_12V:
|
||||
|
|
@ -158,7 +244,7 @@ void RenaultZoeGen2Battery::handle_incoming_can_frame(CAN_frame rx_frame) {
|
|||
battery_max_power = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
break;
|
||||
case POLL_INTERLOCK:
|
||||
battery_interlock = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
battery_interlock_polled = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
break;
|
||||
case POLL_KWH:
|
||||
battery_kwh = (rx_frame.data.u8[4] << 8) | rx_frame.data.u8[5];
|
||||
|
|
@ -660,46 +746,62 @@ void RenaultZoeGen2Battery::transmit_can(unsigned long currentMillis) {
|
|||
if (datalayer_extended.zoePH2.UserRequestNVROLReset) {
|
||||
// Send NVROL reset frames
|
||||
transmit_reset_nvrol_frames();
|
||||
} else {
|
||||
// Send 100ms CAN Message
|
||||
if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
|
||||
previousMillis100 = currentMillis;
|
||||
}
|
||||
// Send 10ms CAN Message
|
||||
if (currentMillis - previousMillis10 >= INTERVAL_10_MS) {
|
||||
previousMillis10 = currentMillis;
|
||||
|
||||
/* FIXME: remove if not needed
|
||||
if ((counter_373 / 5) % 2 == 0) { // Alternate every 5 messages between these two
|
||||
ZOE_373.data.u8[2] = 0xB2;
|
||||
ZOE_373.data.u8[3] = 0xB2;
|
||||
} else {
|
||||
ZOE_373.data.u8[2] = 0x5D;
|
||||
ZOE_373.data.u8[3] = 0x5D;
|
||||
}
|
||||
counter_373 = (counter_373 + 1) % 10;
|
||||
*/
|
||||
counter_10ms = (counter_10ms + 1) % 16;
|
||||
|
||||
transmit_can_frame(&ZOE_373);
|
||||
transmit_can_frame_376();
|
||||
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
|
||||
//transmit_can_frame(&ZOE_133); //Vehicle speed (CRC is frame3 B1A670 55 0006FFFF)
|
||||
}
|
||||
|
||||
// Send 100ms CAN Message
|
||||
if (currentMillis - previousMillis100 >= INTERVAL_100_MS) {
|
||||
previousMillis100 = currentMillis;
|
||||
|
||||
ZOE_373.data.u8[1] = 0x40; //40 vehicle locked, 80 vehicle unlocked
|
||||
|
||||
if ((counter_373 / 5) % 2 == 0) { // Alternate every 5 messages between these two patterns
|
||||
ZOE_373.data.u8[2] = 0xB2;
|
||||
ZOE_373.data.u8[3] = 0x5D;
|
||||
} else {
|
||||
ZOE_373.data.u8[2] = 0x5D;
|
||||
ZOE_373.data.u8[3] = 0xB2;
|
||||
}
|
||||
counter_373 = (counter_373 + 1) % 10;
|
||||
|
||||
// Send 200ms CAN Message
|
||||
if (currentMillis - previousMillis200 >= INTERVAL_200_MS) {
|
||||
previousMillis200 = currentMillis;
|
||||
transmit_can_frame(&ZOE_373); //HEVC Wakeup / Sleep message
|
||||
transmit_can_frame(&ZOE_375); //HEVC Status message
|
||||
transmit_can_frame_376(); //HEVC Time and Date
|
||||
}
|
||||
|
||||
// Update current poll from the array
|
||||
currentpoll = poll_commands[poll_index];
|
||||
poll_index = (poll_index + 1) % 163;
|
||||
// Send 200ms polling CAN Message (Only if not NVROL in progress)
|
||||
if ((currentMillis - previousMillis200 >= INTERVAL_200_MS) && !datalayer_extended.zoePH2.UserRequestNVROLReset) {
|
||||
previousMillis200 = currentMillis;
|
||||
|
||||
ZOE_POLL_18DADBF1.data.u8[2] = (uint8_t)((currentpoll & 0xFF00) >> 8);
|
||||
ZOE_POLL_18DADBF1.data.u8[3] = (uint8_t)(currentpoll & 0x00FF);
|
||||
// Update current poll from the array
|
||||
currentpoll = poll_commands[poll_index];
|
||||
poll_index = (poll_index + 1) % 163;
|
||||
|
||||
transmit_can_frame(&ZOE_POLL_18DADBF1);
|
||||
}
|
||||
ZOE_POLL_18DADBF1.data.u8[2] = (uint8_t)((currentpoll & 0xFF00) >> 8);
|
||||
ZOE_POLL_18DADBF1.data.u8[3] = (uint8_t)(currentpoll & 0x00FF);
|
||||
|
||||
if (currentMillis - previousMillis1000 >= INTERVAL_1_S) {
|
||||
previousMillis1000 = currentMillis;
|
||||
transmit_can_frame(&ZOE_POLL_18DADBF1);
|
||||
}
|
||||
|
||||
// Time in seconds emulated
|
||||
ZOE_376_time_now_s++; // Increment by 1 second
|
||||
}
|
||||
if (currentMillis - previousMillis1000 >= INTERVAL_1_S) {
|
||||
previousMillis1000 = currentMillis;
|
||||
|
||||
// Time in seconds emulated
|
||||
ZOE_376_time_now_s++; // Increment by 1 second
|
||||
|
||||
transmit_can_frame(&ZOE_5F8); //Vehicle ID
|
||||
transmit_can_frame(&ZOE_6BF); //Total Boost Time
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -775,9 +877,13 @@ void RenaultZoeGen2Battery::transmit_reset_nvrol_frames(void) {
|
|||
}
|
||||
break;
|
||||
case 4: //Wait 30s
|
||||
//While waiting, stop streaming 0x373 to make battery go to sleep
|
||||
ZOE_373.data.u8[0] = 0x01;
|
||||
if ((millis() - startTimeNVROL) > INTERVAL_30_S) {
|
||||
// after sleeping, set the nvrol reset flag to false, to continue normal operation of sending CAN messages
|
||||
datalayer_extended.zoePH2.UserRequestNVROLReset = false;
|
||||
// Wake battery back up
|
||||
ZOE_373.data.u8[0] = 0xC1;
|
||||
// reset state machine, we are done!
|
||||
NVROLstateMachine = 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ class RenaultZoeGen2Battery : public CanBattery {
|
|||
allows_contactor_closing = nullptr;
|
||||
datalayer_zoePH2 = extended;
|
||||
|
||||
battery_pack_voltage = 0;
|
||||
battery_pack_voltage_periodic_dV = 0;
|
||||
}
|
||||
|
||||
// Use the default constructor to create the first or single battery.
|
||||
|
|
@ -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;
|
||||
|
||||
|
|
@ -48,6 +50,8 @@ class RenaultZoeGen2Battery : public CanBattery {
|
|||
// If not null, this battery decides when the contactor can be closed and writes the value here.
|
||||
bool* allows_contactor_closing;
|
||||
|
||||
bool is_message_corrupt(CAN_frame rx_frame, uint8_t crc_xor);
|
||||
|
||||
static const int MAX_PACK_VOLTAGE_DV = 4100; //5000 = 500.0V
|
||||
static const int MIN_PACK_VOLTAGE_DV = 3000;
|
||||
static const int MAX_CELL_DEVIATION_MV = 150;
|
||||
|
|
@ -197,15 +201,19 @@ class RenaultZoeGen2Battery : public CanBattery {
|
|||
uint16_t battery_soc = 0;
|
||||
uint16_t battery_usable_soc = 5000;
|
||||
uint16_t battery_soh = 10000;
|
||||
uint16_t battery_pack_voltage = 3700;
|
||||
uint16_t battery_max_cell_voltage = 3700;
|
||||
uint16_t battery_min_cell_voltage = 3700;
|
||||
uint16_t battery_pack_voltage_polled_dV = 3700;
|
||||
uint16_t battery_pack_voltage_periodic_dV = 3700;
|
||||
uint16_t battery_minimum_cell_voltage_mV = 3700;
|
||||
uint16_t battery_maximum_cell_voltage_mV = 3700;
|
||||
uint16_t battery_max_cell_voltage_polled = 3700;
|
||||
uint16_t battery_min_cell_voltage_polled = 3700;
|
||||
uint16_t battery_12v = 12000;
|
||||
uint16_t battery_avg_temp = 920;
|
||||
uint16_t battery_min_temp = 920;
|
||||
uint16_t battery_max_temp = 920;
|
||||
uint16_t battery_max_power = 0;
|
||||
uint16_t battery_interlock = 0;
|
||||
uint16_t battery_interlock = 0xFFFE;
|
||||
uint16_t battery_interlock_polled = 0;
|
||||
uint16_t battery_kwh = 0;
|
||||
int32_t battery_current = 32640;
|
||||
uint16_t battery_current_offset = 0;
|
||||
|
|
@ -241,20 +249,59 @@ 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];
|
||||
|
||||
CAN_frame ZOE_373 = {
|
||||
.FD = false,
|
||||
.ext_ID = false,
|
||||
.DLC = 8,
|
||||
.ID = 0x373,
|
||||
.data = {0xC1, 0x40, 0x5D, 0xB2, 0x00, 0x01, 0xff,
|
||||
0xe3}}; // FIXME: remove if not needed: {0xC1, 0x80, 0x5D, 0x5D, 0x00, 0x00, 0xff, 0xcb}};
|
||||
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, wakeup message
|
||||
.FD = false,
|
||||
.ext_ID = false,
|
||||
.DLC = 8,
|
||||
.ID = 0x373,
|
||||
.data = {0xC1, 0x40, 0x5D, 0xB2, 0x00, 0x01, 0xff, 0xe3}};
|
||||
CAN_frame ZOE_375 = {//HEVC status message
|
||||
.FD = false,
|
||||
.ext_ID = false,
|
||||
.DLC = 8,
|
||||
.ID = 0x375,
|
||||
.data = {0x02, 0x29, 0x00, 0xBF, 0xFE, 0x64, 0x0, 0xff}};
|
||||
CAN_frame ZOE_376 = {
|
||||
//HEVC sender
|
||||
.FD = false,
|
||||
.ext_ID = false,
|
||||
.DLC = 8,
|
||||
.ID = 0x376,
|
||||
.data = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0A,
|
||||
0x00}}; // fill first 6 bytes with 0's. The first 6 bytes are calculated based on the current time.
|
||||
CAN_frame ZOE_5F8 = { //Vehicle ID
|
||||
.FD = false,
|
||||
.ext_ID = false,
|
||||
.DLC = 4,
|
||||
.ID = 0x5F8,
|
||||
.data = {0x16, 0x44, 0x90, 0x8F}};
|
||||
CAN_frame ZOE_6BF = {//Total Boost Time
|
||||
.FD = false,
|
||||
.ext_ID = false,
|
||||
.DLC = 3,
|
||||
.ID = 0x6BF,
|
||||
.data = {0x00, 0x00, 0x00}};
|
||||
CAN_frame ZOE_POLL_18DADBF1 = {.FD = false,
|
||||
.ext_ID = true,
|
||||
.DLC = 8,
|
||||
|
|
@ -455,7 +502,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
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue