Merge pull request #240 from mikkle/mqtt_mem_free

publish ESP free mem in mqtt publishSystem

src/AmsConfiguration.cpp

@@ -233,7 +233,7 @@ bool AmsConfiguration::getDebugConfig(DebugConfig& config) {
 
 bool AmsConfiguration::setDebugConfig(DebugConfig& config) {
 	if(!config.serial && !config.telnet)
-		config.level = 5; // Force error level when debug is disabled
+		config.level = 4; // Force warning level when debug is disabled
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(CONFIG_DEBUG_START, config);
 	bool ret = EEPROM.commit();

src/AmsData.cpp

@@ -160,19 +160,19 @@ float AmsData::getL3PowerFactor() {
     return this->l3PowerFactor;
 }
 
-float AmsData::getActiveImportCounter() {
+double AmsData::getActiveImportCounter() {
     return this->activeImportCounter;
 }
 
-float AmsData::getReactiveImportCounter() {
+double AmsData::getReactiveImportCounter() {
     return this->reactiveImportCounter;
 }
 
-float AmsData::getActiveExportCounter() {
+double AmsData::getActiveExportCounter() {
     return this->activeExportCounter;
 }
 
-float AmsData::getReactiveExportCounter() {
+double AmsData::getReactiveExportCounter() {
     return this->reactiveExportCounter;
 }
 

src/AmsData.h

@@ -53,10 +53,10 @@ public:
     float getL2PowerFactor();
     float getL3PowerFactor();
 
-    float getActiveImportCounter();
+    double getActiveImportCounter();
-    float getReactiveImportCounter();
+    double getReactiveImportCounter();
-    float getActiveExportCounter();
+    double getActiveExportCounter();
-    float getReactiveExportCounter();
+    double getReactiveExportCounter();
 
     bool isThreePhase();
     bool isTwoPhase();
@@ -71,7 +71,7 @@ protected:
     uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
     float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
     float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0;
-    float activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
+    double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
     bool threePhase = false, twoPhase = false, counterEstimated = false;
 };
 

src/AmsToMqttBridge.ino

@@ -182,13 +182,8 @@ void setup() {
 		Serial.begin(115200);
 	}
 
+	Debug.setSerialEnabled(true);
 	DebugConfig debug;
-	if(config.getDebugConfig(debug)) {
-		Debug.setSerialEnabled(debug.serial);
-	}
-	#if DEBUG_MODE
-		Debug.setSerialEnabled(true);
-	#endif
 	delay(1);
 
 	float vcc = hw.getVcc();
@@ -352,6 +347,7 @@ void loop() {
 					longPressActive = false;
 				} else {
 					// Single press action
+					debugD("Button was clicked, no action configured");
 				}
 				buttonActive = false;
 			}
@@ -377,11 +373,12 @@ void loop() {
 					}
 					DebugConfig debug;
 					if(config.getDebugConfig(debug)) {
-						Debug.begin(wifi.hostname, (uint8_t) debug.level);
+						Debug.begin(wifi.hostname, debug.serial || debug.telnet ? (uint8_t) debug.level : RemoteDebug::WARNING); // I don't know why, but ESP8266 stops working after a while if ERROR level is set
-						Debug.setSerialEnabled(debug.serial);
 						if(!debug.telnet) {
 							Debug.stop();
 						}
+					} else {
+						Debug.stop();
 					}
 					if(Debug.isActive(RemoteDebug::INFO)) {
 						debugI("Successfully connected to WiFi!");

src/mqtt/RawMqttHandler.cpp

@@ -211,6 +211,7 @@ bool RawMqttHandler::publishSystem(HwTools* hw) {
 	if(vcc > 0) {
 		mqtt->publish(topic + "/vcc", String(vcc, 2));
 	}
+	mqtt->publish(topic + "/mem", String(ESP.getFreeHeap()));
 	mqtt->publish(topic + "/rssi", String(hw->getWifiRssi()));
     if(hw->getTemperature() > -85) {
 		mqtt->publish(topic + "/temperature", String(hw->getTemperature(), 2));

src/web/AmsWebServer.cpp

@@ -1232,23 +1232,29 @@ void AmsWebServer::handleSave() {
 	if(server.hasArg("debugConfig") && server.arg("debugConfig") == "true") {
 		printD("Received Debug config");
 		DebugConfig debug;
+		config->getDebugConfig(debug);
+		bool active = debug.serial || debug.telnet;
+
 		debug.telnet = server.hasArg("debugTelnet") && server.arg("debugTelnet") == "true";
 		debug.serial = server.hasArg("debugSerial") && server.arg("debugSerial") == "true";
 		debug.level = server.arg("debugLevel").toInt();
 
-		debugger->stop();
+		if(debug.telnet || debug.serial) {
-		if(webConfig.security > 0) {
+			if(webConfig.security > 0) {
-			debugger->setPassword(webConfig.password);
+				debugger->setPassword(webConfig.password);
-		} else {
+			} else {
-			debugger->setPassword("");
+				debugger->setPassword("");
-		}
-		debugger->setSerialEnabled(debug.serial);
-		WiFiConfig wifi;
-		if(config->getWiFiConfig(wifi) && strlen(wifi.hostname) > 0) {
-			debugger->begin(wifi.hostname, (uint8_t) debug.level);
-			if(!debug.telnet) {
-				debugger->stop();
 			}
+			debugger->setSerialEnabled(debug.serial);
+			WiFiConfig wifi;
+			if(config->getWiFiConfig(wifi) && strlen(wifi.hostname) > 0) {
+				debugger->begin(wifi.hostname, (uint8_t) debug.level);
+				if(!debug.telnet) {
+					debugger->stop();
+				}
+			}
+		} else if(active) {
+			performRestart = true;
 		}
 		config->setDebugConfig(debug);
 	}
@@ -1280,7 +1286,7 @@ void AmsWebServer::handleSave() {
 	//if (debugger->isActive(RemoteDebug::DEBUG)) config->print(debugger);
 	if (config->save()) {
 		printI("Successfully saved.");
-		if(config->isWifiChanged()) {
+		if(config->isWifiChanged() || performRestart) {
 			performRestart = true;
             server.sendHeader("Location","/restart-wait");
             server.send(303);

web/debugging.html

@@ -25,7 +25,6 @@
                             <option value="2" ${config.debugLevel2}>Debug</option>
                             <option value="3" ${config.debugLevel3}>Info</option>
                             <option value="4" ${config.debugLevel4}>Warning</option>
-                            <option value="5" ${config.debugLevel5}>Error</option>
                         </select>
                     </div>
                 </div>

web/head32.html

@@ -30,10 +30,10 @@
             width: 50%;
             text-align: center;
         }
-        .ipo,.xpo {
+        .ipo,.epo {
             font-size: 1.7rem;
         }
-        .ipoa,.xpoa {
+        .ipoa,.epoa {
             font-size: 1.0rem;
             color: grey;
         }

web/head8266.html

@@ -30,10 +30,10 @@
             width: 50%;
             text-align: center;
         }
-        .ipo,.xpo {
+        .ipo,.epo {
             font-size: 1.7rem;
         }
-        .ipoa,.xpoa {
+        .ipoa,.epoa {
             font-size: 1.0rem;
             color: grey;
         }