From 28a9d6746b5e7d4e69d8dd2ad7fc87262d8357ba Mon Sep 17 00:00:00 2001
From: Gunnar Skjold <gunnar.skjold@gmail.com>
Date: Wed, 14 Dec 2022 18:15:46 +0100
Subject: [PATCH] Fixed discover when setting different hostname in setup

---
 lib/SvelteUi/app/src/App.svelte            |  2 +-
 lib/SvelteUi/app/src/lib/Header.svelte     |  2 +-
 lib/SvelteUi/app/src/lib/SetupPanel.svelte | 10 ++++++----
 lib/SvelteUi/src/AmsWebServer.cpp          |  4 ++--
 src/AmsToMqttBridge.ino                    |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/lib/SvelteUi/app/src/App.svelte b/lib/SvelteUi/app/src/App.svelte
index 785b1688..63d4d19f 100644
--- a/lib/SvelteUi/app/src/App.svelte
+++ b/lib/SvelteUi/app/src/App.svelte
@@ -64,6 +64,6 @@
   {#if sysinfo.upgrading}
   <Mask active=true message="Device is upgrading, please wait"/>
   {:else if sysinfo.booting}
-  <Mask active=true message="Device is booting, please wait"/>
+  <Mask active=true message={sysinfo.hostname}/>
   {/if}
 </div>
diff --git a/lib/SvelteUi/app/src/lib/Header.svelte b/lib/SvelteUi/app/src/lib/Header.svelte
index 85466def..1a701c58 100644
--- a/lib/SvelteUi/app/src/lib/Header.svelte
+++ b/lib/SvelteUi/app/src/lib/Header.svelte
@@ -58,7 +58,7 @@
           <Badge title="WiFi" text={data.r ? data.r.toFixed(0)+"dBm" : "WiFi"} color={sysinfo.booting ? 'gray' : data.wm === 1 ? 'green' : data.wm === 2 ? 'yellow' : data.wm === 3 ? 'red' : 'gray'}/>
           <Badge title="MQTT" text="MQTT" color={sysinfo.booting ? 'gray' : data.mm === 1 ? 'green' : data.mm === 2 ? 'yellow' : data.mm === 3 ? 'red' : 'gray'}/>
         </div>
-        {#if data.he < 0}
+        {#if data.he < 0 || data.he > 0}
         <div class="bd-red">{ 'HAN: ' + hanError(data.he) }</div>
         {/if}
         {#if data.me < 0}
diff --git a/lib/SvelteUi/app/src/lib/SetupPanel.svelte b/lib/SvelteUi/app/src/lib/SetupPanel.svelte
index dde0ed40..16984e66 100644
--- a/lib/SvelteUi/app/src/lib/SetupPanel.svelte
+++ b/lib/SvelteUi/app/src/lib/SetupPanel.svelte
@@ -41,11 +41,12 @@
 
     async function handleSubmit(e) {
         loadingOrSaving = true;
-        const formData = new FormData(e.target)
-        const data = new URLSearchParams()
+        const formData = new FormData(e.target);
+        let hostname = sysinfo.hostname;
+        const data = new URLSearchParams();
         for (let field of formData) {
-            const [key, value] = field
-            data.append(key, value)
+            const [key, value] = field;
+            if(key == 'sh') hostname = value;
         }
 
         const response = await fetch('/save', {
@@ -56,6 +57,7 @@
         loadingOrSaving = false;
 
         sysinfoStore.update(s => {
+            s.hostname = hostname;
             s.usrcfg = res.success;
             s.booting = res.reboot;
             setTimeout(scanForDevice, 5000);
diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp
index ad410dba..47a17e18 100644
--- a/lib/SvelteUi/src/AmsWebServer.cpp
+++ b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -311,9 +311,9 @@ void AmsWebServer::dataJson() {
 
 
 	uint8_t hanStatus;
-	if(meterState->getLastError() < 0) {
+	if(meterState->getLastError() != 0) {
 		hanStatus = 3;
-	} else if((meterConfig->baud == 0 || meterState->getLastUpdateMillis() == 0) && millis < 15000) {
+	} else if((meterConfig->baud == 0 || meterState->getLastUpdateMillis() == 0) && millis < 30000) {
 		hanStatus = 0;
 	} else if(millis - meterState->getLastUpdateMillis() < 15000) {
 		hanStatus = 1;
diff --git a/src/AmsToMqttBridge.ino b/src/AmsToMqttBridge.ino
index 74f40306..dcbc65fb 100644
--- a/src/AmsToMqttBridge.ino
+++ b/src/AmsToMqttBridge.ino
@@ -233,7 +233,7 @@ void setup() {
 				break;
 		}
 		#if defined(ESP32)
-			Serial.begin(meterConfig.baud == 0 ? 2400 : meterConfig.baud: , serialConfig, -1, -1, meterConfig.invert);
+			Serial.begin(meterConfig.baud == 0 ? 2400 : meterConfig.baud, serialConfig, -1, -1, meterConfig.invert);
 		#else
 			Serial.begin(meterConfig.baud == 0 ? 2400 : meterConfig.baud, serialConfig, SERIAL_FULL, 1, meterConfig.invert);
 		#endif