ua1zbe
/
openwebrxplus
mirror of https://github.com/luarvique/openwebrx
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adding ability to show undecoded DSC messages

This commit is contained in:
Marat Fayzullin 2024-03-01 18:53:37 -05:00
parent e1f94183ca
commit f590af1041
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htdocs/css/openwebrx.css
View File

@ -1373,7 +1373,7 @@ img.openwebrx-mirror-img
} }
#openwebrx-panel-dsc-message .timestamp { #openwebrx-panel-dsc-message .timestamp {
width: 60px; width: 70px;
text-align: center; text-align: center;
} }
@ -1388,7 +1388,7 @@ img.openwebrx-mirror-img
} }
#openwebrx-panel-dsc-message .data { #openwebrx-panel-dsc-message .data {
width: 326px; width: 316px;
text-align: center; text-align: center;
} }

11
htdocs/lib/MessagePanel.js
View File

@ -418,7 +418,7 @@ HfdlMessagePanel.prototype.pushMessage = function(msg) {
if (msg.message) { if (msg.message) {
$b.append($( $b.append($(
'<tr><td class="message" colspan="4">' + Utils.htmlEscape(msg.message) + '</td></tr>' '<tr><td class="message" colspan="4">' + Utils.htmlEscape(msg.message) + '</td></tr>'
)) ));
} }
// Jump list to the last received message // Jump list to the last received message
@ -571,8 +571,8 @@ DscMessagePanel.prototype.pushMessage = function(msg) {
var pad = function (i) { return ('' + i).padStart(2, "0") }; var pad = function (i) { return ('' + i).padStart(2, "0") };
var bcolor = msg.color? msg.color : '#000'; var bcolor = msg.color? msg.color : '#000';
var fcolor = msg.color? '#000' : '#FFF'; var fcolor = msg.color? '#000' : '#FFF';
var src = msg.src? Utils.linkifyVessel(msg.src) : '*'; var src = msg.src? Utils.linkifyVessel(msg.src) : '';
var dst = msg.dst? Utils.linkifyVessel(msg.dst) : '*'; var dst = msg.dst? Utils.linkifyVessel(msg.dst) : '';
var data = ( var data = (
(msg.category? ' ' + msg.category : '') (msg.category? ' ' + msg.category : '')
+ (msg.format? ' ' + msg.format : '') + (msg.format? ' ' + msg.format : '')
@ -595,6 +595,7 @@ DscMessagePanel.prototype.pushMessage = function(msg) {
+ (msg.num? ' DIAL ' + msg.num : '') + (msg.num? ' DIAL ' + msg.num : '')
+ (msg.rxfreq? ' RX ' + msg.rxfreq : '') + (msg.rxfreq? ' RX ' + msg.rxfreq : '')
+ (msg.txfreq? ' TX ' + msg.txfreq : '') + (msg.txfreq? ' TX ' + msg.txfreq : '')
+ (msg.data? ' ' + msg.data + ' &hellip;' : '')
).trim(); ).trim();
// Append report // Append report
@ -611,8 +612,8 @@ DscMessagePanel.prototype.pushMessage = function(msg) {
// Append messsage if present // Append messsage if present
if (message) { if (message) {
$b.append($( $b.append($(
'<tr><td class="message" colspan="4">' + Utils.htmlEscape(msg.message) + '</td></tr>' '<tr><td class="message" colspan="4">' + Utils.htmlEscape(message) + '</td></tr>'
)) ));
} }
// Jump list to the last received message // Jump list to the last received message

3
owrx/dsc.py
View File

@ -22,6 +22,7 @@ class DscParser(TextParser):
out = json.loads(msg) out = json.loads(msg)
# Add mode name and a color to identify the sender # Add mode name and a color to identify the sender
out["mode"] = "DSC" out["mode"] = "DSC"
out["color"] = self.colors.getColor(out["src"]) if "src" in out:
out["color"] = self.colors.getColor(out["src"])
logger.debug("{0}".format(out)) logger.debug("{0}".format(out))
return out return out