diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ecf6362..041f527a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ - Added support for the MSK144 digimode - Added support for decoding ADS-B with dump1090 - Added support for decoding HFDL and VDL2 aircraft communications -- Added support for JT4 modes +- Added support for decoding JT4 modes - Added decoding of ISM band transmissions using rtl_433 - Added support for decoding RDS data on WFM broadcasts using redsea decoder - Added decoding for DAB broadcast stations using csdr-eti and dablin diff --git a/debian/changelog b/debian/changelog index aa95d2f4..dcdbd1cc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ openwebrx (1.3.0) UNRELEASED; urgency=low * Added support for the MSK144 digimode * Added support for decoding ADS-B with dump1090 * Added support for decoding HFDL and VDL2 aircraft communications + * Added support for decoding JT4 modes * Added decoding of ISM band transmissions using rtl_433 * Added support for decoding RDS data on WFM broadcasts using redsea decoder * Added decoding for DAB broadcast stations using csdr-eti and dablin diff --git a/docker.sh b/docker.sh index d40abaf4..b3657af6 100755 --- a/docker.sh +++ b/docker.sh @@ -94,4 +94,4 @@ case ${1:-} in *) usage ;; -esac +esac \ No newline at end of file diff --git a/owrx/modes.py b/owrx/modes.py index 934b6961..14e7e542 100644 --- a/owrx/modes.py +++ b/owrx/modes.py @@ -147,7 +147,7 @@ class Modes(object): WsjtMode("wspr", "WSPR", bandpass=Bandpass(1350, 1650)), WsjtMode("fst4", "FST4", requirements=["wsjt-x-2-3"]), WsjtMode("fst4w", "FST4W", bandpass=Bandpass(1350, 1650), requirements=["wsjt-x-2-3"]), - WsjtMode("jt4", "JT4", requirements=["wsjt-x-2-4"]), + WsjtMode("jt4", "JT4"), WsjtMode("q65", "Q65", requirements=["wsjt-x-2-4"]), DigitalMode("msk144", "MSK144", requirements=["msk144"], underlying=["usb"], service=True), Js8Mode("js8", "JS8Call"), diff --git a/owrx/wsjt.py b/owrx/wsjt.py index 51614c96..f4d0b12c 100644 --- a/owrx/wsjt.py +++ b/owrx/wsjt.py @@ -215,14 +215,11 @@ class JT4Profile(WsjtProfile): def __init__(self, submode): self.submode = submode - def getInterval(self): - return 60 - def getSubmode(self): return self.submode def decoder_commandline(self, file): - return ["jt9", "-4", "-b", str(self.submode), "-F", "1000" , "-d", str(self.decoding_depth()), file] + return ["jt9", "-4", "-b", str(self.submode), "-d", str(self.decoding_depth()), file] def getMode(self): return "JT4"