diff --git a/Software/Software.ino b/Software/Software.ino index 5578ed38..7f24a2ca 100644 --- a/Software/Software.ino +++ b/Software/Software.ino @@ -64,15 +64,14 @@ uint16_t capacity_Wh = BATTERY_WH_MAX; //Wh, 0-60000 uint16_t remaining_capacity_Wh = BATTERY_WH_MAX; //Wh, 0-60000 uint16_t max_target_discharge_power = 0; // 0W (0W > restricts to no discharge), Updates later on from CAN uint16_t max_target_charge_power = 4312; // Init to 4.3kW, Updates later on from CAN -uint16_t temperature_max = 50; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385) -uint16_t temperature_min = 60; // Reads from battery later -uint8_t bms_char_dis_status = STANDBY; // 0 standby, 1 discharging, 2, charging -uint8_t bms_status = ACTIVE; // ACTIVE - [0..5]<>[STANDBY,INACTIVE,DARKSTART,ACTIVE,FAULT,UPDATING] -uint16_t stat_batt_power = 0; // Power going in/out of battery -uint16_t cell_max_voltage = 3700; // Stores the highest cell voltage value in the system -uint16_t cell_min_voltage = 3700; // Stores the minimum cell voltage value in the system -uint16_t cellvoltages[120]; // Stores all cell voltages -uint8_t nof_cellvoltages = 0; // Total number of cell voltages, set by each battery. +uint16_t temperature_max = 50; //C+1, Goes thru convert2unsignedint16 function (15.0C = 150, -15.0C = 65385) +uint16_t temperature_min = 60; // Reads from battery later +uint8_t bms_status = ACTIVE; // ACTIVE - [0..5]<>[STANDBY,INACTIVE,DARKSTART,ACTIVE,FAULT,UPDATING] +uint16_t stat_batt_power = 0; // Power going in/out of battery +uint16_t cell_max_voltage = 3700; // Stores the highest cell voltage value in the system +uint16_t cell_min_voltage = 3700; // Stores the minimum cell voltage value in the system +uint16_t cellvoltages[120]; // Stores all cell voltages +uint8_t nof_cellvoltages = 0; // Total number of cell voltages, set by each battery. bool LFP_Chemistry = false; // Common charger parameters diff --git a/Software/src/battery/BMW-I3-BATTERY.h b/Software/src/battery/BMW-I3-BATTERY.h index 99bc8a8c..882d8721 100644 --- a/Software/src/battery/BMW-I3-BATTERY.h +++ b/Software/src/battery/BMW-I3-BATTERY.h @@ -18,7 +18,6 @@ extern uint16_t capacity_Wh; extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max; diff --git a/Software/src/battery/CHADEMO-BATTERY.cpp b/Software/src/battery/CHADEMO-BATTERY.cpp index 95a03c57..17ec4b1a 100644 --- a/Software/src/battery/CHADEMO-BATTERY.cpp +++ b/Software/src/battery/CHADEMO-BATTERY.cpp @@ -118,19 +118,6 @@ void update_values_chademo_battery() { //This function maps all the values fetc } Serial.print("BMS Status (3=OK): "); Serial.println(bms_status); - switch (bms_char_dis_status) { - case 0: - Serial.println("Battery Idle"); - break; - case 1: - Serial.println("Battery Discharging"); - break; - case 2: - Serial.println("Battery Charging"); - break; - default: - break; - } Serial.print("Max discharge power: "); Serial.println(max_target_discharge_power); Serial.print("Max charge power: "); diff --git a/Software/src/battery/CHADEMO-BATTERY.h b/Software/src/battery/CHADEMO-BATTERY.h index 6eccc66c..4f65a4ec 100644 --- a/Software/src/battery/CHADEMO-BATTERY.h +++ b/Software/src/battery/CHADEMO-BATTERY.h @@ -19,7 +19,6 @@ extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; extern uint8_t bms_status; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max; diff --git a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h index d72ba04a..6d3141e0 100644 --- a/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h +++ b/Software/src/battery/IMIEV-CZERO-ION-BATTERY.h @@ -18,7 +18,6 @@ extern uint16_t capacity_Wh; extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max; diff --git a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h index ff357842..68f483da 100644 --- a/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h +++ b/Software/src/battery/KIA-HYUNDAI-64-BATTERY.h @@ -20,7 +20,6 @@ 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 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) diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp index aecf242d..45a460c4 100644 --- a/Software/src/battery/NISSAN-LEAF-BATTERY.cpp +++ b/Software/src/battery/NISSAN-LEAF-BATTERY.cpp @@ -392,19 +392,6 @@ void update_values_leaf_battery() { /* This function maps all the values fetched } else { Serial.print("FAULT, "); } - switch (bms_char_dis_status) { - case 0: - Serial.print("Idle"); - break; - case 1: - Serial.print("Discharging"); - break; - case 2: - Serial.print("Charging"); - break; - default: - break; - } print_with_units(", Power: ", LB_Power, "W "); Serial.println(""); Serial.println("Values from battery"); diff --git a/Software/src/battery/NISSAN-LEAF-BATTERY.h b/Software/src/battery/NISSAN-LEAF-BATTERY.h index 34fdf23d..14cc9a8f 100644 --- a/Software/src/battery/NISSAN-LEAF-BATTERY.h +++ b/Software/src/battery/NISSAN-LEAF-BATTERY.h @@ -18,7 +18,6 @@ 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 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) diff --git a/Software/src/battery/RENAULT-KANGOO-BATTERY.h b/Software/src/battery/RENAULT-KANGOO-BATTERY.h index 105f60a9..fc4a7af5 100644 --- a/Software/src/battery/RENAULT-KANGOO-BATTERY.h +++ b/Software/src/battery/RENAULT-KANGOO-BATTERY.h @@ -23,7 +23,6 @@ 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 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) diff --git a/Software/src/battery/RENAULT-ZOE-BATTERY.h b/Software/src/battery/RENAULT-ZOE-BATTERY.h index 7a2e46c4..bb34f4c0 100644 --- a/Software/src/battery/RENAULT-ZOE-BATTERY.h +++ b/Software/src/battery/RENAULT-ZOE-BATTERY.h @@ -23,7 +23,6 @@ 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 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) diff --git a/Software/src/battery/SANTA-FE-PHEV-BATTERY.h b/Software/src/battery/SANTA-FE-PHEV-BATTERY.h index f2d977f8..03bd0ab4 100644 --- a/Software/src/battery/SANTA-FE-PHEV-BATTERY.h +++ b/Software/src/battery/SANTA-FE-PHEV-BATTERY.h @@ -18,7 +18,6 @@ extern uint16_t capacity_Wh; extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max; diff --git a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp index b377a1f8..687776ff 100644 --- a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp +++ b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.cpp @@ -37,14 +37,13 @@ void __getData() { max_target_discharge_power = (uint16_t)dataLinkReceive.getReceivedData(6); max_target_charge_power = (uint16_t)dataLinkReceive.getReceivedData(7); uint16_t _bms_status = (uint16_t)dataLinkReceive.getReceivedData(8); - bms_char_dis_status = (uint16_t)dataLinkReceive.getReceivedData(9); - stat_batt_power = (uint16_t)dataLinkReceive.getReceivedData(10); - temperature_min = (uint16_t)dataLinkReceive.getReceivedData(11); - temperature_max = (uint16_t)dataLinkReceive.getReceivedData(12); - cell_max_voltage = (uint16_t)dataLinkReceive.getReceivedData(13); - cell_min_voltage = (uint16_t)dataLinkReceive.getReceivedData(14); - LFP_Chemistry = (bool)dataLinkReceive.getReceivedData(15); - batteryAllowsContactorClosing = (uint16_t)dataLinkReceive.getReceivedData(16); + stat_batt_power = (uint16_t)dataLinkReceive.getReceivedData(9); + temperature_min = (uint16_t)dataLinkReceive.getReceivedData(10); + temperature_max = (uint16_t)dataLinkReceive.getReceivedData(11); + cell_max_voltage = (uint16_t)dataLinkReceive.getReceivedData(12); + cell_min_voltage = (uint16_t)dataLinkReceive.getReceivedData(13); + LFP_Chemistry = (bool)dataLinkReceive.getReceivedData(14); + batteryAllowsContactorClosing = (uint16_t)dataLinkReceive.getReceivedData(15); batteryFault = false; if (_bms_status == FAULT) { @@ -194,8 +193,6 @@ void update_values_serial_link() { Serial.print(max_target_charge_power); Serial.print(" BMS status: "); Serial.print(bms_status); - Serial.print(" BMS status dis/cha: "); - Serial.print(bms_char_dis_status); Serial.print(" Power: "); Serial.print(stat_batt_power); Serial.print(" Temp min: "); diff --git a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h index 089276a5..c1ec844a 100644 --- a/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h +++ b/Software/src/battery/SERIAL-LINK-RECEIVER-FROM-BATTERY.h @@ -24,7 +24,6 @@ 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 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) diff --git a/Software/src/battery/TESLA-MODEL-3-BATTERY.h b/Software/src/battery/TESLA-MODEL-3-BATTERY.h index ed2ba9c1..0d1fa9b8 100644 --- a/Software/src/battery/TESLA-MODEL-3-BATTERY.h +++ b/Software/src/battery/TESLA-MODEL-3-BATTERY.h @@ -21,7 +21,6 @@ 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 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) diff --git a/Software/src/battery/TEST-FAKE-BATTERY.h b/Software/src/battery/TEST-FAKE-BATTERY.h index 8fde83ad..b6bfb209 100644 --- a/Software/src/battery/TEST-FAKE-BATTERY.h +++ b/Software/src/battery/TEST-FAKE-BATTERY.h @@ -19,7 +19,6 @@ 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 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) diff --git a/Software/src/devboard/webserver/webserver.cpp b/Software/src/devboard/webserver/webserver.cpp index c2eab57a..30dd8105 100644 --- a/Software/src/devboard/webserver/webserver.cpp +++ b/Software/src/devboard/webserver/webserver.cpp @@ -515,12 +515,12 @@ String processor(const String& var) { } else { content += "

BMS Status: FAULT

"; } - if (bms_char_dis_status == 2) { - content += "

Battery charging!

"; - } else if (bms_char_dis_status == 1) { - content += "

Battery discharging!

"; - } else { //0 idle + if (battery_current == 0) { content += "

Battery idle

"; + } else if (battery_current > 32767) { + content += "

Battery discharging!

"; + } else { // between 1-32767 + content += "

Battery charging!

"; } content += "

Automatic contactor closing allowed:

"; content += "

Battery: "; diff --git a/Software/src/devboard/webserver/webserver.h b/Software/src/devboard/webserver/webserver.h index 23b65278..888c1bc5 100644 --- a/Software/src/devboard/webserver/webserver.h +++ b/Software/src/devboard/webserver/webserver.h @@ -26,7 +26,6 @@ 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 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) diff --git a/Software/src/inverter/BYD-CAN.h b/Software/src/inverter/BYD-CAN.h index 4a292c45..e9f13f9a 100644 --- a/Software/src/inverter/BYD-CAN.h +++ b/Software/src/inverter/BYD-CAN.h @@ -13,7 +13,6 @@ extern uint16_t capacity_Wh; extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max; diff --git a/Software/src/inverter/BYD-MODBUS.cpp b/Software/src/inverter/BYD-MODBUS.cpp index dff1a934..dbe6cb89 100644 --- a/Software/src/inverter/BYD-MODBUS.cpp +++ b/Software/src/inverter/BYD-MODBUS.cpp @@ -56,6 +56,8 @@ void handle_update_data_modbusp201_byd() { void handle_update_data_modbusp301_byd() { // Store the data into the array static uint16_t battery_data[24]; + + static uint8_t bms_char_dis_status = STANDBY; if (battery_current == 0) { bms_char_dis_status = STANDBY; } else if (battery_current > 32767) { //Negative value = Discharging diff --git a/Software/src/inverter/BYD-MODBUS.h b/Software/src/inverter/BYD-MODBUS.h index aa91fea0..8f9f679d 100644 --- a/Software/src/inverter/BYD-MODBUS.h +++ b/Software/src/inverter/BYD-MODBUS.h @@ -16,7 +16,6 @@ extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; extern uint8_t bms_status; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max; diff --git a/Software/src/inverter/LUNA2000-MODBUS.h b/Software/src/inverter/LUNA2000-MODBUS.h index 93287410..4ab6cbde 100644 --- a/Software/src/inverter/LUNA2000-MODBUS.h +++ b/Software/src/inverter/LUNA2000-MODBUS.h @@ -14,7 +14,6 @@ extern uint16_t capacity_Wh; extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max; diff --git a/Software/src/inverter/PYLON-CAN.h b/Software/src/inverter/PYLON-CAN.h index 444081b8..6438e00e 100644 --- a/Software/src/inverter/PYLON-CAN.h +++ b/Software/src/inverter/PYLON-CAN.h @@ -14,7 +14,6 @@ extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; extern uint8_t bms_status; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max; diff --git a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp index f4d64bb6..9df86075 100644 --- a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp +++ b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.cpp @@ -9,7 +9,7 @@ * Will transmit max 16 int variable - receive none */ -#define BATTERY_SEND_NUM_VARIABLES 17 +#define BATTERY_SEND_NUM_VARIABLES 16 #define BATTERY_RECV_NUM_VARIABLES 1 #ifdef BATTERY_RECV_NUM_VARIABLES @@ -138,14 +138,13 @@ void manageSerialLinkTransmitter() { dataLinkTransmit.updateData(6, max_target_discharge_power); dataLinkTransmit.updateData(7, max_target_charge_power); dataLinkTransmit.updateData(8, bms_status); - dataLinkTransmit.updateData(9, bms_char_dis_status); - dataLinkTransmit.updateData(10, stat_batt_power); - dataLinkTransmit.updateData(11, temperature_min); - dataLinkTransmit.updateData(12, temperature_max); - dataLinkTransmit.updateData(13, cell_max_voltage); - dataLinkTransmit.updateData(14, cell_min_voltage); - dataLinkTransmit.updateData(15, (int16_t)LFP_Chemistry); - dataLinkTransmit.updateData(16, batteryAllowsContactorClosing); + dataLinkTransmit.updateData(9, stat_batt_power); + dataLinkTransmit.updateData(10, temperature_min); + dataLinkTransmit.updateData(11, temperature_max); + dataLinkTransmit.updateData(12, cell_max_voltage); + dataLinkTransmit.updateData(13, cell_min_voltage); + dataLinkTransmit.updateData(14, (int16_t)LFP_Chemistry); + dataLinkTransmit.updateData(15, batteryAllowsContactorClosing); } } } @@ -170,8 +169,6 @@ void printSendingValues() { Serial.print(max_target_charge_power); Serial.print(" BMS status: "); Serial.print(bms_status); - Serial.print(" BMS status dis/cha: "); - Serial.print(bms_char_dis_status); Serial.print(" Power: "); Serial.print(stat_batt_power); Serial.print(" Temp min: "); diff --git a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h index 613190ce..52e06938 100644 --- a/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h +++ b/Software/src/inverter/SERIAL-LINK-TRANSMITTER-INVERTER.h @@ -18,7 +18,6 @@ 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 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) diff --git a/Software/src/inverter/SMA-CAN.h b/Software/src/inverter/SMA-CAN.h index ad8fa09d..29e87b7f 100644 --- a/Software/src/inverter/SMA-CAN.h +++ b/Software/src/inverter/SMA-CAN.h @@ -13,7 +13,6 @@ 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 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) diff --git a/Software/src/inverter/SOFAR-CAN.h b/Software/src/inverter/SOFAR-CAN.h index 75d69602..305b25b0 100644 --- a/Software/src/inverter/SOFAR-CAN.h +++ b/Software/src/inverter/SOFAR-CAN.h @@ -14,7 +14,6 @@ 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 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) diff --git a/Software/src/inverter/SOLAX-CAN.h b/Software/src/inverter/SOLAX-CAN.h index c366ef3a..4046c2d0 100644 --- a/Software/src/inverter/SOLAX-CAN.h +++ b/Software/src/inverter/SOLAX-CAN.h @@ -16,7 +16,6 @@ extern uint16_t capacity_Wh; extern uint16_t remaining_capacity_Wh; extern uint16_t max_target_discharge_power; extern uint16_t max_target_charge_power; -extern uint8_t bms_char_dis_status; extern uint16_t stat_batt_power; extern uint16_t temperature_min; extern uint16_t temperature_max;