diff --git a/htdocs/lib/DemodulatorPanel.js b/htdocs/lib/DemodulatorPanel.js
index e6830f5a..cb1a3897 100644
--- a/htdocs/lib/DemodulatorPanel.js
+++ b/htdocs/lib/DemodulatorPanel.js
@@ -175,7 +175,7 @@ DemodulatorPanel.prototype.updatePanels = function() {
// 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', 'rds'].forEach(function(m) {
+ ['js8', 'page', 'pocsag', 'sstv', 'fax', 'ism', 'dsc', 'rds'].forEach(function(m) {
toggle_panel('openwebrx-panel-' + m + '-message', modulation === m);
});
diff --git a/htdocs/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js
index 759a8c71..a611a646 100644
--- a/htdocs/lib/MessagePanel.js
+++ b/htdocs/lib/MessagePanel.js
@@ -562,6 +562,66 @@ $.fn.adsbMessagePanel = function() {
return this.data('panel');
};
+DscMessagePanel = function(el) {
+ MessagePanel.call(this, el);
+ this.initClearTimer();
+}
+
+DscMessagePanel.prototype = Object.create(MessagePanel.prototype);
+
+DscMessagePanel.prototype.supportsMessage = function(message) {
+ return message['mode'] === 'DSC';
+};
+
+DscMessagePanel.prototype.render = function() {
+ $(this.el).append($(
+ '
' +
+ '' +
+ '| Time | ' +
+ 'From | ' +
+ 'To | ' +
+ 'Data | ' +
+ '
' +
+ '' +
+ '
'
+ ));
+};
+
+DscMessagePanel.prototype.pushMessage = function(msg) {
+ var tstamp = 0;
+ var src = '*';
+ var dst = '*';
+ var data = '';
+
+ // Append report
+ var $b = $(this.el).find('tbody');
+ $b.append($(
+ '
' +
+ '| ' + tstamp + ' | ' +
+ '' + src + ' | ' +
+ '' + dst + ' | ' +
+ '' + data + ' | ' +
+ '
'
+ ));
+
+ // Append messsage if present
+ if (msg.message) {
+ $b.append($(
+ '
| ' + Utils.htmlEscape(msg.message) + ' |
'
+ ))
+ }
+
+ // Jump list to the last received message
+ this.scrollToBottom();
+};
+
+$.fn.dscMessagePanel = function() {
+ if (!this.data('panel')) {
+ this.data('panel', new DscMessagePanel(this));
+ }
+ return this.data('panel');
+};
+
IsmMessagePanel = function(el) {
MessagePanel.call(this, el);
this.initClearTimer();
diff --git a/htdocs/openwebrx.js b/htdocs/openwebrx.js
index 20d8ecbd..712cfe47 100644
--- a/htdocs/openwebrx.js
+++ b/htdocs/openwebrx.js
@@ -1169,7 +1169,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'].map(function(id) {
+ var panels = ['wsjt', 'packet', 'pocsag', 'page', 'sstv', 'fax', 'ism', 'hfdl', 'adsb', 'dsc'].map(function(id) {
return $('#openwebrx-panel-' + id + '-message')[id + 'MessagePanel']();
});
panels.push($('#openwebrx-panel-js8-message').js8());
@@ -1846,7 +1846,7 @@ function secondary_demod_init() {
.mousedown(secondary_demod_canvas_container_mousedown)
.mouseenter(secondary_demod_canvas_container_mousein)
.mouseleave(secondary_demod_canvas_container_mouseleave);
- ['wsjt', 'packet', 'pocsag', 'page', 'sstv', 'fax', 'ism', 'hfdl', 'adsb'].forEach(function(id){
+ ['wsjt', 'packet', 'pocsag', 'page', 'sstv', 'fax', 'ism', 'hfdl', 'adsb', 'dsc'].forEach(function(id){
$('#openwebrx-panel-' + id + '-message')[id + 'MessagePanel']();
})
$('#openwebrx-panel-js8-message').js8();
diff --git a/owrx/dsc.py b/owrx/dsc.py
new file mode 100644
index 00000000..36b68715
--- /dev/null
+++ b/owrx/dsc.py
@@ -0,0 +1,27 @@
+from owrx.toolbox import TextParser
+from owrx.color import ColorCache
+import json
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+
+class DscParser(TextParser):
+ def __init__(self, service: bool = False):
+ # Colors will be assigned via this cache
+ self.colors = ColorCache()
+ # Construct parent object
+ super().__init__(filePrefix="DSC", service=service)
+
+ def parse(self, msg: bytes):
+ # Do not parse in service mode
+ if self.service:
+ return None
+ # Expect JSON data in text form
+ out = json.loads(msg)
+ # Add mode name and a color to identify the sender
+ out["mode"] = "DSC"
+ out["color"] = self.colors.getColor(out["src"])
+ logger.debug("{0}".format(out))
+ return out
diff --git a/owrx/modes.py b/owrx/modes.py
index 66e7e098..2369ecd9 100644
--- a/owrx/modes.py
+++ b/owrx/modes.py
@@ -142,8 +142,7 @@ class Modes(object):
DigitalMode("rtty450", "RTTY-450 (50N)", underlying=["usb", "lsb"]),
DigitalMode("rtty85", "RTTY-85 (50N)", underlying=["usb", "lsb"]),
DigitalMode("sitorb", "SITOR-B", underlying=["usb"]),
-# Currently in development
-# DigitalMode("dsc", "DSC", underlying=["usb"]),
+ DigitalMode("dsc", "DSC", underlying=["usb"]),
WsjtMode("ft8", "FT8"),
WsjtMode("ft4", "FT4"),
WsjtMode("jt65", "JT65"),