Fixed some minuor issues

UtilitechAS · Dec 10, 2023 · c43c073 · c43c073
1 parent 91958f5
commit c43c073
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/lib/AmsConfiguration/include/AmsConfiguration.h b/lib/AmsConfiguration/include/AmsConfiguration.h
@@ -21,15 +21,15 @@
 #define CONFIG_METER_START 296
 #define CONFIG_GPIO_START 368
 #define CONFIG_PRICE_START 400
-#define CONFIG_ENERGYACCOUNTING_START 464
-#define CONFIG_WEB_START 488
-#define CONFIG_DEBUG_START 624
-#define CONFIG_NTP_START 632
-#define CONFIG_MQTT_START 760
-#define CONFIG_DOMOTICZ_START 1528
-#define CONFIG_HA_START 1544
-#define CONFIG_UI_START 1712
-#define CONFIG_CLOUD_START 1728
+#define CONFIG_ENERGYACCOUNTING_START 472
+#define CONFIG_WEB_START 496
+#define CONFIG_DEBUG_START 632
+#define CONFIG_NTP_START 640
+#define CONFIG_MQTT_START 768
+#define CONFIG_DOMOTICZ_START 1536
+#define CONFIG_HA_START 1552
+#define CONFIG_UI_START 1720
+#define CONFIG_CLOUD_START 1736
 
 #define CONFIG_METER_START_103 32
 #define CONFIG_UPGRADE_INFO_START_103 216

diff --git a/lib/SvelteUi/app/dist/index.js b/lib/SvelteUi/app/dist/index.js
diff --git a/lib/SvelteUi/app/src/lib/DataStores.js b/lib/SvelteUi/app/src/lib/DataStores.js
@@ -33,7 +33,10 @@ let sysinfo = {
         f: null,
         t: null
     },
-    trying: null
+    trying: null,
+    if: {
+        eth: false
+    }
 };
 export const sysinfoStore = writable(sysinfo);
 export async function getSysinfo() {

diff --git a/lib/SvelteUi/app/src/lib/VendorPanel.svelte b/lib/SvelteUi/app/src/lib/VendorPanel.svelte
@@ -5,7 +5,7 @@
     import Mask from './Mask.svelte'
     import { navigate } from 'svelte-navigator';
 
-    export let sysinfo = {}
+    export let sysinfo = {};
 
     let loadingOrSaving = false;
     async function handleSubmit(e) {
@@ -27,6 +27,8 @@
         sysinfoStore.update(s => {
             s.vndcfg = res.success;
             s.booting = res.reboot;
+            s.if.eth = s.boardType > 240 && s.boardType < 250;
+
             return s;
         });
         navigate(sysinfo.usrcfg ? "/" : "/setup");

diff --git a/lib/SvelteUi/src/AmsWebServer.cpp b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -1229,6 +1229,7 @@ void AmsWebServer::handleSave() {
 		#endif
 		if(success) {
 			config->setGpioConfig(*gpioConfig);
+			config->setMeterConfig(meterConfig);
 
 			SystemConfig sys;
 			config->getSystemConfig(sys);