Skip to content

Fix Home Assistant discovery: entity IDs and retained config #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BorisBrock merged 3 commits into from
Aug 4, 2026
Merged

Fix Home Assistant discovery: entity IDs and retained config #73

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
717ef62
Add the missing domain prefix to every default_entity_id
sadilek Aug 3, 2026
961f3c2
Publish Home Assistant discovery messages retained
sadilek Aug 3, 2026
919936c
Update MQTTManager.cpp
BorisBrockBbr Aug 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 16 additions & 16 deletions src/Components/MQTT/MQTTManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ namespace MQTTManager
StringUtils::InsertString(topic, TopicBuffer, sizeof(TopicBuffer), '%', Settings::Instance()->DeviceName.c_str());
StringUtils::InsertString(payload, PayloadBuffer, sizeof(PayloadBuffer), '%', Settings::Instance()->DeviceName.c_str());

gMqttClient.publish(TopicBuffer, 1, false, PayloadBuffer);
gMqttClient.publish(TopicBuffer, 1, true, PayloadBuffer);
}

// Publishes MQTT discovery messages for Home Assistant integration
Expand All @@ -74,7 +74,7 @@ namespace MQTTManager
"payload_on":"1",
"payload_off":"0",
"unique_id":"%_is_vehicle_connected",
"default_entity_id":"%_is_vehicle_connected",
"default_entity_id":"binary_sensor.%_is_vehicle_connected",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

PublishHomeAssistantDiscoveryTopic(
Expand All @@ -86,7 +86,7 @@ namespace MQTTManager
"payload_on":"1",
"payload_off":"0",
"unique_id":"%_is_vehicle_charging",
"default_entity_id":"%_is_vehicle_charging",
"default_entity_id":"binary_sensor.%_is_vehicle_charging",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

PublishHomeAssistantDiscoveryTopic(
Expand All @@ -97,7 +97,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/charging_power",
"unique_id":"%_charging_power",
"default_entity_id":"%_charging_power",
"default_entity_id":"sensor.%_charging_power",
"unit_of_measurement":"W",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -109,7 +109,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/charging_current/phase1",
"unique_id":"%_charging_current_phase1",
"default_entity_id":"%_charging_current_phase1",
"default_entity_id":"sensor.%_charging_current_phase1",
"unit_of_measurement":"A",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -121,7 +121,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/charging_current/phase2",
"unique_id":"%_charging_current_phase2",
"default_entity_id":"%_charging_current_phase2",
"default_entity_id":"sensor.%_charging_current_phase2",
"unit_of_measurement":"A",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -133,7 +133,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/charging_current/phase3",
"unique_id":"%_charging_current_phase3",
"default_entity_id":"%_charging_current_phase3",
"default_entity_id":"sensor.%_charging_current_phase3",
"unit_of_measurement":"A",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -145,7 +145,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/charging_current_limit",
"unique_id":"%_charging_current_limit",
"default_entity_id":"%_charging_current_limit",
"default_entity_id":"sensor.%_charging_current_limit",
"unit_of_measurement":"A",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -157,7 +157,7 @@ namespace MQTTManager
"state_topic":"%/energy_meter",
"state_class":"total_increasing",
"unique_id":"%_energy_meter",
"default_entity_id":"%_energy_meter",
"default_entity_id":"sensor.%_energy_meter",
"unit_of_measurement":"kWh",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -169,7 +169,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/temperature",
"unique_id":"%_temperature",
"default_entity_id":"%_temperature",
"default_entity_id":"sensor.%_temperature",
"unit_of_measurement":"°C",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -181,7 +181,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/charging_voltage/phase1",
"unique_id":"%_charging_voltage_phase1",
"default_entity_id":"%_charging_voltage_phase1",
"default_entity_id":"sensor.%_charging_voltage_phase1",
"unit_of_measurement":"V",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -193,7 +193,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/charging_voltage/phase2",
"unique_id":"%_charging_voltage_phase2",
"default_entity_id":"%_charging_voltage_phase2",
"default_entity_id":"sensor.%_charging_voltage_phase2",
"unit_of_measurement":"V",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -205,7 +205,7 @@ namespace MQTTManager
"state_class":"measurement",
"state_topic":"%/charging_voltage/phase3",
"unique_id":"%_charging_voltage_phase3",
"default_entity_id":"%_charging_voltage_phase3",
"default_entity_id":"sensor.%_charging_voltage_phase3",
"unit_of_measurement":"V",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");

Expand All @@ -216,7 +216,7 @@ namespace MQTTManager
"state_topic":"%/enable_charging",
"command_topic":"%/control/enable_charging",
"unique_id":"%control_enable_charging",
"default_entity_id":"%control_enable_charging",
"default_entity_id":"switch.%_control_enable_charging",
"payload_on":"ON",
"payload_off":"OFF",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");
Expand All @@ -228,7 +228,7 @@ namespace MQTTManager
"state_topic":"%/standby_enabled",
"command_topic":"%/control/standby",
"unique_id":"%_control_standby",
"default_entity_id":"%_control_standby",
"default_entity_id":"switch.%_control_standby",
"payload_on":"ON",
"payload_off":"OFF",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");
Expand All @@ -244,7 +244,7 @@ namespace MQTTManager
"step":1,
"unit_of_measurement":"A",
"unique_id":"%_control_charging_current_limit",
"default_entity_id":"%_control_charging_current_limit",
"default_entity_id":"number.%_control_charging_current_limit",
"device":{"identifiers":["%"],"name":"%","model":"EnergyControl","manufacturer":"Heidelberg"}})");
}

Expand Down
Loading