forked from tbnobody/OpenDTU
-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Feature: Set powerlimiter thresholds via MQTT
publish DPL thresholds to MQTT, add support for setting powerlimiter thresholds via MQTT, and make these auto-discoverable for Home Assistent.
- Loading branch information
1 parent
803b30c
commit fba5c02
Showing
5 changed files
with
295 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-or-later | ||
| #pragma once | ||
|
|
||
| #include <ArduinoJson.h> | ||
| #include <TaskSchedulerDeclarations.h> | ||
|
|
||
| class MqttHandlePowerLimiterHassClass { | ||
| public: | ||
| void init(Scheduler& scheduler); | ||
| void publishConfig(); | ||
| void forceUpdate(); | ||
|
|
||
| private: | ||
| void loop(); | ||
| void publish(const String& subtopic, const String& payload); | ||
| void publishNumber(const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, const int16_t min, const int16_t max); | ||
| void publishSelect(const char* caption, const char* icon, const char* category, const char* commandTopic, const char* stateTopic); | ||
| void createDeviceInfo(JsonObject& object); | ||
|
|
||
| Task _loopTask; | ||
|
|
||
| bool _wasConnected = false; | ||
| bool _updateForced = false; | ||
| }; | ||
|
|
||
| extern MqttHandlePowerLimiterHassClass MqttHandlePowerLimiterHass; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,163 @@ | ||
| // SPDX-License-Identifier: GPL-2.0-or-later | ||
| /* | ||
| * Copyright (C) 2022 Thomas Basler and others | ||
| */ | ||
| #include "MqttHandlePowerLimiterHass.h" | ||
| #include "Configuration.h" | ||
| #include "MqttSettings.h" | ||
| #include "NetworkSettings.h" | ||
| #include "MessageOutput.h" | ||
| #include "Utils.h" | ||
|
|
||
| MqttHandlePowerLimiterHassClass MqttHandlePowerLimiterHass; | ||
|
|
||
| void MqttHandlePowerLimiterHassClass::init(Scheduler& scheduler) | ||
| { | ||
| scheduler.addTask(_loopTask); | ||
| _loopTask.setCallback(std::bind(&MqttHandlePowerLimiterHassClass::loop, this)); | ||
| _loopTask.setIterations(TASK_FOREVER); | ||
| _loopTask.enable(); | ||
| } | ||
|
|
||
| void MqttHandlePowerLimiterHassClass::loop() | ||
| { | ||
| if (!Configuration.get().PowerLimiter.Enabled) { | ||
| return; | ||
| } | ||
| if (_updateForced) { | ||
| publishConfig(); | ||
| _updateForced = false; | ||
| } | ||
|
|
||
| if (MqttSettings.getConnected() && !_wasConnected) { | ||
| // Connection established | ||
| _wasConnected = true; | ||
| publishConfig(); | ||
| } else if (!MqttSettings.getConnected() && _wasConnected) { | ||
| // Connection lost | ||
| _wasConnected = false; | ||
| } | ||
| } | ||
|
|
||
| void MqttHandlePowerLimiterHassClass::forceUpdate() | ||
| { | ||
| _updateForced = true; | ||
| } | ||
|
|
||
| void MqttHandlePowerLimiterHassClass::publishConfig() | ||
| { | ||
| if (!Configuration.get().Mqtt.Hass.Enabled) { | ||
| return; | ||
| } | ||
|
|
||
| if (!MqttSettings.getConnected()) { | ||
| return; | ||
| } | ||
|
|
||
| if (!Configuration.get().PowerLimiter.Enabled) { | ||
| publishSelect("DPL Mode", "mdi:gauge", "config", "mode", "mode"); | ||
| publishNumber("DPL battery SoC start threshold", "mdi:battery-charging", "config", "threshold/soc/start", "threshold/soc/start", "%", 0, 100); | ||
| publishNumber("DPL battery SoC stop threshold", "mdi:battery-charging", "config", "threshold/soc/stop", "threshold/soc/stop", "%", 0, 100); | ||
| } | ||
| if (!Configuration.get().Vedirect.Enabled) { | ||
| publishNumber("DPL full solar passthrough SoC", "mdi:transmission-tower-import", "config", "threshold/soc/full_solar_passthrough", "threshold/soc/full_solar_passthrough", "%", 0, 100); | ||
| } | ||
| } | ||
|
|
||
| void MqttHandlePowerLimiterHassClass::publishSelect( | ||
| const char* caption, const char* icon, const char* category, | ||
| const char* commandTopic, const char* stateTopic) | ||
| { | ||
|
|
||
| String selectId = caption; | ||
| selectId.replace(" ", "_"); | ||
| selectId.toLowerCase(); | ||
|
|
||
| const String configTopic = "select/powerlimiter/" + selectId + "/config"; | ||
|
|
||
| const String cmdTopic = MqttSettings.getPrefix() + "powerlimiter/cmd/" + commandTopic; | ||
| const String statTopic = MqttSettings.getPrefix() + "powerlimiter/status/" + stateTopic; | ||
|
|
||
| DynamicJsonDocument root(1024); | ||
| if (!Utils::checkJsonAlloc(root, __FUNCTION__, __LINE__)) { | ||
| return; | ||
| } | ||
|
|
||
| root["name"] = caption; | ||
| root["uniq_id"] = selectId; | ||
| if (strcmp(icon, "")) { | ||
| root["ic"] = icon; | ||
| } | ||
| root["ent_cat"] = category; | ||
| root["cmd_t"] = cmdTopic; | ||
| root["stat_t"] = statTopic; | ||
| JsonArray options = root.createNestedArray("options"); | ||
| options.add("0"); | ||
| options.add("1"); | ||
| options.add("2"); | ||
|
|
||
| JsonObject deviceObj = root.createNestedObject("dev"); | ||
| createDeviceInfo(deviceObj); | ||
|
|
||
| String buffer; | ||
| serializeJson(root, buffer); | ||
| publish(configTopic, buffer); | ||
| } | ||
|
|
||
| void MqttHandlePowerLimiterHassClass::publishNumber( | ||
| const char* caption, const char* icon, const char* category, | ||
| const char* commandTopic, const char* stateTopic, const char* unitOfMeasure, | ||
| const int16_t min, const int16_t max) | ||
| { | ||
|
|
||
| String numberId = caption; | ||
| numberId.replace(" ", "_"); | ||
| numberId.toLowerCase(); | ||
|
|
||
| const String configTopic = "number/powerlimiter/" + numberId + "/config"; | ||
|
|
||
| const String cmdTopic = MqttSettings.getPrefix() + "powerlimiter/cmd/" + commandTopic; | ||
| const String statTopic = MqttSettings.getPrefix() + "powerlimiter/status/" + stateTopic; | ||
|
|
||
| DynamicJsonDocument root(1024); | ||
| if (!Utils::checkJsonAlloc(root, __FUNCTION__, __LINE__)) { | ||
| return; | ||
| } | ||
|
|
||
| root["name"] = caption; | ||
| root["uniq_id"] = numberId; | ||
| if (strcmp(icon, "")) { | ||
| root["ic"] = icon; | ||
| } | ||
| root["ent_cat"] = category; | ||
| root["cmd_t"] = cmdTopic; | ||
| root["stat_t"] = statTopic; | ||
| root["unit_of_meas"] = unitOfMeasure; | ||
| root["min"] = min; | ||
| root["max"] = max; | ||
| root["mode"] = "box"; | ||
|
|
||
| JsonObject deviceObj = root.createNestedObject("dev"); | ||
| createDeviceInfo(deviceObj); | ||
|
|
||
| String buffer; | ||
| serializeJson(root, buffer); | ||
| publish(configTopic, buffer); | ||
| } | ||
|
|
||
| void MqttHandlePowerLimiterHassClass::createDeviceInfo(JsonObject& object) | ||
| { | ||
| object["name"] = "Dynamic Power Limiter"; | ||
| object["ids"] = "0002"; | ||
| object["cu"] = String("http://") + NetworkSettings.localIP().toString(); | ||
| object["mf"] = "OpenDTU"; | ||
| object["mdl"] = "Dynamic Power Limiter"; | ||
| object["sw"] = AUTO_GIT_HASH; | ||
| } | ||
|
|
||
| void MqttHandlePowerLimiterHassClass::publish(const String& subtopic, const String& payload) | ||
| { | ||
| String topic = Configuration.get().Mqtt.Hass.Topic; | ||
| topic += subtopic; | ||
| MqttSettings.publishGeneric(topic.c_str(), payload.c_str(), Configuration.get().Mqtt.Hass.Retain); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fba5c02There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! Is this changing the data in RAM or NAND?
fba5c02There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The changes are saved to the configuration on non-volatile flash storage, except for the mode override, which is volatile.
fba5c02There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok, I see. Thanks for always responding so quick and also your great efforts.