diff --git a/src/App.svelte b/src/App.svelte
index c345dcb..7747626 100644
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -29,11 +29,11 @@
//****************************************************constants section*********************************************************/
//******************************************************************************************************************************/
- let version = 408;
+ let version = 410;
let debug = true;
let LOG_MAX_MESSAGES = 100;
let reconnectTimeout = 20000;
- let rebootingTimeout = 15000;
+ let rebootingTimeout = 18000;
let updatingTimeout = 80000;
let opened = false;
let preventMove = false;
@@ -48,6 +48,9 @@
let showInput = false;
let showModalFlag = false;
+ let rebootingUpdatingInProgress = false;
+ const myTimeout = undefined;
+
let additionalParams = false;
//dashboard
@@ -119,7 +122,7 @@
let selectedDeviceData = undefined;
let selectedWs = 0;
- let flag = true;
+ let firstTime = true;
let newDevice = {};
let coreMessages = [];
@@ -669,18 +672,22 @@
function wsTestMsgTask() {
setTimeout(wsTestMsgTask, reconnectTimeout);
- if (debug) console.log("[i]", "----timer tick----");
- if (!flag) {
- deviceList.forEach((device) => {
- if (!getDeviceStatus(device.ws)) {
- wsConnect(device.ws);
- wsEventAdd(device.ws);
- } else {
- wsSendMsg(device.ws, "/tst|");
- }
- });
+ if (!rebootingUpdatingInProgress) {
+ if (debug) console.log("[i]", "----timer tick----");
+ if (!firstTime) {
+ deviceList.forEach((device) => {
+ if (!getDeviceStatus(device.ws)) {
+ wsConnect(device.ws);
+ wsEventAdd(device.ws);
+ } else {
+ wsSendMsg(device.ws, "/tst|");
+ }
+ });
+ }
+ firstTime = false;
+ } else {
+ if (debug) console.log("[i]", "----timer skipped----");
}
- flag = false;
}
function wsSendMsg(ws, msg) {
@@ -960,13 +967,10 @@
wsSendMsg(selectedWs, "/scan|");
}
- let rebootingInProgress = false;
- const myTimeout = undefined;
-
function rebootEsp() {
if (debug) console.log("[i]", "reboot...");
wsSendMsg(selectedWs, "/reboot|");
- rebootingInProgress = true;
+ rebootingUpdatingInProgress = true;
myTimeout = setTimeout(rebootingTask, rebootingTimeout);
}
@@ -974,7 +978,7 @@
clearTimeout(myTimeout);
clearData();
connectToAllDevices();
- rebootingInProgress = false;
+ rebootingUpdatingInProgress = false;
}
function cancelAlarm(alarmKey) {
@@ -1020,7 +1024,7 @@
wsSendMsg(selectedWs, '/rorre|{"chver":' + choosingVersion + "}");
//начнем обновление
wsSendMsg(selectedWs, "/update|");
- rebootingInProgress = true;
+ rebootingUpdatingInProgress = true;
myTimeout = setTimeout(rebootingTask, updatingTimeout);
} else {
console.log("update canceled");
@@ -1036,7 +1040,7 @@
- {#if rebootingInProgress}
+ {#if rebootingUpdatingInProgress}
{/if}