diff --git a/src/main/java/ru/r2cloud/jradio/Ax100BeaconSource.java b/src/main/java/ru/r2cloud/jradio/Ax100BeaconSource.java index f33678f0..1f7a3009 100644 --- a/src/main/java/ru/r2cloud/jradio/Ax100BeaconSource.java +++ b/src/main/java/ru/r2cloud/jradio/Ax100BeaconSource.java @@ -12,24 +12,26 @@ public class Ax100BeaconSource extends BeaconSource { + private static final String DEFAULT_SYNCWORD = "10010011000010110101000111011110"; + private static final Logger LOG = LoggerFactory.getLogger(Ax100BeaconSource.class); private final Class clazz; public Ax100BeaconSource(ByteInput input, Class clazz) { - this(input, 512, "10010011000010110101000111011110", clazz, false, true, true); + this(input, 512, DEFAULT_SYNCWORD, clazz, false, true, true); } public Ax100BeaconSource(ByteInput input, int beaconSizeBytes, Class clazz) { - this(input, beaconSizeBytes, "10010011000010110101000111011110", clazz, false, true, true); + this(input, beaconSizeBytes, DEFAULT_SYNCWORD, clazz, false, true, true); } public Ax100BeaconSource(ByteInput input, int beaconSizeBytes, Class clazz, boolean forceViterbi, boolean forceScrambler, boolean forceReedSolomon) { - this(input, beaconSizeBytes, "10010011000010110101000111011110", clazz, forceViterbi, forceScrambler, forceReedSolomon); + this(input, beaconSizeBytes, DEFAULT_SYNCWORD, clazz, forceViterbi, forceScrambler, forceReedSolomon); } - public Ax100BeaconSource(ByteInput input, int beaconSizeBytes, String accessCode, Class clazz, boolean forceViterbi, boolean forceScrambler, boolean forceReedSolomon) { - super(new AX100Decoder(new CorrelateSyncword(input, 6, Collections.singleton(accessCode), (beaconSizeBytes + 3) * 8), forceViterbi, forceScrambler, forceReedSolomon)); + public Ax100BeaconSource(ByteInput input, int beaconSizeBytes, String syncword, Class clazz, boolean forceViterbi, boolean forceScrambler, boolean forceReedSolomon) { + super(new AX100Decoder(new CorrelateSyncword(input, 6, Collections.singleton(syncword), (beaconSizeBytes + 3) * 8), forceViterbi, forceScrambler, forceReedSolomon)); this.clazz = clazz; } diff --git a/src/main/java/ru/r2cloud/jradio/suchai2/TelemetryStatus.java b/src/main/java/ru/r2cloud/jradio/suchai2/TelemetryStatus.java index 00047c8f..9e48e12f 100644 --- a/src/main/java/ru/r2cloud/jradio/suchai2/TelemetryStatus.java +++ b/src/main/java/ru/r2cloud/jradio/suchai2/TelemetryStatus.java @@ -31,7 +31,7 @@ public class TelemetryStatus { private long drpMachAction; private long drpMachState; private long drpMachPayloads; - private long drpMachStep;; + private long drpMachStep; public TelemetryStatus() { // do nothing