Added 300 baud

Various fix for realtime values
Fix on special case for Kaifa MA304T3
2026-03-11 13:05:31 +00:00 · 2022-12-07 11:51:45 +01:00 · 2022-12-06 15:45:43 +01:00 · 2022-12-06 08:28:30 +01:00 · 2022-12-01 18:06:19 +01:00 · 2022-11-08 18:41:31 +01:00
64 changed files with 1861 additions and 1035 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -33,6 +33,7 @@ If applicable, add screenshots to help explain your problem.
 **Relevant firmware information:**
 - Version: [e.g. 2.1.0]
 - MQTT: [yes/no]
+ - MQTT payload type: [e.g. JSON]
 - HAN GPIO: [e.g. GPIO5]
 - HAN baud and parity: [e.g. 2400 8E1]
 - Temperature sensors [e.g. 3xDS18B20]
--- a/.github/ISSUE_TEMPLATE/support.md
+++ b/.github/ISSUE_TEMPLATE/support.md
@@ -20,6 +20,7 @@ A clear and concise description of what the problem is.
 **Relevant firmware information:**
 - Version: [e.g. 2.1.0]
 - MQTT: [yes/no]
+ - MQTT payload type: [e.g. JSON]
 - HAN GPIO: [e.g. GPIO5]
 - HAN baud and parity: [e.g. 2400 8E1]
 - Temperature sensors [e.g. 3xDS18B20]
--- a/frames/lng.raw
+++ b/frames/lng.raw
@@ -43,3 +43,37 @@ FF // Last byte of OBIS in previous block
 0600000000 // Accumulated export
 8BA4
 7E
+
+
+
+
+7E A1 23 CE FF 03 13 21 55 E6 E7 00 
+
+0F 00 00 08 E2 
+0C 07 E5 07 13 01 0C 1A 0A FF 80 00 00 
+
+02 0B // 11
+  01 0B // 11
+    02 04 12 00 28 09 06 00 08 19 09 00 FF 0F 02 12 00 00 
+    02 04 12 00 28 09 06 00 08 19 09 00 FF 0F 01 12 00 00 
+    02 04 12 00 01 09 06 00 00 60 01 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 00 01 07 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 00 02 07 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 01 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 02 08 00 FF 0F 02 12 00 00
+    02 04 12 00 03 09 06 01 01 05 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 06 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 07 08 00 FF 0F 02 12 00 00 
+    02 04 12 00 03 09 06 01 01 08 08 00 FF 0F 02 12 00 00 
+  09 06 00 08 19 09 00 FF
+  09 08 34 33 30 39 34 33 35 31 
+  06 00 00 00 0B 
+  06 00 00 00 00 
+  06 00 00 00 10 
+  06 00 00 00 04 
+  06 00 00 00 00 
+  06 00 00 00 08 
+  06 00 00 00 00 
+  06 00 00 00 01 
+7C 8B
+7E
--- a/platformio.ini
+++ b/platformio.ini
@@ -17,8 +17,10 @@ extra_scripts =
    pre:scripts/addversion.py
    scripts/makeweb.py

+# Sticking to v2.0.3 because of #298
+
 [env:esp32]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4/platform-espressif32-2.0.4.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.3/platform-espressif32-2.0.3.zip
 framework = arduino
 board = esp32dev
 board_build.f_cpu = 160000000L
@@ -33,8 +35,8 @@ extra_scripts =
 # https://github.com/Jason2866/esp32-arduino-lib-builder

 [env:esp32s2]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4/platform-espressif32-2.0.4.zip
-platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.4
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.3/platform-espressif32-2.0.3.zip
+platform_packages = framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.3
 framework = arduino
 board = esp32dev
 board_build.mcu = esp32s2
@@ -50,7 +52,7 @@ extra_scripts =
    scripts/makeweb.py

 [env:esp32solo]
-platform = https://github.com/tasmota/platform-espressif32/releases/download/v2.0.4/platform-espressif32-solo1-2.0.4.zip
+platform = https://github.com/tasmota/platform-espressif32/releases/download/v.2.0.3/platform-espressif32-solo1-v.2.0.3.zip
 framework = arduino
 board = esp32dev
 board_build.f_cpu = 160000000L
--- a/scripts/addversion.py
+++ b/scripts/addversion.py
@@ -19,6 +19,6 @@ hf = """
  #define VERSION "{}"
 #endif
 #define BUILD_EPOCH {}
-""".format(version, time())
+""".format(version, round(time()))
 with open(FILENAME_VERSION_H, 'w+') as f:
    f.write(hf)
--- a/src/AmsConfiguration.cpp
+++ b/src/AmsConfiguration.cpp
@@ -24,6 +24,7 @@ bool AmsConfiguration::getWiFiConfig(WiFiConfig& config) {
 		EEPROM.begin(EEPROM_SIZE);
 		EEPROM.get(CONFIG_WIFI_START, config);
 		EEPROM.end();
+		if(config.sleep > 2) config.sleep = 1;
 		return true;
 	} else {
 		clearWifi(config);
@@ -33,6 +34,7 @@ bool AmsConfiguration::getWiFiConfig(WiFiConfig& config) {

 bool AmsConfiguration::setWiFiConfig(WiFiConfig& config) {
 	WiFiConfig existing;
+	if(config.sleep > 2) config.sleep = 1;
 	if(getWiFiConfig(existing)) {
 		wifiChanged |= strcmp(config.ssid, existing.ssid) != 0;
 		wifiChanged |= strcmp(config.psk, existing.psk) != 0;
@@ -45,6 +47,7 @@ bool AmsConfiguration::setWiFiConfig(WiFiConfig& config) {
 		}
 		wifiChanged |= strcmp(config.hostname, existing.hostname) != 0;
 		wifiChanged |= config.power != existing.power;
+		wifiChanged |= config.sleep != existing.sleep;
 	} else {
 		wifiChanged = true;
 	}
@@ -63,11 +66,14 @@ void AmsConfiguration::clearWifi(WiFiConfig& config) {
 	uint16_t chipId;
 	#if defined(ESP32)
 		chipId = ESP.getEfuseMac();
+		config.power = 195;
 	#else
 		chipId = ESP.getChipId();
+		config.power = 205;
 	#endif
 	strcpy(config.hostname, (String("ams-") + String(chipId, HEX)).c_str());
 	config.mdns = true;
+	config.sleep = 0xFF;
 }

 void AmsConfiguration::clearWifiIp(WiFiConfig& config) {
@@ -508,6 +514,7 @@ bool AmsConfiguration::getEnergyAccountingConfig(EnergyAccountingConfig& config)
 		if(config.thresholds[9] != 255) {
 			clearEnergyAccountingConfig(config);
 		}
+		if(config.hours > 5) config.hours = 5;
 		return true;
 	} else {
 		return false;
@@ -515,6 +522,7 @@ bool AmsConfiguration::getEnergyAccountingConfig(EnergyAccountingConfig& config)
 }

 bool AmsConfiguration::setEnergyAccountingConfig(EnergyAccountingConfig& config) {
+	if(config.hours > 5) config.hours = 5;
 	EnergyAccountingConfig existing;
 	if(getEnergyAccountingConfig(existing)) {
 		for(int i = 0; i < 9; i++) {
@@ -523,6 +531,7 @@ bool AmsConfiguration::setEnergyAccountingConfig(EnergyAccountingConfig& config)
 			}
 		}
 		config.thresholds[9] = 255;
+		energyAccountingChanged |= config.hours != existing.hours;
 	} else {
 		energyAccountingChanged = true;
 	}
@@ -545,6 +554,7 @@ void AmsConfiguration::clearEnergyAccountingConfig(EnergyAccountingConfig& confi
 	config.thresholds[7] = 100;
 	config.thresholds[8] = 150;
 	config.thresholds[9] = 255;
+	config.hours = 3;
 }

 bool AmsConfiguration::isEnergyAccountingChanged() {
@@ -665,6 +675,14 @@ bool AmsConfiguration::hasConfig() {
 					configVersion = 0;
 					return false;
 				}
+			case 95:
+				configVersion = -1; // Prevent loop
+				if(relocateConfig95()) {
+					configVersion = 96;
+				} else {
+					configVersion = 0;
+					return false;
+				}
 			case EEPROM_CHECK_SUM:
 				return true;
 			default:
@@ -739,7 +757,7 @@ bool AmsConfiguration::relocateConfig86() {
 }

 bool AmsConfiguration::relocateConfig87() {
-	MeterConfig87 meter87;
+	MeterConfig87 meter87 = {0,0,0,0,0,0,0};
 	MeterConfig meter;
 	EEPROM.begin(EEPROM_SIZE);
    EEPROM.get(CONFIG_METER_START_87, meter87);
@@ -842,6 +860,23 @@ bool AmsConfiguration::relocateConfig94() {
 	return ret;
 }

+bool AmsConfiguration::relocateConfig95() {
+	MeterConfig meter;
+	MeterConfig95 meter95;
+	EEPROM.begin(EEPROM_SIZE);
+	EEPROM.get(CONFIG_METER_START, meter);
+	EEPROM.get(CONFIG_METER_START, meter95);
+	meter.wattageMultiplier = meter95.wattageMultiplier;
+	meter.voltageMultiplier = meter95.voltageMultiplier;
+	meter.amperageMultiplier = meter95.amperageMultiplier;
+	meter.accumulatedMultiplier = meter95.accumulatedMultiplier;
+	EEPROM.put(CONFIG_METER_START, meter);
+	EEPROM.put(EEPROM_CONFIG_ADDRESS, 96);
+	bool ret = EEPROM.commit();
+	EEPROM.end();
+	return ret;
+}
+
 bool AmsConfiguration::save() {
 	EEPROM.begin(EEPROM_SIZE);
 	EEPROM.put(EEPROM_CONFIG_ADDRESS, EEPROM_CHECK_SUM);
--- a/src/AmsConfiguration.h
+++ b/src/AmsConfiguration.h
@@ -4,7 +4,7 @@
 #include "Arduino.h"

 #define EEPROM_SIZE 1024*3
-#define EEPROM_CHECK_SUM 95 // Used to check if config is stored. Change if structure changes
+#define EEPROM_CHECK_SUM 96 // Used to check if config is stored. Change if structure changes
 #define EEPROM_CONFIG_ADDRESS 0
 #define EEPROM_TEMP_CONFIG_ADDRESS 2048

@@ -54,7 +54,8 @@ struct WiFiConfig {
 	char hostname[32];
 	bool mdns;
 	uint8_t power;
-}; // 210
+	uint8_t sleep;
+}; // 211

 struct MqttConfig86 {
 	char host[128];
@@ -87,6 +88,23 @@ struct WebConfig {
 }; // 129

 struct MeterConfig {
+	uint32_t baud;
+	uint8_t parity;
+	bool invert;
+	uint8_t distributionSystem;
+	uint8_t mainFuse;
+	uint8_t productionCapacity;
+	uint8_t encryptionKey[16];
+	uint8_t authenticationKey[16];
+	uint32_t wattageMultiplier;
+	uint32_t voltageMultiplier;
+	uint32_t amperageMultiplier;
+	uint32_t accumulatedMultiplier;
+	uint8_t source;
+	uint8_t parser;
+}; // 50
+
+struct MeterConfig95 {
 	uint32_t baud;
 	uint8_t parity;
 	bool invert;
@@ -269,6 +287,7 @@ private:
 	bool relocateConfig92(); // 2.0.3
 	bool relocateConfig93(); // 2.1.0
 	bool relocateConfig94(); // 2.1.4
+	bool relocateConfig95(); // 2.1.13

 	void saveToFs();
 	bool loadFromFs(uint8_t version);
--- a/src/AmsData.cpp
+++ b/src/AmsData.cpp
@@ -45,6 +45,12 @@ void AmsData::apply(AmsData& other) {
            this->l1PowerFactor = other.getL1PowerFactor();
            this->l2PowerFactor = other.getL2PowerFactor();
            this->l3PowerFactor = other.getL3PowerFactor();
+            this->l1activeImportPower = other.getL1ActiveImportPower();
+            this->l2activeImportPower = other.getL2ActiveImportPower();
+            this->l3activeImportPower = other.getL3ActiveImportPower();
+            this->l1activeExportPower = other.getL1ActiveExportPower();
+            this->l2activeExportPower = other.getL2ActiveExportPower();
+            this->l3activeExportPower = other.getL3ActiveExportPower();
        case 3:
            this->meterTimestamp = other.getMeterTimestamp();
            this->activeImportCounter = other.getActiveImportCounter();
@@ -161,6 +167,30 @@ float AmsData::getL3PowerFactor() {
    return this->l3PowerFactor;
 }

+float AmsData::getL1ActiveImportPower() {
+    return this->l1activeImportPower;
+}
+
+float AmsData::getL2ActiveImportPower() {
+    return this->l2activeImportPower;
+}
+
+float AmsData::getL3ActiveImportPower() {
+    return this->l3activeImportPower;
+}
+
+float AmsData::getL1ActiveExportPower() {
+    return this->l1activeExportPower;
+}
+
+float AmsData::getL2ActiveExportPower() {
+    return this->l2activeExportPower;
+}
+
+float AmsData::getL3ActiveExportPower() {
+    return this->l3activeExportPower;
+}
+
 double AmsData::getActiveImportCounter() {
    return this->activeImportCounter;
 }
--- a/src/AmsData.h
+++ b/src/AmsData.h
@@ -12,6 +12,7 @@ enum AmsType {
    AmsTypeIskra = 0x08,
    AmsTypeLandis = 0x09,
    AmsTypeSagemcom = 0x0A,
+    AmsTypeLng = 0x0B,
    AmsTypeCustom = 0x88,
    AmsTypeUnknown = 0xFF
 };
@@ -53,6 +54,14 @@ public:
    float getL2PowerFactor();
    float getL3PowerFactor();

+    float getL1ActiveImportPower();
+    float getL2ActiveImportPower();
+    float getL3ActiveImportPower();
+
+    float getL1ActiveExportPower();
+    float getL2ActiveExportPower();
+    float getL3ActiveExportPower();
+
    double getActiveImportCounter();
    double getReactiveImportCounter();
    double getActiveExportCounter();
@@ -70,6 +79,8 @@ protected:
    time_t meterTimestamp = 0;
    uint16_t activeImportPower = 0, reactiveImportPower = 0, activeExportPower = 0, reactiveExportPower = 0;
    float l1voltage = 0, l2voltage = 0, l3voltage = 0, l1current = 0, l2current = 0, l3current = 0;
+    float l1activeImportPower = 0, l2activeImportPower = 0, l3activeImportPower = 0;
+    float l1activeExportPower = 0, l2activeExportPower = 0, l3activeExportPower = 0;
    float powerFactor = 0, l1PowerFactor = 0, l2PowerFactor = 0, l3PowerFactor = 0;
    double activeImportCounter = 0, reactiveImportCounter = 0, activeExportCounter = 0, reactiveExportCounter = 0;
    bool threePhase = false, twoPhase = false, counterEstimated = false;
--- a/src/AmsDataStorage.h
+++ b/src/AmsDataStorage.h
@@ -7,20 +7,20 @@

 struct DayDataPoints {
    uint8_t version;
-    int16_t hImport[24];
+    uint16_t hImport[24];
    time_t lastMeterReadTime;
    uint32_t activeImport;
    uint32_t activeExport;
-    int16_t hExport[24];
+    uint16_t hExport[24];
 }; // 112 bytes

 struct MonthDataPoints {
    uint8_t version;
-    int16_t dImport[31];
+    uint16_t dImport[31];
    time_t lastMeterReadTime;
    uint32_t activeImport;
    uint32_t activeExport;
-    int16_t dExport[31];
+    uint16_t dExport[31];
 }; // 141 bytes

 class AmsDataStorage {
--- a/src/AmsToMqttBridge.h
+++ b/src/AmsToMqttBridge.h
@@ -1,7 +1,7 @@
 #ifndef _AMSTOMQTTBRIDGE_H
 #define _AMSTOMQTTBRIDGE_H

-#define WIFI_CONNECTION_TIMEOUT 30000;
+#define WIFI_CONNECTION_TIMEOUT 30000

 #define INVALID_BUTTON_PIN  0xFFFFFFFF

--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -32,6 +32,10 @@ ADC_MODE(ADC_VCC);
 #endif
 #define WDT_TIMEOUT 60

+#if defined(CONFIG_IDF_TARGET_ESP32S2)
+#include <driver/uart.h>
+#endif
+
 #include "version.h"

 #include "AmsToMqttBridge.h"
@@ -61,10 +65,11 @@ ADC_MODE(ADC_VCC);
 #include "RemoteDebug.h"

 #define BUF_SIZE_COMMON (2048)
-#define BUF_SIZE_HAN (1024)
+#define BUF_SIZE_HAN (1280)

 #include "IEC6205621.h"
 #include "IEC6205675.h"
+#include "LNG.h"

 #include "ams/DataParsers.h"

@@ -114,7 +119,6 @@ DLMSParser *dlmsParser = NULL;
 DSMRParser *dsmrParser = NULL;

 void setup() {
-	WiFiConfig wifi;
 	Serial.begin(115200);

 	if(!config.getGpioConfig(gpioConfig)) {
@@ -148,6 +152,8 @@ void setup() {
 			gpioConfig.hanPin = 3;
 			gpioConfig.ledPin = 2;
 			gpioConfig.ledInverted = true;
+		#elif defined(CONFIG_IDF_TARGET_ESP32S2)
+			gpioConfig.hanPin = 18;
 		#elif defined(ESP32)
 			gpioConfig.hanPin = 16;
 			gpioConfig.ledPin = 2;
@@ -155,6 +161,7 @@ void setup() {
 			gpioConfig.tempSensorPin = 14;
 		#endif
 	}
+
 	delay(1);
 	config.loadTempSensors();
 	hw.setup(&gpioConfig, &config);
@@ -238,7 +245,6 @@ void setup() {
 	}

 	Debug.setSerialEnabled(true);
-	DebugConfig debug;
 	delay(1);

 	float vcc = hw.getVcc();
@@ -301,7 +307,7 @@ void setup() {
 				}

 				debugI(" flashing");
-				File firmwareFile = LittleFS.open(FILE_FIRMWARE, "r");
+				File firmwareFile = LittleFS.open(FILE_FIRMWARE, (char*) "r");
 				debugD(" firmware size: %d", firmwareFile.size());
 				uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
 				debugD(" available: %d", maxSketchSpace);
@@ -352,7 +358,7 @@ void setup() {
 		
 		NtpConfig ntp;
 		if(config.getNtpConfig(ntp)) {
-			configTime(ntp.offset*10, ntp.summerOffset*10, ntp.enable ? strlen(ntp.server) > 0 ? ntp.server : "pool.ntp.org" : ""); // Add NTP server by default if none is configured
+			configTime(ntp.offset*10, ntp.summerOffset*10, ntp.enable ? strlen(ntp.server) > 0 ? ntp.server : (char*) F("pool.ntp.org") : (char*) F("")); // Add NTP server by default if none is configured
 			sntp_servermode_dhcp(ntp.enable && ntp.dhcp ? 1 : 0);
 			ntpEnabled = ntp.enable;
 			TimeChangeRule std = {"STD", Last, Sun, Oct, 3, ntp.offset / 6};
@@ -428,6 +434,10 @@ void loop() {
 		}
 	}

+	if(now > 10000 && now - lastErrorBlink > 3000) {
+		errorBlink();
+	}
+
 	// Only do normal stuff if we're not booted as AP
 	if (WiFi.getMode() != WIFI_AP) {
 		if (WiFi.status() != WL_CONNECTED) {
@@ -463,7 +473,7 @@ void loop() {
 					if(strlen(wifi.hostname) > 0 && wifi.mdns) {
 						debugD("mDNS is enabled, using host: %s", wifi.hostname);
 						if(MDNS.begin(wifi.hostname)) {
-							MDNS.addService("http", "tcp", 80);
+							MDNS.addService(F("http"), F("tcp"), 80);
 						} else {
 							debugE("Failed to set up mDNS!");
 						}
@@ -498,13 +508,10 @@ void loop() {
 			MDNS.update();
 			#endif

-			if(now > 10000 && now - lastErrorBlink > 3000) {
-				errorBlink();
-			}
-
 			if (mqttEnabled || config.isMqttChanged()) {
 				if(mqtt == NULL || !mqtt->connected() || config.isMqttChanged()) {
 					MQTT_connect();
+					config.ackMqttChange();
 				}
 			} else if(mqtt != NULL && mqtt->connected()) {
 				mqttClient->stop();
@@ -582,11 +589,11 @@ void loop() {
 			if(mqtt != NULL && mqttHandler != NULL && WiFi.getMode() != WIFI_AP && WiFi.status() == WL_CONNECTED && mqtt->connected() && !topic.isEmpty()) {
 				mqttHandler->publishTemperatures(&config, &hw);
 			}
-			debugD("Used %d ms to update temperature", millis()-start);
+			debugD("Used %ld ms to update temperature", millis()-start);
 		}
 		if(now - lastSysupdate > 10000) {
 			if(mqtt != NULL && mqttHandler != NULL && WiFi.getMode() != WIFI_AP && WiFi.status() == WL_CONNECTED && mqtt->connected() && !topic.isEmpty()) {
-				mqttHandler->publishSystem(&hw);
+				mqttHandler->publishSystem(&hw, eapi, &ea);
 			}
 			lastSysupdate = now;
 		}
@@ -600,7 +607,7 @@ void loop() {
 }

 void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert) {
-	if(Debug.isActive(RemoteDebug::INFO)) Debug.printf("(setupHanPort) Setting up HAN on pin %d with baud %d and parity %d\n", pin, baud, parityOrdinal);
+	if(Debug.isActive(RemoteDebug::INFO)) Debug.printf((char*) F("(setupHanPort) Setting up HAN on pin %d with baud %d and parity %d\n"), pin, baud, parityOrdinal);

 	HardwareSerial *hwSerial = NULL;
 	if(pin == 3 || pin == 113) {
@@ -616,9 +623,7 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
 				hwSerial = &Serial2;
 			}
 		#elif defined(CONFIG_IDF_TARGET_ESP32S2)
-			if(pin == 18) {
-				hwSerial = &Serial1;
-			}
+			hwSerial = &Serial1;
 		#elif defined(CONFIG_IDF_TARGET_ESP32C3)
 		#endif
 	#endif
@@ -651,12 +656,13 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
 				break;
 		}

-		#if defined(ESP32)
+		#if defined(CONFIG_IDF_TARGET_ESP32S2)
+			hwSerial->begin(baud, serialConfig, -1, -1, invert);
+			uart_set_pin(UART_NUM_1, UART_PIN_NO_CHANGE, pin, UART_PIN_NO_CHANGE, UART_PIN_NO_CHANGE);
+		#elif defined(ESP32)
 			hwSerial->begin(baud, serialConfig, -1, -1, invert);
-			hwSerial->setRxBufferSize(768);
 		#else
 			hwSerial->begin(baud, serialConfig, SERIAL_FULL, 1, invert);
-			hwSerial->setRxBufferSize(768);
 		#endif
 		
 		#if defined(ESP8266)
@@ -714,22 +720,25 @@ void errorBlink() {
 	if(lastError == 3)
 		lastError = 0;
 	lastErrorBlink = millis();
-	for(;lastError < 3;lastError++) {
-		switch(lastError) {
+	while(lastError < 3) {
+		switch(lastError++) {
 			case 0:
 				if(lastErrorBlink - meterState.getLastUpdateMillis() > 30000) {
+					debugW("No HAN data received last 30s, single blink");
 					hw.ledBlink(LED_RED, 1); // If no message received from AMS in 30 sec, blink once
 					return;
 				}
 				break;
 			case 1:
 				if(mqttEnabled && mqtt != NULL && mqtt->lastError() != 0) {
+					debugW("MQTT connection not available, double blink");
 					hw.ledBlink(LED_RED, 2); // If MQTT error, blink twice
 					return;
 				}
 				break;
 			case 2:
 				if(WiFi.getMode() != WIFI_AP && WiFi.status() != WL_CONNECTED) {
+					debugW("WiFi not connected, tripe blink");
 					hw.ledBlink(LED_RED, 3); // If WiFi not connected, blink three times
 					return;
 				}
@@ -753,14 +762,14 @@ void swapWifiMode() {

 	if (mode != WIFI_AP || !config.hasConfig()) {
 		if(Debug.isActive(RemoteDebug::INFO)) debugI("Swapping to AP mode");
-		WiFi.softAP("AMS2MQTT");
+		WiFi.softAP((char*) F("AMS2MQTT"));
 		WiFi.mode(WIFI_AP);

 		if(dnsServer == NULL) {
 			dnsServer = new DNSServer();
 		}
 		dnsServer->setErrorReplyCode(DNSReplyCode::NoError);
-		dnsServer->start(53, "*", WiFi.softAPIP());
+		dnsServer->start(53, (char*) F("*"), WiFi.softAPIP());
 	} else {
 		if(Debug.isActive(RemoteDebug::INFO)) debugI("Swapping to STA mode");
 		if(dnsServer != NULL) {
@@ -801,7 +810,7 @@ bool readHanPort() {
 		hanBuffer[len++] = hanSerial->read();
 		ctx.length = len;
 		pos = unwrapData((uint8_t *) hanBuffer, ctx);
-		if(pos >= 0) {
+		if(ctx.type > 0 && pos >= 0) {
 			if(ctx.type == DATA_TAG_DLMS) {
 				debugV("Received valid DLMS at %d", pos);
 			} else if(ctx.type == DATA_TAG_DSMR) {
@@ -816,6 +825,12 @@ bool readHanPort() {
 	}
 	if(pos == DATA_PARSE_INCOMPLETE) {
 		return false;
+	} else if(pos == DATA_PARSE_UNKNOWN_DATA) {
+		debugV("Unknown data payload:");
+		len = len + hanSerial->readBytes(hanBuffer+len, BUF_SIZE_HAN-len);
+		debugPrint(hanBuffer, 0, len);
+		len = 0;
+		return false;
 	}

 	if(pos == DATA_PARSE_INTERMEDIATE_SEGMENT) {
@@ -826,6 +841,7 @@ bool readHanPort() {
 		len += hanSerial->readBytes(hanBuffer+len, BUF_SIZE_HAN-len);
 		if(mqttEnabled && mqtt != NULL && mqttHandler == NULL) {
 			mqtt->publish(topic.c_str(), toHex(hanBuffer+pos, len));
+			mqtt->loop();
 		}
 		while(hanSerial->available()) hanSerial->read(); // Make sure it is all empty, in case we overflowed buffer above
 		len = 0;
@@ -838,19 +854,26 @@ bool readHanPort() {
 	}

 	AmsData data;
+	char* payload = ((char *) (hanBuffer)) + pos;
 	if(ctx.type == DATA_TAG_DLMS) {
 		// If MQTT bytestream payload is selected (mqttHandler == NULL), send the payload to MQTT
 		if(mqttEnabled && mqtt != NULL && mqttHandler == NULL) {
-			mqtt->publish(topic.c_str(), toHex(hanBuffer+pos, ctx.length));
+			mqtt->publish(topic.c_str(), toHex((byte*) payload, ctx.length));
+			mqtt->loop();
 		}

 		debugV("Using application data:");
-		if(Debug.isActive(RemoteDebug::VERBOSE)) debugPrint(hanBuffer+pos, 0, ctx.length);
+		if(Debug.isActive(RemoteDebug::VERBOSE)) debugPrint((byte*) payload, 0, ctx.length);

-		// TODO: Split IEC6205675 into DataParserKaifa and DataParserObis. This way we can add other means of parsing, for those other proprietary formats
-		data = IEC6205675(((char *) (hanBuffer)) + pos, meterState.getMeterType(), &meterConfig, ctx);
+		// Rudimentary detector for L&G proprietary format
+		if(payload[0] == CosemTypeStructure && payload[2] == CosemTypeArray && payload[1] == payload[3]) {
+			data = LNG(payload, meterState.getMeterType(), &meterConfig, ctx, &Debug);
+		} else {
+			// TODO: Split IEC6205675 into DataParserKaifa and DataParserObis. This way we can add other means of parsing, for those other proprietary formats
+			data = IEC6205675(payload, meterState.getMeterType(), &meterConfig, ctx);
+		}
 	} else if(ctx.type == DATA_TAG_DSMR) {
-		data = IEC6205621(((char *) (hanBuffer)) + pos);
+		data = IEC6205621(payload);
 	}
 	len = 0;

@@ -953,13 +976,13 @@ void printHanReadError(int pos) {
 void debugPrint(byte *buffer, int start, int length) {
 	for (int i = start; i < start + length; i++) {
 		if (buffer[i] < 0x10)
-			Debug.print("0");
+			Debug.print(F("0"));
 		Debug.print(buffer[i], HEX);
-		Debug.print(" ");
+		Debug.print(F(" "));
 		if ((i - start + 1) % 16 == 0)
 			Debug.println("");
 		else if ((i - start + 1) % 4 == 0)
-			Debug.print(" ");
+			Debug.print(F(" "));

 		yield(); // Let other get some resources too
 	}
@@ -1055,6 +1078,8 @@ void WiFi_connect() {
 				WiFi.setTxPower(WIFI_POWER_5dBm);
 			else if(wifi.power >= 20)
 				WiFi.setTxPower(WIFI_POWER_2dBm);
+			else
+				WiFi.setTxPower(WIFI_POWER_MINUS_1dBm);
 		#elif defined(ESP8266)
 			WiFi.setOutputPower(wifi.power / 10.0);
 		#endif
@@ -1071,7 +1096,7 @@ void WiFi_connect() {
 			if(strlen(wifi.dns2) > 0) {
 				dns2.fromString(wifi.dns2);
 			} else if(dns1.toString().isEmpty()) {
-				dns2.fromString("208.67.220.220"); // Add OpenDNS as second by default if nothing is configured
+				dns2.fromString(F("208.67.220.220")); // Add OpenDNS as second by default if nothing is configured
 			}
 			if(!WiFi.config(ip, gw, sn, dns1, dns2)) {
 				debugE("Static IP configuration is invalid, not using");
@@ -1090,6 +1115,19 @@ void WiFi_connect() {
 		WiFi.setAutoReconnect(true);
 		WiFi.persistent(true);
 		if(WiFi.begin(wifi.ssid, wifi.psk)) {
+			if(wifi.sleep <= 2) {
+				switch(wifi.sleep) {
+					case 0:
+						WiFi.setSleep(WIFI_PS_NONE);
+						break;
+					case 1:
+						WiFi.setSleep(WIFI_PS_MIN_MODEM);
+						break;
+					case 2:
+						WiFi.setSleep(WIFI_PS_MAX_MODEM);
+						break;
+				}
+			}
 			yield();
 		} else {
 			if (Debug.isActive(RemoteDebug::ERROR)) debugI("Unable to start WiFi");
@@ -1099,16 +1137,16 @@ void WiFi_connect() {

 void mqttMessageReceived(String &topic, String &payload) {
    debugI("Received message for topic %s", topic.c_str() );
-	if(meterConfig.source == METER_SOURCE_MQTT) {
-		DataParserContext ctx = {payload.length()/2};
-		fromHex(hanBuffer, payload, ctx.length);
-		uint16_t pos = unwrapData(hanBuffer, ctx);
+	//if(meterConfig.source == METER_SOURCE_MQTT) {
+		//DataParserContext ctx = {static_cast<uint8_t>(payload.length()/2)};
+		//fromHex(hanBuffer, payload, ctx.length);
+		//uint16_t pos = unwrapData(hanBuffer, ctx);
 		// TODO: Run through DLMS/DMSR parser and apply AmsData
-	}
+	//}
 }

 int16_t unwrapData(uint8_t *buf, DataParserContext &context) {
-	int16_t ret;
+	int16_t ret = 0;
 	bool doRet = false;
 	uint16_t end = BUF_SIZE_HAN;
 	uint8_t tag = (*buf);
@@ -1148,7 +1186,7 @@ int16_t unwrapData(uint8_t *buf, DataParserContext &context) {
 				if(res >= 0) doRet = true;
 				break;
 			default:
-				debugE("Ended up in default case while unwrapping...");
+				debugE("Ended up in default case while unwrapping...(tag %02X)", tag);
 				return DATA_PARSE_UNKNOWN_DATA;
 		}
 		lastTag = tag;
@@ -1163,6 +1201,7 @@ int16_t unwrapData(uint8_t *buf, DataParserContext &context) {
 					// If MQTT bytestream payload is selected (mqttHandler == NULL), send the payload to MQTT
 					if(mqttEnabled && mqtt != NULL && mqttHandler == NULL) {
 						mqtt->publish(topic.c_str(), toHex(buf, curLen));
+						mqtt->loop();
 					}
 					break;
 				case DATA_TAG_MBUS:
@@ -1170,6 +1209,7 @@ int16_t unwrapData(uint8_t *buf, DataParserContext &context) {
 					// If MQTT bytestream payload is selected (mqttHandler == NULL), send the payload to MQTT
 					if(mqttEnabled && mqtt != NULL && mqttHandler == NULL) {
 						mqtt->publish(topic.c_str(), toHex(buf, curLen));
+						mqtt->loop();
 					}
 					break;
 				case DATA_TAG_GBT:
@@ -1188,6 +1228,7 @@ int16_t unwrapData(uint8_t *buf, DataParserContext &context) {
 					debugV("DSMR frame:");
 					if(mqttEnabled && mqtt != NULL && mqttHandler == NULL) {
 						mqtt->publish(topic.c_str(), (char*) buf);
+						mqtt->loop();
 					}
 					break;
 			}
@@ -1226,7 +1267,6 @@ void MQTT_connect() {
 		if(Debug.isActive(RemoteDebug::WARNING)) debugW("No MQTT config");
 		mqttEnabled = false;
 		ws.setMqttEnabled(false);
-		config.ackMqttChange();
 		return;
 	}
 	if(mqtt != NULL) {
@@ -1241,20 +1281,19 @@ void MQTT_connect() {
 		}

 		mqtt->disconnect();
+		if(config.isMqttChanged()) {
+			if(mqttSecureClient != NULL) {
+				mqttSecureClient->stop();
+				delete mqttSecureClient;
+				mqttSecureClient = NULL;
+			} else {
+				mqttClient->stop();
+			}
+			mqttClient = NULL;
+		}
 		yield();
 	} else {
-		uint16_t size = 256;
-		switch(mqttConfig.payloadFormat) {
-			case 0: // JSON
-			case 4: // Home Assistant
-				size = 768;
-				break;
-			case 255: // Raw frame
-				size = 1024;
-				break;
-		}
-
-		mqtt = new MQTTClient(size);
+		mqtt = new MQTTClient(1024);
 		ws.setMqtt(mqtt);
 	}

@@ -1289,54 +1328,54 @@ void MQTT_connect() {
 		debugI("MQTT SSL is configured (%dkb free heap)", ESP.getFreeHeap());
 		if(mqttSecureClient == NULL) {
 			mqttSecureClient = new WiFiClientSecure();
-		}
-		#if defined(ESP8266)
-			mqttSecureClient->setBufferSizes(512, 512);
-		#endif
-	
-		if(LittleFS.begin()) {
-			File file;
+			#if defined(ESP8266)
+				mqttSecureClient->setBufferSizes(512, 512);
+			#endif
+		
+			if(LittleFS.begin()) {
+				File file;

-			if(LittleFS.exists(FILE_MQTT_CA)) {
-				debugI("Found MQTT CA file (%dkb free heap)", ESP.getFreeHeap());
-				file = LittleFS.open(FILE_MQTT_CA, "r");
-				#if defined(ESP8266)
-					BearSSL::X509List *serverTrustedCA = new BearSSL::X509List(file);
-                    mqttSecureClient->setTrustAnchors(serverTrustedCA);
-				#elif defined(ESP32)
-					mqttSecureClient->loadCACert(file, file.size());
-				#endif
-				file.close();
+				if(LittleFS.exists(FILE_MQTT_CA)) {
+					debugI("Found MQTT CA file (%dkb free heap)", ESP.getFreeHeap());
+					file = LittleFS.open(FILE_MQTT_CA, (char*) "r");
+					#if defined(ESP8266)
+						BearSSL::X509List *serverTrustedCA = new BearSSL::X509List(file);
+						mqttSecureClient->setTrustAnchors(serverTrustedCA);
+					#elif defined(ESP32)
+						mqttSecureClient->loadCACert(file, file.size());
+					#endif
+					file.close();
+				}
+
+				if(LittleFS.exists(FILE_MQTT_CERT) && LittleFS.exists(FILE_MQTT_KEY)) {
+					#if defined(ESP8266)
+						debugI("Found MQTT certificate file (%dkb free heap)", ESP.getFreeHeap());
+						file = LittleFS.open(FILE_MQTT_CERT, (char*) "r");
+						BearSSL::X509List *serverCertList = new BearSSL::X509List(file);
+						file.close();
+
+						debugI("Found MQTT key file (%dkb free heap)", ESP.getFreeHeap());
+						file = LittleFS.open(FILE_MQTT_KEY, (char*) "r");
+						BearSSL::PrivateKey *serverPrivKey = new BearSSL::PrivateKey(file);
+						file.close();
+
+						debugD("Setting client certificates (%dkb free heap)", ESP.getFreeHeap());
+						mqttSecureClient->setClientRSACert(serverCertList, serverPrivKey);
+					#elif defined(ESP32)
+						debugI("Found MQTT certificate file (%dkb free heap)", ESP.getFreeHeap());
+						file = LittleFS.open(FILE_MQTT_CERT, (char*) "r");
+						mqttSecureClient->loadCertificate(file, file.size());
+						file.close();
+
+						debugI("Found MQTT key file (%dkb free heap)", ESP.getFreeHeap());
+						file = LittleFS.open(FILE_MQTT_KEY, (char*) "r");
+						mqttSecureClient->loadPrivateKey(file, file.size());
+						file.close();
+					#endif
+				}
+				LittleFS.end();
+				debugD("MQTT SSL setup complete (%dkb free heap)", ESP.getFreeHeap());
 			}
-
-			if(LittleFS.exists(FILE_MQTT_CERT) && LittleFS.exists(FILE_MQTT_KEY)) {
-				#if defined(ESP8266)
-					debugI("Found MQTT certificate file (%dkb free heap)", ESP.getFreeHeap());
-					file = LittleFS.open(FILE_MQTT_CERT, "r");
-				 	BearSSL::X509List *serverCertList = new BearSSL::X509List(file);
-					file.close();
-
-					debugI("Found MQTT key file (%dkb free heap)", ESP.getFreeHeap());
-					file = LittleFS.open(FILE_MQTT_KEY, "r");
-  					BearSSL::PrivateKey *serverPrivKey = new BearSSL::PrivateKey(file);
-					file.close();
-
-					debugD("Setting client certificates (%dkb free heap)", ESP.getFreeHeap());
-					mqttSecureClient->setClientRSACert(serverCertList, serverPrivKey);
-				#elif defined(ESP32)
-					debugI("Found MQTT certificate file (%dkb free heap)", ESP.getFreeHeap());
-					file = LittleFS.open(FILE_MQTT_CERT, "r");
-					mqttSecureClient->loadCertificate(file, file.size());
-					file.close();
-
-					debugI("Found MQTT key file (%dkb free heap)", ESP.getFreeHeap());
-					file = LittleFS.open(FILE_MQTT_KEY, "r");
-					mqttSecureClient->loadPrivateKey(file, file.size());
-					file.close();
-				#endif
-			}
-			LittleFS.end();
-			debugD("MQTT SSL setup complete (%dkb free heap)", ESP.getFreeHeap());
 		}
 		mqttClient = mqttSecureClient;
 	} else if(mqttClient == NULL) {
@@ -1352,7 +1391,7 @@ void MQTT_connect() {
 	#if defined(ESP8266)
 		if(mqttSecureClient) {
 			time_t epoch = time(nullptr);
-			debugD("Setting NTP time %i for secure MQTT connection", epoch);
+			debugD("Setting NTP time %lld for secure MQTT connection", epoch);
 			mqttSecureClient->setX509Time(epoch);
 		}
 	#endif
@@ -1361,10 +1400,9 @@ void MQTT_connect() {
 	if ((strlen(mqttConfig.username) == 0 && mqtt->connect(mqttConfig.clientId)) ||
 		(strlen(mqttConfig.username) > 0 && mqtt->connect(mqttConfig.clientId, mqttConfig.username, mqttConfig.password))) {
 		if (Debug.isActive(RemoteDebug::INFO)) debugI("Successfully connected to MQTT!");
-		config.ackMqttChange();
 		
 		if(mqttHandler != NULL) {
-			mqttHandler->publishSystem(&hw);
+			mqttHandler->publishSystem(&hw, eapi, &ea);
 		}

 		// Subscribe to the chosen MQTT topic, if set in configuration
@@ -1396,7 +1434,7 @@ void configFileParse() {
 		return;
 	}

-	File file = LittleFS.open(FILE_CFG, "r");
+	File file = LittleFS.open(FILE_CFG, (char*) "r");

 	bool lSys = false;
 	bool lWiFi = false;
@@ -1426,195 +1464,196 @@ void configFileParse() {
 	char* buf = (char*) commonBuffer;
 	memset(buf, 0, 1024);
 	while((size = file.readBytesUntil('\n', buf, 1024)) > 0) {
-		if(strncmp(buf, "boardType ", 10) == 0) {
+		if(strncmp_P(buf, PSTR("boardType "), 10) == 0) {
 			if(!lSys) { config.getSystemConfig(sys); lSys = true; };
 			sys.boardType = String(buf+10).toInt();
-		} else if(strncmp(buf, "ssid ", 5) == 0) {
+		} else if(strncmp_P(buf, PSTR("ssid "), 5) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			memcpy(wifi.ssid, buf+5, size-5);
-		} else if(strncmp(buf, "psk ", 4) == 0) {
+		} else if(strncmp_P(buf, PSTR("psk "), 4) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			memcpy(wifi.psk, buf+4, size-4);
-		} else if(strncmp(buf, "ip ", 3) == 0) {
+		} else if(strncmp_P(buf, PSTR("ip "), 3) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			memcpy(wifi.ip, buf+3, size-3);
-		} else if(strncmp(buf, "gateway ", 8) == 0) {
+		} else if(strncmp_P(buf, PSTR("gateway "), 8) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			memcpy(wifi.gateway, buf+8, size-8);
-		} else if(strncmp(buf, "subnet ", 7) == 0) {
+		} else if(strncmp_P(buf, PSTR("subnet "), 7) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			memcpy(wifi.subnet, buf+7, size-7);
-		} else if(strncmp(buf, "dns1 ", 5) == 0) {
+		} else if(strncmp_P(buf, PSTR("dns1 "), 5) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			memcpy(wifi.dns1, buf+5, size-5);
-		} else if(strncmp(buf, "dns2 ", 5) == 0) {
+		} else if(strncmp_P(buf, PSTR("dns2 "), 5) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			memcpy(wifi.dns2, buf+5, size-5);
-		} else if(strncmp(buf, "hostname ", 9) == 0) {
+		} else if(strncmp_P(buf, PSTR("hostname "), 9) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			memcpy(wifi.hostname, buf+9, size-9);
-		} else if(strncmp(buf, "mdns ", 5) == 0) {
+		} else if(strncmp_P(buf, PSTR("mdns "), 5) == 0) {
 			if(!lWiFi) { config.getWiFiConfig(wifi); lWiFi = true; };
 			wifi.mdns = String(buf+5).toInt() == 1;;
-		} else if(strncmp(buf, "mqttHost ", 9) == 0) {
+		} else if(strncmp_P(buf, PSTR("mqttHost "), 9) == 0) {
 			if(!lMqtt) { config.getMqttConfig(mqtt); lMqtt = true; };
 			memcpy(mqtt.host, buf+9, size-9);
-		} else if(strncmp(buf, "mqttPort ", 9) == 0) {
+		} else if(strncmp_P(buf, PSTR("mqttPort "), 9) == 0) {
 			if(!lMqtt) { config.getMqttConfig(mqtt); lMqtt = true; };
 			mqtt.port = String(buf+9).toInt();
-		} else if(strncmp(buf, "mqttClientId ", 13) == 0) {
+		} else if(strncmp_P(buf, PSTR("mqttClientId "), 13) == 0) {
 			if(!lMqtt) { config.getMqttConfig(mqtt); lMqtt = true; };
 			memcpy(mqtt.clientId, buf+13, size-13);
-		} else if(strncmp(buf, "mqttPublishTopic ", 17) == 0) {
+		} else if(strncmp_P(buf, PSTR("mqttPublishTopic "), 17) == 0) {
 			if(!lMqtt) { config.getMqttConfig(mqtt); lMqtt = true; };
 			memcpy(mqtt.publishTopic, buf+17, size-17);
-		} else if(strncmp(buf, "mqttUsername ", 13) == 0) {
+		} else if(strncmp_P(buf, PSTR("mqttUsername "), 13) == 0) {
 			if(!lMqtt) { config.getMqttConfig(mqtt); lMqtt = true; };
 			memcpy(mqtt.username, buf+13, size-13);
-		} else if(strncmp(buf, "mqttPassword ", 13) == 0) {
+		} else if(strncmp_P(buf, PSTR("mqttPassword "), 13) == 0) {
 			if(!lMqtt) { config.getMqttConfig(mqtt); lMqtt = true; };
 			memcpy(mqtt.password, buf+13, size-13);
-		} else if(strncmp(buf, "mqttPayloadFormat ", 18) == 0) {
+		} else if(strncmp_P(buf, PSTR("mqttPayloadFormat "), 18) == 0) {
 			if(!lMqtt) { config.getMqttConfig(mqtt); lMqtt = true; };
 			mqtt.payloadFormat = String(buf+18).toInt();
-		} else if(strncmp(buf, "mqttSsl ", 8) == 0) {
+		} else if(strncmp_P(buf, PSTR("mqttSsl "), 8) == 0) {
 			if(!lMqtt) { config.getMqttConfig(mqtt); lMqtt = true; };
 			mqtt.ssl = String(buf+8).toInt() == 1;;
-		} else if(strncmp(buf, "webSecurity ", 12) == 0) {
+		} else if(strncmp_P(buf, PSTR("webSecurity "), 12) == 0) {
 			if(!lWeb) { config.getWebConfig(web); lWeb = true; };
 			web.security = String(buf+12).toInt();
-		} else if(strncmp(buf, "webUsername ", 12) == 0) {
+		} else if(strncmp_P(buf, PSTR("webUsername "), 12) == 0) {
 			if(!lWeb) { config.getWebConfig(web); lWeb = true; };
 			memcpy(web.username, buf+12, size-12);
-		} else if(strncmp(buf, "webPassword ", 12) == 0) {
+		} else if(strncmp_P(buf, PSTR("webPassword "), 12) == 0) {
 			if(!lWeb) { config.getWebConfig(web); lWeb = true; };
 			memcpy(web.username, buf+12, size-12);
-		} else if(strncmp(buf, "meterBaud ", 10) == 0) {
+		} else if(strncmp_P(buf, PSTR("meterBaud "), 10) == 0) {
 			if(!lMeter) { config.getMeterConfig(meter); lMeter = true; };
 			meter.baud = String(buf+10).toInt();
-		} else if(strncmp(buf, "meterParity ", 12) == 0) {
+		} else if(strncmp_P(buf, PSTR("meterParity "), 12) == 0) {
 			if(!lMeter) { config.getMeterConfig(meter); lMeter = true; };
-			if(strncmp(buf+12, "7N1", 3) == 0) meter.parity = 2;
-			if(strncmp(buf+12, "8N1", 3) == 0) meter.parity = 3;
-			if(strncmp(buf+12, "7E1", 3) == 0) meter.parity = 10;
-			if(strncmp(buf+12, "8E1", 3) == 0) meter.parity = 11;
-		} else if(strncmp(buf, "meterInvert ", 12) == 0) {
+			if(strncmp_P(buf+12, PSTR("7N1"), 3) == 0) meter.parity = 2;
+			if(strncmp_P(buf+12, PSTR("8N1"), 3) == 0) meter.parity = 3;
+			if(strncmp_P(buf+12, PSTR("7E1"), 3) == 0) meter.parity = 10;
+			if(strncmp_P(buf+12, PSTR("8E1"), 3) == 0) meter.parity = 11;
+		} else if(strncmp_P(buf, PSTR("meterInvert "), 12) == 0) {
 			if(!lMeter) { config.getMeterConfig(meter); lMeter = true; };
 			meter.invert = String(buf+12).toInt() == 1;;
-		} else if(strncmp(buf, "meterDistributionSystem ", 24) == 0) {
+		} else if(strncmp_P(buf, PSTR("meterDistributionSystem "), 24) == 0) {
 			if(!lMeter) { config.getMeterConfig(meter); lMeter = true; };
 			meter.distributionSystem = String(buf+24).toInt();
-		} else if(strncmp(buf, "meterMainFuse ", 14) == 0) {
+		} else if(strncmp_P(buf, PSTR("meterMainFuse "), 14) == 0) {
 			if(!lMeter) { config.getMeterConfig(meter); lMeter = true; };
 			meter.mainFuse = String(buf+14).toInt();
-		} else if(strncmp(buf, "meterProductionCapacity ", 24) == 0) {
+		} else if(strncmp_P(buf, PSTR("meterProductionCapacity "), 24) == 0) {
 			if(!lMeter) { config.getMeterConfig(meter); lMeter = true; };
 			meter.productionCapacity = String(buf+24).toInt();
-		} else if(strncmp(buf, "meterEncryptionKey ", 19) == 0) {
+		} else if(strncmp_P(buf, PSTR("meterEncryptionKey "), 19) == 0) {
 			if(!lMeter) { config.getMeterConfig(meter); lMeter = true; };
 			fromHex(meter.encryptionKey, String(buf+19), 16);
-		} else if(strncmp(buf, "meterAuthenticationKey ", 23) == 0) {
+		} else if(strncmp_P(buf, PSTR("meterAuthenticationKey "), 23) == 0) {
 			if(!lMeter) { config.getMeterConfig(meter); lMeter = true; };
 			fromHex(meter.authenticationKey, String(buf+19), 16);
-		} else if(strncmp(buf, "gpioHanPin ", 11) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioHanPin "), 11) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.hanPin = String(buf+11).toInt();
-		} else if(strncmp(buf, "gpioApPin ", 10) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioApPin "), 10) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.apPin = String(buf+10).toInt();
-		} else if(strncmp(buf, "gpioLedPin ", 11) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioLedPin "), 11) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.ledPin = String(buf+11).toInt();
-		} else if(strncmp(buf, "gpioLedInverted ", 16) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioLedInverted "), 16) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.ledInverted = String(buf+16).toInt() == 1;
-		} else if(strncmp(buf, "gpioLedPinRed ", 14) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioLedPinRed "), 14) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.ledPinRed = String(buf+14).toInt();
-		} else if(strncmp(buf, "gpioLedPinGreen ", 16) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioLedPinGreen "), 16) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.ledPinGreen = String(buf+16).toInt();
-		} else if(strncmp(buf, "gpioLedPinBlue ", 15) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioLedPinBlue "), 15) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.ledPinBlue = String(buf+15).toInt();
-		} else if(strncmp(buf, "gpioLedRgbInverted ", 19) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioLedRgbInverted "), 19) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.ledRgbInverted = String(buf+19).toInt() == 1;
-		} else if(strncmp(buf, "gpioTempSensorPin ", 18) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioTempSensorPin "), 18) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.tempSensorPin = String(buf+18).toInt();
-		} else if(strncmp(buf, "gpioTempAnalogSensorPin ", 24) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioTempAnalogSensorPin "), 24) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.tempAnalogSensorPin = String(buf+24).toInt();
-		} else if(strncmp(buf, "gpioVccPin ", 11) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioVccPin "), 11) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.vccPin = String(buf+11).toInt();
-		} else if(strncmp(buf, "gpioVccOffset ", 14) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioVccOffset "), 14) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.vccOffset = String(buf+14).toDouble() * 100;
-		} else if(strncmp(buf, "gpioVccMultiplier ", 18) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioVccMultiplier "), 18) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.vccMultiplier = String(buf+18).toDouble() * 1000;
-		} else if(strncmp(buf, "gpioVccBootLimit ", 17) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioVccBootLimit "), 17) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.vccBootLimit = String(buf+17).toDouble() * 10;
-		} else if(strncmp(buf, "gpioVccResistorGnd ", 19) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioVccResistorGnd "), 19) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.vccResistorGnd = String(buf+19).toInt();
-		} else if(strncmp(buf, "gpioVccResistorVcc ", 19) == 0) {
+		} else if(strncmp_P(buf, PSTR("gpioVccResistorVcc "), 19) == 0) {
 			if(!lGpio) { config.getGpioConfig(gpio); lGpio = true; };
 			gpio.vccResistorVcc = String(buf+19).toInt();
-		} else if(strncmp(buf, "domoticzElidx ", 14) == 0) {
+		} else if(strncmp_P(buf, PSTR("domoticzElidx "), 14) == 0) {
 			if(!lDomo) { config.getDomoticzConfig(domo); lDomo = true; };
 			domo.elidx = String(buf+14).toInt();
-		} else if(strncmp(buf, "domoticzVl1idx ", 15) == 0) {
+		} else if(strncmp_P(buf, PSTR("domoticzVl1idx "), 15) == 0) {
 			if(!lDomo) { config.getDomoticzConfig(domo); lDomo = true; };
 			domo.vl1idx = String(buf+15).toInt();
-		} else if(strncmp(buf, "domoticzVl2idx ", 15) == 0) {
+		} else if(strncmp_P(buf, PSTR("domoticzVl2idx "), 15) == 0) {
 			if(!lDomo) { config.getDomoticzConfig(domo); lDomo = true; };
 			domo.vl2idx = String(buf+15).toInt();
-		} else if(strncmp(buf, "domoticzVl3idx ", 15) == 0) {
+		} else if(strncmp_P(buf, PSTR("domoticzVl3idx "), 15) == 0) {
 			if(!lDomo) { config.getDomoticzConfig(domo); lDomo = true; };
 			domo.vl3idx = String(buf+15).toInt();
-		} else if(strncmp(buf, "domoticzCl1idx ", 15) == 0) {
+		} else if(strncmp_P(buf, PSTR("domoticzCl1idx "), 15) == 0) {
 			if(!lDomo) { config.getDomoticzConfig(domo); lDomo = true; };
 			domo.cl1idx = String(buf+15).toInt();
-		} else if(strncmp(buf, "ntpEnable ", 10) == 0) {
+		} else if(strncmp_P(buf, PSTR("ntpEnable "), 10) == 0) {
 			if(!lNtp) { config.getNtpConfig(ntp); lNtp = true; };
 			ntp.enable = String(buf+10).toInt() == 1;
-		} else if(strncmp(buf, "ntpDhcp ", 8) == 0) {
+		} else if(strncmp_P(buf, PSTR("ntpDhcp "), 8) == 0) {
 			if(!lNtp) { config.getNtpConfig(ntp); lNtp = true; };
 			ntp.dhcp = String(buf+8).toInt() == 1;
-		} else if(strncmp(buf, "ntpOffset ", 10) == 0) {
+		} else if(strncmp_P(buf, PSTR("ntpOffset "), 10) == 0) {
 			if(!lNtp) { config.getNtpConfig(ntp); lNtp = true; };
 			ntp.offset = String(buf+10).toInt() / 10;
-		} else if(strncmp(buf, "ntpSummerOffset ", 16) == 0) {
+		} else if(strncmp_P(buf, PSTR("ntpSummerOffset "), 16) == 0) {
 			if(!lNtp) { config.getNtpConfig(ntp); lNtp = true; };
 			ntp.summerOffset = String(buf+16).toInt() / 10;
-		} else if(strncmp(buf, "ntpServer ", 10) == 0) {
+		} else if(strncmp_P(buf, PSTR("ntpServer "), 10) == 0) {
 			if(!lNtp) { config.getNtpConfig(ntp); lNtp = true; };
 			memcpy(ntp.server, buf+10, size-10);
-		} else if(strncmp(buf, "entsoeToken ", 12) == 0) {
+		} else if(strncmp_P(buf, PSTR("entsoeToken "), 12) == 0) {
 			if(!lEntsoe) { config.getEntsoeConfig(entsoe); lEntsoe = true; };
 			memcpy(entsoe.token, buf+12, size-12);
-		} else if(strncmp(buf, "entsoeArea ", 11) == 0) {
+		} else if(strncmp_P(buf, PSTR("entsoeArea "), 11) == 0) {
 			if(!lEntsoe) { config.getEntsoeConfig(entsoe); lEntsoe = true; };
 			memcpy(entsoe.area, buf+11, size-11);
-		} else if(strncmp(buf, "entsoeCurrency ", 15) == 0) {
+		} else if(strncmp_P(buf, PSTR("entsoeCurrency "), 15) == 0) {
 			if(!lEntsoe) { config.getEntsoeConfig(entsoe); lEntsoe = true; };
 			memcpy(entsoe.currency, buf+15, size-15);
-		} else if(strncmp(buf, "entsoeMultiplier ", 17) == 0) {
+		} else if(strncmp_P(buf, PSTR("entsoeMultiplier "), 17) == 0) {
 			if(!lEntsoe) { config.getEntsoeConfig(entsoe); lEntsoe = true; };
 			entsoe.multiplier = String(buf+17).toDouble() * 1000;
-		} else if(strncmp(buf, "thresholds ", 11) == 0) {
+		} else if(strncmp_P(buf, PSTR("thresholds "), 11) == 0) {
 			if(!lEac) { config.getEnergyAccountingConfig(eac); lEac = true; };
 			int i = 0;
 			char * pch = strtok (buf+11," ");
-			while (pch != NULL) {
+			while (pch != NULL && i < 10) {
 				eac.thresholds[i++] = String(pch).toInt();
 				pch = strtok (NULL, " ");
 			}
-		} else if(strncmp(buf, "dayplot ", 8) == 0) {
+			eac.hours = String(pch).toInt();
+		} else if(strncmp_P(buf, PSTR("dayplot "), 8) == 0) {
 			int i = 0;
 			DayDataPoints day = { 4 }; // Use a version we know the multiplier of the data points
 			char * pch = strtok (buf+8," ");
@@ -1637,7 +1676,7 @@ void configFileParse() {
 			}
 			ds.setDayData(day);
 			sDs = true;
-		} else if(strncmp(buf, "monthplot ", 10) == 0) {
+		} else if(strncmp_P(buf, PSTR("monthplot "), 10) == 0) {
 			int i = 0;
 			MonthDataPoints month = { 5 }; // Use a version we know the multiplier of the data points
 			char * pch = strtok (buf+10," ");
@@ -1660,7 +1699,7 @@ void configFileParse() {
 			}
 			ds.setMonthData(month);
 			sDs = true;
-		} else if(strncmp(buf, "energyaccounting ", 17) == 0) {
+		} else if(strncmp_P(buf, PSTR("energyaccounting "), 17) == 0) {
 			uint8_t i = 0;
 			EnergyAccountingData ead = { 4, 0, 
                0, 0, 0,
@@ -1725,6 +1764,7 @@ void configFileParse() {
 	if(lDomo) config.setDomoticzConfig(domo);
 	if(lNtp) config.setNtpConfig(ntp);
 	if(lEntsoe) config.setEntsoeConfig(entsoe);
+	if(lEac) config.setEnergyAccountingConfig(eac);
 	if(sDs) ds.save();
 	if(sEa) ea.save();
 	config.save();
--- a/src/EnergyAccounting.cpp
+++ b/src/EnergyAccounting.cpp
@@ -57,7 +57,7 @@ bool EnergyAccounting::update(AmsData* amsData) {
            for(uint8_t i = 0; i < 5; i++) {
                debugger->printf("(EnergyAccounting) Peak hour from day %d: %d\n", data.peaks[i].day, data.peaks[i].value*10);
            }
-            debugger->printf("(EnergyAccounting) Loaded cost yesterday: %d, this month: %d, last month: %d\n", data.costYesterday / 10.0, data.costThisMonth, data.costLastMonth);
+            debugger->printf("(EnergyAccounting) Loaded cost yesterday: %.2f, this month: %d, last month: %d\n", data.costYesterday / 10.0, data.costThisMonth, data.costLastMonth);
        }
        init = true;
    }
@@ -70,16 +70,20 @@ bool EnergyAccounting::update(AmsData* amsData) {
    if(local.Hour != currentHour && (amsData->getListType() >= 3 || local.Minute == 1)) {
        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EnergyAccounting) New local hour %d\n", local.Hour);

-        tmElements_t oneHrAgo;
+        tmElements_t oneHrAgo, oneHrAgoLocal;
        breakTime(now-3600, oneHrAgo);
        uint16_t val = ds->getHourImport(oneHrAgo.Hour) / 10;
-        ret |= updateMax(val, local.Day);

+        breakTime(tz->toLocal(now-3600), oneHrAgoLocal);
+        ret |= updateMax(val, oneHrAgoLocal.Day);
+
+        currentHour = local.Hour; // Need to be defined here so that day cost is correctly calculated
        if(local.Hour > 0) {
            calcDayCost();
        }

        use = 0;
+        produce = 0;
        costHour = 0;
        currentHour = local.Hour;

@@ -106,19 +110,24 @@ bool EnergyAccounting::update(AmsData* amsData) {
    }

    unsigned long ms = this->lastUpdateMillis > amsData->getLastUpdateMillis() ? 0 : amsData->getLastUpdateMillis() - this->lastUpdateMillis;
-    float kwh = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    float kwhi = (amsData->getActiveImportPower() * (((float) ms) / 3600000.0)) / 1000.0;
+    float kwhe = (amsData->getActiveExportPower() * (((float) ms) / 3600000.0)) / 1000.0;
    lastUpdateMillis = amsData->getLastUpdateMillis();
-    if(kwh > 0) {
-        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh\n", kwh);
-        use += kwh;
+    if(kwhi > 0) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh import\n", kwhi);
+        use += kwhi;
        if(eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
            float price = eapi->getValueForHour(0);
-            float cost = price * kwh;
+            float cost = price * kwhi;
            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  and %.4f %s\n", cost / 100.0, eapi->getCurrency());
            costHour += cost;
            costDay += cost;
        }
    }
+    if(kwhe > 0) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting) Adding %.4f kWh export\n", kwhe);
+        produce += kwhe;
+    }

    if(config != NULL) {
        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(EnergyAccounting)  calculating threshold, currently at %d\n", currentThresholdIdx);
@@ -136,7 +145,7 @@ void EnergyAccounting::calcDayCost() {

    if(eapi != NULL && eapi->getValueForHour(0) != ENTSOE_NO_VALUE) {
        if(initPrice) costDay = 0;
-        for(int i = 0; i < local.Hour; i++) {
+        for(int i = 0; i < currentHour; i++) {
            float price = eapi->getValueForHour(i - local.Hour);
            if(price == ENTSOE_NO_VALUE) break;
            breakTime(now - ((local.Hour - i) * 3600), utc);
@@ -151,23 +160,60 @@ double EnergyAccounting::getUseThisHour() {
    return use;
 }

-double EnergyAccounting::getCostThisHour() {
-    return costHour;
-}
-
 double EnergyAccounting::getUseToday() {
    float ret = 0.0;
    time_t now = time(nullptr);
    if(now < BUILD_EPOCH) return 0;
-    tmElements_t local, utc;
+    tmElements_t utc, local;
    breakTime(tz->toLocal(now), local);
-    for(int i = 0; i < local.Hour; i++) {
+    for(int i = 0; i < currentHour; i++) {
        breakTime(now - ((local.Hour - i) * 3600), utc);
        ret += ds->getHourImport(utc.Hour) / 1000.0;
    }
    return ret + getUseThisHour();
 }

+double EnergyAccounting::getUseThisMonth() {
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    float ret = 0;
+    for(int i = 0; i < currentDay; i++) {
+        ret += ds->getDayImport(i) / 1000.0;
+    }
+    return ret + getUseToday();
+}
+
+double EnergyAccounting::getProducedThisHour() {
+    return produce;
+}
+
+double EnergyAccounting::getProducedToday() {
+    float ret = 0.0;
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    tmElements_t utc;
+    for(int i = 0; i < currentHour; i++) {
+        breakTime(now - ((currentHour - i) * 3600), utc);
+        ret += ds->getHourExport(utc.Hour) / 1000.0;
+    }
+    return ret + getProducedThisHour();
+}
+
+double EnergyAccounting::getProducedThisMonth() {
+    time_t now = time(nullptr);
+    if(now < BUILD_EPOCH) return 0;
+    float ret = 0;
+    for(int i = 0; i < currentDay; i++) {
+        ret += ds->getDayExport(i) / 1000.0;
+    }
+    return ret + getProducedToday();
+}
+
+
+double EnergyAccounting::getCostThisHour() {
+    return costHour;
+}
+
 double EnergyAccounting::getCostToday() {
    return costDay;
 }
@@ -176,21 +222,6 @@ double EnergyAccounting::getCostYesterday() {
    return data.costYesterday / 10.0;
 }

-double EnergyAccounting::getUseThisMonth() {
-    time_t now = time(nullptr);
-    if(now < BUILD_EPOCH) return 0;
-    tmElements_t tm;
-    if(tz != NULL)
-        breakTime(tz->toLocal(now), tm);
-    else
-        breakTime(now, tm);
-    float ret = 0;
-    for(int i = 0; i < tm.Day; i++) {
-        ret += ds->getDayImport(i) / 1000.0;
-    }
-    return ret + getUseToday();
-}
-
 double EnergyAccounting::getCostThisMonth() {
    return data.costThisMonth + getCostToday();
 }
@@ -210,7 +241,37 @@ float EnergyAccounting::getMonthMax() {
    uint32_t maxHour = 0.0;
    bool included[5] = { false, false, false, false, false };

-    while(count < config->hours) {
+    for(uint8_t x = 0;x < min((uint8_t) 5, config->hours); x++) {
+        uint8_t maxIdx = 0;
+        uint16_t maxVal = 0;
+        for(uint8_t i = 0; i < 5; i++) {
+            if(included[i]) continue;
+            if(data.peaks[i].day == 0) continue;
+            if(data.peaks[i].value > maxVal) {
+                maxVal = data.peaks[i].value;
+                maxIdx = i;
+            }
+        }
+        if(maxVal > 0) {
+            included[maxIdx] = true;
+            count++;
+        }
+    }
+
+    for(uint8_t i = 0; i < 5; i++) {
+        if(!included[i]) continue;
+        maxHour += data.peaks[i].value;
+    }
+    return maxHour > 0 ? maxHour / count / 100.0 : 0.0;
+}
+
+float EnergyAccounting::getPeak(uint8_t num) {
+    if(num < 1 || num > 5) return 0.0;
+
+    uint8_t count = 0;
+    bool included[5] = { false, false, false, false, false };
+
+    for(uint8_t x = 0;x < min((uint8_t) 5, config->hours); x++) {
        uint8_t maxIdx = 0;
        uint16_t maxVal = 0;
        for(uint8_t i = 0; i < 5; i++) {
@@ -220,17 +281,21 @@ float EnergyAccounting::getMonthMax() {
                maxIdx = i;
            }
        }
-        included[maxIdx] = true;
-        count++;
-    }
-
-    for(uint8_t i = 0; i < 5; i++) {
-        if(!included[i]) continue;
-        if(data.peaks[i].day > 0) {
-            maxHour += data.peaks[i].value;
+        if(maxVal > 0) {
+            included[maxIdx] = true;
+            count++;
        }
    }
-    return maxHour > 0 ? maxHour / count / 100.0 : 0.0;
+
+    uint8_t pos = 0;
+    for(uint8_t i = 0; i < 5; i++) {
+        if(!included[i]) continue;
+        pos++;
+        if(pos == num) {
+            return data.peaks[i].value / 100.0;
+        }
+    }
+    return 0.0;
 }

 bool EnergyAccounting::load() {
@@ -283,7 +348,7 @@ bool EnergyAccounting::load() {
                    this->data.peaks[b].day = b;
                    memcpy(&this->data.peaks[b].value, buf+i, 2);
                    b++;
-                    if(b >= config->hours) break;
+                    if(b >= config->hours || b >= 5) break;
                }
                ret = true;
            } else if(buf[0] == 1) {
--- a/src/EnergyAccounting.h
+++ b/src/EnergyAccounting.h
@@ -42,16 +42,22 @@ public:
    bool save();

    double getUseThisHour();
-    double getCostThisHour();
    double getUseToday();
+    double getUseThisMonth();
+
+    double getProducedThisHour();
+    double getProducedToday();
+    double getProducedThisMonth();
+
+    double getCostThisHour();
    double getCostToday();
    double getCostYesterday();
-    double getUseThisMonth();
    double getCostThisMonth();
    uint16_t getCostLastMonth();

    float getMonthMax();
    uint8_t getCurrentThreshold();
+    float getPeak(uint8_t);

    EnergyAccountingData getData();
    void setData(EnergyAccountingData&);
@@ -66,6 +72,7 @@ private:
    Timezone *tz = NULL;
    uint8_t currentHour = 0, currentDay = 0, currentThresholdIdx = 0;
    double use, costHour, costDay;
+    double produce;
    EnergyAccountingData data = { 0, 0, 0, 0, 0, 0 };

    void calcDayCost();
--- a/src/HwTools.cpp
+++ b/src/HwTools.cpp
@@ -373,8 +373,7 @@ bool HwTools::ledBlink(uint8_t color, uint8_t blink) {
        if(!ledOn(color)) return false;
        delay(50);
        ledOff(color);
-        if(i != blink)
-            delay(50);
+        delay(200);
    }
    return true;
 }
--- a/src/IEC6205675.cpp
+++ b/src/IEC6205675.cpp
@@ -98,8 +98,10 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
                }

                if(listType >= 2 && memcmp(meterModel.c_str(), "MA304T3", 7) == 0) {
-                    l2current = (((activeImportPower - activeExportPower) * sqrt(3)) - (l1voltage * l1current) - (l3voltage * l3current)) / l2voltage;
                    l2voltage = sqrt(pow(l1voltage - l3voltage * cos(60 * (PI/180)), 2) + pow(l3voltage * sin(60 * (PI/180)),2));
+                    if(l2voltage > 0) {
+                        l2current = (((activeImportPower - activeExportPower) * sqrt(3)) - (l1voltage * l1current) - (l3voltage * l3current)) / l2voltage;
+                    }
                }

                if(listType == 3) {
@@ -266,7 +268,9 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
        if(meterTs != NULL) {
            AmsOctetTimestamp* amst = (AmsOctetTimestamp*) meterTs;
            time_t ts = decodeCosemDateTime(amst->dt);
-            if(meterType == AmsTypeKamstrup || meterType == AmsTypeAidon) {
+            if(meterType == AmsTypeAidon) {
+                meterTimestamp = ts - 3600;
+            } else if(meterType == AmsTypeKamstrup) {
                meterTimestamp = tz.toUTC(ts);
            } else {
                meterTimestamp = ts;
@@ -294,6 +298,38 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
            l3PowerFactor = val;
        }

+        val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L1, sizeof(AMS_OBIS_ACTIVE_IMPORT_L1), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l1activeImportPower = val;
+        }
+        val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L2, sizeof(AMS_OBIS_ACTIVE_IMPORT_L2), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l2activeImportPower = val;
+        }
+        val = getNumber(AMS_OBIS_ACTIVE_IMPORT_L3, sizeof(AMS_OBIS_ACTIVE_IMPORT_L3), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l3activeImportPower = val;
+        }
+
+        val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L1, sizeof(AMS_OBIS_ACTIVE_EXPORT_L1), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l1activeExportPower = val;
+        }
+        val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L2, sizeof(AMS_OBIS_ACTIVE_EXPORT_L2), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l2activeExportPower = val;
+        }
+        val = getNumber(AMS_OBIS_ACTIVE_EXPORT_L3, sizeof(AMS_OBIS_ACTIVE_EXPORT_L3), ((char *) (d)));
+        if (val != NOVALUE) {
+            listType = 4;
+            l3activeExportPower = val;
+        }
+
        if(meterType == AmsTypeKamstrup) {
            if(listType >= 3) {
                activeImportCounter *= 10;
@@ -334,12 +370,14 @@ IEC6205675::IEC6205675(const char* d, uint8_t useMeterType, MeterConfig* meterCo
            if(mid != NULL) {
                switch(mid->base.type) {
                    case CosemTypeString:
-                        memcpy(&meterId, mid->str.data, mid->str.length);
-                        meterId[mid->str.length] = 0;
+                        memcpy(str, mid->oct.data, mid->oct.length);
+                        str[mid->oct.length] = 0x00;
+                        meterId = String(str);
                        break;
                    case CosemTypeOctetString:
-                        memcpy(&meterId, mid->oct.data, mid->oct.length);
-                        meterId[mid->oct.length] = 0;
+                        memcpy(str, mid->str.data, mid->str.length);
+                        str[mid->str.length] = 0x00;
+                        meterId = String(str);
                        break;
                }
            }
--- a/src/IEC6205675.h
+++ b/src/IEC6205675.h
@@ -49,6 +49,12 @@ private:
    uint8_t AMS_OBIS_POWER_FACTOR_L1[4]         = { 33, 7, 0, 255 };
    uint8_t AMS_OBIS_POWER_FACTOR_L2[4]         = { 53, 7, 0, 255 };
    uint8_t AMS_OBIS_POWER_FACTOR_L3[4]         = { 73, 7, 0, 255 };
+    uint8_t AMS_OBIS_ACTIVE_IMPORT_L1[4]        = { 21, 7, 0, 255 };
+    uint8_t AMS_OBIS_ACTIVE_IMPORT_L2[4]        = { 41, 7, 0, 255 };
+    uint8_t AMS_OBIS_ACTIVE_IMPORT_L3[4]        = { 61, 7, 0, 255 };
+    uint8_t AMS_OBIS_ACTIVE_EXPORT_L1[4]        = { 22, 7, 0, 255 };
+    uint8_t AMS_OBIS_ACTIVE_EXPORT_L2[4]        = { 42, 7, 0, 255 };
+    uint8_t AMS_OBIS_ACTIVE_EXPORT_L3[4]        = { 62, 7, 0, 255 };

 };
 #endif
--- a/src/LNG.cpp
+++ b/src/LNG.cpp
@@ -0,0 +1,152 @@
+#include "LNG.h"
+#include "lwip/def.h"
+#include "ams/ntohll.h"
+
+LNG::LNG(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, RemoteDebug* debugger) {
+    LngHeader* h = (LngHeader*) payload;
+    if(h->tag == CosemTypeStructure && h->arrayTag == CosemTypeArray) {
+        meterType = AmsTypeLng;
+        this->packageTimestamp = ctx.timestamp;
+
+        uint8_t* ptr = (uint8_t*) &h[1];
+        uint8_t* data = ptr + (18*h->arrayLength); // Skip descriptors
+
+        uint64_t o170 = 0, o270 = 0;
+        uint64_t o180 = 0, o280 = 0;
+        uint64_t o181 = 0, o182 = 0;
+        uint64_t o281 = 0, o282 = 0;
+        LngObisDescriptor* descriptor = (LngObisDescriptor*) ptr;
+        for(uint8_t x = 0;  x < h->arrayLength-1; x++) {
+            ptr = (uint8_t*) &descriptor[1];
+            descriptor = (LngObisDescriptor*) ptr;
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("(L&G) OBIS %d.%d.%d with type 0x%02X", descriptor->obis[2], descriptor->obis[3], descriptor->obis[4], *data);
+
+            CosemData* item = (CosemData*) data;
+            if(descriptor->obis[2] == 1) {
+                if(descriptor->obis[3] == 7) {
+                    if(descriptor->obis[4] == 0) {
+                        o170 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o170);
+                    }
+                } else if(descriptor->obis[3] == 8) {
+                    if(descriptor->obis[4] == 0) {
+                        o180 = getNumber(item);
+                        listType = listType >= 3 ? listType : 3;
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o180);
+                        activeImportCounter = o180 / 1000.0;
+                    } else if(descriptor->obis[4] == 1) {
+                        o181 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o181);
+                    } else if(descriptor->obis[4] == 2) {
+                        o182 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o182);
+                    }
+                } 
+            } else if(descriptor->obis[2] == 2) {
+                if(descriptor->obis[3] == 7) {
+                    if(descriptor->obis[4] == 0) {
+                        o270 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o270);
+                    }
+                } else if(descriptor->obis[3] == 8) {
+                    if(descriptor->obis[4] == 0) {
+                        o280 = getNumber(item);
+                        listType = listType >= 3 ? listType : 3;
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o280);
+                        activeExportCounter = o280 / 1000.0;
+                    } else if(descriptor->obis[4] == 1) {
+                        o281 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o281);
+                    } else if(descriptor->obis[4] == 2) {
+                        o282 = getNumber(item);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %lu", o282);
+                    }
+                } 
+            } else if(descriptor->obis[2] == 96) {
+                if(descriptor->obis[3] == 1) {
+                    if(descriptor->obis[4] == 0) {
+                        char str[item->oct.length+1];
+                        memcpy(str, item->oct.data, item->oct.length);
+                        str[item->oct.length] = '\0';
+                        meterId = String(str);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %s (oct)", str);
+                    } else if(descriptor->obis[4] == 1) {
+                        char str[item->oct.length+1];
+                        memcpy(str, item->oct.data, item->oct.length);
+                        str[item->oct.length] = '\0';
+                        meterModel = String(str);
+                        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf(" and value %s (oct)", str);
+                    }
+                }
+            }
+
+            if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf("\n");
+
+            if(o170 > 0 || o270 > 0) {
+                int32_t sum = o170-o270;
+                if(sum > 0) {
+                    listType = listType >= 1 ? listType : 1;
+                    activeImportPower = sum;
+                } else {
+                    listType = listType >= 2 ? listType : 2;
+                    activeExportPower = sum * -1;
+                }
+            }
+
+            if(o181 > 0 || o182 > 0) {
+                activeImportCounter = (o181 + o182) / 1000.0;
+                listType = listType >= 3 ? listType : 3;
+            }
+            if(o281 > 0 || o282 > 0) {
+                activeExportCounter = (o281 + o282) / 1000.0;
+                listType = listType >= 3 ? listType : 3;
+            }
+
+            if((*data) == 0x09) {
+                data += (*(data+1))+2;
+            } else if((*data) == 0x15) {
+                data += 9;
+            } else if((*data) == 0x06) {
+                data += 5;
+            } else if((*data) == 0x12) {
+                data += 3;
+            }
+
+            lastUpdateMillis = millis();
+        }
+    }
+}
+
+uint64_t LNG::getNumber(CosemData* item) {
+    if(item != NULL) {
+        uint64_t ret = 0.0;
+        switch(item->base.type) {
+            case CosemTypeLongSigned: {
+                int16_t i16 = ntohs(item->ls.data);
+                return i16;
+            }
+            case CosemTypeLongUnsigned: {
+                uint16_t u16 = ntohs(item->lu.data);
+                return u16;
+            }
+            case CosemTypeDLongSigned: {
+                int32_t i32 = ntohl(item->dlu.data);
+                return i32;
+            }
+            case CosemTypeDLongUnsigned: {
+                uint32_t u32 = ntohl(item->dlu.data);
+                return u32;
+            }
+            case CosemTypeLong64Signed: {
+                int64_t i64 = ntohll(item->l64s.data);
+                return i64;
+            }
+            case CosemTypeLong64Unsigned: {
+                uint64_t u64 = ntohll(item->l64u.data);
+                return u64;
+            }
+        }
+        return ret;
+    }
+    return 0.0;
+}
--- a/src/LNG.h
+++ b/src/LNG.h
@@ -0,0 +1,32 @@
+#ifndef _LNG_H
+#define _LNG_H
+
+#include "AmsData.h"
+#include "AmsConfiguration.h"
+#include "ams/DataParser.h"
+#include "ams/Cosem.h"
+#include "RemoteDebug.h"
+
+struct LngHeader {
+    uint8_t tag;
+    uint8_t values;
+    uint8_t arrayTag;
+    uint8_t arrayLength;
+} __attribute__((packed));
+
+struct LngObisDescriptor {
+    uint8_t ignore1[5];
+    uint8_t octetTag;
+    uint8_t octetLength;
+    uint8_t obis[6];
+    uint8_t ignore2[5];
+} __attribute__((packed));
+
+
+class LNG : public AmsData {
+public:
+    LNG(const char* payload, uint8_t useMeterType, MeterConfig* meterConfig, DataParserContext &ctx, RemoteDebug* debugger);
+    uint64_t getNumber(CosemData* item);
+};
+
+#endif
--- a/src/Uptime.cpp
+++ b/src/Uptime.cpp
@@ -1,5 +1,8 @@
 #include "Uptime.h"

+uint32_t _uptime_last_value = 0;
+uint32_t _uptime_rollovers = 0;
+
 uint64_t millis64() {
    uint32_t new_low32 = millis();
    if (new_low32 < _uptime_last_value) _uptime_rollovers++;
--- a/src/Uptime.h
+++ b/src/Uptime.h
@@ -3,8 +3,6 @@

 #include "Arduino.h"

-static uint32_t _uptime_last_value = 0;
-static uint32_t _uptime_rollovers = 0;
 uint64_t millis64();

 #endif
--- a/src/ams/DsmrParser.cpp
+++ b/src/ams/DsmrParser.cpp
@@ -4,7 +4,6 @@ int8_t DSMRParser::parse(uint8_t *buf, DataParserContext &ctx, bool verified) {
    uint16_t crcPos = 0;
    bool reachedEnd = verified;
    uint8_t lastByte = 0x00;
-    int c = 0;
    for(int pos = 0; pos < ctx.length; pos++) {
        uint8_t b = *(buf+pos);
        if(pos == 0 && b != '/') return DATA_PARSE_BOUNDRY_FLAG_MISSING;
--- a/src/ams/GcmParser.cpp
+++ b/src/ams/GcmParser.cpp
@@ -27,7 +27,7 @@ int8_t GCMParser::parse(uint8_t *d, DataParserContext &ctx) {
    memcpy(ctx.system_title, ptr, systemTitleLength);
    memcpy(initialization_vector, ctx.system_title, systemTitleLength);

-    int len;
+    int len = 0;
    int headersize = 2 + systemTitleLength;
    ptr += systemTitleLength;
    if(((*ptr) & 0xFF) == 0x81) {
--- a/src/ams/HdlcParser.cpp
+++ b/src/ams/HdlcParser.cpp
@@ -5,8 +5,6 @@
 int8_t HDLCParser::parse(uint8_t *d, DataParserContext &ctx) {
    int len;

-    uint8_t flag = *d;
-
    uint8_t* ptr;
    if(ctx.length < 3)
        return DATA_PARSE_INCOMPLETE;
--- a/src/ams/LlcParser.cpp
+++ b/src/ams/LlcParser.cpp
@@ -1,7 +1,6 @@
 #include "LlcParser.h"

 int8_t LLCParser::parse(uint8_t *buf, DataParserContext &ctx) {
-    LLCHeader* llc = (LLCHeader*) buf;
    ctx.length -= 3;
    return 3;
 }
--- a/src/ams/MbusParser.cpp
+++ b/src/ams/MbusParser.cpp
@@ -5,8 +5,6 @@ int8_t MBUSParser::parse(uint8_t *d, DataParserContext &ctx) {
    int headersize = 3;
    int footersize = 1;

-    uint8_t flag = *d;
-
    uint8_t* ptr;

    // https://m-bus.com/documentation-wired/06-application-layer
--- a/src/entsoe/DnbCurrParser.cpp
+++ b/src/entsoe/DnbCurrParser.cpp
@@ -22,7 +22,7 @@ void DnbCurrParser::flush() {
 }

 size_t DnbCurrParser::write(const uint8_t *buffer, size_t size) {
-    for(int i = 0; i < size; i++) {
+    for(size_t i = 0; i < size; i++) {
        write(buffer[i]);
    }
    return size;
--- a/src/entsoe/EntsoeA44Parser.cpp
+++ b/src/entsoe/EntsoeA44Parser.cpp
@@ -5,6 +5,10 @@ EntsoeA44Parser::EntsoeA44Parser() {
    for(int i = 0; i < 24; i++) points[i] = ENTSOE_NO_VALUE;
 }

+EntsoeA44Parser::~EntsoeA44Parser() {
+
+}
+
 char* EntsoeA44Parser::getCurrency() {
    return currency;
 }
@@ -35,7 +39,7 @@ void EntsoeA44Parser::flush() {
 }

 size_t EntsoeA44Parser::write(const uint8_t *buffer, size_t size) {
-    for(int i = 0; i < size; i++) {
+    for(size_t i = 0; i < size; i++) {
        write(buffer[i]);
    }
    return size;
--- a/src/entsoe/EntsoeA44Parser.h
+++ b/src/entsoe/EntsoeA44Parser.h
@@ -14,6 +14,7 @@
 class EntsoeA44Parser: public Stream {
 public:
    EntsoeA44Parser();
+    virtual ~EntsoeA44Parser();

    char* getCurrency();
    char* getMeasurementUnit();
--- a/src/entsoe/EntsoeApi.cpp
+++ b/src/entsoe/EntsoeApi.cpp
@@ -106,11 +106,11 @@ bool EntsoeApi::loop() {
    if(midnightMillis == 0) {
        uint32_t curDayMillis = (((((tm.Hour * 60) + tm.Minute) * 60) + tm.Second) * 1000);
        midnightMillis = now + (SECS_PER_DAY * 1000) - curDayMillis;
-        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Setting midnight millis %lu\n", midnightMillis);
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Setting midnight millis %llu\n", midnightMillis);
        currentDay = tm.Day;
        return false;
    } else if(now > midnightMillis && currentDay != tm.Day) {
-        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Rotating price objects at %lu\n", t);
+        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf("(EntsoeApi) Rotating price objects at %lld\n", t);
        if(today != NULL) delete today;
        if(tomorrow != NULL) {
            today = tomorrow;
--- a/src/mqtt/AmsMqttHandler.h
+++ b/src/mqtt/AmsMqttHandler.h
@@ -15,11 +15,12 @@ public:
        this->mqtt = mqtt;
        this->json = buf;
    };
+    virtual ~AmsMqttHandler() {};

    virtual bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
    virtual bool publishTemperatures(AmsConfiguration*, HwTools*);
    virtual bool publishPrices(EntsoeApi* eapi);
-    virtual bool publishSystem(HwTools*);
+    virtual bool publishSystem(HwTools*, EntsoeApi*, EnergyAccounting*);

 protected:
    MQTTClient* mqtt;
--- a/src/mqtt/DomoticzMqttHandler.cpp
+++ b/src/mqtt/DomoticzMqttHandler.cpp
@@ -71,6 +71,6 @@ bool DomoticzMqttHandler::publishPrices(EntsoeApi* eapi) {
    return false;
 }

-bool DomoticzMqttHandler::publishSystem(HwTools* hw) {
+bool DomoticzMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
    return false;
 }
--- a/src/mqtt/DomoticzMqttHandler.h
+++ b/src/mqtt/DomoticzMqttHandler.h
@@ -12,7 +12,7 @@ public:
    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(EntsoeApi*);
-    bool publishSystem(HwTools*);
+    bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);

 private:
    DomoticzConfig config;
--- a/src/mqtt/HomeAssistantMqttHandler.cpp
+++ b/src/mqtt/HomeAssistantMqttHandler.cpp
@@ -6,9 +6,11 @@
 #include "web/root/ha1_json.h"
 #include "web/root/ha2_json.h"
 #include "web/root/ha3_json.h"
+#include "web/root/ha4_json.h"
 #include "web/root/jsonsys_json.h"
 #include "web/root/jsonprices_json.h"
 #include "web/root/hadiscover_json.h"
+#include "web/root/realtime_json.h"

 bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea) {
 	if(topic.isEmpty() || !mqtt->connected())
@@ -24,6 +26,7 @@ bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, En
            data->getMeterTimestamp()
        );
        mqtt->publish(topic + "/energy", json);
+        mqtt->loop();
    }
    String meterModel = data->getMeterModel();
    meterModel.replace("\\", "\\\\");
@@ -31,8 +34,8 @@ bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, En
        snprintf_P(json, BufferSize, HA1_JSON,
            data->getActiveImportPower()
        );
-        return mqtt->publish(topic + "/power", json);
-    } else if(data->getListType() >= 2) { // publish power counts and volts/amps
+        mqtt->publish(topic + "/power", json);
+    } else if(data->getListType() <= 3) { // publish power counts and volts/amps
        snprintf_P(json, BufferSize, HA3_JSON,
            data->getListId().c_str(),
            data->getMeterId().c_str(),
@@ -46,15 +49,62 @@ bool HomeAssistantMqttHandler::publish(AmsData* data, AmsData* previousState, En
            data->getL3Current(),
            data->getL1Voltage(),
            data->getL2Voltage(),
+            data->getL3Voltage()
+        );
+        mqtt->publish(topic + "/power", json);
+    } else if(data->getListType() == 4) { // publish power counts and volts/amps/phase power and PF
+        snprintf_P(json, BufferSize, HA4_JSON,
+            data->getListId().c_str(),
+            data->getMeterId().c_str(),
+            meterModel.c_str(),
+            data->getActiveImportPower(),
+            data->getL1ActiveImportPower(),
+            data->getL2ActiveImportPower(),
+            data->getL3ActiveImportPower(),
+            data->getReactiveImportPower(),
+            data->getActiveExportPower(),
+            data->getL1ActiveExportPower(),
+            data->getL2ActiveExportPower(),
+            data->getL3ActiveExportPower(),
+            data->getReactiveExportPower(),
+            data->getL1Current(),
+            data->getL2Current(),
+            data->getL3Current(),
+            data->getL1Voltage(),
+            data->getL2Voltage(),
            data->getL3Voltage(),
            data->getPowerFactor() == 0 ? 1 : data->getPowerFactor(),
            data->getPowerFactor() == 0 ? 1 : data->getL1PowerFactor(),
            data->getPowerFactor() == 0 ? 1 : data->getL2PowerFactor(),
            data->getPowerFactor() == 0 ? 1 : data->getL3PowerFactor()
        );
-        return mqtt->publish(topic + "/power", json);
+        mqtt->publish(topic + "/power", json);
    }
-    return false;
+
+	String peaks = "";
+    uint8_t peakCount = ea->getConfig()->hours;
+    if(peakCount > 5) peakCount = 5;
+	for(uint8_t i = 1; i <= peakCount; i++) {
+		if(!peaks.isEmpty()) peaks += ",";
+		peaks += String(ea->getPeak(i), 2);
+	}
+    snprintf_P(json, BufferSize, REALTIME_JSON,
+		ea->getMonthMax(),
+		peaks.c_str(),
+		ea->getCurrentThreshold(),
+		ea->getUseThisHour(),
+		ea->getCostThisHour(),
+		ea->getProducedThisHour(),
+		ea->getUseToday(),
+		ea->getCostToday(),
+		ea->getProducedToday(),
+		ea->getUseThisMonth(),
+		ea->getCostThisMonth(),
+		ea->getProducedThisMonth()
+    );
+    mqtt->publish(topic + "/realtime", json);
+
+    return true;
 }

 bool HomeAssistantMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) {
@@ -91,7 +141,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {

 	time_t now = time(nullptr);

-	float min1hr, min3hr, min6hr;
+	float min1hr = 0.0, min3hr = 0.0, min6hr = 0.0;
 	int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1;
 	float min = INT16_MAX, max = INT16_MIN;
 	float values[24];
@@ -141,7 +191,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {

 	}

-	char ts1hr[21];
+	char ts1hr[24];
 	if(min1hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
        //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts);
@@ -149,7 +199,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
        breakTime(ts, tm);
 		sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
-	char ts3hr[21];
+	char ts3hr[24];
 	if(min3hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
        //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts);
@@ -157,7 +207,7 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
        breakTime(ts, tm);
 		sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
-	char ts6hr[21];
+	char ts6hr[24];
 	if(min6hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
        //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts);
@@ -186,10 +236,10 @@ bool HomeAssistantMqttHandler::publishPrices(EntsoeApi* eapi) {
        ts3hr,
        ts6hr
    );
-    return mqtt->publish(topic + "/prices", json);
+    return mqtt->publish(topic + "/prices", json, true, 0);
 }

-bool HomeAssistantMqttHandler::publishSystem(HwTools* hw) {
+bool HomeAssistantMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
 	if(topic.isEmpty() || !mqtt->connected()){
        sequence = 0;
 		return false;
@@ -202,7 +252,8 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw) {
            (uint32_t) (millis64()/1000),
            hw->getVcc(),
            hw->getWifiRssi(),
-            hw->getTemperature()
+            hw->getTemperature(),
+            VERSION
        );
        mqtt->publish(topic + "/state", json);
    }
@@ -215,27 +266,46 @@ bool HomeAssistantMqttHandler::publishSystem(HwTools* hw) {
        #endif
        String haUrl = "http://" + haUID + ".local/";
        // Could this be necessary? haUID.replace("-", "_");
+        uint8_t peakCount = ea->getConfig()->hours;
+        if(peakCount > 5) peakCount = 5;

-        for(int i=0;i<sensors;i++){
+        uint8_t peaks = 0;
+        for(int i=0;i<HA_SENSOR_COUNT;i++) {
+            HomeAssistantSensor sensor = HA_SENSORS[i];
+            String uid = String(sensor.path);
+            uid.replace(".", "");
+            uid.replace("[", "");
+            uid.replace("]", "");
+            uid.replace("'", "");
+            String uom = String(sensor.uom);
+            if(strncmp(sensor.devcl, "monetary", 8) == 0) {
+                if(eapi == NULL) continue;
+                uom = String(eapi->getCurrency());
+            }
+            if(strncmp(sensor.path, "peaks[", 6) == 0) {
+                if(peaks >= peakCount) continue;
+                peaks++;
+            }
            snprintf_P(json, BufferSize, HADISCOVER_JSON,
-                FPSTR(HA_NAMES[i]),
-                topic.c_str(), FPSTR(HA_TOPICS[i]),
-                haUID.c_str(), FPSTR(HA_PARAMS[i]),
-                haUID.c_str(), FPSTR(HA_PARAMS[i]),
-                FPSTR(HA_UOM[i]),
-                FPSTR(HA_PARAMS[i]),
-                FPSTR(HA_DEVCL[i]),
+                sensor.name,
+                topic.c_str(), sensor.topic,
+                haUID.c_str(), uid.c_str(),
+                haUID.c_str(), uid.c_str(),
+                uom.c_str(),
+                sensor.path,
+                sensor.devcl,
                haUID.c_str(),
                haName.c_str(),
                haModel.c_str(),
                VERSION,
                haManuf.c_str(),
                haUrl.c_str(),
-                strlen_P(HA_STACL[i]) > 0 ? ", \"stat_cla\" :" : "",
-                strlen_P(HA_STACL[i]) > 0 ? (char *) FPSTR(HA_STACL[i]) : ""
+                strlen_P(sensor.stacl) > 0 ? ", \"stat_cla\" :" : "",
+                strlen_P(sensor.stacl) > 0 ? (char *) FPSTR(sensor.stacl) : ""
            );
-            mqtt->publish(haTopic + haUID + "_" + FPSTR(HA_PARAMS[i]) + "/config", json, true, 0);
+            mqtt->publish(haTopic + haUID + "_" + uid.c_str() + "/config", json, true, 0);
        }
+
        autodiscoverInit = true;
    }
    if(listType>0) sequence++;
--- a/src/mqtt/HomeAssistantMqttHandler.h
+++ b/src/mqtt/HomeAssistantMqttHandler.h
@@ -13,11 +13,9 @@ public:
    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(EntsoeApi*);
-    bool publishSystem(HwTools*);
+    bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);

 private:
-    static const uint8_t sensors = 17;
-
    String haTopic = "homeassistant/sensor/";

    String haName = "AMS reader";
--- a/src/mqtt/HomeAssistantStatic.h
+++ b/src/mqtt/HomeAssistantStatic.h
@@ -3,12 +3,79 @@

 #include "Arduino.h"

-const char* HA_TOPICS[17] PROGMEM = {"/state", "/state", "/state", "/power", "/power", "/power", "/power", "/power", "/power", "/power", "/power", "/power", "/power", "/energy", "/energy", "/energy", "/energy"};
-const char* HA_NAMES[17] PROGMEM = {"Status", "Supply volt", "Temperature", "Active import", "Reactive import", "Active export", "Reactive export", "L1 current", "L2 current", "L3 current",
-                            "L1 voltage", "L2 voltage", "L3 voltage", "Accumulated active import", "Accumulated active export", "Accumulated reactive import", "Accumulated reactive export"};
-const char* HA_PARAMS[17] PROGMEM = {"rssi", "vcc", "temp", "P", "Q", "PO", "QO", "I1", "I2", "I3", "U1", "U2", "U3", "tPI", "tPO", "tQI", "tQO"};
-const char* HA_UOM[17] PROGMEM = {"dBm", "V", "C", "W", "W", "W", "W", "A", "A", "A", "V", "V", "V", "kWh", "kWh", "kWh", "kWh"};
-const char* HA_DEVCL[17] PROGMEM = {"signal_strength", "voltage", "temperature", "power", "power", "power", "power", "current", "current", "current", "voltage", "voltage", "voltage", "energy", "energy", "energy", "energy"};
-const char* HA_STACL[17] PROGMEM = {"", "", "", "\"measurement\"", "\"measurement\"", "\"measurement\"", "\"measurement\"", "", "", "", "", "", "", "\"total_increasing\"", "\"total_increasing\"", "\"total_increasing\"", "\"total_increasing\""};
+struct HomeAssistantSensor {
+    const char* name;
+    const char* topic;
+    const char* path;
+    const char* uom;
+    const char* devcl;
+    const char* stacl;
+};
+
+
+const uint8_t HA_SENSOR_COUNT PROGMEM = 60;
+HomeAssistantSensor HA_SENSORS[HA_SENSOR_COUNT] PROGMEM = {
+    {"Status",                     "/state",   "rssi",              "dBm",  "signal_strength", "\"measurement\""},
+    {"Supply volt",                "/state",   "vcc",               "V",    "voltage",         "\"measurement\""},
+    {"Temperature",                "/state",   "temp",              "C",    "temperature",     "\"measurement\""},
+    {"Active import",              "/power",   "P",                 "W",    "power",           "\"measurement\""},
+    {"L1 active import",           "/power",   "P1",                "W",    "power",           "\"measurement\""},
+    {"L2 active import",           "/power",   "P2",                "W",    "power",           "\"measurement\""},
+    {"L3 active import",           "/power",   "P3",                "W",    "power",           "\"measurement\""},
+    {"Reactive import",            "/power",   "Q",                 "VAr",  "reactive_power",  "\"measurement\""},
+    {"Active export",              "/power",   "PO",                "W",    "power",           "\"measurement\""},
+    {"L1 active export",           "/power",   "PO1",               "W",    "power",           "\"measurement\""},
+    {"L2 active export",           "/power",   "PO2",               "W",    "power",           "\"measurement\""},
+    {"L3 active export",           "/power",   "PO3",               "W",    "power",           "\"measurement\""},
+    {"Reactive export",            "/power",   "QO",                "VAr",  "reactive_power",  "\"measurement\""},
+    {"L1 current",                 "/power",   "I1",                "A",    "current",         "\"measurement\""},
+    {"L2 current",                 "/power",   "I2",                "A",    "current",         "\"measurement\""},
+    {"L3 current",                 "/power",   "I3",                "A",    "current",         "\"measurement\""},
+    {"L1 voltage",                 "/power",   "U1",                "V",    "voltage",         "\"measurement\""},
+    {"L2 voltage",                 "/power",   "U2",                "V",    "voltage",         "\"measurement\""},
+    {"L3 voltage",                 "/power",   "U3",                "V",    "voltage",         "\"measurement\""},
+    {"Accumulated active import",  "/energy",  "tPI",               "kWh",  "energy",          "\"total_increasing\""},
+    {"Accumulated active export",  "/energy",  "tPO",               "kWh",  "energy",          "\"total_increasing\""},
+    {"Accumulated reactive import","/energy",  "tQI",               "kVArh","energy",          "\"total_increasing\""},
+    {"Accumulated reactive export","/energy",  "tQO",               "kVArh","energy",          "\"total_increasing\""},
+    {"Power factor",               "/power",   "PF",                "",     "power_factor",    "\"measurement\""},
+    {"L1 power factor",            "/power",   "PF1",               "",     "power_factor",    "\"measurement\""},
+    {"L2 power factor",            "/power",   "PF2",               "",     "power_factor",    "\"measurement\""},
+    {"L3 power factor",            "/power",   "PF3",               "",     "power_factor",    "\"measurement\""},
+    {"Price current hour",         "/prices",  "prices['0']",       "",     "monetary",        ""},
+    {"Price next hour",            "/prices",  "prices['1']",       "",     "monetary",        ""},
+    {"Price in two hour",          "/prices",  "prices['2']",       "",     "monetary",        ""},
+    {"Price in three hour",        "/prices",  "prices['3']",       "",     "monetary",        ""},
+    {"Price in four hour",         "/prices",  "prices['4']",       "",     "monetary",        ""},
+    {"Price in five hour",         "/prices",  "prices['5']",       "",     "monetary",        ""},
+    {"Price in six hour",          "/prices",  "prices['6']",       "",     "monetary",        ""},
+    {"Price in seven hour",        "/prices",  "prices['7']",       "",     "monetary",        ""},
+    {"Price in eight hour",        "/prices",  "prices['8']",       "",     "monetary",        ""},
+    {"Price in nine hour",         "/prices",  "prices['9']",       "",     "monetary",        ""},
+    {"Price in ten hour",          "/prices",  "prices['10']",      "",     "monetary",        ""},
+    {"Price in eleven hour",       "/prices",  "prices['11']",      "",     "monetary",        ""},
+    {"Minimum price ahead",        "/prices",  "prices.min",        "",     "monetary",        ""},
+    {"Maximum price ahead",        "/prices",  "prices.max",        "",     "monetary",        ""},
+    {"Cheapest 1hr period ahead",  "/prices",  "prices.cheapest1hr","",     "timestamp",       ""},
+    {"Cheapest 3hr period ahead",  "/prices",  "prices.cheapest3hr","",     "timestamp",       ""},
+    {"Cheapest 6hr period ahead",  "/prices",  "prices.cheapest6hr","",     "timestamp",       ""},
+    {"Month max",                  "/realtime","max",               "kWh",  "energy",          "\"total_increasing\""},
+    {"Tariff threshold",           "/realtime","threshold",         "kWh",  "energy",          "\"total_increasing\""},
+    {"Current hour used",          "/realtime","hour.use",          "kWh",  "energy",          "\"total_increasing\""},
+    {"Current hour cost",          "/realtime","hour.cost",         "",     "monetary",        "\"total_increasing\""},
+    {"Current hour produced",      "/realtime","hour.produced",     "kWh",  "energy",          "\"total_increasing\""},
+    {"Current day used",           "/realtime","day.use",           "kWh",  "energy",          "\"total_increasing\""},
+    {"Current day cost",           "/realtime","day.cost",          "",     "monetary",        "\"total_increasing\""},
+    {"Current day produced",       "/realtime","day.produced",      "kWh",  "energy",          "\"total_increasing\""},
+    {"Current month used",         "/realtime","month.use",         "kWh",  "energy",          "\"total_increasing\""},
+    {"Current month cost",         "/realtime","month.cost",        "",     "monetary",        "\"total_increasing\""},
+    {"Current month produced",     "/realtime","month.produced",    "kWh",  "energy",          "\"total_increasing\""},
+    {"Current month peak 1",       "/realtime","peaks[0]",          "kWh",  "energy",          ""},
+    {"Current month peak 2",       "/realtime","peaks[1]",          "kWh",  "energy",          ""},
+    {"Current month peak 3",       "/realtime","peaks[2]",          "kWh",  "energy",          ""},
+    {"Current month peak 4",       "/realtime","peaks[3]",          "kWh",  "energy",          ""},
+    {"Current month peak 5",       "/realtime","peaks[4]",          "kWh",  "energy",          ""},
+};
+

 #endif
--- a/src/mqtt/JsonMqttHandler.cpp
+++ b/src/mqtt/JsonMqttHandler.cpp
@@ -1,4 +1,5 @@
 #include "JsonMqttHandler.h"
+#include "version.h"
 #include "hexutils.h"
 #include "Uptime.h"
 #include "web/root/json1_json.h"
@@ -27,7 +28,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
            ea->getUseThisHour(),
            ea->getUseToday(),
            ea->getCurrentThreshold(),
-            ea->getMonthMax()
+            ea->getMonthMax(),
+            ea->getProducedThisHour(),
+            ea->getProducedToday()
        );
        return mqtt->publish(topic, json);
    } else if(data->getListType() == 2) {
@@ -55,7 +58,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
            ea->getUseThisHour(),
            ea->getUseToday(),
            ea->getCurrentThreshold(),
-            ea->getMonthMax()
+            ea->getMonthMax(),
+            ea->getProducedThisHour(),
+            ea->getProducedToday()
        );
        return mqtt->publish(topic, json);
    } else if(data->getListType() == 3) {
@@ -88,7 +93,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
            ea->getUseThisHour(),
            ea->getUseToday(),
            ea->getCurrentThreshold(),
-            ea->getMonthMax()
+            ea->getMonthMax(),
+            ea->getProducedThisHour(),
+            ea->getProducedToday()
        );
        return mqtt->publish(topic, json);
    } else if(data->getListType() == 4) {
@@ -104,8 +111,14 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
            data->getMeterId().c_str(),
            meterModel.c_str(),
            data->getActiveImportPower(),
+            data->getL1ActiveImportPower(),
+            data->getL2ActiveImportPower(),
+            data->getL3ActiveImportPower(),
            data->getReactiveImportPower(),
            data->getActiveExportPower(),
+            data->getL1ActiveExportPower(),
+            data->getL2ActiveExportPower(),
+            data->getL3ActiveExportPower(),
            data->getReactiveExportPower(),
            data->getL1Current(),
            data->getL2Current(),
@@ -125,7 +138,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou
            ea->getUseThisHour(),
            ea->getUseToday(),
            ea->getCurrentThreshold(),
-            ea->getMonthMax()
+            ea->getMonthMax(),
+            ea->getProducedThisHour(),
+            ea->getProducedToday()
        );
        return mqtt->publish(topic, json);
    }
@@ -134,8 +149,9 @@ bool JsonMqttHandler::publish(AmsData* data, AmsData* previousState, EnergyAccou

 bool JsonMqttHandler::publishTemperatures(AmsConfiguration* config, HwTools* hw) {
 	int count = hw->getTempSensorCount();
-    if(count < 2)
+    if(count < 2) {
        return false;
+    }

 	snprintf(json, 24, "{\"temperatures\":{");

@@ -164,7 +180,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {

 	time_t now = time(nullptr);

-	float min1hr, min3hr, min6hr;
+	float min1hr = 0.0, min3hr = 0.0, min6hr = 0.0;
 	int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1;
 	float min = INT16_MAX, max = INT16_MIN;
 	float values[24];
@@ -214,7 +230,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {

 	}

-	char ts1hr[21];
+	char ts1hr[24];
 	if(min1hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
        //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts);
@@ -222,7 +238,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
        breakTime(ts, tm);
 		sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
-	char ts3hr[21];
+	char ts3hr[24];
 	if(min3hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
        //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts);
@@ -230,7 +246,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
        breakTime(ts, tm);
 		sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
-	char ts6hr[21];
+	char ts6hr[24];
 	if(min6hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
        //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts);
@@ -262,7 +278,7 @@ bool JsonMqttHandler::publishPrices(EntsoeApi* eapi) {
    return mqtt->publish(topic, json);
 }

-bool JsonMqttHandler::publishSystem(HwTools* hw) {
+bool JsonMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
 	if(init || topic.isEmpty() || !mqtt->connected())
 		return false;

@@ -272,7 +288,8 @@ bool JsonMqttHandler::publishSystem(HwTools* hw) {
        (uint32_t) (millis64()/1000),
        hw->getVcc(),
        hw->getWifiRssi(),
-        hw->getTemperature()
+        hw->getTemperature(),
+        VERSION
    );
    init = mqtt->publish(topic, json);
    return init;
--- a/src/mqtt/JsonMqttHandler.h
+++ b/src/mqtt/JsonMqttHandler.h
@@ -13,7 +13,7 @@ public:
    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(EntsoeApi*);
-    bool publishSystem(HwTools*);
+    bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);

 private:
    String clientId;
--- a/src/mqtt/RawMqttHandler.cpp
+++ b/src/mqtt/RawMqttHandler.cpp
@@ -11,6 +11,24 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState, EnergyAccountin
    }
    switch(data->getListType()) {
        case 4:
+            if(full || meterState->getL1ActiveImportPower() != data->getL1ActiveImportPower()) {
+                mqtt->publish(topic + "/meter/import/l1", String(data->getL1ActiveImportPower(), 2));
+            }
+            if(full || meterState->getL2ActiveImportPower() != data->getL2ActiveImportPower()) {
+                mqtt->publish(topic + "/meter/import/l2", String(data->getL2ActiveImportPower(), 2));
+            }
+            if(full || meterState->getL3ActiveImportPower() != data->getL3ActiveImportPower()) {
+                mqtt->publish(topic + "/meter/import/l3", String(data->getL3ActiveImportPower(), 2));
+            }
+            if(full || meterState->getL1ActiveExportPower() != data->getL1ActiveExportPower()) {
+                mqtt->publish(topic + "/meter/export/l1", String(data->getL1ActiveExportPower(), 2));
+            }
+            if(full || meterState->getL2ActiveExportPower() != data->getL2ActiveExportPower()) {
+                mqtt->publish(topic + "/meter/export/l2", String(data->getL2ActiveExportPower(), 2));
+            }
+            if(full || meterState->getL3ActiveExportPower() != data->getL3ActiveExportPower()) {
+                mqtt->publish(topic + "/meter/export/l3", String(data->getL3ActiveExportPower(), 2));
+            }
            if(full || meterState->getPowerFactor() != data->getPowerFactor()) {
                mqtt->publish(topic + "/meter/powerfactor", String(data->getPowerFactor(), 2));
            }
@@ -74,8 +92,15 @@ bool RawMqttHandler::publish(AmsData* data, AmsData* meterState, EnergyAccountin
    }
    mqtt->publish(topic + "/realtime/import/hour", String(ea->getUseThisHour(), 3));
    mqtt->publish(topic + "/realtime/import/day", String(ea->getUseToday(), 2));
+    uint8_t peakCount = ea->getConfig()->hours;
+    if(peakCount > 5) peakCount = 5;
+    for(uint8_t i = 1; i <= peakCount; i++) {
+        mqtt->publish(topic + "/realtime/import/peak/" + String(i, 10), String(ea->getPeak(i), 10), true, 0);
+    }
    mqtt->publish(topic + "/realtime/import/threshold", String(ea->getCurrentThreshold(), 10), true, 0);
    mqtt->publish(topic + "/realtime/import/monthmax", String(ea->getMonthMax(), 3), true, 0);
+    mqtt->publish(topic + "/realtime/export/hour", String(ea->getProducedThisHour(), 3));
+    mqtt->publish(topic + "/realtime/export/day", String(ea->getProducedToday(), 2));
    return true;
 }

@@ -101,7 +126,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) {

 	time_t now = time(nullptr);

-	float min1hr, min3hr, min6hr;
+	float min1hr = 0.0, min3hr = 0.0, min6hr = 0.0;
 	int8_t min1hrIdx = -1, min3hrIdx = -1, min6hrIdx = -1;
 	float min = INT16_MAX, max = INT16_MIN;
 	float values[34];
@@ -152,7 +177,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) {

 	}

-	char ts1hr[21];
+	char ts1hr[24];
 	if(min1hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min1hrIdx);
        //Serial.printf("1hr: %d %lu\n", min1hrIdx, ts);
@@ -160,7 +185,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) {
        breakTime(ts, tm);
 		sprintf(ts1hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
-	char ts3hr[21];
+	char ts3hr[24];
 	if(min3hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min3hrIdx);
        //Serial.printf("3hr: %d %lu\n", min3hrIdx, ts);
@@ -168,7 +193,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) {
        breakTime(ts, tm);
 		sprintf(ts3hr, "%04d-%02d-%02dT%02d:00:00Z", tm.Year+1970, tm.Month, tm.Day, tm.Hour);
 	}
-	char ts6hr[21];
+	char ts6hr[24];
 	if(min6hrIdx > -1) {
        time_t ts = now + (SECS_PER_HOUR * min6hrIdx);
        //Serial.printf("6hr: %d %lu\n", min6hrIdx, ts);
@@ -206,7 +231,7 @@ bool RawMqttHandler::publishPrices(EntsoeApi* eapi) {
    return true;
 }

-bool RawMqttHandler::publishSystem(HwTools* hw) {
+bool RawMqttHandler::publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea) {
 	if(topic.isEmpty() || !mqtt->connected())
 		return false;

--- a/src/mqtt/RawMqttHandler.h
+++ b/src/mqtt/RawMqttHandler.h
@@ -12,7 +12,7 @@ public:
    bool publish(AmsData* data, AmsData* previousState, EnergyAccounting* ea);
    bool publishTemperatures(AmsConfiguration*, HwTools*);
    bool publishPrices(EntsoeApi*);
-    bool publishSystem(HwTools*);
+    bool publishSystem(HwTools* hw, EntsoeApi* eapi, EnergyAccounting* ea);

 private:
    String topic;
--- a/src/web/AmsWebHeaders.h
+++ b/src/web/AmsWebHeaders.h
@@ -2,6 +2,7 @@ static const char HEADER_CACHE_CONTROL[] PROGMEM = "Cache-Control";
 static const char HEADER_PRAGMA[] PROGMEM = "Pragma";
 static const char HEADER_EXPIRES[] PROGMEM = "Expires";
 static const char HEADER_AUTHENTICATE[] PROGMEM = "WWW-Authenticate";
+static const char HEADER_LOCATION[] PROGMEM = "Location";

 static const char CACHE_CONTROL_NO_CACHE[] PROGMEM = "no-cache, no-store, must-revalidate";
 static const char CACHE_1HR[] PROGMEM = "public, max-age=3600";
--- a/src/web/AmsWebServer.cpp
+++ b/src/web/AmsWebServer.cpp
--- a/src/web/AmsWebServer.h
+++ b/src/web/AmsWebServer.h
@@ -24,6 +24,7 @@
 	#include <WiFi.h>
 	#include <WebServer.h>
 	#include <HTTPClient.h>
+	#include <HTTPUpdate.h>
 #else
 	#warning "Unsupported board type"
 #endif
@@ -58,6 +59,13 @@ private:
 	bool uploading = false;
 	File file;
 	bool performRestart = false;
+	bool performUpgrade = false;
+	bool rebootForUpgrade = false;
+	#if defined(AMS2MQTT_FIRMWARE_URL)
+	String customFirmwareUrl = AMS2MQTT_FIRMWARE_URL;
+	#else
+	String customFirmwareUrl;
+	#endif

    static const uint16_t BufferSize = 2048;
    char* buf;
@@ -101,6 +109,7 @@ private:

 	String getSerialSelectOptions(int selected);
 	void firmwareHtml();
+	void firmwarePost();
 	void firmwareUpload();
 	void firmwareDownload();
 	void restartHtml();
--- a/web/application.js
+++ b/web/application.js
@@ -316,6 +316,7 @@ $(function() {
            url: swv.data('url'),
            dataType: 'json'
        }).done(function(releases) {
+            var isnew = false;
            if(/^v\d{1,2}\.\d{1,2}\.\d{1,2}$/.test(swv.text()) && fwl.length == 0) {
                releases.reverse();
                var next_patch;
@@ -352,10 +353,13 @@ $(function() {
                });
                if(next_minor) {
                    nextVersion = next_minor;
+                    isnew = true;
                } else if(next_major) {
                    nextVersion = next_major;
+                    isnew = true;
                } else if(next_patch) {
                    nextVersion = next_patch;
+                    isnew = true;
                }
            } else {
                nextVersion = releases[0];
@@ -375,9 +379,11 @@ $(function() {
                        }
                    });
                };
-                $('#newVersionTag').text(nextVersion.tag_name);
-                $('#newVersionUrl').prop('href', nextVersion.html_url);
-                $('#newVersion').removeClass('d-none');
+                if(isnew) {
+                    $('#newVersionTag').text(nextVersion.tag_name);
+                    $('#newVersionUrl').prop('href', nextVersion.html_url);
+                    $('#newVersion').removeClass('d-none');
+                }
            }
        });
    }
@@ -478,7 +484,7 @@ var drawDay = function() {
        timeout: 30000,
        dataType: 'json',
    }).done(function(json) {
-        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }]];
+        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }, { role: 'annotation' }]];
        var r = 1;
        var hour = moment.utc().hours();
        var offset = moment().utcOffset()/60;
@@ -486,13 +492,13 @@ var drawDay = function() {
        for(var i = hour; i<24; i++) {
            var imp = json["i"+zeropad(i)];
            var exp = json["e"+zeropad(i)];
-            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(1) : imp.toFixed(1) + '\n' + -exp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", imp == 0 ? "" : imp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;", exp == 0 ? "" : -exp.toFixed(1)];
            min = Math.min(0, -exp);
        };
        for(var i = 0; i < hour; i++) {
            var imp = json["i"+zeropad(i)];
            var exp = json["e"+zeropad(i)];
-            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(1) : imp.toFixed(1) + '\n' + -exp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            data[r++] = [zeropad((i+offset)%24), imp, "opacity: 0.9;", imp == 0 ? "" : imp.toFixed(1), exp == 0 ? 0 : -exp, "opacity: 0.9;", exp == 0 ? "" : -exp.toFixed(1)];
            min = Math.min(0, -exp);
        };
        ea = google.visualization.arrayToDataTable(data);
@@ -511,7 +517,7 @@ var drawMonth = function() {
        timeout: 30000,
        dataType: 'json',
    }).done(function(json) {
-        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }]];
+        data = [['Hour', 'Import', { role: 'style' }, { role: 'annotation' }, 'Export', { role: 'style' }, { role: 'annotation' }]];
        var r = 1;
        var day = moment().date();
        var eom = moment().subtract(1, 'months').endOf('month').date();
@@ -519,13 +525,13 @@ var drawMonth = function() {
        for(var i = day; i<=eom; i++) {
            var imp = json["i"+zeropad(i)];
            var exp = json["e"+zeropad(i)];
-            data[r++] = [zeropad(i), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(0) : imp.toFixed(0) + '\n' + -exp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            data[r++] = [zeropad(i), imp, "opacity: 0.9;", imp == 0 ? "" : imp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;", exp == 0 ? "" : -exp.toFixed(0)];
            min = Math.min(0, -exp);
        }
        for(var i = 1; i < day; i++) {
            var imp = json["i"+zeropad(i)];
            var exp = json["e"+zeropad(i)];
-            data[r++] = [zeropad(i), imp, "opacity: 0.9;", exp == 0 ? imp.toFixed(0) : imp.toFixed(0) + '\n' + -exp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;"];
+            data[r++] = [zeropad(i), imp, "opacity: 0.9;", imp == 0 ? "" : imp.toFixed(0), exp == 0 ? 0 : -exp, "opacity: 0.9;", exp == 0 ? "" : -exp.toFixed(0)];
            min = Math.min(0, -exp);
        }
        ma = google.visualization.arrayToDataTable(data);
@@ -651,7 +657,7 @@ var fetch = function() {

        if(ip) {
            var v = parseInt(json.i);
-            var pct = (v*100)/parseInt(json.im);
+            var pct = Math.min((v*100)/parseInt(json.im), 100);
            var append = "W";
            if(v > 1000 && !swatt) {
                v = (v/1000).toFixed(1);
@@ -677,7 +683,7 @@ var fetch = function() {
            $('.rim').hide();
            if(xp) {
                var v = parseInt(json.e);
-                var pct = (v*100)/(om*1000);
+                var pct = Math.min((v*100)/(om*1000), 100);
                var append = "W";
                if(v > 1000 && !swatt) {
                    v = (v/1000).toFixed(1);
@@ -717,21 +723,21 @@ var fetch = function() {
                var u1 = parseFloat(json.u1);
                t += u1;
                c++;
-                var pct = (Math.max(parseFloat(json.u1)-195.5, 1)*100/69);
+                var pct = Math.min(Math.max(parseFloat(json.u1)-195.5, 1)*100/69, 100);
                arr[r++] = [ds == 1 ? 'L1-L2' : 'L1', u1, "color: " + voltcol(pct) + ";opacity: 0.9;", u1 + "V"];
            }
            if(json.u2) {
                var u2 = parseFloat(json.u2);
                t += u2;
                c++;
-                var pct = (Math.max(parseFloat(json.u2)-195.5, 1)*100/69);
+                var pct = Math.min(Math.max(parseFloat(json.u2)-195.5, 1)*100/69, 100);
                arr[r++] = [ds == 1 ? 'L1-L3' : 'L2', u2, "color: " + voltcol(pct) + ";opacity: 0.9;", u2 + "V"];
            }
            if(json.u3) {
                var u3 = parseFloat(json.u3);
                t += u3;
                c++;
-                var pct = (Math.max(parseFloat(json.u3)-195.5, 1)*100/69);
+                var pct = Math.min(Math.max(parseFloat(json.u3)-195.5, 1)*100/69, 100);
                arr[r++] = [ds == 1 ? 'L2-L3' : 'L3', u3, "color: " + voltcol(pct) + ";opacity: 0.9;", u3 + "V"];
            }
            v = t/c;
@@ -756,19 +762,19 @@ var fetch = function() {
            if(json.i1 || json.u1) {
                var i1 = parseFloat(json.i1);
                dA = true;
-                var pct = (parseFloat(json.i1)/parseInt(json.mf))*100;
+                var pct = Math.min((parseFloat(json.i1)/parseInt(json.mf))*100, 100);
                arr[r++] = ['L1', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i1 + "A"];
            }
            if(json.i2 || json.u2) {
                var i2 = parseFloat(json.i2);
                dA = true;
-                var pct = (parseFloat(json.i2)/parseInt(json.mf))*100;
+                var pct = Math.min((parseFloat(json.i2)/parseInt(json.mf))*100, 100);
                arr[r++] = ['L2', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i2 + "A"];
            }
            if(json.i3 || json.u3) {
                var i3 = parseFloat(json.i3);
                dA = true;
-                var pct = (parseFloat(json.i3)/parseInt(json.mf))*100;
+                var pct = Math.min((parseFloat(json.i3)/parseInt(json.mf))*100, 100);
                arr[r++] = ['L3', pct, "color: " + ampcol(pct) + ";opacity: 0.9;", i3 + "A"];
            }
            if(dA) {
@@ -790,6 +796,12 @@ var fetch = function() {
            if(currency) {
                $('.sp').show();
            }
+            if(om > 0) {
+                $('.se').removeClass('d-none');
+                $('#eache').html(json.ea.h.p.toFixed(2));
+                $('#eacde').html(json.ea.d.p.toFixed(1));
+                $('#eacme').html(json.ea.m.p.toFixed(0));
+            }
        }

        if(json.me) {
@@ -878,7 +890,7 @@ var fetch = function() {

 var upgrade = function() {
    if(nextVersion) {
-        if(confirm("Are you sure you want to perform upgrade to " + nextVersion.tag_name + "?")) {
+        if(confirm("WARNING: If you have a M-BUS powered device (Pow-U), please keep USB power connected while upgrading.\n\nAre you sure you want to perform upgrade to " + nextVersion.tag_name + "?")) {
            $('#loading-indicator').show();
            window.location.href="/upgrade?version=" + nextVersion.tag_name;
        }
--- a/web/data.json
+++ b/web/data.json
@@ -23,8 +23,8 @@
    "v" : %.3f,
    "r" : %d,
    "t" : %.2f,
-    "u" : %lu,
-    "m" : %lu,
+    "u" : %u,
+    "m" : %u,
    "em" : %d,
    "hm" : %d,
    "wm" : %d,
@@ -35,19 +35,23 @@
    "ds" : %d,
    "ea" : {
        "x" : %.1f,
+        "p" : [ %s ],
        "t" : %d,
        "h" : {
            "u" : %.2f,
-            "c" : %.2f
+            "c" : %.2f,
+            "p" : %.2f
        },
        "d" : {
            "u" : %.2f,
-            "c" : %.2f
+            "c" : %.2f,
+            "p" : %.2f
        },
        "m" : {
            "u" : %.2f,
-            "c" : %.2f
+            "c" : %.2f,
+            "p" : %.2f
        }
    },
-    "c" : %lu
+    "c" : %u
 }
--- a/web/entsoe.html
+++ b/web/entsoe.html
@@ -34,6 +34,19 @@
                            <option value="10YDK-1--------W" {eaDk1}>DK1</option>
                            <option value="10YDK-2--------M" {eaDk2}>DK2</option>
                        </optgroup>
+                        <option value="10YAT-APG------L" {at}>Austria</option>
+                        <option value="10YBE----------2" {be}>Belgium</option>
+                        <option value="10YCZ-CEPS-----N" {cz}>Czech Republic</option>
+                        <option value="10Y1001A1001A39I" {ee}>Estonia</option>
+                        <option value="10YFI-1--------U" {fi}>Finland</option>
+                        <option value="10YFR-RTE------C" {fr}>France</option>
+                        <option value="10Y1001A1001A83F" {de}>Germany</option>
+                        <option value="10YGB----------A" {gb}>Great Britain</option>
+                        <option value="10YLV-1001A00074" {lv}>Latvia</option>
+                        <option value="10YLT-1001A0008Q" {lt}>Lithuania</option>
+                        <option value="10YNL----------L" {nl}>Netherland</option>
+                        <option value="10YPL-AREA-----S" {pl}>Poland</option>
+                        <option value="10YCH-SWISSGRIDZ" {ch}>Switzerland</option>
                    </select>
                </div>
            </div>
--- a/web/firmware.html
+++ b/web/firmware.html
@@ -1,18 +1,21 @@
 <div class="alert alert-danger">
-    WARNING: Units powered over M-bus must be connected to an external power supply during firmware upload. Failure to do so may cause power-down during upload resulting in non-functioning unit.
+    WARNING: Units powered by M-BUS (Pow-U) must be connected to an external power supply during firmware upload. Failure to do so may cause power-down during upload resulting in non-functioning unit.
 </div>
 <div class="alert alert-warning">
    Your board is using {chipset} chipset. Only upload firmware designed for this chipset. Failure to do so may result in non-functioning unit.
    <span id="fwDownload" style="display: none;"><br/>Download latest firmware file <a  id="fwLink" href="#" data-chipset="{chipset}">here</a></span>
 </div>
+<div class="alert alert-warning">
+    When using URL, only a valid ESP OTA server response will be accepted.
+</div>

 <form method="post" enctype="multipart/form-data" class="upload-form">
    <div class="my-3 p-3 bg-white rounded shadow">
        <div class="row">
            <div class="col-lg-6">
-                <div class="input-group mb-3">
+                <div class="input-group">
                    <div class="input-group-prepend">
-                        <span class="input-group-text">Upload</span>
+                        <span class="input-group-text">Upload file</span>
                    </div>
                    <div class="custom-file">
                        <input name="file" type="file" class="custom-file-input" id="fileUploadField">
@@ -21,6 +24,19 @@
                </div>
            </div>
        </div>
+        <div class="row">
+            <div class="col-lg-6">or</div>
+        </div>
+        <div class="row">
+            <div class="col-lg-6">
+                <div class="input-group">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Use URL</span>
+                    </div>
+                    <input type="text" name="url" class="form-control"/>
+                </div>
+            </div>
+        </div>
    </div>
    <hr/>
    <div class="row form-group">
@@ -28,7 +44,7 @@
            <a href="javascript:history.back();" class="btn btn-outline-secondary">Back</a>
        </div>
        <div class="col-6 text-right">
-            <button class="btn btn-primary">Upload</button>
+            <button class="btn btn-primary">Upgrade firmware</button>
        </div>
    </div>
-</form>
+</form>
--- a/web/foot.html
+++ b/web/foot.html
@@ -1,6 +1,5 @@
        <div id="newVersion" class="alert alert-info d-none">New version <span id="newVersionTag"></span>! 
-            <a id="newVersionUrl" href="#" target="_blank">view</a>
-            <span class="d-none ssl-capable"> or <a href="javascript:upgrade();">upgrade</a></span>
+            <a id="newVersionUrl" href="#" target="_blank">view</a> or <a href="javascript:upgrade();">click here to upgrade</a>
        </div>
    </main>

--- a/web/gpio.html
+++ b/web/gpio.html
@@ -1,6 +1,6 @@
 <div class="alert alert-warning">!!WARNING!!<br/>Do not change anything here unless you know exactly what you are doing! Changing things here could cause the device to stop responding</div>
 <form method="post" action="/save">
-    <input type="hidden" name="gpioConfig" value="true"/>
+    <input type="hidden" name="gc" value="true"/>
    <div class="my-3 p-3 bg-white rounded shadow">
        <h6>GPIO settings</h6>
        <div class="d-flex flex-row flex-wrap">
@@ -8,18 +8,18 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">HAN</span>
                </div>
-                <select name="hanPin" class="form-control">
-                    ${options.han}
+                <select name="h" class="form-control">
+                    ${h}
                </select>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 150px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">LED</span>
                </div>
-                <input name="ledPin" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPin}"/>
+                <input name="l" type="number" min="2" max="${g}" class="form-control" value="${l}"/>
                <div class="input-group-append" title="Inverted">
                    <label class="input-group-text">
-                        <input type="checkbox" name="ledInverted" value="true" ${config.ledInverted}/> inv
+                        <input type="checkbox" name="i" value="true" ${i}/> inv
                    </label>
                </div>
            </div>
@@ -27,12 +27,12 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">RGB</span>
                </div>
-                <input name="ledPinRed" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinRed}"/>
-                <input name="ledPinGreen" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinGreen}"/>
-                <input name="ledPinBlue" type="number" min="2" max="${gpio.max}" class="form-control" value="${config.ledPinBlue}"/>
+                <input name="r" type="number" min="2" max="${g}" class="form-control" value="${r}"/>
+                <input name="e" type="number" min="2" max="${g}" class="form-control" value="${e}"/>
+                <input name="b" type="number" min="2" max="${g}" class="form-control" value="${b}"/>
                <div class="input-group-append" title="Inverted">
                    <label class="input-group-text">
-                        <input type="checkbox" name="ledRgbInverted" value="true" ${config.ledRgbInverted}/> inv
+                        <input type="checkbox" name="n" value="true" ${n}/> inv
                    </label>
                </div>
            </div>
@@ -40,31 +40,31 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">AP button</span>
                </div>
-                <input name="apPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.apPin}"/>
+                <input name="a" type="number" min="0" max="${g}" class="form-control" value="${a}"/>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 150px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Temperature</span>
                </div>
-                <input name="tempSensorPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.tempSensorPin}"/>
+                <input name="t" type="number" min="0" max="${g}" class="form-control" value="${t}"/>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 150px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Analog temp</span>
                </div>
-                <input name="tempAnalogSensorPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.tempAnalogSensorPin}"/>
+                <input name="m" type="number" min="0" max="${g}" class="form-control" value="${m}"/>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 100px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Vcc</span>
                </div>
-                <input name="vccPin" type="number" min="0" max="${gpio.max}" class="form-control" value="${config.vccPin}"/>
+                <input name="v" type="number" min="0" max="${g}" class="form-control" value="${v}"/>
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 200px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">GND resistor</span>
                </div>
-                <input type="number" min="1" max="1000" step="1" class="form-control" name="vccResistorGnd" value="${config.vccResistorGnd}" />
+                <input type="number" min="1" max="1000" step="1" class="form-control" name="d" value="${d}" />
                <div class="input-group-append" title="Inverted">
                    <label class="input-group-text">k&ohm;</label>
                </div>
@@ -73,7 +73,7 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">Vcc resistor</span>
                </div>
-                <input type="number" min="1" max="1000" step="1" class="form-control" name="vccResistorVcc" value="${config.vccResistorVcc}" />
+                <input type="number" min="1" max="1000" step="1" class="form-control" name="s" value="${s}" />
                <div class="input-group-append" title="Inverted">
                    <label class="input-group-text">k&ohm;</label>
                </div>
@@ -82,19 +82,19 @@
                <div class="input-group-prepend">
                    <span class="input-group-text">Multiplier</span>
                </div>
-                <input type="number" min="0.1" max="10" step="0.01" class="form-control" name="vccMultiplier" value="${config.vccMultiplier}" />
+                <input type="number" min="0.1" max="10" step="0.01" class="form-control" name="u" value="${u}" />
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 120px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Offset</span>
                </div>
-                <input type="number" min="0.0" max="3.5" step="0.01" class="form-control" name="vccOffset" value="${config.vccOffset}" />
+                <input type="number" min="0.0" max="3.5" step="0.01" class="form-control" name="o" value="${o}" />
            </div>
            <div class="m-2 input-group input-group-sm" style="width: 130px;">
                <div class="input-group-prepend">
                    <span class="input-group-text">Boot limit</span>
                </div>
-                <input type="number" min="2.5" max="3.5" step="0.1" class="form-control" name="vccBootLimit" value="${config.vccBootLimit}" />
+                <input type="number" min="2.5" max="3.5" step="0.1" class="form-control" name="c" value="${c}" />
            </div>
        </div>
    </div>
--- a/web/ha2.json
+++ b/web/ha2.json
@@ -3,5 +3,5 @@
    "tPO" : %.2f,
    "tQI" : %.2f,
    "tQO" : %.2f,
-    "rtc" : %llu
+    "rtc" : %lu
 }
--- a/web/ha3.json
+++ b/web/ha3.json
@@ -11,9 +11,5 @@
    "I3" : %.2f,
    "U1" : %.2f,
    "U2" : %.2f,
-    "U3" : %.2f,
-    "PF" : %.2f,
-    "PF1" : %.2f,
-    "PF2" : %.2f,
-    "PF3" : %.2f
+    "U3" : %.2f
 }
--- a/web/ha4.json
+++ b/web/ha4.json
@@ -0,0 +1,25 @@
+{
+    "lv" : "%s",
+    "id" : "%s",
+    "type" : "%s",
+    "P" : %d,
+    "P1" : %.2f,
+    "P2" : %.2f,
+    "P3" : %.2f,
+    "Q" : %d,
+    "PO" : %d,
+    "PO1" : %.2f,
+    "PO2" : %.2f,
+    "PO3" : %.2f,
+    "QO" : %d,
+    "I1" : %.2f,
+    "I2" : %.2f,
+    "I3" : %.2f,
+    "U1" : %.2f,
+    "U2" : %.2f,
+    "U3" : %.2f,
+    "PF" : %.2f,
+    "PF1" : %.2f,
+    "PF2" : %.2f,
+    "PF3" : %.2f
+}
--- a/web/head.html
+++ b/web/head.html
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <html>
 <head>
    <meta charset="UTF-8">
--- a/web/index.html
+++ b/web/index.html
@@ -113,7 +113,7 @@

    <div class="col-xl-12 mb-3">
        <div class="bg-white rounded shadow pt-3 pb-3" style="font-size: 14px;">
-            <strong class="mr-3 ml-3">Real time calculation</strong><br/>
+            <strong class="mr-3 ml-3">Real time consumption</strong><br/>
            <div class="row">
                <div class="col-lg-3 col-sm-6">
                    <div class="mr-3 ml-3 d-flex">
@@ -151,6 +151,35 @@
                    </div>
                </div>
            </div>
+
+            <strong class="mr-3 ml-3 se d-none">Real time production</strong><br/>
+            <div class="row se d-none">
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Hour</div>
+                        <div class="flex-fill text-right">
+                            <span id="eache"></span> kWh
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Day</div>
+                        <div class="flex-fill text-right">
+                            <span id="eacde"></span> kWh
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6">
+                    <div class="mr-3 ml-3 d-flex">
+                        <div>Month</div>
+                        <div class="flex-fill text-right">
+                            <span id="eacme"></span> kWh
+                        </div>
+                    </div>
+                </div>
+                <div class="col-lg-3 col-sm-6"></div>
+            </div>
        </div>
    </div>

--- a/web/json1.json
+++ b/web/json1.json
@@ -1,7 +1,7 @@
 {
    "id" : "%s",
    "name" : "%s",
-    "up" : %lu,
+    "up" : %u,
    "t" : %lu,
    "vcc" : %.3f,
    "rssi": %d,
@@ -13,6 +13,8 @@
        "h" : %.2f,
        "d" : %.1f,
        "t" : %d,
-        "x" : %.2f
+        "x" : %.2f,
+        "he" : %.2f,
+        "de" : %.1f
    }
 }
--- a/web/json2.json
+++ b/web/json2.json
@@ -1,7 +1,7 @@
 {
    "id" : "%s",
    "name" : "%s",
-    "up" : %lu,
+    "up" : %u,
    "t" : %lu,
    "vcc" : %.3f,
    "rssi": %d,
@@ -25,6 +25,8 @@
        "h" : %.2f,
        "d" : %.1f,
        "t" : %d,
-        "x" : %.2f
+        "x" : %.2f,
+        "he" : %.2f,
+        "de" : %.1f
    }
 }
--- a/web/json3.json
+++ b/web/json3.json
@@ -1,7 +1,7 @@
 {
    "id" : "%s",
    "name" : "%s",
-    "up" : %lu,
+    "up" : %u,
    "t" : %lu,
    "vcc" : %.3f,
    "rssi": %d,
@@ -30,6 +30,8 @@
        "h" : %.2f,
        "d" : %.1f,
        "t" : %d,
-        "x" : %.2f
+        "x" : %.2f,
+        "he" : %.2f,
+        "de" : %.1f
    }
 }
--- a/web/json4.json
+++ b/web/json4.json
@@ -1,7 +1,7 @@
 {
    "id" : "%s",
    "name" : "%s",
-    "up" : %lu,
+    "up" : %u,
    "t" : %lu,
    "vcc" : %.3f,
    "rssi": %d,
@@ -11,8 +11,14 @@
        "id" : "%s",
        "type" : "%s",
        "P" : %d,
+        "P1" : %.2f,
+        "P2" : %.2f,
+        "P3" : %.2f,
        "Q" : %d,
        "PO" : %d,
+        "PO1" : %.2f,
+        "PO2" : %.2f,
+        "PO3" : %.2f,
        "QO" : %d,
        "I1" : %.2f,
        "I2" : %.2f,
@@ -34,6 +40,8 @@
        "h" : %.2f,
        "d" : %.1f,
        "t" : %d,
-        "x" : %.2f
+        "x" : %.2f,
+        "he" : %.2f,
+        "de" : %.1f
    }
 }
--- a/web/jsonsys.json
+++ b/web/jsonsys.json
@@ -4,5 +4,6 @@
    "up" : %d,
    "vcc" : %.3f,
    "rssi": %d,
-    "temp": %.2f
+    "temp": %.2f,
+    "version": "%s"
 }
--- a/web/meter.html
+++ b/web/meter.html
@@ -35,6 +35,7 @@
                        <span class="input-group-text">Baud rate</span>
                    </div>
                    <select class="form-control sd" name="b">
+                        <option value="300" {b300}>300</option>
                        <option value="2400" {b2400}>2400</option>
                        <option value="4800" {b4800}>4800</option>
                        <option value="9600" {b9600}>9600</option>
--- a/web/realtime.json
+++ b/web/realtime.json
@@ -0,0 +1,20 @@
+{
+    "max" : %.1f,
+    "peaks" : [ %s ],
+    "threshold" : %d,
+    "hour" : {
+        "use" : %.2f,
+        "cost" : %.2f,
+        "produced" : %.2f
+    },
+    "day" : {
+        "use" : %.2f,
+        "cost" : %.2f,
+        "produced" : %.2f
+    },
+    "month" : {
+        "use" : %.2f,
+        "cost" : %.2f,
+        "produced" : %.2f
+    }
+}
--- a/web/restartwait.html
+++ b/web/restartwait.html
@@ -18,9 +18,10 @@
            </li>
        </ul>
    </header>
-    <div class="my-3 p-3 bg-white rounded shadow">
+    <div class="my-3 p-3 bg-white rounded shadow {rs}">
        Device is rebooting. You will be redirected to the main page when it is available again.
    </div>
+    <div class="alert alert-warning shadow {us}">Firmware upgrade in progress, DO NOT disconnect power from the device. You will be redirected to the main page when firmware upgrade is complete.</div>
 </main>
 <script>
    var tries = 0;
--- a/web/setup.html
+++ b/web/setup.html
@@ -26,6 +26,7 @@
                    <select name="board" class="form-control" required>
                        <option value=""></option>
                        <optgroup label="Custom hardware">
+                            <option value="7" ${config.boardType7}>Pow-U+ (ESP32) from amsleser.no</option>
                            <option value="6" ${config.boardType6}>Pow-P1 from amsleser.no</option>
                            <option value="5" ${config.boardType5}>Pow-K+ (ESP32) from amsleser.no</option>
                            <option value="4" ${config.boardType4}>Pow-U or Pow-K from amsleser.no (GPIO12)</option>
--- a/web/wifi.html
+++ b/web/wifi.html
@@ -37,7 +37,7 @@
            </div>
        </div>
        <div class="row" id="i">
-            <div class="col-xl-3 col-lg-4 form-group">
+            <div class="col-xl-3 col-lg-4 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">IP</span>
@@ -45,7 +45,7 @@
                    <input type="text" name="i" class="form-control sip" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" value="{i}"/>
                </div>
            </div>
-            <div class="col-xl-3 col-lg-4 form-group">
+            <div class="col-xl-3 col-lg-4 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">Netmask</span>
@@ -53,7 +53,7 @@
                    <input type="text" name="sn" class="form-control sip" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" value="{sn}"/>
                </div>
            </div>
-            <div class="col-xl-3 col-lg-4 form-group">
+            <div class="col-xl-3 col-lg-4 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">Gateway</span>
@@ -61,7 +61,7 @@
                    <input type="text" name="g" class="form-control sip" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" value="{g}"/>
                </div>
            </div>
-            <div class="col-xl-4 col-lg-5 form-group">
+            <div class="col-xl-4 col-lg-5 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">DNS 1</span>
@@ -69,7 +69,7 @@
                    <input type="text" name="d1" class="form-control sip" pattern="\d?\d?\d.\d?\d?\d.\d?\d?\d.\d?\d?\d" value="{d1}"/>
                </div>
            </div>
-            <div class="col-xl-4 col-lg-5 form-group">
+            <div class="col-xl-4 col-lg-5 col-md-6 form-group">
                <div class="input-group input-group-sm">
                    <div class="input-group-prepend">
                        <span class="input-group-text">DNS 2</span>
@@ -89,7 +89,21 @@
                    </div>
                </div>
            </div>
-        </div>
+    
+            <div class="col-lg-3 col-md-4 col-sm-6 form-group">
+                <div class="input-group input-group-sm">
+                    <div class="input-group-prepend">
+                        <span class="input-group-text">Power saving</span>
+                    </div>
+                    <select name="z" class="form-control">
+                        <option value="255">Default</option>
+                        <option value="0" {z0}>Off</option>
+                        <option value="1" {z1}>Minimum</option>
+                        <option value="2" {z2}>Maximum</option>
+                    </select>
+                </div>
+            </div>
+    </div>
    </div>
    <hr/>
    <div class="row form-group">
Author	SHA1	Message	Date
Gunnar Skjold	6b0d540f39	Added 300 baud	2022-12-07 11:51:45 +01:00
Gunnar Skjold	33bd3da310	Various fix for realtime values	2022-12-06 15:45:43 +01:00
Gunnar Skjold	a239e1a63d	Fix on special case for Kaifa MA304T3	2022-12-06 08:28:30 +01:00
Gunnar Skjold	1ef5703971	Fixed changing mdns settings	2022-12-01 18:06:19 +01:00
Gunnar Skjold	538de5ea99	Increased range of multipliers	2022-11-08 18:41:31 +01:00
Gunnar Skjold	042e2bcc85	Fixed power saving	2022-11-07 14:57:53 +01:00
Gunnar Skjold	775e5a0881	Support different size numbers in L&G payload	2022-11-01 18:41:43 +01:00
Gunnar Skjold	6c0d5fcc09	Some adjustments to wifi power saving option	2022-10-31 10:09:07 +01:00
Gunnar Skjold	69d8fa9254	Made wifi sleep mode configurable	2022-10-27 19:17:50 +02:00
Gunnar Skjold	c38c305bab	Fixed threshold update via config file	2022-10-21 19:21:55 +02:00
Gunnar Skjold	bfee2a1d64	Fixed month average calculation	2022-10-21 18:43:30 +02:00
Gunnar Skjold	ec7edae9a1	Updated issue templates	2022-10-21 17:43:33 +02:00
Gunnar Skjold	d8e265b7ac	Fixed JSON errors	2022-10-20 20:12:33 +02:00
Gunnar Skjold	1987cddab7	Some more cleanup	2022-10-20 20:11:13 +02:00
Gunnar Skjold	e18be5f97c	Better memory optimization	2022-10-19 20:58:57 +02:00
Gunnar Skjold	537597d6d1	Expanding size of daily and monthly data points	2022-10-19 20:30:29 +02:00
Gunnar Skjold	a89013cec3	Fixed config file upload	2022-10-19 20:24:21 +02:00
Gunnar Skjold	9c7a0cb7ff	Fixed graph error	2022-10-19 19:59:41 +02:00
Gunnar Skjold	ade12199b9	Reclaiming some heap space	2022-10-19 19:54:26 +02:00
Gunnar Skjold	39b68aca51	Removed invalid code	2022-10-18 18:30:26 +02:00
Gunnar Skjold	8ac1e034b1	Reverted WiFi_connect method	2022-10-17 13:09:28 +02:00
Gunnar Skjold	f446dff865	Fixed LED blink delay	2022-10-17 13:09:04 +02:00
Gunnar Skjold	34ebe9601a	Changed blink behaviour	2022-10-16 18:31:11 +02:00
Gunnar Skjold	fa299198fc	Fixed all build warnings	2022-10-13 20:33:59 +02:00
Gunnar Skjold	6d81b0a856	Fixed all build warnings	2022-10-13 20:24:56 +02:00
Gunnar Skjold	dd095da97b	Reduced footprint of GPIO config page	2022-10-13 19:27:25 +02:00
Gunnar Skjold	1b6ce203b7	Better debug output whem receiving unknown data	2022-10-13 17:40:44 +02:00
Gunnar Skjold	2850be4e48	Merge pull request #322 from tbarnekov/extend_power_info Populate Active Import and Export per phase and export to HA	2022-10-12 20:34:09 +02:00
Gunnar Skjold	7eca31de84	Fixed build errors	2022-10-12 20:01:55 +02:00
Gunnar Skjold	a64f960cc7	Added Pow-U+ profile	2022-10-12 19:30:00 +02:00
Gunnar Skjold	ce3a47a7e6	Fixed error blinks and improved WiFi reconnect	2022-10-12 19:25:48 +02:00
Thomas Barnekov	8395e1dc77	Merge remote-tracking branch 'origin/master' into extend_power_info	2022-10-10 17:06:09 +02:00
Thomas Barnekov	39a4761415	Add DOCTYPE to html to fix quirks mode	2022-10-10 16:59:43 +02:00
Gunnar Skjold	867ab9d6c2	Build variable for upgrade URL	2022-10-07 19:35:30 +02:00
Thomas Barnekov	5e03e3d3c2	Move per-phase power consumption and power factor values to new ha4.json	2022-10-07 13:40:29 +02:00
Thomas Barnekov	adb5050621	Merge branch 'gskjold:master' into extend_power_info	2022-10-06 17:31:43 +02:00
Gunnar Skjold	026cd25c8c	Setting modem sleep to max	2022-10-06 17:30:37 +02:00
Gunnar Skjold	06ec97b42a	Make sure we dont use more than 5 peaks if defined higher	2022-10-06 17:20:13 +02:00
Gunnar Skjold	b420a0e6f4	Limit peak count if over 5	2022-10-06 17:12:12 +02:00
Thomas Barnekov	7cd52d5689	Add individual power reading for all phases (include in HA)	2022-10-06 00:35:30 +02:00
Thomas Barnekov	ad78ff3082	Fix implicit cast and non-const char pointer warnings	2022-10-05 22:42:43 +02:00
Gunnar Skjold	fe7be81f1e	Rudimentary detection for L&G data. Probably change this in the future	2022-10-01 12:11:46 +02:00
Gunnar Skjold	7674fc2ad0	Merge branch 'lng-parser'	2022-10-01 11:56:08 +02:00
Gunnar Skjold	d50181c347	Upgrade with custom URL	2022-10-01 11:43:42 +02:00
Gunnar Skjold	8ca771fa5a	Changed "BUS" to "M-BUS"	2022-10-01 09:25:56 +02:00
Gunnar Skjold	7d557b2679	Only show new version when actually new in firmware page. Also be more specific on USB power in upgrade warning	2022-10-01 09:24:07 +02:00
Gunnar Skjold	2f0c912388	Exclude decimals in BUILD_EPOCH flag	2022-10-01 09:22:09 +02:00
Gunnar Skjold	57e6d0fbe3	Modifications to make price sensors work in HA	2022-09-30 19:18:23 +02:00
Gunnar Skjold	e7c25fafda	Prices and realtime HA sensors	2022-09-28 20:13:03 +02:00
Gunnar Skjold	2a4772fe25	Fixed memory leak when reconnecting to MQTT/SSL	2022-09-27 19:59:37 +02:00
Gunnar Skjold	f1f7408208	Added price zones	2022-09-25 11:46:04 +02:00
Gunnar Skjold	feb8e5007b	Fixed MQTT buffer size	2022-09-25 10:50:34 +02:00
Gunnar Skjold	c4af1ee74f	Fixed saving tariff thresholds	2022-09-25 10:50:09 +02:00
Gunnar Skjold	992e1b6121	Net value for active power (L&G)	2022-09-12 08:03:32 +02:00
Gunnar Skjold	9cc7529934	Fixed L&G scaling	2022-08-31 08:19:09 +02:00
Gunnar Skjold	ef8715be6d	Merge branch 'master' into lng-parser	2022-08-31 08:04:24 +02:00
Gunnar Skjold	e232b875fa	Fixed Aidon timestamp	2022-08-23 21:07:06 +02:00
Gunnar Skjold	f18171fecc	Fixed MQTT byte mode	2022-08-23 20:39:47 +02:00
Gunnar Skjold	a3c7a09211	Adding peaks to data.json and MQTT RAW	2022-08-23 20:21:19 +02:00
Gunnar Skjold	a6f3bc3f71	Added version to system json	2022-08-23 19:49:19 +02:00
Gunnar Skjold	44bcd386d1	aggregate obis 1.8.x and 2.8.x for L&G	2022-08-23 09:04:45 +02:00
Gunnar Skjold	01547f9a52	Adjustments to make L&G parser work	2022-08-19 13:26:29 +02:00
Gunnar Skjold	940d38af5c	Merge branch 'master' into lng-parser	2022-08-17 17:33:24 +02:00
Gunnar Skjold	4e451c51e1	HW serial fix for S2	2022-08-17 17:33:06 +02:00
Gunnar Skjold	43def1c311	Fixed Pow-P1 profile	2022-08-17 17:32:53 +02:00
Gunnar Skjold	2978116207	Fixed formatting error in HA payload	2022-08-16 11:55:07 +02:00
Gunnar Skjold	a055465ce0	Untestet L&G data parser	2022-08-16 08:22:43 +02:00
Gunnar Skjold	998b986604	Adjusted modem sleep to a safer value	2022-08-12 20:48:34 +02:00
Gunnar Skjold	7799431405	Remove unused files	2022-08-12 20:42:13 +02:00
Gunnar Skjold	508c14a671	Fixed modem sleep on S2 and fixed default wifi power	2022-08-12 09:02:04 +02:00
Gunnar Skjold	4a7ef87269	Fixed realtime day calculation	2022-08-10 17:43:51 +02:00
Gunnar Skjold	3a4fc707b0	Show real time production	2022-08-10 10:53:16 +02:00
Gunnar Skjold	5d2e320b07	Fixed export labels on graph	2022-08-10 10:28:31 +02:00
Gunnar Skjold	d12613b91a	Trying to fix HA accumulated	2022-08-10 10:01:24 +02:00
Gunnar Skjold	e6a02f34ab	USB power warning when upgrading	2022-08-10 09:31:50 +02:00
Gunnar Skjold	0b2ffbfd77	Revert to arduino 2.0.3 because of #298	2022-08-10 09:30:31 +02:00
Gunnar Skjold	cab6c54ed9	Correct Vcc GPIO for Pow-K+	2022-08-01 12:48:31 +02:00
Gunnar Skjold	313024f273	Support OTA upgrade from ESP8266	2022-08-01 08:17:24 +02:00