diff --git a/src/App.svelte b/src/App.svelte index 938639d..a5a6ec6 100644 --- a/src/App.svelte +++ b/src/App.svelte @@ -39,12 +39,12 @@ let opened = false; let preventMove = false; const blobDebug = false; - const devMode = true; + const devMode = false; //****************************************************variable section**********************************************************/ //******************************************************************************************************************************/ let myip = document.location.hostname; - if (devMode) myip = "192.168.88.234"; + if (devMode) myip = "192.168.88.248"; //Flags let firstDevListRequest = true; @@ -77,7 +77,7 @@ let itemsJson = []; let widgetsJson = []; let configJson = []; - let scenarioTxt = ""; + let scenarioTxt = " "; let settingsJson = {}; let ssidJson = {}; let errorsJson = {}; @@ -438,7 +438,6 @@ if (blobDebug) console.log("[e]", "devParams parse error"); } } - if (header === "charta") { let txt = await getPayloadAsTxt(blob, size); txt = "[" + txt.substring(0, txt.length - 1) + "]"; @@ -469,7 +468,6 @@ if (blobDebug) console.log("[✔]", "chartJson: ", finalDataJson); apdateWidgetByArray(finalDataJson); } - if (header === "chartb") { let out = {}; if (await getPayloadAsJson(blob, size, out)) { @@ -545,13 +543,11 @@ pageReady.system = true; } - // if (currentPageName === "/dev|" && parsed.errorsJson && parsed.settingsJson && configJsonPacket.isParced && itemsJsonPacket.isParced) { - // clearParcedFlags(); - // configJson = configJsonPacket.getData; - // itemsJson = itemsJsonPacket.getData; - // if (debug) console.log("✔✔", "dev page parced"); - // pageReady.dev = true; - // } + if (currentPageName === "/dev|" && parsed.errorsJson && parsed.settingsJson && parsed.configJson && parsed.itemsJson) { + clearParcedFlags(); + if (debug) console.log("✔✔", "dev page parced"); + pageReady.dev = true; + } } function handleDeviseList() { @@ -819,7 +815,7 @@ itemsJson = []; widgetsJson = []; configJson = []; - scenarioTxt = "-"; + scenarioTxt = " "; settingsJson = {}; //ssidJson = {}; errorsJson = {}; @@ -1282,7 +1278,7 @@ addDevInList()} newDevice={newDevice} sendToAllDevices={(msg) => sendToAllDevices(msg)} /> - saveSett()} cleanLogs={() => cleanLogs()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} versionsList={versionsList} bind:choosingVersion startUpdate={() => startUpdate()} coreMessages={coreMessages} /> + saveSett()} rebootEsp={() => rebootEsp()} cleanLogs={() => cleanLogs()} cancelAlarm={(alarmKey) => cancelAlarm(alarmKey)} versionsList={versionsList} bind:choosingVersion startUpdate={() => startUpdate()} coreMessages={coreMessages} /> {#if devMode} diff --git a/src/pages/System.svelte b/src/pages/System.svelte index 3270e7e..0c8a1d9 100644 --- a/src/pages/System.svelte +++ b/src/pages/System.svelte @@ -112,10 +112,18 @@ 1: { descr: "Ошибка json", color: "text-red-500", - txt: "Ошибка чтения json файла с виджетами", + txt: "Ошибка чтения json файла с виджетами при отправки в mqtt", cancel: true, }, }, + tme1: { + 1: { + descr: "Ошибка времени", + color: "text-red-500", + txt: "Ошибка синхронизации времени с NTP сервером", + cancel: false, + }, + }, }; import Card from "../components/Card.svelte"; @@ -123,8 +131,6 @@ export let errorsJson; - //export let rebootEsp = () => {}; - export let versionsList; export let choosingVersion; export let coreMessages; @@ -133,11 +139,14 @@ export let startUpdate = () => {}; export let saveSett = () => {}; export let cleanLogs = () => {}; + export let rebootEsp = () => {}; export let show; export let paramsBeenChanged = false; + let reboot = false; + export let cancelAlarm = (alarmKey) => {}; @@ -317,10 +326,48 @@ + +
+
+

i2c SCL gpio

+
+
+ (reboot = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" type="number" /> +
+
+
+
+

i2c SDA gpio

+
+
+ (reboot = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" type="number" /> +
+
+
+
+

i2c частота

+
+
+ (reboot = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" type="number" /> +
+
+ +
+
+

Группа устройств

+
+
+ (reboot = true)} class="ipt-rnd h-7 text-center focus:border-indigo-500" /> +
+
+ {#if paramsBeenChanged} {/if} + {#if reboot} + + {/if}