diff --git a/csdr/chain/toolbox.py b/csdr/chain/toolbox.py index cfc46982..94d31a71 100644 --- a/csdr/chain/toolbox.py +++ b/csdr/chain/toolbox.py @@ -124,7 +124,7 @@ class HfdlDemodulator(ServiceDemodulator, DialFrequencyReceiver): class Vdl2Demodulator(ServiceDemodulator, DialFrequencyReceiver): def __init__(self, service: bool = False): - self.sampleRate = 210000 #525000 #1050000 + self.sampleRate = 105000 self.parser = Vdl2Parser(service=service) workers = [ Agc(Format.COMPLEX_FLOAT), diff --git a/csdr/module/toolbox.py b/csdr/module/toolbox.py index edd7e866..417a7644 100644 --- a/csdr/module/toolbox.py +++ b/csdr/module/toolbox.py @@ -62,7 +62,7 @@ class DumpHfdlModule(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.jsonOutput = jsonOutput super().__init__() diff --git a/htdocs/css/openwebrx.css b/htdocs/css/openwebrx.css index 8645033c..ba2f4bbd 100644 --- a/htdocs/css/openwebrx.css +++ b/htdocs/css/openwebrx.css @@ -1243,7 +1243,7 @@ img.openwebrx-mirror-img } #openwebrx-panel-hfdl-message { - height: 180px; + height: 310px; } #openwebrx-panel-hfdl-message a { @@ -1251,7 +1251,7 @@ img.openwebrx-mirror-img } #openwebrx-panel-hfdl-message tbody { - height: 150px; + height: 280px; } #openwebrx-panel-hfdl-message .timestamp { diff --git a/htdocs/lib/MessagePanel.js b/htdocs/lib/MessagePanel.js index d6f574bf..07f64618 100644 --- a/htdocs/lib/MessagePanel.js +++ b/htdocs/lib/MessagePanel.js @@ -353,17 +353,10 @@ HfdlMessagePanel.prototype.setModeSUrl = function(url) { this.modes_url = url; }; -HfdlMessagePanel.prototype.linkify = function(id, url = null) { +HfdlMessagePanel.prototype.linkify = function(id, url) { // Do not linkify empty strings 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 if ((url == null) || (url == '')) return id; diff --git a/owrx/aircraft.py b/owrx/aircraft.py index 58930036..50c1aeb4 100644 --- a/owrx/aircraft.py +++ b/owrx/aircraft.py @@ -44,7 +44,8 @@ class AircraftParser(TextParser): def parseAcars(self, data, out): # 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["message"] = data["msg_text"].strip() # Get flight ID, if present diff --git a/owrx/feature.py b/owrx/feature.py index cab48e6d..5e3aae04 100644 --- a/owrx/feature.py +++ b/owrx/feature.py @@ -610,8 +610,7 @@ class FeatureDetector(object): """ 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 - to compile it from source. Please, use the UNSTABLE branch, since it contains changes, - necessary for the OpenWebRX integration. + to compile it from source. """ return self.command_is_runnable("dumpvdl2 --help")