andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix mqtt enabled check

Browse Source
This commit is contained in:
proddy
2023-02-13 22:45:35 +01:00
parent 8c91311c1e
commit a3719b12e5
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/analogsensor.cpp
View File

@@ -377,7 +377,7 @@ bool AnalogSensor::updated_values() {
// publish a single sensor to MQTT // publish a single sensor to MQTT
void AnalogSensor::publish_sensor(const Sensor & sensor) const { void AnalogSensor::publish_sensor(const Sensor & sensor) const {
if (Mqtt::ha_enabled() && Mqtt::publish_single()) { if (Mqtt::enabled() && Mqtt::publish_single()) {
char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
if (Mqtt::publish_single2cmd()) { if (Mqtt::publish_single2cmd()) {
snprintf(topic, sizeof(topic), "%s/%s", F_(analogsensor), sensor.name().c_str()); snprintf(topic, sizeof(topic), "%s/%s", F_(analogsensor), sensor.name().c_str());
@@ -406,7 +406,7 @@ void AnalogSensor::remove_ha_topic(const uint8_t gpio) const {
// send all sensor values as a JSON package to MQTT // send all sensor values as a JSON package to MQTT
void AnalogSensor::publish_values(const bool force) { void AnalogSensor::publish_values(const bool force) {
if (!Mqtt::ha_enabled()) { if (!Mqtt::enabled()) {
return; return;
} }

4
src/dallassensor.cpp
View File

@@ -439,7 +439,7 @@ bool DallasSensor::get_value_info(JsonObject & output, const char * cmd, const i
// publish a single sensor to MQTT // publish a single sensor to MQTT
void DallasSensor::publish_sensor(const Sensor & sensor) { void DallasSensor::publish_sensor(const Sensor & sensor) {
if (Mqtt::ha_enabled() && Mqtt::publish_single()) { if (Mqtt::enabled() && Mqtt::publish_single()) {
char topic[Mqtt::MQTT_TOPIC_MAX_SIZE]; char topic[Mqtt::MQTT_TOPIC_MAX_SIZE];
if (Mqtt::publish_single2cmd()) { if (Mqtt::publish_single2cmd()) {
snprintf(topic, sizeof(topic), "%s/%s", (F_(dallassensor)), sensor.name().c_str()); snprintf(topic, sizeof(topic), "%s/%s", (F_(dallassensor)), sensor.name().c_str());
@@ -469,7 +469,7 @@ void DallasSensor::remove_ha_topic(const std::string & id) {
// send all dallas sensor values as a JSON package to MQTT // send all dallas sensor values as a JSON package to MQTT
void DallasSensor::publish_values(const bool force) { void DallasSensor::publish_values(const bool force) {
if (!Mqtt::ha_enabled()) { if (!Mqtt::enabled()) {
return; return;
} }