clean up a bit

CircuitSetup · Nov 8, 2019 · 6163b84 · 6163b84
1 parent e67ee2c
commit 6163b84
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 6 deletions.
diff --git a/Software/EmonESP/src/emoncms.cpp b/Software/EmonESP/src/emoncms.cpp
@@ -31,8 +31,6 @@
 #include "http.h"
 #include "wifi.h"
 
-#include <Arduino.h>
-
 //EMONCMS SERVER strings
 const char* e_url = "/input/post.json?json=";
 boolean emoncms_connected = false;

diff --git a/Software/EmonESP/src/emonesp_v2.5.2_noAP_lost_conn.bin b/Software/EmonESP/src/emonesp_v2.5.2_noAP_lost_conn.bin
diff --git a/Software/EmonESP/src/mqtt.cpp b/Software/EmonESP/src/mqtt.cpp
@@ -49,6 +49,7 @@ boolean mqtt_connect()
 {
   mqttclient.setServer(mqtt_server.c_str(), 1883);
   DBUGS.println("MQTT Connecting...");
+  DBUGS.println(mqttclient.state());
 
 #ifdef ESP32
   String strID = String((uint32_t)ESP.getEfuseMac());
@@ -100,7 +101,7 @@ void mqtt_publish(String data)
     }
     // send data via mqtt
     //delay(100);
-    DBUGS.printf("%s = %s\r\n", topic.c_str(), mqtt_data.c_str());
+    //DBUGS.printf("%s = %s\r\n", topic.c_str(), mqtt_data.c_str());
     mqttclient.publish(topic.c_str(), mqtt_data.c_str());
     topic = mqtt_topic + "/" + mqtt_feed_prefix;
     mqtt_data = "";

diff --git a/Software/EmonESP/src_solar/emoncms.cpp b/Software/EmonESP/src_solar/emoncms.cpp
@@ -31,8 +31,6 @@
 #include "http.h"
 #include "wifi.h"
 
-#include <Arduino.h>
-
 //EMONCMS SERVER strings
 const char* e_url = "/input/post.json?json=";
 boolean emoncms_connected = false;

diff --git a/Software/EmonESP/src_solar/energy_meter.h b/Software/EmonESP/src_solar/energy_meter.h
@@ -29,6 +29,7 @@
 //#define ENABLE_OLED_DISPLAY
 #define SOLAR_METER
 
+
 /*
     Uncomment to send metering values to EmonCMS, like Fundamental, Harmonic, Reactive, Apparent Power, and Phase Angle
 */

diff --git a/Software/EmonESP/src_solar/web_server.h b/Software/EmonESP/src_solar/web_server.h
@@ -30,7 +30,6 @@
 
 #include <FS.h>                       // SPIFFS file-system: store web server html, CSS etc.
 #include <Arduino.h>
-
 #ifdef ESP32
 #include <SPIFFS.h>
 #include <WiFi.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ @@
     //#define ENABLE_OLED_DISPLAY
     #define SOLAR_METER
     /*
         Uncomment to send metering values to EmonCMS, like Fundamental, Harmonic, Reactive, Apparent Power, and Phase Angle
     */
@@ Expand Down @@