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

Merge from main and fix conflict

Browse source
This commit is contained in:
Jaakko Haakana 2025-07-11 17:26:09 +03:00
commit 0b3bc738ac
17 changed files with 887 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -64,6 +64,7 @@ static String device_id = "";
static bool publish_common_info(void);
static bool publish_cell_voltages(void);
static bool publish_cell_balancing(void);
static bool publish_events(void);
/** Publish global values and call callbacks for specific modules */
@ -86,6 +87,12 @@ static void publish_values(void) {
return;
}
#endif
#ifdef MQTT_PUBLISH_CELL_VOLTAGES
if (publish_cell_balancing() == false) {
return;
}
#endif
}
static bool ha_common_info_published = false;
@ -129,7 +136,8 @@ SensorConfig batterySensorConfigTemplate[] = {
{"max_discharge_power", "Battery Max Discharge Power", "", "W", "power", always},
{"max_charge_power", "Battery Max Charge Power", "", "W", "power", always},
{"charged_energy", "Battery Charged Energy", "", "Wh", "energy", supports_charged},
{"discharged_energy", "Battery Discharged Energy", "", "Wh", "energy", supports_charged}};
{"discharged_energy", "Battery Discharged Energy", "", "Wh", "energy", supports_charged},
{"balancing_active_cells", "Balancing Active Cells", "", "", "", always}};
SensorConfig globalSensorConfigTemplate[] = {{"bms_status", "BMS Status", "", "", "", always},
{"pause_status", "Pause Status", "", "", "", always}};
@ -238,6 +246,17 @@ void set_battery_attributes(JsonDocument& doc, const DATALAYER_BATTERY_TYPE& bat
doc["discharged_energy" + suffix] = ((float)datalayer.battery.status.total_discharged_battery_Wh);
}
}
// Add balancing data
uint16_t active_cells = 0;
if (battery.info.number_of_cells != 0u) {
for (size_t i = 0; i < battery.info.number_of_cells; ++i) {
if (battery.status.cell_balancing_status[i]) {
active_cells++;
}
}
}
doc["balancing_active_cells" + suffix] = active_cells;
}
static std::vector<EventData> order_events;
@ -398,6 +417,53 @@ static bool publish_cell_voltages(void) {
return true;
}
static bool publish_cell_balancing(void) {
static JsonDocument doc;
static String state_topic = topic_name + "/balancing_data";
static String state_topic_2 = topic_name + "/balancing_data_2";
// If cell balancing data is available...
if (datalayer.battery.info.number_of_cells != 0u) {
JsonArray cell_balancing = doc["cell_balancing"].to<JsonArray>();
for (size_t i = 0; i < datalayer.battery.info.number_of_cells; ++i) {
cell_balancing.add(datalayer.battery.status.cell_balancing_status[i]);
}
serializeJson(doc, mqtt_msg, sizeof(mqtt_msg));
if (!mqtt_publish(state_topic.c_str(), mqtt_msg, false)) {
#ifdef DEBUG_LOG
logging.println("Cell balancing MQTT msg could not be sent");
#endif // DEBUG_LOG
return false;
}
doc.clear();
}
// Handle second battery if available
if (battery2) {
if (datalayer.battery2.info.number_of_cells != 0u) {
JsonArray cell_balancing = doc["cell_balancing"].to<JsonArray>();
for (size_t i = 0; i < datalayer.battery2.info.number_of_cells; ++i) {
cell_balancing.add(datalayer.battery2.status.cell_balancing_status[i]);
}
serializeJson(doc, mqtt_msg, sizeof(mqtt_msg));
if (!mqtt_publish(state_topic_2.c_str(), mqtt_msg, false)) {
#ifdef DEBUG_LOG
logging.println("Cell balancing MQTT msg could not be sent");
#endif // DEBUG_LOG
return false;
}
doc.clear();
}
}
return true;
}
bool publish_events() {
static JsonDocument doc;
static String state_topic = topic_name + "/events";