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

Fix for compilation errors in mqtt due to HA_AUTODISCOVERY

Browse source
This commit is contained in:
James Brookes 2025-02-01 10:59:06 +00:00
parent 5cff02d8e3
commit bec9b04255
1 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,10 +113,6 @@ static String generateEventsAutoConfigTopic(const char* object_id) {
return "homeassistant/sensor/" + topic_name + "/" + String(object_id) + "/config"; return "homeassistant/sensor/" + topic_name + "/" + String(object_id) + "/config";
} }
static String generateButtonTopic(const char* subtype) {
return topic_name + "/command/" + String(subtype);
}
static String generateButtonAutoConfigTopic(const char* subtype) { static String generateButtonAutoConfigTopic(const char* subtype) {
return "homeassistant/button/" + topic_name + "/" + String(subtype) + "/config"; return "homeassistant/button/" + topic_name + "/" + String(subtype) + "/config";
} }
@ -131,8 +127,24 @@ void set_common_discovery_attributes(JsonDocument& doc) {
doc["payload_not_available"] = "offline"; doc["payload_not_available"] = "offline";
doc["enabled_by_default"] = true; doc["enabled_by_default"] = true;
} }
void set_battery_voltage_attributes(JsonDocument& doc, int i, int cellNumber, const String& state_topic,
const String& object_id_prefix, const String& battery_name_suffix) {
doc["name"] = "Battery" + battery_name_suffix + " Cell Voltage " + String(cellNumber);
doc["object_id"] = object_id_prefix + "battery_voltage_cell" + String(cellNumber);
doc["unique_id"] = topic_name + object_id_prefix + "_battery_voltage_cell" + String(cellNumber);
doc["device_class"] = "voltage";
doc["state_class"] = "measurement";
doc["state_topic"] = state_topic;
doc["unit_of_measurement"] = "V";
doc["value_template"] = "{{ value_json.cell_voltages[" + String(i) + "] }}";
}
#endif // HA_AUTODISCOVERY #endif // HA_AUTODISCOVERY
static String generateButtonTopic(const char* subtype) {
return topic_name + "/command/" + String(subtype);
}
void set_battery_attributes(JsonDocument& doc, const DATALAYER_BATTERY_TYPE& battery, const String& suffix) { void set_battery_attributes(JsonDocument& doc, const DATALAYER_BATTERY_TYPE& battery, const String& suffix) {
doc["SOC" + suffix] = ((float)battery.status.reported_soc) / 100.0; doc["SOC" + suffix] = ((float)battery.status.reported_soc) / 100.0;
doc["SOC_real" + suffix] = ((float)battery.status.real_soc) / 100.0; doc["SOC_real" + suffix] = ((float)battery.status.real_soc) / 100.0;
@ -155,20 +167,6 @@ void set_battery_attributes(JsonDocument& doc, const DATALAYER_BATTERY_TYPE& bat
doc["max_charge_power" + suffix] = ((float)battery.status.max_charge_power_W); doc["max_charge_power" + suffix] = ((float)battery.status.max_charge_power_W);
} }
#ifdef HA_AUTODISCOVERY
void set_battery_voltage_attributes(JsonDocument& doc, int i, int cellNumber, const String& state_topic,
const String& object_id_prefix, const String& battery_name_suffix) {
doc["name"] = "Battery" + battery_name_suffix + " Cell Voltage " + String(cellNumber);
doc["object_id"] = object_id_prefix + "battery_voltage_cell" + String(cellNumber);
doc["unique_id"] = topic_name + object_id_prefix + "_battery_voltage_cell" + String(cellNumber);
doc["device_class"] = "voltage";
doc["state_class"] = "measurement";
doc["state_topic"] = state_topic;
doc["unit_of_measurement"] = "V";
doc["value_template"] = "{{ value_json.cell_voltages[" + String(i) + "] }}";
}
#endif // HA_AUTODISCOVERY
static std::vector<EventData> order_events; static std::vector<EventData> order_events;
static void publish_common_info(void) { static void publish_common_info(void) {
@ -425,7 +423,6 @@ void mqtt_message_received(char* topic, int topic_len, char* data, int data_len)
} }
#endif // REMOTE_BMS_RESET #endif // REMOTE_BMS_RESET
#ifdef HA_AUTODISCOVERY
if (strncmp(topic, generateButtonTopic("PAUSE").c_str(), topic_len) == 0) { if (strncmp(topic, generateButtonTopic("PAUSE").c_str(), topic_len) == 0) {
setBatteryPause(true, false); setBatteryPause(true, false);
} }
@ -443,7 +440,6 @@ void mqtt_message_received(char* topic, int topic_len, char* data, int data_len)
if (strncmp(topic, generateButtonTopic("STOP").c_str(), topic_len) == 0) { if (strncmp(topic, generateButtonTopic("STOP").c_str(), topic_len) == 0) {
setBatteryPause(true, false, true); setBatteryPause(true, false, true);
} }
#endif // HA_AUTODISCOVERY
} }
static void mqtt_event_handler(void* handler_args, esp_event_base_t base, int32_t event_id, void* event_data) { static void mqtt_event_handler(void* handler_args, esp_event_base_t base, int32_t event_id, void* event_data) {
@ -484,8 +480,9 @@ static void mqtt_event_handler(void* handler_args, esp_event_base_t base, int32_
void init_mqtt(void) { void init_mqtt(void) {
#ifdef MQTT #ifdef HA_AUTODISCOVERY
create_sensor_configs(); create_sensor_configs();
#endif // HA_AUTODISCOVERY
#ifdef MQTT_MANUAL_TOPIC_OBJECT_NAME #ifdef MQTT_MANUAL_TOPIC_OBJECT_NAME
// Use custom topic name, object ID prefix, and device name from user settings // Use custom topic name, object ID prefix, and device name from user settings
topic_name = mqtt_topic_name; topic_name = mqtt_topic_name;
@ -498,7 +495,6 @@ void init_mqtt(void) {
object_id_prefix = String(WiFi.getHostname()) + String("_"); object_id_prefix = String(WiFi.getHostname()) + String("_");
device_name = "BatteryEmulator_" + String(WiFi.getHostname()); device_name = "BatteryEmulator_" + String(WiFi.getHostname());
device_id = "battery-emulator"; device_id = "battery-emulator";
#endif
#endif #endif
char clientId[64]; // Adjust the size as needed char clientId[64]; // Adjust the size as needed
@ -540,6 +536,6 @@ void mqtt_loop(void) {
} }
bool mqtt_publish(const char* topic, const char* mqtt_msg, bool retain) { bool mqtt_publish(const char* topic, const char* mqtt_msg, bool retain) {
int msg_id = esp_mqtt_client_publish(client, topic, mqtt_msg, strlen(mqtt_msg), 1, retain); int msg_id = esp_mqtt_client_publish(client, topic, mqtt_msg, strlen(mqtt_msg), MQTT_QOS, retain);
return msg_id > -1; return msg_id > -1;
} }