From b3c4c273a6bc537b09849a7c48a76b69255e8ddb Mon Sep 17 00:00:00 2001 From: Vladislav Ostapov Date: Thu, 23 Jan 2025 16:41:35 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B8=D0=BA=D1=80=D0=BE=D1=84=D0=B8?= =?UTF-8?q?=D0=BA=D1=81=D1=8B=20=D0=BC=D0=BE=D0=B4=D0=BA=D0=BE=D0=B4=D0=B0?= =?UTF-8?q?=20=D0=B2=20=D1=81=D1=82=D0=B0=D1=82=D0=B8=D1=81=D1=82=D0=B8?= =?UTF-8?q?=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- devtool.py | 2 +- front-generator/template/common/monitoring-methods.js.j2 | 5 ++++- static/main-scpc.html | 5 ++++- static/main-tdma.html | 5 ++++- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/devtool.py b/devtool.py index bf02aad..e7931e9 100755 --- a/devtool.py +++ b/devtool.py @@ -50,7 +50,7 @@ def set_logging(base_url, value): if __name__ == '__main__': if len(sys.argv) < 3: - print(f"Usage: {sys.argv[0]} http(s)://terminal-api logging on|off") + print(f"Usage: {sys.argv[0]} http(s)://terminal-url logging on|off") print(f" set_dma_debug ") print(f" get_dma_debug ") exit(1) diff --git a/front-generator/template/common/monitoring-methods.js.j2 b/front-generator/template/common/monitoring-methods.js.j2 index b33da4b..5c886ee 100644 --- a/front-generator/template/common/monitoring-methods.js.j2 +++ b/front-generator/template/common/monitoring-methods.js.j2 @@ -8,9 +8,12 @@ "16APSK 2/3", "16APSK 3/4", "16APSK 4/5", "16APSK 5/6", "16APSK 8/9", "16APSK 9/10", "32APSK 3/4", "32APSK 4/5", "32APSK 5/6", "32APSK 8/9", "32APSK 9/10", ] - if (typeof modcod != "number" || modcod < 0 || modcod >= modcod.length) { + if (typeof modcod != "number") { return "?"; } + if (modcod < 0 || modcod >= modcods.length) { + return `? (${modcod})` + } return modcods[modcod] } diff --git a/static/main-scpc.html b/static/main-scpc.html index 0181650..bad893e 100644 --- a/static/main-scpc.html +++ b/static/main-scpc.html @@ -956,9 +956,12 @@ "16APSK 2/3", "16APSK 3/4", "16APSK 4/5", "16APSK 5/6", "16APSK 8/9", "16APSK 9/10", "32APSK 3/4", "32APSK 4/5", "32APSK 5/6", "32APSK 8/9", "32APSK 9/10", ] - if (typeof modcod != "number" || modcod < 0 || modcod >= modcod.length) { + if (typeof modcod != "number") { return "?"; } + if (modcod < 0 || modcod >= modcods.length) { + return `? (${modcod})` + } return modcods[modcod] } diff --git a/static/main-tdma.html b/static/main-tdma.html index 07099c4..8b44efa 100644 --- a/static/main-tdma.html +++ b/static/main-tdma.html @@ -520,9 +520,12 @@ "16APSK 2/3", "16APSK 3/4", "16APSK 4/5", "16APSK 5/6", "16APSK 8/9", "16APSK 9/10", "32APSK 3/4", "32APSK 4/5", "32APSK 5/6", "32APSK 8/9", "32APSK 9/10", ] - if (typeof modcod != "number" || modcod < 0 || modcod >= modcod.length) { + if (typeof modcod != "number") { return "?"; } + if (modcod < 0 || modcod >= modcods.length) { + return `? (${modcod})` + } return modcods[modcod] }