From d01801ebc32fdcbbc5201da1bd8bf615bcfadead Mon Sep 17 00:00:00 2001 From: denny Date: Sat, 26 Dec 2015 07:01:02 -0500 Subject: [PATCH] Resolves issue with registering instrumentation taps. --- src/module/decode/p25/P25_C4FMDecoder.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/module/decode/p25/P25_C4FMDecoder.java b/src/module/decode/p25/P25_C4FMDecoder.java index 1bd7f486..c4fabf0a 100644 --- a/src/module/decode/p25/P25_C4FMDecoder.java +++ b/src/module/decode/p25/P25_C4FMDecoder.java @@ -77,7 +77,7 @@ public class P25_C4FMDecoder extends P25Decoder implements IRealBufferListener /* Filter demodulated sample buffers */ float[] filter = FilterFactory.getLowPass( 48000, 2500, 4000, 80, WindowType.HANNING, true ); - mLog.debug( "Filter taps:" + filter.length + " co:" + Arrays.toString( filter ) ); + mLog.debug( "Demod Filter tap count:" + filter.length + " coefficients:" + Arrays.toString( filter ) ); mC4FMPreFilter = new RealFIRFilter_RB_RB( filter, 1.0f ); /* Issue tuned frequency correction commands, remotely controlled by the @@ -157,7 +157,7 @@ public class P25_C4FMDecoder extends P25Decoder implements IRealBufferListener TapGroup group = new TapGroup( "P25 C4FM Decoder" ); - group.add( new FloatTap( INSTRUMENT_FILTER_OUTPUT, 0, 1.0f ) ); + group.add( new FloatBufferTap( INSTRUMENT_FILTER_OUTPUT, 0, 1.0f ) ); group.add( new FloatTap( INSTRUMENT_C4FM_SYMBOL_FILTER_OUTPUT, 0, 0.1f ) ); group.add( new DibitTap( INSTRUMENT_C4FM_SLICER_OUTPUT, 0, 0.1f ) ); @@ -205,8 +205,7 @@ public class P25_C4FMDecoder extends P25Decoder implements IRealBufferListener } break; default: - throw new IllegalArgumentException( "Unrecognized tap: " + - tap.getName() ); + break; } }