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

Dropped VDL2 sampling rate to 105kHz, added better parsing, instructions.

This commit is contained in:
Marat Fayzullin 2023-08-21 15:53:56 -04:00
parent b5bd9cdf0e
commit d4a09eb3dc
6 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
csdr/chain/toolbox.py
View File

@ -124,7 +124,7 @@ class HfdlDemodulator(ServiceDemodulator, DialFrequencyReceiver):
class Vdl2Demodulator(ServiceDemodulator, DialFrequencyReceiver): class Vdl2Demodulator(ServiceDemodulator, DialFrequencyReceiver):
def __init__(self, service: bool = False): def __init__(self, service: bool = False):
self.sampleRate = 210000 #525000 #1050000 self.sampleRate = 105000
self.parser = Vdl2Parser(service=service) self.parser = Vdl2Parser(service=service)
workers = [ workers = [
Agc(Format.COMPLEX_FLOAT), Agc(Format.COMPLEX_FLOAT),

2
csdr/module/toolbox.py
View File

@ -62,7 +62,7 @@ class DumpHfdlModule(PopenModule):
class DumpVdl2Module(PopenModule): class DumpVdl2Module(PopenModule):
def __init__(self, sampleRate: int = 1050000, jsonOutput: bool = False): def __init__(self, sampleRate: int = 105000, jsonOutput: bool = False):
self.sampleRate = sampleRate self.sampleRate = sampleRate
self.jsonOutput = jsonOutput self.jsonOutput = jsonOutput
super().__init__() super().__init__()

4
htdocs/css/openwebrx.css
View File

@ -1243,7 +1243,7 @@ img.openwebrx-mirror-img
} }
#openwebrx-panel-hfdl-message { #openwebrx-panel-hfdl-message {
height: 180px; height: 310px;
} }
#openwebrx-panel-hfdl-message a { #openwebrx-panel-hfdl-message a {
@ -1251,7 +1251,7 @@ img.openwebrx-mirror-img
} }
#openwebrx-panel-hfdl-message tbody { #openwebrx-panel-hfdl-message tbody {
height: 150px; height: 280px;
} }
#openwebrx-panel-hfdl-message .timestamp { #openwebrx-panel-hfdl-message .timestamp {

9
htdocs/lib/MessagePanel.js
View File

@ -353,17 +353,10 @@ HfdlMessagePanel.prototype.setModeSUrl = function(url) {
this.modes_url = url; this.modes_url = url;
}; };
HfdlMessagePanel.prototype.linkify = function(id, url = null) { HfdlMessagePanel.prototype.linkify = function(id, url) {
// Do not linkify empty strings // Do not linkify empty strings
if (id.len<=0) return id; if (id.len<=0) return id;
// 6 hexadecimal digits are an ICAO aircraft ID, not linkifying
// @@@ THIS BREAKS: AAxxxx, ACxxxx, AFxxxx, BAxxxx, BDxxxx, etc.
//if (id.match(new RegExp('^[0-9A-F]{6}$'))) return id;
// Everything else is a flight ID
url = url? url : this.flight_url;
// Must have valid lookup URL // Must have valid lookup URL
if ((url == null) || (url == '')) if ((url == null) || (url == ''))
return id; return id;

3
owrx/aircraft.py
View File

@ -44,7 +44,8 @@ class AircraftParser(TextParser):
def parseAcars(self, data, out): def parseAcars(self, data, out):
# Collect data # Collect data
out["type"] = "ACARS frame" subnote = " ({0})".format(out["aircraft"]) if "aircraft" in out else ""
out["type"] = "ACARS frame" + subnote
out["aircraft"] = data["reg"].strip() out["aircraft"] = data["reg"].strip()
out["message"] = data["msg_text"].strip() out["message"] = data["msg_text"].strip()
# Get flight ID, if present # Get flight ID, if present

3
owrx/feature.py
View File

@ -610,8 +610,7 @@ class FeatureDetector(object):
""" """
OpenWebRX uses the [dumphfdl](https://github.com/szpajder/dumpvdl2) tool to decode VDL2 OpenWebRX uses the [dumphfdl](https://github.com/szpajder/dumpvdl2) tool to decode VDL2
aircraft communications. Dumpvdl2 is not yet available as a package and thus you will have aircraft communications. Dumpvdl2 is not yet available as a package and thus you will have
to compile it from source. Please, use the UNSTABLE branch, since it contains changes, to compile it from source.
necessary for the OpenWebRX integration.
""" """
return self.command_is_runnable("dumpvdl2 --help") return self.command_is_runnable("dumpvdl2 --help")