From 9d6099b6d8f3c5d50818255ce5eb804399c93248 Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Wed, 9 Dec 2020 17:38:37 +0100 Subject: [PATCH] FST4[W] frontend work --- htdocs/css/openwebrx.css | 10 ++++++++-- htdocs/lib/DemodulatorPanel.js | 2 +- htdocs/openwebrx.js | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css index def2470..07de366 100644 --- a/htdocs/css/openwebrx.css +++ b/htdocs/css/openwebrx.css @@ -1146,6 +1146,8 @@ img.openwebrx-mirror-img #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-content-container, #openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-content-container, #openwebrx-panel-digimodes[data-mode="js8"] #openwebrx-digimode-content-container, +#openwebrx-panel-digimodes[data-mode="fst4"] #openwebrx-digimode-content-container, +#openwebrx-panel-digimodes[data-mode="fst4w"] #openwebrx-digimode-content-container, #openwebrx-panel-digimodes[data-mode="ft8"] #openwebrx-digimode-select-channel, #openwebrx-panel-digimodes[data-mode="wspr"] #openwebrx-digimode-select-channel, #openwebrx-panel-digimodes[data-mode="jt65"] #openwebrx-digimode-select-channel, @@ -1153,7 +1155,9 @@ img.openwebrx-mirror-img #openwebrx-panel-digimodes[data-mode="ft4"] #openwebrx-digimode-select-channel, #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-select-channel, #openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-select-channel, -#openwebrx-panel-digimodes[data-mode="js8"] #openwebrx-digimode-select-channel +#openwebrx-panel-digimodes[data-mode="js8"] #openwebrx-digimode-select-channel, +#openwebrx-panel-digimodes[data-mode="fst4"] #openwebrx-digimode-select-channel, +#openwebrx-panel-digimodes[data-mode="fst4w"] #openwebrx-digimode-select-channel { display: none; } @@ -1165,7 +1169,9 @@ img.openwebrx-mirror-img #openwebrx-panel-digimodes[data-mode="ft4"] #openwebrx-digimode-canvas-container, #openwebrx-panel-digimodes[data-mode="packet"] #openwebrx-digimode-canvas-container, #openwebrx-panel-digimodes[data-mode="pocsag"] #openwebrx-digimode-canvas-container, -#openwebrx-panel-digimodes[data-mode="js8"] #openwebrx-digimode-canvas-container +#openwebrx-panel-digimodes[data-mode="js8"] #openwebrx-digimode-canvas-container, +#openwebrx-panel-digimodes[data-mode="fst4"] #openwebrx-digimode-canvas-container, +#openwebrx-panel-digimodes[data-mode="fst4w"] #openwebrx-digimode-canvas-container { height: 200px; margin: -10px; diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js index 2a770bb..169e427 100644 --- a/htdocs/lib/DemodulatorPanel.js +++ b/htdocs/lib/DemodulatorPanel.js @@ -155,7 +155,7 @@ DemodulatorPanel.prototype.updatePanels = function() { var modulation = this.getDemodulator().get_secondary_demod(); $('#openwebrx-panel-digimodes').attr('data-mode', modulation); toggle_panel("openwebrx-panel-digimodes", !!modulation); - toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4'].indexOf(modulation) >= 0); + toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4', 'fst4', 'fst4w'].indexOf(modulation) >= 0); toggle_panel("openwebrx-panel-js8-message", modulation == "js8"); toggle_panel("openwebrx-panel-packet-message", modulation === "packet"); toggle_panel("openwebrx-panel-pocsag-message", modulation === "pocsag"); diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js index af88f2f..9c0b627 100644 --- a/htdocs/openwebrx.js +++ b/htdocs/openwebrx.js @@ -953,7 +953,7 @@ function update_wsjt_panel(msg) { }; var linkedmsg = msg['msg']; var matches; - if (['FT8', 'JT65', 'JT9', 'FT4'].indexOf(msg['mode']) >= 0) { + if (['FT8', 'JT65', 'JT9', 'FT4', 'FST4', 'FST4W'].indexOf(msg['mode']) >= 0) { matches = linkedmsg.match(/(.*\s[A-Z0-9]+\s)([A-R]{2}[0-9]{2})$/); if (matches && matches[2] !== 'RR73') { linkedmsg = html_escape(matches[1]) + '' + matches[2] + '';