diff --git a/Software/src/battery/RENAULT-KANGOO-BATTERY.h b/Software/src/battery/RENAULT-KANGOO-BATTERY.h index 2010c765..d81825a6 100644 --- a/Software/src/battery/RENAULT-KANGOO-BATTERY.h +++ b/Software/src/battery/RENAULT-KANGOO-BATTERY.h @@ -2,7 +2,7 @@ #define RENAULT_KANGOO_BATTERY_H #include #include "../../USER_SETTINGS.h" -#include "../devboard/config.h" // Needed for LED defines +#include "../devboard/config.h" // Needed for defines #include "../lib/miwagner-ESP32-Arduino-CAN/ESP32CAN.h" #define ABSOLUTE_MAX_VOLTAGE \ @@ -23,8 +23,8 @@ extern uint16_t capacity_Wh; //Wh, 0-60000 extern uint16_t remaining_capacity_Wh; //Wh, 0-60000 extern uint16_t max_target_discharge_power; //W, 0-60000 extern uint16_t max_target_charge_power; //W, 0-60000 -extern uint16_t bms_status; //Enum, 0-5 -extern uint16_t bms_char_dis_status; //Enum, 0-2 +extern uint8_t bms_status; //Enum, 0-5 +extern uint8_t bms_char_dis_status; //Enum, 0-2 extern uint16_t stat_batt_power; //W, Goes thru convert2unsignedint16 function (5W = 5, -5W = 65530) extern uint16_t temperature_min; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385) extern uint16_t temperature_max; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385) @@ -35,14 +35,6 @@ extern uint8_t LEDcolor; //Enum, 0-10 extern bool batteryAllowsContactorClosing; //Bool, 1=true, 0=false extern bool inverterAllowsContactorClosing; //Bool, 1=true, 0=false -// Definitions for BMS status -#define STANDBY 0 -#define INACTIVE 1 -#define DARKSTART 2 -#define ACTIVE 3 -#define FAULT 4 -#define UPDATING 5 - void update_values_kangoo_battery(); void receive_can_kangoo_battery(CAN_frame_t rx_frame); void send_can_kangoo_battery();