Merge branch 'master' into dev-v2.1.0

src/AmsToMqttBridge.ino

@@ -562,8 +562,10 @@ void setupHanPort(uint8_t pin, uint32_t baud, uint8_t parityOrdinal, bool invert
 
 		#if 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)
@@ -708,7 +710,6 @@ bool readHanPort() {
 		while(hanSerial->available() && pos == HDLC_FRAME_INCOMPLETE) {
 			buf[len++] = hanSerial->read();
 			pos = HDLC_validate((uint8_t *) buf, len, hc, &timestamp);
-			delay(1);
 		}
 		if(len > 0) {
 			if(len >= BUF_SIZE) {
@@ -980,7 +981,9 @@ void WiFi_connect() {
 			} else if(dns1.toString().isEmpty()) {
 				dns2.fromString("208.67.220.220"); // Add OpenDNS as second by default if nothing is configured
 			}
-			WiFi.config(ip, gw, sn, dns1, dns2);
+			if(!WiFi.config(ip, gw, sn, dns1, dns2)) {
+				debugE("Static IP configuration is invalid, not using");
+			}
 		} else {
 			#if defined(ESP32)
 			// This trick does not work anymore...

src/entsoe/EntsoeApi.cpp

@@ -13,7 +13,7 @@ EntsoeApi::EntsoeApi(RemoteDebug* Debug) {
 
     client.setInsecure();
     https.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
-    https.setTimeout(5000);
+    https.setTimeout(20000);
 
     // Entso-E uses CET/CEST
     TimeChangeRule CEST = {"CEST", Last, Sun, Mar, 2, 120};
@@ -270,7 +270,9 @@ float EntsoeApi::getCurrencyMultiplier(const char* from, const char* to) {
         return 1.00;
 
     uint64_t now = millis64();
-    if(lastCurrencyFetch < midnightMillis) {
+    if(now > lastCurrencyFetch && (now - lastCurrencyFetch) < 900000) {
+        lastCurrencyFetch = now;
+        
         char url[256];
         DnbCurrParser p;
 

src/web/AmsWebServer.cpp

@@ -458,9 +458,6 @@ void AmsWebServer::configMeterHtml() {
 		html.replace("{d" + String(i) + "}", meterConfig->distributionSystem == i ? "selected"  : "");
 	}
 	html.replace("{f}", String(meterConfig->mainFuse));
-	for(int i = 0; i<64; i++) {
-		html.replace("{f" + String(i) + "}", meterConfig->mainFuse == i ? "selected"  : "");
-	}
 	html.replace("{p}", String(meterConfig->productionCapacity));
 
 	if(meterConfig->encryptionKey[0] != 0x00) {
@@ -1135,6 +1132,7 @@ void AmsWebServer::handleSave() {
 		meterConfig->distributionSystem = server.arg("d").toInt();
 		meterConfig->mainFuse = server.arg("f").toInt();
 		meterConfig->productionCapacity = server.arg("p").toInt();
+		maxPwr = 0;
 
 		String encryptionKeyHex = server.arg("e");
 		if(!encryptionKeyHex.isEmpty()) {
@@ -1609,6 +1607,7 @@ void AmsWebServer::firmwareDownload() {
 		printI("Downloading firmware...");
 		HTTPClient httpClient;
 		httpClient.setFollowRedirects(HTTPC_STRICT_FOLLOW_REDIRECTS);
+		httpClient.setTimeout(20000);
 		httpClient.addHeader("User-Agent", "ams2mqtt/" + String(VERSION));
 
 #if defined(ESP8266)
@@ -1627,6 +1626,13 @@ void AmsWebServer::firmwareDownload() {
 			if(status == HTTP_CODE_OK) {
 				printD("Received OK from server");
 				if(LittleFS.begin()) {
+					#if defined(ESP32)
+						esp_task_wdt_delete(NULL);
+						esp_task_wdt_deinit();
+					#elif defined(ESP8266)
+						ESP.wdtDisable();
+					#endif
+
 					printI("Downloading firmware to LittleFS");
 					file = LittleFS.open(FILE_FIRMWARE, "w");
 					int len = httpClient.writeToStream(&file);

web/meter.html

@@ -61,7 +61,7 @@
             </div>
         </div>
         <div class="row">
-            <div class="col-xl-3 col-lg-4 col-md-5 col-sm-6">
+            <div class="col-xl-3 col-lg-4 col-md-5 col-sm-7">
                 <div class="m-2 input-group input-group-sm">
                     <div class="input-group-prepend">
                         <span class="input-group-text">Distribution system</span>
@@ -73,22 +73,15 @@
                     </select>
                 </div>
             </div>
-            <div class="col-xl-2 col-md-3 col-sm-5">
+            <div class="col-lg-3 col-md-4 col-sm-5">
                 <div class="m-2 input-group input-group-sm">
                     <div class="input-group-prepend">
                         <span class="input-group-text">Main fuse</span>
                     </div>
-                    <select class="form-control" name="f">
-                        <option value="0" {f0}></option>
-                        <option value="16" {f16}>16A</option>
-                        <option value="20" {f20}>20A</option>
-                        <option value="25" {f25}>25A</option>
-                        <option value="32" {f32}>32A</option>
-                        <option value="35" {f35}>35A</option>
-                        <option value="40" {f40}>40A</option>
-                        <option value="50" {f50}>50A</option>
-                        <option value="63" {f63}>63A</option>
-                    </select>
+                    <input class="form-control text-right" name="f" type="number" min="5" max="255" step="1" value="{f}"/>
+                    <div class="input-group-append">
+                        <span class="input-group-text">A</span>
+                    </div>
                 </div>
             </div>
             <div class="col-xl-3 col-lg-4 col-md-5 col-sm-7">
@@ -96,7 +89,7 @@
                     <div class="input-group-prepend">
                         <span class="input-group-text">Production capacity</span>
                     </div>
-                    <input class="form-control" name="p" type="number" min="0" max="50" value="{p}"/>
+                    <input class="form-control text-right" name="p" type="number" min="0" max="255" step="1" value="{p}"/>
                     <div class="input-group-append">
                         <span class="input-group-text">kWp</span>
                     </div>