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

Rewrite part 1

Browse source
This commit is contained in:
Daniel 2024-02-19 00:44:04 +02:00
parent d4c514f43c
commit 032a0d75ee
18 changed files with 335 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ static void publish_cell_voltages(void) {
static bool mqtt_first_transmission = true;
// If the cell voltage number isn't initialized...
if (nof_cellvoltages == 0u) {
if (system_number_of_cells == 0u) {
return;
}
// At startup, re-post the discovery message for home assistant
@ -39,7 +39,7 @@ static void publish_cell_voltages(void) {
// Base topic for any cell voltage "sensor"
String topic = "homeassistant/sensor/battery-emulator/cell_voltage";
for (int i = 0; i < nof_cellvoltages; i++) {
for (int i = 0; i < system_number_of_cells; i++) {
// Build JSON message with device configuration for each cell voltage
// Probably shouldn't be BatteryEmulator here, instead "LeafBattery"
// or similar but hey, it works.
@ -83,15 +83,15 @@ static void publish_cell_voltages(void) {
// is the string content
// If cell voltages haven't been populated...
if (nof_cellvoltages == 0u) {
if (system_number_of_cells == 0u) {
return;
}
}
size_t msg_length = snprintf(mqtt_msg, sizeof(mqtt_msg), "{\n\"cell_voltages\":[");
for (size_t i = 0; i < nof_cellvoltages; ++i) {
for (size_t i = 0; i < system_number_of_cells; ++i) {
msg_length += snprintf(mqtt_msg + msg_length, sizeof(mqtt_msg) - msg_length, "%s%.3f", (i == 0) ? "" : ", ",
((float)cellvoltages[i]) / 1000);
((float)system_cellvoltages_mV[i]) / 1000);
}
snprintf(mqtt_msg + msg_length, sizeof(mqtt_msg) - msg_length, "]\n}\n");
@ -170,20 +170,21 @@ static void publish_common_info(void) {
} else {
snprintf(mqtt_msg, sizeof(mqtt_msg),
"{\n"
" \"SOC\": %.3f,\n"
" \"state_of_health\": %.3f,\n"
" \"temperature_min\": %.3f,\n"
" \"temperature_max\": %.3f,\n"
" \"stat_batt_power\": %.3f,\n"
" \"battery_current\": %.3f,\n"
" \"cell_max_voltage\": %.3f,\n"
" \"cell_min_voltage\": %.3f,\n"
" \"battery_voltage\": %d\n"
" \"system_scaled_SOC_pptt\": %.3f,\n"
" \"system_SOH_pptt\": %.3f,\n"
" \"system_temperature_min_dC\": %.3f,\n"
" \"system_temperature_max_dC\": %.3f,\n"
" \"system_active_power_W\": %.3f,\n"
" \"system_battery_current_dA\": %.3f,\n"
" \"system_cell_max_voltage_mV\": %.3f,\n"
" \"system_cell_min_voltage_mV\": %.3f,\n"
" \"system_battery_voltage_dV\": %d\n"
"}\n",
((float)SOC) / 100.0, ((float)StateOfHealth) / 100.0, ((float)((int16_t)temperature_min)) / 10.0,
((float)((int16_t)temperature_max)) / 10.0, ((float)((int16_t)stat_batt_power)),
((float)((int16_t)battery_current)) / 10.0, ((float)cell_max_voltage) / 1000,
((float)cell_min_voltage) / 1000, battery_voltage / 10.0);
((float)system_scaled_SOC_pptt) / 100.0, ((float)system_SOH_pptt) / 100.0,
((float)((int16_t)system_temperature_min_dC)) / 10.0, ((float)((int16_t)system_temperature_max_dC)) / 10.0,
((float)((int16_t)system_active_power_W)), ((float)((int16_t)system_battery_current_dA)) / 10.0,
((float)system_cell_max_voltage_mV) / 1000, ((float)system_cell_min_voltage_mV) / 1000,
system_battery_voltage_dV / 10.0);
bool result = client.publish(state_topic, mqtt_msg, true);
}