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

Eliminate mqtt compile time dependency to battery type

Browse source
This commit is contained in:
Jaakko Haakana 2025-06-02 08:24:59 +03:00
parent 3789d72833
commit dbe3de7422
3 changed files with 47 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Software/src/battery/NISSAN-LEAF-BATTERY.h
View file

@ -43,9 +43,14 @@ class NissanLeafBattery : public CanBattery {
virtual void transmit_can(unsigned long currentMillis); virtual void transmit_can(unsigned long currentMillis);
bool supports_reset_SOH(); bool supports_reset_SOH();
void reset_SOH() { datalayer_extended.nissanleaf.UserRequestSOHreset = true; } void reset_SOH() { datalayer_extended.nissanleaf.UserRequestSOHreset = true; }
bool soc_plausible() {
// When pack voltage is close to max, and SOC% is still low, SOC is not plausible
return !((datalayer.battery.status.voltage_dV > (datalayer.battery.info.max_design_voltage_dV - 100)) &&
(datalayer.battery.status.real_soc < 6500));
}
BatteryHtmlRenderer& get_status_renderer() { return renderer; } BatteryHtmlRenderer& get_status_renderer() { return renderer; }
private: private:

63
Software/src/devboard/mqtt/mqtt.cpp
View file

@ -62,38 +62,47 @@ struct SensorConfig {
const char* value_template; const char* value_template;
const char* unit; const char* unit;
const char* device_class; const char* device_class;
// A function that returns true for the battery if it supports this config
std::function<bool(Battery*)> condition;
};
static std::function<bool(Battery*)> always = [](Battery* b) {
return true;
};
static std::function<bool(Battery*)> supports_charged = [](Battery* b) {
return b->supports_charged_energy();
}; };
SensorConfig sensorConfigTemplate[] = { SensorConfig sensorConfigTemplate[] = {
{"SOC", "SOC (Scaled)", "", "%", "battery"}, {"SOC", "SOC (Scaled)", "", "%", "battery", always},
{"SOC_real", "SOC (real)", "", "%", "battery"}, {"SOC_real", "SOC (real)", "", "%", "battery", always},
{"state_of_health", "State Of Health", "", "%", "battery"}, {"state_of_health", "State Of Health", "", "%", "battery", always},
{"temperature_min", "Temperature Min", "", "°C", "temperature"}, {"temperature_min", "Temperature Min", "", "°C", "temperature", always},
{"temperature_max", "Temperature Max", "", "°C", "temperature"}, {"temperature_max", "Temperature Max", "", "°C", "temperature", always},
{"cpu_temp", "CPU Temperature", "", "°C", "temperature"}, {"cpu_temp", "CPU Temperature", "", "°C", "temperature", always},
{"stat_batt_power", "Stat Batt Power", "", "W", "power"}, {"stat_batt_power", "Stat Batt Power", "", "W", "power", always},
{"battery_current", "Battery Current", "", "A", "current"}, {"battery_current", "Battery Current", "", "A", "current", always},
{"cell_max_voltage", "Cell Max Voltage", "", "V", "voltage"}, {"cell_max_voltage", "Cell Max Voltage", "", "V", "voltage", always},
{"cell_min_voltage", "Cell Min Voltage", "", "V", "voltage"}, {"cell_min_voltage", "Cell Min Voltage", "", "V", "voltage", always},
{"cell_voltage_delta", "Cell Voltage Delta", "", "mV", "voltage"}, {"cell_voltage_delta", "Cell Voltage Delta", "", "mV", "voltage", always},
{"battery_voltage", "Battery Voltage", "", "V", "voltage"}, {"battery_voltage", "Battery Voltage", "", "V", "voltage", always},
{"total_capacity", "Battery Total Capacity", "", "Wh", "energy"}, {"total_capacity", "Battery Total Capacity", "", "Wh", "energy", always},
{"remaining_capacity", "Battery Remaining Capacity (scaled)", "", "Wh", "energy"}, {"remaining_capacity", "Battery Remaining Capacity (scaled)", "", "Wh", "energy", always},
{"remaining_capacity_real", "Battery Remaining Capacity (real)", "", "Wh", "energy"}, {"remaining_capacity_real", "Battery Remaining Capacity (real)", "", "Wh", "energy", always},
{"max_discharge_power", "Battery Max Discharge Power", "", "W", "power"}, {"max_discharge_power", "Battery Max Discharge Power", "", "W", "power", always},
{"max_charge_power", "Battery Max Charge Power", "", "W", "power"}, {"max_charge_power", "Battery Max Charge Power", "", "W", "power", always},
#if defined(MEB_BATTERY) || defined(TESLA_BATTERY) {"charged_energy", "Battery Charged Energy", "", "Wh", "energy", supports_charged},
{"charged_energy", "Battery Charged Energy", "", "Wh", "energy"}, {"discharged_energy", "Battery Discharged Energy", "", "Wh", "energy", supports_charged},
{"discharged_energy", "Battery Discharged Energy", "", "Wh", "energy"}, {"bms_status", "BMS Status", "", "", "", always},
#endif {"pause_status", "Pause Status", "", "", "", always}};
{"bms_status", "BMS Status", "", "", ""},
{"pause_status", "Pause Status", "", "", ""}};
// Enough space for two batteries // Enough space for two batteries
SensorConfig sensorConfigs[((sizeof(sensorConfigTemplate) / sizeof(sensorConfigTemplate[0])) * 2) - 2]; SensorConfig sensorConfigs[((sizeof(sensorConfigTemplate) / sizeof(sensorConfigTemplate[0])) * 2) - 2];
void create_sensor_configs() { void create_sensor_configs() {
int number_of_templates = sizeof(sensorConfigTemplate) / sizeof(sensorConfigTemplate[0]); int number_of_templates = sizeof(sensorConfigTemplate) / sizeof(sensorConfigTemplate[0]);
for (int i = 0; i < number_of_templates; i++) { for (int i = 0; i < number_of_templates; i++) {
SensorConfig config = sensorConfigTemplate[i]; SensorConfig config = sensorConfigTemplate[i];
config.value_template = strdup(("{{ value_json." + std::string(config.object_id) + " }}").c_str()); config.value_template = strdup(("{{ value_json." + std::string(config.object_id) + " }}").c_str());
@ -203,13 +212,19 @@ static bool publish_common_info(void) {
if (ha_common_info_published == false) { if (ha_common_info_published == false) {
for (int i = 0; i < sizeof(sensorConfigs) / sizeof(sensorConfigs[0]); i++) { for (int i = 0; i < sizeof(sensorConfigs) / sizeof(sensorConfigs[0]); i++) {
SensorConfig& config = sensorConfigs[i]; SensorConfig& config = sensorConfigs[i];
if (!config.condition(battery)) {
continue;
}
doc["name"] = config.name; doc["name"] = config.name;
doc["state_topic"] = state_topic; doc["state_topic"] = state_topic;
doc["unique_id"] = topic_name + "_" + String(config.object_id); doc["unique_id"] = topic_name + "_" + String(config.object_id);
doc["object_id"] = object_id_prefix + String(config.object_id); doc["object_id"] = object_id_prefix + String(config.object_id);
doc["value_template"] = config.value_template; doc["value_template"] = config.value_template;
if (config.unit != nullptr && strlen(config.unit) > 0) if (config.unit != nullptr && strlen(config.unit) > 0) {
doc["unit_of_measurement"] = config.unit; doc["unit_of_measurement"] = config.unit;
}
if (config.device_class != nullptr && strlen(config.device_class) > 0) { if (config.device_class != nullptr && strlen(config.device_class) > 0) {
doc["device_class"] = config.device_class; doc["device_class"] = config.device_class;
doc["state_class"] = "measurement"; doc["state_class"] = "measurement";

13
Software/src/devboard/safety/safety.cpp
View file

@ -156,18 +156,9 @@ void update_machineryprotection() {
clear_event(EVENT_SOH_LOW); clear_event(EVENT_SOH_LOW);
} }
#ifdef NISSAN_LEAF_BATTERY if (!battery->soc_plausible()) {
// Check if SOC% is plausible set_event(EVENT_SOC_PLAUSIBILITY_ERROR, datalayer.battery.status.real_soc);
if (datalayer.battery.status.voltage_dV >
(datalayer.battery.info.max_design_voltage_dV -
100)) { // When pack voltage is close to max, and SOC% is still low, raise event
if (datalayer.battery.status.real_soc < 6500) { // 65.00%
set_event(EVENT_SOC_PLAUSIBILITY_ERROR, datalayer.battery.status.real_soc);
} else {
clear_event(EVENT_SOC_PLAUSIBILITY_ERROR);
}
} }
#endif //NISSAN_LEAF_BATTERY
// Check diff between highest and lowest cell // Check diff between highest and lowest cell
cell_deviation_mV = cell_deviation_mV =