Browse Source

Merge branch 'dev' of bitbucket.org:xoseperez/espurna into dev

fastled
Xose Pérez 7 years ago
parent
commit
25510824b5
2 changed files with 5 additions and 0 deletions
  1. +2
    -0
      code/espurna/config/general.h
  2. +3
    -0
      code/espurna/utils.ino

+ 2
- 0
code/espurna/config/general.h View File

@ -120,6 +120,7 @@
#define HEARTBEAT_REPORT_MAC 1 #define HEARTBEAT_REPORT_MAC 1
#define HEARTBEAT_REPORT_RSSI 1 #define HEARTBEAT_REPORT_RSSI 1
#define HEARTBEAT_REPORT_UPTIME 1 #define HEARTBEAT_REPORT_UPTIME 1
#define HEARTBEAT_REPORT_DATETIME 1
#define HEARTBEAT_REPORT_FREEHEAP 1 #define HEARTBEAT_REPORT_FREEHEAP 1
#define HEARTBEAT_REPORT_VCC 1 #define HEARTBEAT_REPORT_VCC 1
#define HEARTBEAT_REPORT_RELAY 1 #define HEARTBEAT_REPORT_RELAY 1
@ -428,6 +429,7 @@ PROGMEM const char* const custom_reset_string[] = {
#define MQTT_TOPIC_IP "ip" #define MQTT_TOPIC_IP "ip"
#define MQTT_TOPIC_VERSION "version" #define MQTT_TOPIC_VERSION "version"
#define MQTT_TOPIC_UPTIME "uptime" #define MQTT_TOPIC_UPTIME "uptime"
#define MQTT_TOPIC_DATETIME "datetime"
#define MQTT_TOPIC_FREEHEAP "freeheap" #define MQTT_TOPIC_FREEHEAP "freeheap"
#define MQTT_TOPIC_VCC "vcc" #define MQTT_TOPIC_VCC "vcc"
#define MQTT_TOPIC_STATUS "status" #define MQTT_TOPIC_STATUS "status"


+ 3
- 0
code/espurna/utils.ino View File

@ -118,6 +118,9 @@ void heartbeat() {
#if (HEARTBEAT_REPORT_UPTIME) #if (HEARTBEAT_REPORT_UPTIME)
mqttSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str()); mqttSend(MQTT_TOPIC_UPTIME, String(uptime_seconds).c_str());
#endif #endif
#if (HEARTBEAT_REPORT_DATETIME) & (NTP_SUPPORT)
mqttSend(MQTT_TOPIC_DATETIME, String(ntpDateTime()).c_str());
#endif
#if (HEARTBEAT_REPORT_FREEHEAP) #if (HEARTBEAT_REPORT_FREEHEAP)
mqttSend(MQTT_TOPIC_FREEHEAP, String(free_heap).c_str()); mqttSend(MQTT_TOPIC_FREEHEAP, String(free_heap).c_str());
#endif #endif


Loading…
Cancel
Save