From afa49c207fee744f6329b791bf693b408f49e7d3 Mon Sep 17 00:00:00 2001
From: Eric Duminil <eric.duminil@gmail.com>
Date: Wed, 9 Feb 2022 22:24:23 +0100
Subject: [PATCH] Checking if MQTT is active
---
ampel-firmware/mqtt.cpp | 2 ++
ampel-firmware/web_config.cpp | 3 +++
ampel-firmware/web_config.h | 2 +-
3 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/ampel-firmware/mqtt.cpp b/ampel-firmware/mqtt.cpp
index 0b03cdb..0aec8cd 100644
--- a/ampel-firmware/mqtt.cpp
+++ b/ampel-firmware/mqtt.cpp
@@ -42,6 +42,8 @@ namespace mqtt {
char last_successful_publish[23] = "";
void initialize(const char *sensorId) {
+ Serial.print("MQTT ? ");
+ Serial.println(config::mqtt_active());
json_sensor_format = PSTR("{\"time\":\"%s\", \"co2\":%d, \"temp\":%.1f, \"rh\":%.1f}");
snprintf(publish_topic, sizeof(publish_topic), "CO2sensors/%s", sensorId);
#if MQTT_ENCRYPTED
diff --git a/ampel-firmware/web_config.cpp b/ampel-firmware/web_config.cpp
index c81c494..f7bad77 100644
--- a/ampel-firmware/web_config.cpp
+++ b/ampel-firmware/web_config.cpp
@@ -295,6 +295,9 @@ namespace config {
uint16_t &csv_interval = web_config::csvTimestepParam.value();
// MQTT
+ bool mqtt_active() {
+ return web_config::mqttParams.isActive();
+ }
char *mqtt_server = web_config::mqttServerParam.value();
char *mqtt_user = web_config::mqttUserParam.value();
char *mqtt_password = web_config::mqttPasswordParam.value();
diff --git a/ampel-firmware/web_config.h b/ampel-firmware/web_config.h
index 3b6bf90..8a8dce9 100644
--- a/ampel-firmware/web_config.h
+++ b/ampel-firmware/web_config.h
@@ -32,7 +32,7 @@ namespace config {
extern uint16_t &csv_interval; // [s]
// MQTT
- //TODO: Add use_mqtt
+ bool mqtt_active();
extern char *mqtt_server;
extern char *mqtt_user;
extern char *mqtt_password;
--
GitLab