Mirror/AI-on-the-edge-device
1
0
Fork 0
mirror of https://github.com/jomjol/AI-on-the-edge-device.git synced 2025-12-08 04:26:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
CaCO3
2022-10-28 17:50:27 +02:00
parent 5188734c8b
commit 7ebbba3cf2
1 changed files with 27 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
code/components/jomjol_flowcontroll/ClassFlowMQTT.cpp
View File

@@ -25,16 +25,8 @@ extern const char* libfive_git_branch(void);
std::vector<NumberPost*>* NUMBERS; std::vector<NumberPost*>* NUMBERS;
enum TopicType {
TOPIC_TYPE_NORMAL,
TOPIC_TYPE_ERROR,
TOPIC_TYPE_SIGNAL_STRENGTH,
TOPIC_TYPE_TEMPERATURE,
TOPIC_TYPE_TIMESTAMP
};
void sendHomeAssistantDiscoveryTopic(std::string maintopic, std::string group, std::string field, void sendHomeAssistantDiscoveryTopic(std::string maintopic, std::string group, std::string field,
std::string userFriendlyName, std::string icon, std::string unit, TopicType topicType) { std::string userFriendlyName, std::string icon, std::string unit, std::string deviceClass, std::string stateClass) {
std::string version = std::string(libfive_git_version()); std::string version = std::string(libfive_git_version());
if (version == "") { if (version == "") {
@@ -79,26 +71,19 @@ void sendHomeAssistantDiscoveryTopic(std::string maintopic, std::string group, s
payload += "\"state_topic\": \"~/" + field + "\"," + nl; payload += "\"state_topic\": \"~/" + field + "\"," + nl;
} }
if (unit != "-") { if (unit != "") {
payload += "\"unit_of_meas\": \"" + unit + "\"," + nl; payload += "\"unit_of_meas\": \"" + unit + "\"," + nl;
} }
if (topicType == TOPIC_TYPE_ERROR) { if (deviceClass != "") {
payload += std::string("") + payload += "\"device_class\": \"" + deviceClass + "\"," + nl;
"\"value_template\": \"{{ 'OFF' if 'no error' in value else 'ON'}}\"," + nl + if (deviceClass == "problem") {
"\"device_class\": \"problem\"," + nl; payload += "\"value_template\": \"{{ 'OFF' if 'no error' in value else 'ON'}}\"," + nl;
} }
else if (topicType == TOPIC_TYPE_SIGNAL_STRENGTH) {
payload += std::string("") +
"\"device_class\": \"signal_strength\"," + nl;
} }
else if (topicType == TOPIC_TYPE_TEMPERATURE) {
payload += std::string("") + if (stateClass != "") {
"\"device_class\": \"temperature\"," + nl; payload += "\"state_class\": \"" + stateClass + "\"," + nl;
}
else if (topicType == TOPIC_TYPE_TIMESTAMP) {
payload += std::string("") +
"\"device_class\": \"timestamp\"," + nl;
} }
payload += payload +=
@@ -122,24 +107,24 @@ void sendHomeAssistantDiscoveryTopic(std::string maintopic, std::string group, s
void MQTThomeassistantDiscovery(std::string maintopic) { void MQTThomeassistantDiscovery(std::string maintopic) {
LogFile.WriteToFile(ESP_LOG_INFO, "MQTT - Sending Homeassistant Discovery Topics..."); LogFile.WriteToFile(ESP_LOG_INFO, "MQTT - Sending Homeassistant Discovery Topics...");
// maintopic group field User Friendly Name icon unit Topic Type // maintopic group field User Friendly Name icon unit Device Class State Class
sendHomeAssistantDiscoveryTopic(maintopic, "", "uptime", "Uptime", "clock-time-eight-outline", "s", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, "", "uptime", "Uptime", "clock-time-eight-outline", "s", "", "");
sendHomeAssistantDiscoveryTopic(maintopic, "", "IP", "IP", "network-outline", "-", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, "", "IP", "IP", "network-outline", "", "", "");
sendHomeAssistantDiscoveryTopic(maintopic, "", "MAC", "MAC Address", "network-outline", "-", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, "", "MAC", "MAC Address", "network-outline", "", "", "");
sendHomeAssistantDiscoveryTopic(maintopic, "", "hostname", "Hostname", "network-outline", "-", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, "", "hostname", "Hostname", "network-outline", "", "", "");
sendHomeAssistantDiscoveryTopic(maintopic, "", "FreeMem", "Free Memory", "memory", "B", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, "", "freeMem", "Free Memory", "memory", "B", "", "measurement");
sendHomeAssistantDiscoveryTopic(maintopic, "", "wifiRSSI", "Wi-Fi RSSI", "wifi", "dBm", TOPIC_TYPE_SIGNAL_STRENGTH); sendHomeAssistantDiscoveryTopic(maintopic, "", "wifiRSSI", "Wi-Fi RSSI", "wifi", "dBm", "signal_strength", "");
sendHomeAssistantDiscoveryTopic(maintopic, "", "CPUtemp", "CPU Temperature", "thermometer", "°C", TOPIC_TYPE_TEMPERATURE); sendHomeAssistantDiscoveryTopic(maintopic, "", "CPUtemp", "CPU Temperature", "thermometer", "°C", "temperature", "measurement");
for (int i = 0; i < (*NUMBERS).size(); ++i) { for (int i = 0; i < (*NUMBERS).size(); ++i) {
// maintopic group field User Friendly Name icon unit Topic Type // maintopic group field User Friendly Name icon unit Device Class State Class
sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "value", "Value", "gauge", "", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "value", "Value", "gauge", "", "", "total_increasing");
sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "error", "Error", "alert-circle-outline", "-", TOPIC_TYPE_ERROR); sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "error", "Error", "alert-circle-outline", "", "problem", "");
sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "rate", "Rate", "swap-vertical", "", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "rate", "Rate", "swap-vertical", "", "", "");
sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "changeabsolut", "Absolute Change", "arrow-expand-vertical", "", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "changeabsolut", "Absolute Change", "arrow-expand-vertical", "", "", "measurement");
sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "raw", "Raw Value", "raw", "", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "raw", "Raw Value", "raw", "", "", "total_increasing");
sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "timestamp", "Timestamp", "clock-time-eight-outline", "-", TOPIC_TYPE_TIMESTAMP); sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "timestamp", "Timestamp", "clock-time-eight-outline", "", "timestamp", "");
sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "json", "JSON", "code-json", "-", TOPIC_TYPE_NORMAL); sendHomeAssistantDiscoveryTopic(maintopic, (*NUMBERS)[i]->name, "json", "JSON", "code-json", "", "", "");
} }
} }