From 389b896944b4847a4463f506f0147e53ee0092b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20=C3=96ster?= Date: Mon, 20 Jan 2025 23:50:16 +0200 Subject: [PATCH] Move battery-allows-closing writing --- Software/src/battery/NISSAN-LEAF-BATTERY.cpp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp index 747342c7..3bcc6f5b 100644 --- a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp +++ b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp @@ -766,11 +766,6 @@ void handle_incoming_can_frame_battery(CAN_frame rx_frame) { battery_Relay_Cut_Request = ((rx_frame.data.u8[1] & 0x18) >> 3); battery_Failsafe_Status = (rx_frame.data.u8[1] & 0x07); battery_MainRelayOn_flag = (bool)((rx_frame.data.u8[3] & 0x20) >> 5); - if (battery_MainRelayOn_flag) { - datalayer.system.status.battery_allows_contactor_closing = true; - } else { - datalayer.system.status.battery_allows_contactor_closing = false; - } battery_Full_CHARGE_flag = (bool)((rx_frame.data.u8[3] & 0x10) >> 4); battery_Interlock = (bool)((rx_frame.data.u8[3] & 0x08) >> 3); break; @@ -1499,7 +1494,7 @@ void decodeChallengeData(unsigned int incomingChallenge, unsigned char* solvedCh void setup_battery(void) { // Performs one time setup at startup strncpy(datalayer.system.info.battery_protocol, "Nissan LEAF battery", 63); datalayer.system.info.battery_protocol[63] = '\0'; - + datalayer.system.status.battery_allows_contactor_closing = true; datalayer.battery.info.number_of_cells = 96; datalayer.battery.info.max_design_voltage_dV = MAX_PACK_VOLTAGE_DV; datalayer.battery.info.min_design_voltage_dV = MIN_PACK_VOLTAGE_DV;