diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index c37d2399..28b0bcbf 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -173,12 +173,10 @@ DemodulatorPanel.prototype.updatePanels = function() {
toggle_panel("openwebrx-panel-wsjt-message", ['ft8', 'wspr', 'jt65', 'jt9', 'ft4', 'fst4', 'fst4w', "q65", "msk144"].indexOf(modulation) >= 0);
// Aeronautic modes share the same panel
toggle_panel("openwebrx-panel-hfdl-message", ['hfdl', 'vdl2', 'acars'].indexOf(modulation) >= 0);
- // But ADSB has its own panel
- toggle_panel("openwebrx-panel-adsb-message", modulation === 'adsb');
// Packet modes share the same panel
toggle_panel("openwebrx-panel-packet-message", ['packet', 'ais'].indexOf(modulation) >= 0);
- // these modes come with their own
- ['js8', 'page', 'pocsag', 'sstv', 'fax', 'ism', 'dsc'].forEach(function(m) {
+ // These modes come with their own panels
+ ['js8', 'page', 'pocsag', 'sstv', 'fax', 'ism', 'dsc', 'adsb', 'cwskimmer'].forEach(function(m) {
toggle_panel('openwebrx-panel-' + m + '-message', modulation === m);
});
diff --git a/htdocs/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js
index de2212a1..b46724af 100644
--- a/htdocs/lib/MessagePanel.js
+++ b/htdocs/lib/MessagePanel.js
@@ -877,3 +877,63 @@ $.fn.faxMessagePanel = function() {
}
return this.data('panel');
};
+
+CwSkimmerMessagePanel = function(el) {
+ MessagePanel.call(this, el);
+ this.initClearTimer();
+ this.freqs = [];
+ this.texts = [];
+}
+
+CwSkimmerMessagePanel.prototype = Object.create(MessagePanel.prototype);
+
+CwSkimmerMessagePanel.prototype.supportsMessage = function(message) {
+ return message['mode'] === 'CW';
+};
+
+CwSkimmerMessagePanel.prototype.render = function() {
+ $(this.el).append($(
+ '
' +
+ '' +
+ '| Freq | ' +
+ 'Message | ' +
+ '
' +
+ '' +
+ '
'
+ ));
+};
+
+CwSkimmerMessagePanel.prototype.pushMessage = function(msg) {
+ // Find existing frequency
+ var j = this.freqs.indexOf(msg.freq);
+
+ if (j >= 0) {
+ // Update existing entry
+ this.texts[j] = msg.text;
+ } else {
+ // Add a new entry
+ this.freqs.push(msg.freq);
+ this.texts.push(msg.text);
+ // Limit the number of active frequencies
+ if (this.freqs.length > 10) {
+ this.freqs.pop();
+ this.texts.pop();
+ }
+ }
+
+ // Generate table body
+ var body = '';
+ for (j = 0 ; j < this.freqs.length ; j++) {
+ body += '
| ' + this.freqs[j] + ' | ' + this.texts[j] + ' |
\n';
+ }
+
+ // Assign new table body
+ $(this.el).find('tbody').html(body);
+};
+
+$.fn.cwskimmerMessagePanel = function() {
+ if (!this.data('panel')) {
+ this.data('panel', new CwSkimmerMessagePanel(this));
+ }
+ return this.data('panel');
+};
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 08112933..30679df0 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1056,7 +1056,7 @@ function on_ws_recv(evt) {
break;
case 'secondary_demod':
var value = json['value'];
- var panels = ['wsjt', 'packet', 'pocsag', 'page', 'sstv', 'fax', 'ism', 'hfdl', 'adsb', 'dsc'].map(function(id) {
+ var panels = ['wsjt', 'packet', 'pocsag', 'page', 'sstv', 'fax', 'ism', 'hfdl', 'adsb', 'dsc', 'cwskimmer'].map(function(id) {
return $('#openwebrx-panel-' + id + '-message')[id + 'MessagePanel']();
});
panels.push($('#openwebrx-panel-js8-message').js8());
diff --git a/owrx/toolbox.py b/owrx/toolbox.py
index 140da2d3..edcb757f 100644
--- a/owrx/toolbox.py
+++ b/owrx/toolbox.py
@@ -419,7 +419,8 @@ class EasParser(TextParser):
class CwSkimmerParser(TextParser):
def __init__(self, charTotal: int = 32, service: bool = False):
self.reLine = re.compile("^(\d+):\s*(.*)$")
- self.data = {}
+ self.charTotal = charTotal
+ self.cwCache = {}
# Construct parent object
super().__init__(filePrefix="CW", service=service)
@@ -434,11 +435,11 @@ class CwSkimmerParser(TextParser):
freq = int(r.group(1))
text = r.group(2)
# Add up newly decoded characters
- if freq in self.data:
- text = self.data[freq] + text
+ if freq in self.cwCache:
+ text = self.cwCache[freq] + text
# Truncate received text to charTotal
- text = text if len(text) <= charTotal else text[:charTotal]
- self.data[freq] = text
+ text = text if len(text) <= self.charTotal else text[:self.charTotal]
+ self.cwCache[freq] = text
# Compose output
out = { "mode": "CW", "text": text }
# Add frequency, if known