fabian/pitrix
1
0
Fork 0
Code Issues 8 Releases Activity

MQTT can now be disabled via MQTT_ENABLE

Browse Source
This commit is contained in:
Fabian Schlenz 2019-06-06 06:43:50 +02:00
parent 158847d4c4
commit f7fc459095
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/my_mqtt.h
View File

@ -1,5 +1,7 @@
#ifndef my_mqtt_H #pragma once
#define my_mqtt_H #include "config.h"
#ifdef MQTT_ENABLE
#include <PubSubClient.h> #include <PubSubClient.h>
#include <Arduino.h> #include <Arduino.h>
@ -27,4 +29,4 @@ void mqtt_log_send(const char* message);
extern String mqtt_log_str; extern String mqtt_log_str;
#endif // mqtt_H #endif // MQTT_ENABLE

5
src/mqtt.cpp
View File

@ -1,5 +1,8 @@
#include "my_mqtt.h" #include "my_mqtt.h"
#include "config.h" #include "config.h"
#ifdef MQTT_ENABLE
#include <ESP8266WiFi.h> #include <ESP8266WiFi.h>
#include <PubSubClient.h> #include <PubSubClient.h>
#include "EffectEntry.h" #include "EffectEntry.h"
@ -118,3 +121,5 @@ void mqtt_log_send(const char* message) {
mqtt_client.publish(MQTT_TOPIC_LOG, message); mqtt_client.publish(MQTT_TOPIC_LOG, message);
} }
} }
#endif // MQTT_ENABLE

8
src/pitrix.cpp
View File

@ -29,7 +29,9 @@ void setup() {
ota_setup(); ota_setup();
fastled_setup(); fastled_setup();
ntpClient.begin(); ntpClient.begin();
#ifdef MQTT_ENABLE
mqtt_setup(); mqtt_setup();
#endif
LOGln("Core * Setup complete"); LOGln("Core * Setup complete");
current_effect->start(); current_effect->start();
@ -53,7 +55,9 @@ void loop() {
} }
ntpClient.update(); ntpClient.update();
#ifdef MQTT_ENABLE
mqtt_loop(); mqtt_loop();
#endif
EVERY_N_MILLISECONDS(100) { EVERY_N_MILLISECONDS(100) {
baseHue++; baseHue++;
@ -70,12 +74,12 @@ void loop() {
FastLED.show(); FastLED.show();
} }
#if defined(MQTT_ENABLE) && defined(MQTT_REPORT_METRICS)
EVERY_N_SECONDS(15) { EVERY_N_SECONDS(15) {
if (REPORT_METRICS) {
mqtt_publish("free_heap", ESP.getFreeHeap()); mqtt_publish("free_heap", ESP.getFreeHeap());
mqtt_publish("uptime", millis()/1000); mqtt_publish("uptime", millis()/1000);
} }
} #endif // MQTT_REPORT_METRICS
if (MONITOR_LOOP_TIMES && millis()-loop_started_at>=MONITOR_LOOP_TIME_THRESHOLD) { if (MONITOR_LOOP_TIMES && millis()-loop_started_at>=MONITOR_LOOP_TIME_THRESHOLD) {