Updated spectral display to used dBm scale and removed baseline/amplification items.

Updated sample handling code to use -1.0 to 1.0 float values throughout, to support P25 decoder and symbol filter.

src/source/tuner/hackrf/HackRFTunerController.java

@@ -79,11 +79,11 @@ import org.usb4java.Transfer;
 import org.usb4java.TransferCallback;
 
 import sample.Listener;
+import sample.adapter.ByteSampleAdapter;
 import sample.complex.ComplexBuffer;
 import source.SourceException;
 import source.tuner.TunerConfiguration;
 import source.tuner.TunerController;
-import source.tuner.rtl.ByteSampleAdapter;
 
 
 public class HackRFTunerController extends TunerController

src/source/tuner/rtl/ByteSampleAdapter.java

@@ -1,57 +0,0 @@
-/*******************************************************************************
- *     SDR Trunk 
- *     Copyright (C) 2014 Dennis Sheirer
- * 
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- * 
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- * 
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <http://www.gnu.org/licenses/>
- ******************************************************************************/
-package source.tuner.rtl;
-
-import sample.adapter.SampleAdapter;
-import sample.complex.ComplexBuffer;
-
-public class ByteSampleAdapter extends SampleAdapter
-{
-	private final static float[] LOOKUP_VALUES;
-
-	/**
-	 * Creates a static lookup table that converts the 8-bit valued range 
-	 * from 0 - 255 into scaled float values of -32768.0 to 0 to 32512.0
-	 */
-	static
-	{
-		LOOKUP_VALUES = new float[ 256 ];
-		
-		for( int x = 0; x < 256; x++ )
-		{
-			LOOKUP_VALUES[ x ] = (float)( x - 128 ) * 256.0f;
-		}
-		
-		LOOKUP_VALUES[ 128 ] = 0.0000001f;
-	}
-
-	@Override
-    public float[] convert( byte[] samples )
-    {
-		float[] convertedSamples = new float[ samples.length ];
-		int pointer = 0;
-		
-		for( byte sample: samples )
-		{
-			/* Convert byte value into float from the lookup table */
-			convertedSamples[ pointer++ ] = LOOKUP_VALUES[ ( sample & 0xFF ) ];
-		}
-		
-	    return convertedSamples;
-    }
-}

src/source/tuner/rtl/RTL2832TunerController.java

@@ -52,6 +52,7 @@ import org.usb4java.Transfer;
 import org.usb4java.TransferCallback;
 
 import sample.Listener;
+import sample.adapter.ByteSampleAdapter;
 import sample.complex.ComplexBuffer;
 import source.SourceException;
 import source.tuner.FrequencyChangeEvent;

src/source/wave/FloatWaveSource.java

@@ -29,10 +29,12 @@ import javax.sound.sampled.AudioInputStream;
 import javax.sound.sampled.AudioSystem;
 import javax.sound.sampled.UnsupportedAudioFileException;
 
+import sample.adapter.ShortToFloatMap;
 import sample.real.RealSampleListener;
 
 public class FloatWaveSource extends WaveSource
 {
+	private ShortToFloatMap mMap = new ShortToFloatMap();
 	private boolean mRunning = false;
     private boolean mLoop = false;
 
@@ -221,7 +223,7 @@ public class FloatWaveSource extends WaveSource
     		if( broadcast && mListener != null )
     		{
         		/* Convert the short into a float value */
-    			mListener.receive( (float)sample );
+    			mListener.receive( mMap.get( sample ) );
     		}
     		
     		success = true;