From 71ff69529034791099601073a336a4125edcc60f Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 27 Feb 2023 10:51:00 +0100 Subject: [PATCH 1/3] update packages --- interface/package.json | 2 +- interface/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/interface/package.json b/interface/package.json index 44e53d3c3..b3a71dacd 100644 --- a/interface/package.json +++ b/interface/package.json @@ -27,7 +27,7 @@ "@remix-run/router": "^1.3.2", "@table-library/react-table-library": "4.0.28", "@types/lodash-es": "^4.17.6", - "@types/node": "^18.14.1", + "@types/node": "^18.14.2", "@types/react": "^18.0.28", "@types/react-dom": "^18.0.11", "@types/react-router-dom": "^5.3.3", diff --git a/interface/yarn.lock b/interface/yarn.lock index 3c6ef38ae..89da5d15a 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -1237,10 +1237,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^18.14.1": - version: 18.14.1 - resolution: "@types/node@npm:18.14.1" - checksum: 58556bbdb0050e44a4934742c1da2530812782c06d266a758e669e44c5aa196166c5fce45fdb03f016876717e3840478b3220129bb77367f979607564047f0a3 +"@types/node@npm:^18.14.2": + version: 18.14.2 + resolution: "@types/node@npm:18.14.2" + checksum: 53c07e721f6ae33de71306f6a0b75dae6066a4f55bd5484c93bd59ff25f0c5f004ceafeef509a4d0cb9e24a247efc34d50489bcc1b05a53ecc68e2fc088e65cb languageName: node linkType: hard @@ -1487,7 +1487,7 @@ __metadata: "@table-library/react-table-library": 4.0.28 "@types/lodash-es": ^4.17.6 "@types/mime-types": ^2 - "@types/node": ^18.14.1 + "@types/node": ^18.14.2 "@types/react": ^18.0.28 "@types/react-dom": ^18.0.11 "@types/react-router-dom": ^5.3.3 From 23cfdb95f2355ed7b1dbe89e162b8eed7d7514b9 Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 27 Feb 2023 10:51:33 +0100 Subject: [PATCH 2/3] update package --- mock-api/yarn.lock | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/mock-api/yarn.lock b/mock-api/yarn.lock index 7ece4636a..b17d7c30e 100644 --- a/mock-api/yarn.lock +++ b/mock-api/yarn.lock @@ -117,9 +117,7 @@ __metadata: "@msgpack/msgpack": ^2.8.0 compression: ^1.7.4 express: ^4.18.2 - express-sse: ^0.5.3 nodemon: ^2.0.20 - ws: ^8.12.1 languageName: unknown linkType: soft @@ -485,13 +483,6 @@ __metadata: languageName: node linkType: hard -"express-sse@npm:^0.5.3": - version: 0.5.3 - resolution: "express-sse@npm:0.5.3" - checksum: 81ecc2645930a0f53e3ffccd425653c570210ae214e7e96cba3b6d258d7d07e2f74f743532e65e02637bf9801f3c9ded59705a72001f744c65415771c7c2bc1d - languageName: node - linkType: hard - "express@npm:^4.18.2": version: 4.18.2 resolution: "express@npm:4.18.2" @@ -1696,21 +1687,6 @@ __metadata: languageName: node linkType: hard -"ws@npm:^8.12.1": - version: 8.12.1 - resolution: "ws@npm:8.12.1" - peerDependencies: - bufferutil: ^4.0.1 - utf-8-validate: ">=5.0.2" - peerDependenciesMeta: - bufferutil: - optional: true - utf-8-validate: - optional: true - checksum: 97301c1c4d838fc81bd413f370f75c12aabe44527b31323b761eab3043a9ecb7e32ffd668548382c9a6a5ad3a1c3a9249608e8338e6b939f2f9540f1e21970b5 - languageName: node - linkType: hard - "yallist@npm:^4.0.0": version: 4.0.0 resolution: "yallist@npm:4.0.0" From 9ed32307d3c003560ab681daeb49595056c205cd Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 27 Feb 2023 10:51:41 +0100 Subject: [PATCH 3/3] fix lint warnings --- src/web/WebSchedulerService.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/web/WebSchedulerService.cpp b/src/web/WebSchedulerService.cpp index 52df936e2..2b0ab7007 100644 --- a/src/web/WebSchedulerService.cpp +++ b/src/web/WebSchedulerService.cpp @@ -100,11 +100,11 @@ void WebSchedulerService::loop() { return; } - time_t now = time(nullptr); - tm * tm = localtime(&now); - static int last_min = 100; // some high marker - auto uptime_seconds = uuid::get_uptime_sec(); // sync to EMS-ESP clock - auto uptime_min = uptime_seconds / 60; // sync to EMS-ESP clock + time_t now = time(nullptr); + tm * tm = localtime(&now); + static uint32_t last_min = 100; // some high marker + uint32_t uptime_seconds = uuid::get_uptime_sec(); // sync to EMS-ESP clock + uint32_t uptime_min = uptime_seconds / 60; // sync to EMS-ESP clock // check if we're on the minute - taking the EMS-ESP uptime // with the exception of allowing the first pass (on boot) through