diff --git a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelDFTFactory.java b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelDFTFactory.java index 9defc97bd..ddd321e11 100644 --- a/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelDFTFactory.java +++ b/src/main/java/io/github/dsheirer/dsp/filter/channelizer/ChannelDFTFactory.java @@ -42,6 +42,7 @@ public class ChannelDFTFactory case VECTOR_SIMD_PREFERRED: return new VectorChannelDFT(channelCount); case SCALAR: + case UNCALIBRATED: default: return new ScalarChannelDFT(channelCount); } diff --git a/src/main/java/io/github/dsheirer/dsp/filter/dc/DcRemovalFilterFactory.java b/src/main/java/io/github/dsheirer/dsp/filter/dc/DcRemovalFilterFactory.java index a5db586e0..92e2d4423 100644 --- a/src/main/java/io/github/dsheirer/dsp/filter/dc/DcRemovalFilterFactory.java +++ b/src/main/java/io/github/dsheirer/dsp/filter/dc/DcRemovalFilterFactory.java @@ -42,6 +42,7 @@ public class DcRemovalFilterFactory case VECTOR_SIMD_PREFERRED: return new VectorDcRemovalFilter(gain); case SCALAR: + case UNCALIBRATED: default: return new ScalarDcRemovalFilter(gain); } diff --git a/src/main/java/io/github/dsheirer/dsp/fm/FmDemodulatorFactory.java b/src/main/java/io/github/dsheirer/dsp/fm/FmDemodulatorFactory.java index 33014c24b..089585a66 100644 --- a/src/main/java/io/github/dsheirer/dsp/fm/FmDemodulatorFactory.java +++ b/src/main/java/io/github/dsheirer/dsp/fm/FmDemodulatorFactory.java @@ -52,6 +52,7 @@ public class FmDemodulatorFactory case VECTOR_SIMD_512: return new VectorFMDemodulator512(); case SCALAR: + case UNCALIBRATED: default: return new ScalarFMDemodulator(); } diff --git a/src/main/java/io/github/dsheirer/dsp/gain/complex/ComplexGainFactory.java b/src/main/java/io/github/dsheirer/dsp/gain/complex/ComplexGainFactory.java index 0ae9532a0..d69a304d8 100644 --- a/src/main/java/io/github/dsheirer/dsp/gain/complex/ComplexGainFactory.java +++ b/src/main/java/io/github/dsheirer/dsp/gain/complex/ComplexGainFactory.java @@ -44,6 +44,7 @@ public class ComplexGainFactory return new VectorComplexGainControl(); } case SCALAR: + case UNCALIBRATED: default: return new ComplexGainControl(); } @@ -64,6 +65,7 @@ public class ComplexGainFactory return new VectorComplexGain(gain); } case SCALAR: + case UNCALIBRATED: default: return new ScalarComplexGain(gain); } diff --git a/src/main/java/io/github/dsheirer/dsp/magnitude/MagnitudeFactory.java b/src/main/java/io/github/dsheirer/dsp/magnitude/MagnitudeFactory.java index 9e43ea909..c8ec84b08 100644 --- a/src/main/java/io/github/dsheirer/dsp/magnitude/MagnitudeFactory.java +++ b/src/main/java/io/github/dsheirer/dsp/magnitude/MagnitudeFactory.java @@ -52,6 +52,7 @@ public class MagnitudeFactory case VECTOR_SIMD_512: return new VectorMagnitudeCalculator512(); case SCALAR: + case UNCALIBRATED: default: return new ScalarMagnitudeCalculator(); } diff --git a/src/main/java/io/github/dsheirer/dsp/mixer/ComplexMixerFactory.java b/src/main/java/io/github/dsheirer/dsp/mixer/ComplexMixerFactory.java index 4610cda4b..08eacf5a4 100644 --- a/src/main/java/io/github/dsheirer/dsp/mixer/ComplexMixerFactory.java +++ b/src/main/java/io/github/dsheirer/dsp/mixer/ComplexMixerFactory.java @@ -49,6 +49,7 @@ public class ComplexMixerFactory return new VectorComplexMixer(frequency, sampleRate); } case SCALAR: + case UNCALIBRATED: { return new ScalarComplexMixer(frequency, sampleRate); } diff --git a/src/main/java/io/github/dsheirer/dsp/oscillator/OscillatorFactory.java b/src/main/java/io/github/dsheirer/dsp/oscillator/OscillatorFactory.java index 3aafea0cc..3c5daf209 100644 --- a/src/main/java/io/github/dsheirer/dsp/oscillator/OscillatorFactory.java +++ b/src/main/java/io/github/dsheirer/dsp/oscillator/OscillatorFactory.java @@ -49,6 +49,7 @@ public class OscillatorFactory case VECTOR_SIMD_PREFERRED: return new VectorRealOscillator(frequency, sampleRate); case SCALAR: + case UNCALIBRATED: default: return new ScalarRealOscillator(frequency, sampleRate); } @@ -69,6 +70,7 @@ public class OscillatorFactory case VECTOR_SIMD_PREFERRED: return new VectorComplexOscillator(frequency, sampleRate); case SCALAR: + case UNCALIBRATED: default: return new ScalarComplexOscillator(frequency, sampleRate); } diff --git a/src/main/java/io/github/dsheirer/dsp/psk/demod/DifferentialDemodulatorFactory.java b/src/main/java/io/github/dsheirer/dsp/psk/demod/DifferentialDemodulatorFactory.java index 22aae9b9b..b3a7cf02a 100644 --- a/src/main/java/io/github/dsheirer/dsp/psk/demod/DifferentialDemodulatorFactory.java +++ b/src/main/java/io/github/dsheirer/dsp/psk/demod/DifferentialDemodulatorFactory.java @@ -45,7 +45,8 @@ public class DifferentialDemodulatorFactory case VECTOR_SIMD_128 -> new DifferentialDemodulatorFloatVector128(sampleRate, symbolRate); case VECTOR_SIMD_256 -> new DifferentialDemodulatorFloatVector256(sampleRate, symbolRate); case VECTOR_SIMD_512 -> new DifferentialDemodulatorFloatVector512(sampleRate, symbolRate); - default -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate); //Includes SCALAR case + case SCALAR, UNCALIBRATED -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate); + default -> new DifferentialDemodulatorFloatScalar(sampleRate, symbolRate); }; } } diff --git a/src/main/java/io/github/dsheirer/module/decode/dmr/sync/DMRSoftSyncDetectorFactory.java b/src/main/java/io/github/dsheirer/module/decode/dmr/sync/DMRSoftSyncDetectorFactory.java index 8e29d8a0a..d9871ac34 100644 --- a/src/main/java/io/github/dsheirer/module/decode/dmr/sync/DMRSoftSyncDetectorFactory.java +++ b/src/main/java/io/github/dsheirer/module/decode/dmr/sync/DMRSoftSyncDetectorFactory.java @@ -52,6 +52,7 @@ public class DMRSoftSyncDetectorFactory case VECTOR_SIMD_512: return new DMRSoftSyncDetectorVector512(); case SCALAR: + case UNCALIBRATED: default: return new DMRSoftSyncDetectorScalar(); } diff --git a/src/main/java/io/github/dsheirer/module/decode/nxdn/layer1/sync/NXDNSyncDetectorFactory.java b/src/main/java/io/github/dsheirer/module/decode/nxdn/layer1/sync/NXDNSyncDetectorFactory.java index fef4fff1f..c3d7a6608 100644 --- a/src/main/java/io/github/dsheirer/module/decode/nxdn/layer1/sync/NXDNSyncDetectorFactory.java +++ b/src/main/java/io/github/dsheirer/module/decode/nxdn/layer1/sync/NXDNSyncDetectorFactory.java @@ -51,6 +51,7 @@ public class NXDNSyncDetectorFactory case VECTOR_SIMD_512: return new NXDNSoftSyncDetectorVector512(); case SCALAR: + case UNCALIBRATED: default: return new NXDNSoftSyncDetectorScalar(); } diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/sync/P25P1SoftSyncDetectorFactory.java b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/sync/P25P1SoftSyncDetectorFactory.java index 9b363a229..cc83cf8ba 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/phase1/sync/P25P1SoftSyncDetectorFactory.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/phase1/sync/P25P1SoftSyncDetectorFactory.java @@ -52,6 +52,7 @@ public class P25P1SoftSyncDetectorFactory case VECTOR_SIMD_512: return new P25P1SoftSyncDetectorVector512(); case SCALAR: + case UNCALIBRATED: default: return new P25P1SoftSyncDetectorScalar(); }