github.com/UtilitechAS.amsreader-firmware
1
0
Fork 0
mirror of https://github.com/UtilitechAS/amsreader-firmware.git synced 2026-01-17 17:03:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed discover when setting different hostname in setup

Browse Source
This commit is contained in:
Gunnar Skjold 2022-12-14 18:15:46 +01:00
parent 7ea4fe881c
commit 28a9d6746b
5 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/SvelteUi/app/src/App.svelte
View File

@ -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>

2
lib/SvelteUi/app/src/lib/Header.svelte
View File

@ -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}

10
lib/SvelteUi/app/src/lib/SetupPanel.svelte
View File

@ -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);

4
lib/SvelteUi/src/AmsWebServer.cpp
View File

@ -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;

2
src/AmsToMqttBridge.ino
View File

@ -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