libraries/ha-mqtt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

keep track of enabled sensors using struct

Browse Source
This commit is contained in:
Nicu Hodos 2024-10-09 08:43:45 +02:00
parent 2456ae1dc8
commit 8f534cce94
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/esp.h
View File

@ -1,12 +1,16 @@
#pragma once #pragma once
#include "TaskScheduler.h" #include "TaskScheduler.h"
#include "mqtt.h"
#include "ha.h" #include "ha.h"
using namespace Ha; using namespace Ha;
namespace HaESP { namespace HaESP {
struct {
bool heapStats = false;
bool restartInfo = false;
} activeSensors;
Task tHeap(5 * TASK_MINUTE, TASK_FOREVER, []() { Task tHeap(5 * TASK_MINUTE, TASK_FOREVER, []() {
Sensor::mapSensors["heap_fragmentation"]->updateState(to_string(ESP.getHeapFragmentation()).c_str()); Sensor::mapSensors["heap_fragmentation"]->updateState(to_string(ESP.getHeapFragmentation()).c_str());
Sensor::mapSensors["heap_free"]->updateState(to_string(ESP.getFreeHeap()).c_str()); Sensor::mapSensors["heap_free"]->updateState(to_string(ESP.getFreeHeap()).c_str());
@ -35,16 +39,19 @@ namespace HaESP {
.withPrecision(0) .withPrecision(0)
.build() .build()
); );
Mqtt::connectedStatus.setWaiting(); activeSensors.heapStats = true;
tHeap.enable();
return builder; return builder;
} }
template <class T> template <class T>
Builder<T>& restartInfo(Builder<T>& builder) { Builder<T>& restartInfo(Builder<T>& builder) {
builder.addDiagnostic(Builder<Sensor>::instance((new Sensor{ "Restart reason", "restart_reason" })).build()); builder.addDiagnostic(Builder<Sensor>::instance((new Sensor{ "Restart reason", "restart_reason" })).build());
Mqtt::connectedStatus.setWaiting(); activeSensors.restartInfo = true;
tRestartInfo.waitFor(&Mqtt::connectedStatus);
return builder; return builder;
} }
void enableSensors() {
if (activeSensors.heapStats) tHeap.enable();
if (activeSensors.restartInfo) tRestartInfo.enable();
}
} }

6
src/mqtt.h
View File

@ -3,15 +3,13 @@
#include <AsyncMqttClient.h> #include <AsyncMqttClient.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
#include <TaskScheduler.h> #include <TaskScheduler.h>
#include "ha.h" #include "esp.h"
#define MAIN_TOPIC "homeassistant/+/" MAIN_DEVICE_ID "/#" #define MAIN_TOPIC "homeassistant/+/" MAIN_DEVICE_ID "/#"
using namespace Ha; using namespace Ha;
namespace Mqtt { namespace Mqtt {
StatusRequest connectedStatus;
AsyncMqttClient client; AsyncMqttClient client;
Task tReConnect(TASK_MINUTE, TASK_FOREVER, []{ Task tReConnect(TASK_MINUTE, TASK_FOREVER, []{
@ -33,6 +31,7 @@ namespace Mqtt {
if (firstTime) { if (firstTime) {
Component::components.forEach([](Component* c) { c->publishConfig(); }); Component::components.forEach([](Component* c) { c->publishConfig(); });
AbstractBuilder::deleteAll(); AbstractBuilder::deleteAll();
HaESP::enableSensors();
firstTime = false; firstTime = false;
} }
} }
@ -66,7 +65,6 @@ namespace Mqtt {
client.subscribe(MAIN_TOPIC, 0); client.subscribe(MAIN_TOPIC, 0);
tReConnect.disable(); tReConnect.disable();
Serial.println("Connected to MQTT"); Serial.println("Connected to MQTT");
connectedStatus.signal();
if (onConnected) onConnected(); if (onConnected) onConnected();
}); });
client.onDisconnect([onDisconnected](AsyncMqttClientDisconnectReason reason) { client.onDisconnect([onDisconnected](AsyncMqttClientDisconnectReason reason) {