Merge branch 'rolling' into add-homeassistant-discovery2

This commit is contained in:
CaCO3
2022-10-27 23:43:41 +02:00
committed by GitHub
10 changed files with 36 additions and 21 deletions

View File

@@ -866,8 +866,6 @@ bool ClassFlowPostProcessing::doFlow(string zwtime)
void ClassFlowPostProcessing::WriteDataLog(int _index)
{
LogFile.WriteToFile(ESP_LOG_WARN, "Data file writing temporarily disabled, see https://github.com/jomjol/AI-on-the-edge-device/issues/1225");
return;
string analog = "";
string digital = "";
string timezw = "";
@@ -875,7 +873,7 @@ void ClassFlowPostProcessing::WriteDataLog(int _index)
struct tm* timeinfo = localtime(&NUMBERS[_index]->lastvalue);
strftime(buffer, 80, PREVALUE_TIME_FORMAT_OUTPUT, timeinfo);
timezw = std::string(buffer);
if (flowAnalog)
analog = flowAnalog->getReadoutRawString(_index);
if (flowDigit)

View File

@@ -51,6 +51,7 @@ bool MQTTPublish(std::string _key, std::string _content, int retained_flag) {
zw = "MQTT - Published topic: " + _key + ", content: " + _content + " (msg_id=" + std::to_string(msg_id) + ")";
LogFile.WriteToFile(ESP_LOG_DEBUG, zw);
return true;
}