From c16de474c6ab39389575f98b303127fbac47404f Mon Sep 17 00:00:00 2001 From: Jakob Ketterl Date: Tue, 14 Feb 2023 18:45:51 +0100 Subject: [PATCH] route msk144 data to the wsjt message panel --- htdocs/css/openwebrx.css | 7 +++++-- htdocs/lib/DemodulatorPanel.js | 4 ++-- htdocs/lib/MessagePanel.js | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css index cbbacdb..4967861 100644 --- a/htdocs/css/openwebrx.css +++ b/htdocs/css/openwebrx.css @@ -1265,6 +1265,7 @@ img.openwebrx-mirror-img #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="q65"] #openwebrx-digimode-content-container, +#openwebrx-panel-digimodes[data-mode="msk144"] #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, @@ -1275,7 +1276,8 @@ img.openwebrx-mirror-img #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, -#openwebrx-panel-digimodes[data-mode="q65"] #openwebrx-digimode-select-channel +#openwebrx-panel-digimodes[data-mode="q65"] #openwebrx-digimode-select-channel, +#openwebrx-panel-digimodes[data-mode="msk144"] #openwebrx-digimode-select-channel { display: none; } @@ -1290,7 +1292,8 @@ img.openwebrx-mirror-img #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, -#openwebrx-panel-digimodes[data-mode="q65"] #openwebrx-digimode-canvas-container +#openwebrx-panel-digimodes[data-mode="q65"] #openwebrx-digimode-canvas-container, +#openwebrx-panel-digimodes[data-mode="msk144"] #openwebrx-digimode-canvas-container { height: 200px; margin: -10px; diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js index dc02447..eb4e8c5 100644 --- a/htdocs/lib/DemodulatorPanel.js +++ b/htdocs/lib/DemodulatorPanel.js @@ -158,8 +158,8 @@ 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', 'fst4', 'fst4w', "q65"].indexOf(modulation) >= 0); - toggle_panel("openwebrx-panel-js8-message", modulation == "js8"); + toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4', 'fst4', 'fst4w', "q65", "msk144"].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/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js index 80afc25..51e258a 100644 --- a/htdocs/lib/MessagePanel.js +++ b/htdocs/lib/MessagePanel.js @@ -50,7 +50,7 @@ MessagePanel.prototype.initClearButton = function() { function WsjtMessagePanel(el) { MessagePanel.call(this, el); this.initClearTimer(); - this.qsoModes = ['FT8', 'JT65', 'JT9', 'FT4', 'FST4', 'Q65']; + this.qsoModes = ['FT8', 'JT65', 'JT9', 'FT4', 'FST4', 'Q65', 'MSK144']; this.beaconModes = ['WSPR', 'FST4W']; this.modes = [].concat(this.qsoModes, this.beaconModes); }