GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Changed to slf4j logging framework

Browse Source 
Enhanced error handling/logging in RTL2832 eeprom device descriptor read method for troubleshooting issue present in some R820T tuners.
This commit is contained in:
dennis.sheirer
2014-09-20 10:04:04 +00:00
parent f2f658c43a
commit e441ebf0c9
78 changed files with 791 additions and 834 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/source/mixer/MixerManager.java
View File

@@ -28,7 +28,9 @@ import javax.sound.sampled.Line;
import javax.sound.sampled.Mixer;
import javax.sound.sampled.TargetDataLine;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.config.SourceConfigMixer;
import source.config.SourceConfiguration;
import source.tuner.MixerTunerDataLine;
@@ -37,6 +39,9 @@ import controller.channel.ProcessingChain;
public class MixerManager
{
private final static Logger mLog =
LoggerFactory.getLogger( MixerManager.class );
private static MixerManager sInstance = null;
private HashMap<String,TargetDataLine> mMixerLines =
@@ -129,7 +134,7 @@ public class MixerManager
{
StringBuilder sb = new StringBuilder();
sb.append( "MixerManager - loading system mixer devices\n" );
sb.append( "loading system mixer devices\n" );
for( Mixer.Info mixerInfo: AudioSystem.getMixerInfo() )
{
@@ -189,7 +194,7 @@ public class MixerManager
}
}
Log.info( sb.toString() );
mLog.info( sb.toString() );
}
private TargetDataLine getTargetDataLine( Mixer.Info mixerInfo, AudioFormat format )
@@ -254,5 +259,4 @@ public class MixerManager
return sb.toString();
}
}

19
src/source/mixer/MixerSource.java
View File

@@ -27,13 +27,18 @@ import javax.sound.sampled.AudioSystem;
import javax.sound.sampled.LineUnavailableException;
import javax.sound.sampled.TargetDataLine;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import source.FloatArraySource;
import source.SourceException;
public class MixerSource extends FloatArraySource
{
private final static Logger mLog =
LoggerFactory.getLogger( MixerSource.class );
private long mFrequency = 0;
private int mBufferSize = 16384;
@@ -174,7 +179,7 @@ public class MixerSource extends FloatArraySource
{
mRunning.set( false );
Log.error( "ComplexMixerSource - mixer target data line"
mLog.error( "ComplexMixerSource - mixer target data line"
+ " is null" );
}
else
@@ -201,9 +206,8 @@ public class MixerSource extends FloatArraySource
}
catch ( LineUnavailableException e )
{
Log.error( "ComplexMixerSource - mixer target data line"
+ "not available to read data from - " +
e.getLocalizedMessage() );
mLog.error( "ComplexMixerSource - mixer target data line"
+ "not available to read data from", e );
mRunning.set( false );
}
@@ -224,9 +228,8 @@ public class MixerSource extends FloatArraySource
}
catch ( Exception e )
{
Log.error( "ComplexMixerSource - error while reading"
+ "from the mixer target data line - " +
e.getLocalizedMessage() );
mLog.error( "ComplexMixerSource - error while reading"
+ "from the mixer target data line", e );
mRunning.set( false );
}

12
src/source/recording/RecordingSourceManager.java
View File

@@ -17,11 +17,15 @@
******************************************************************************/
package source.recording;
import gui.SDRTrunk;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import settings.SettingsManager;
import source.Source;
import source.SourceException;
@@ -33,6 +37,9 @@ import controller.channel.ProcessingChain;
public class RecordingSourceManager
{
private final static Logger mLog =
LoggerFactory.getLogger( RecordingSourceManager.class );
private ResourceManager mResourceManager;
private ArrayList<Recording> mRecordings = new ArrayList<Recording>();
@@ -138,7 +145,8 @@ public class RecordingSourceManager
ArrayList<RecordingConfiguration> recordingConfigurations =
settingsManager.getRecordingConfigurations();
Log.info( "RecordingSourceManager - discovered [" + recordingConfigurations.size() + "] recording configurations" );
mLog.info( "RecordingSourceManager - discovered [" +
recordingConfigurations.size() + "] recording configurations" );
for( RecordingConfiguration config: recordingConfigurations )
{

3
src/source/tuner/NumericallyControlledOscillator.java
View File

@@ -17,7 +17,6 @@
******************************************************************************/
package source.tuner;
import log.Log;
import sample.Listener;
import sample.complex.ComplexSample;
import sample.complex.ComplexSampleUtils;
@@ -86,8 +85,6 @@ public class NumericallyControlledOscillator implements Listener<ComplexSample>,
*/
public void setFrequency( long frequency )
{
Log.info( "NumericallyControlledOscillator - setting sine wave gen to freq:" + frequency );
mFrequency = frequency;
mSineWaveGenerator.setFrequency( frequency );
}

9
src/source/tuner/TunerController.java
View File

@@ -22,13 +22,18 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.concurrent.RejectedExecutionException;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.FrequencyController.Tunable;
import controller.ThreadPoolManager;
public abstract class TunerController implements Tunable
{
private final static Logger mLog =
LoggerFactory.getLogger( TunerController.class );
/* List of currently tuned channels being served to demod channels */
protected ArrayList<TunerChannel> mTunedChannels =
new ArrayList<TunerChannel>();
@@ -176,7 +181,7 @@ public abstract class TunerController implements Tunable
}
else
{
Log.error( "Tuner Controller - couldn't find the tuned channel "
mLog.error( "Tuner Controller - couldn't find the tuned channel "
+ "to release it" );
}
}

62
src/source/tuner/TunerManager.java
View File

@@ -29,7 +29,9 @@ import javax.usb.UsbHostManager;
import javax.usb.UsbHub;
import javax.usb.UsbServices;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.Source;
import source.SourceException;
import source.config.SourceConfigTuner;
@@ -48,6 +50,9 @@ import controller.channel.ProcessingChain;
public class TunerManager
{
private final static Logger mLog =
LoggerFactory.getLogger( TunerManager.class );
private static final String sLOADED = "\t[LOADED]\t";
private static final String sNOT_LOADED = "\t[NOT LOADED]\t";
@@ -90,14 +95,12 @@ public class TunerManager
}
catch ( RejectedExecutionException ree )
{
Log.error( "TunerManager - couldn't provide tuner channel "
+ "source - " + ree.getLocalizedMessage() );
mLog.error( "couldn't provide tuner channel source", ree );
}
catch ( SourceException e )
{
Log.error( "TunerManager - error obtaining channel " +
"from tuner [" + tuner.getName() + "] - "
+ e.getLocalizedMessage() );
mLog.error( "error obtaining channel from tuner [" +
tuner.getName() + "]", e );
}
}
}
@@ -125,11 +128,20 @@ public class TunerManager
StringBuilder sb = new StringBuilder();
sb.append( "Tuner Manager - discovered [" + devices.size() +
"] USB tuner devices\n" );
sb.append( "discovered and using [" + devices.size() +
"] available tuner devices\n" );
mLog.info( "inspecting [" + devices.size() + "] available usb tuner devices" );
int counter = 0;
for( USBTunerDevice device: devices )
{
counter++;
mLog.info( "inspecting usb device [" + counter + "] tuner class: "
+ device.getTunerClass().toString() );
String status = sNOT_LOADED;
String name = "Unknown";
String reason = "No device driver class available";
@@ -252,7 +264,9 @@ public class TunerManager
tunerType = RTL2832TunerController.identifyTunerType( device );
}
Log.debug( "TunerManager - identified tuner class [" + tunerClass.toString() + "] with tuner type [" + tunerType.toString() + "]" );
mLog.debug( "identified tuner class [" +
tunerClass.toString() + "] with tuner type [" +
tunerType.toString() + "]" );
switch( tunerType )
{
@@ -288,13 +302,14 @@ public class TunerManager
}
break;
case RAFAELMICRO_R820T:
Log.debug( "TunerManager - attempting to construct R820T tuner controller" );
mLog.debug( "attempting to construct R820T "
+ "tuner controller" );
try
{
R820TTunerController controller =
new R820TTunerController( device );
Log.debug( "TunerManager - init() R820T tuner controller" );
mLog.debug( "initializing R820T tuner controller" );
controller.init();
RTL2832Tuner rtlTuner =
@@ -306,12 +321,13 @@ public class TunerManager
if( config != null )
{
Log.debug( "TunerManager - applying tuner config to R820T tuner" );
mLog.debug( "applying tuner config to R820T tuner" );
rtlTuner.apply( config );
}
else
{
Log.debug( "TunerManager - R820T tuner config was null - not applied" );
mLog.debug( "R820T tuner config was "
+ "null - not applied" );
}
mTuners.add( rtlTuner );
@@ -325,7 +341,7 @@ public class TunerManager
reason = "Error constructing R820T tuner "
+ "controller - " + se.getLocalizedMessage();
Log.error( "TunerManager - error constructing tuner", se );
mLog.error( "error constructing tuner", se );
}
break;
case FITIPOWER_FC0012:
@@ -372,8 +388,8 @@ public class TunerManager
sb.append( "\n" );
}
Log.header( "Configuring USB Tuners" );
Log.info( sb.toString() );
mLog.info( "Configuring USB Tuners" );
mLog.info( sb.toString() );
}
/**
@@ -385,8 +401,8 @@ public class TunerManager
List<UsbDevice> devices = getUSBDevices();
sb.append( "TunerManager - discovered [" + devices.size() +
"] attached usb devices\n" );
sb.append( "discovered [" + devices.size() +
"] attached USB devices\n" );
ArrayList<USBTunerDevice> tuners = new ArrayList<USBTunerDevice>();
@@ -416,8 +432,8 @@ public class TunerManager
sb.append( "\n" );
}
Log.header( "USB Device Discovery" );
Log.info( sb.toString() );
mLog.info( "USB Device Discovery" );
mLog.info( sb.toString() );
return tuners;
}
@@ -437,13 +453,11 @@ public class TunerManager
}
catch( SecurityException e )
{
Log.error( "TunerManager - security exception while getting "
+ "USB devices" );
mLog.error( "security exception while getting USB devices", e );
}
catch( UsbException e )
{
Log.error( "TunerManager - usb exception while getting USB "
+ "devices - " + e.getLocalizedMessage() );
mLog.error( "usb exception while getting USB devices", e );
}
return devices;

13
src/source/tuner/TunerNode.java
View File

@@ -25,14 +25,19 @@ import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JPopupMenu;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import spectrum.SpectrumFrame;
import controller.BaseNode;
public class TunerNode extends BaseNode implements FrequencyChangeListener
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( TunerNode.class );
private static final long serialVersionUID = 1L;
private static DecimalFormat FREQUENCY_FORMAT = new DecimalFormat( "0.00000" );
private static DecimalFormat SAMPLE_RATE_FORMAT = new DecimalFormat( "0.000" );
@@ -52,8 +57,8 @@ public class TunerNode extends BaseNode implements FrequencyChangeListener
}
catch ( SourceException e )
{
Log.error( "TunerNode - error reading frequency and sample rate "
+ "from tuner - " + e.getLocalizedMessage() );
mLog.error( "TunerNode - error reading frequency and sample rate "
+ "from tuner", e );
}
}

8
src/source/tuner/ettus/B100Tuner.java
View File

@@ -21,7 +21,9 @@ import java.util.concurrent.RejectedExecutionException;
import javax.swing.JPanel;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.Tuner;
import source.tuner.TunerChannel;
@@ -35,6 +37,8 @@ import controller.ThreadPoolManager;
public class B100Tuner extends Tuner
{
private final static Logger mLog = LoggerFactory.getLogger( B100Tuner.class );
private USBTunerDevice mDevice;
public B100Tuner( USBTunerDevice device )
@@ -68,7 +72,7 @@ public class B100Tuner extends Tuner
@Override
public void apply( TunerConfiguration config ) throws SourceException
{
Log.error( "B100 Tuner - can't apply tuner configuration" );
mLog.error( "B100 Tuner - can't apply tuner configuration" );
}
@Override

17
src/source/tuner/fcd/FCDTunerController.java
View File

@@ -27,7 +27,9 @@ import javax.usb.UsbInterface;
import javax.usb.UsbInterfacePolicy;
import javax.usb.UsbPipe;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.TunerClass;
import source.tuner.TunerConfiguration;
@@ -39,6 +41,9 @@ import controller.ResourceManager;
public abstract class FCDTunerController extends TunerController
{
private final static Logger mLog =
LoggerFactory.getLogger( FCDTunerController.class );
public final static int sINT_NULL_VALUE = -1;
public final static long sLONG_NULL_VALUE = -1l;
public final static double sDOUBLE_NULL_VALUE = -1.0D;
@@ -208,7 +213,8 @@ public abstract class FCDTunerController extends TunerController
}
else
{
Log.info( "Attempted to claim the Funcube HID interface, but it's in use by another program" );
mLog.info( "Attempted to claim the Funcube HID interface, but "
+ "it's in use by another program" );
}
return claimed;
@@ -228,7 +234,8 @@ public abstract class FCDTunerController extends TunerController
}
catch ( Exception e )
{
Log.error( "Exception thrown while releasing the funcube HID interface" + e.getLocalizedMessage() );
mLog.error( "Exception thrown while releasing the funcube HID "
+ "interface", e );
}
}
@@ -345,13 +352,13 @@ public abstract class FCDTunerController extends TunerController
}
else
{
Log.error( "FCD Pro Tuner Controller - couldn't gain access " +
mLog.error( "FCD Pro Tuner Controller - couldn't gain access " +
"to the USB in/out endpoints or pipes." );
}
}
else
{
Log.error( "FCD Pro Tuner Controller - couldn't claim the USB " +
mLog.error( "FCD Pro Tuner Controller - couldn't claim the USB " +
"interface. Check to see if another program is using it." );
}
}

66
src/source/tuner/fcd/proV1/FCD1TunerConfigurationPanel.java
View File

@@ -25,7 +25,6 @@ import java.awt.event.FocusListener;
import java.text.DecimalFormat;
import java.util.ArrayList;
import javax.swing.BorderFactory;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton;
@@ -43,21 +42,28 @@ import javax.swing.event.ChangeListener;
import javax.usb.UsbClaimException;
import javax.usb.UsbException;
import com.jidesoft.swing.JideTabbedPane;
import log.Log;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.TunerConfiguration;
import source.tuner.TunerType;
import source.tuner.fcd.proV1.FCD1TunerController.LNAEnhance;
import source.tuner.fcd.proV1.FCD1TunerController.LNAGain;
import source.tuner.fcd.proV1.FCD1TunerController.MixerGain;
import com.jidesoft.swing.JideTabbedPane;
import controller.ResourceManager;
public class FCD1TunerConfigurationPanel extends JPanel
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( FCD1TunerConfigurationPanel.class );
private static final long serialVersionUID = 1L;
private ResourceManager mResourceManager;
private FCD1TunerController mController;
@@ -180,10 +186,9 @@ public class FCD1TunerConfigurationPanel extends JPanel
"FCD Pro Tuner Controller - cannot claim FCD "
+ "Controller to apply LNA gain [" + gain.toString() + "]" );
Log.error( "FuncubeDonglePro Controller - usb claim "
mLog.error( "FuncubeDonglePro Controller - usb claim "
+ "exception while applying LNA gain value [" +
gain.toString() + "] - " +
e1.getLocalizedMessage() );
gain.toString() + "]", e1 );
}
catch ( UsbException e1 )
{
@@ -192,10 +197,9 @@ public class FCD1TunerConfigurationPanel extends JPanel
"FCD Pro Tuner Controller - FCD Controller "
+ "cannot apply LNA gain [" + gain.toString() + "]" );
Log.error( "FuncubeDonglePro Controller - "
mLog.error( "FuncubeDonglePro Controller - "
+ "exception while applying LNA gain value [" +
gain.toString() + "] - " +
e1.getLocalizedMessage() );
gain.toString() + "]", e1 );
}
save();
@@ -235,10 +239,9 @@ public class FCD1TunerConfigurationPanel extends JPanel
"FCD Pro Tuner Controller - cannot claim FCD "
+ "Controller to apply LNA enhance [" + enhance.toString() + "]" );
Log.error( "FuncubeDonglePro Controller - usb claim "
mLog.error( "FuncubeDonglePro Controller - usb claim "
+ "exception while applying LNA enhance value [" +
enhance.toString() + "] - " +
e1.getLocalizedMessage() );
enhance.toString() + "]", e1 );
}
catch ( UsbException e1 )
{
@@ -247,10 +250,9 @@ public class FCD1TunerConfigurationPanel extends JPanel
"FCD Pro Tuner Controller - FCD Controller "
+ "cannot apply LNA enhance [" + enhance.toString() + "]" );
Log.error( "FuncubeDonglePro Controller - "
mLog.error( "FuncubeDonglePro Controller - "
+ "exception while applying LNA enhance value [" +
enhance.toString() + "] - " +
e1.getLocalizedMessage() );
enhance.toString() + "]", e1 );
}
save();
@@ -289,10 +291,9 @@ public class FCD1TunerConfigurationPanel extends JPanel
"FCD Pro Tuner Controller - cannot claim FCD "
+ "Controller to apply Mixer gain [" + gain.toString() + "]" );
Log.error( "FuncubeDonglePro Controller - usb claim "
mLog.error( "FuncubeDonglePro Controller - usb claim "
+ "exception while applying Mixer gain value [" +
gain.toString() + "] - " +
e1.getLocalizedMessage() );
gain.toString() + "]", e1 );
}
catch ( UsbException e1 )
{
@@ -301,10 +302,9 @@ public class FCD1TunerConfigurationPanel extends JPanel
"FCD Pro Tuner Controller - FCD Controller "
+ "cannot apply Mixer gain [" + gain.toString() + "]" );
Log.error( "FuncubeDonglePro Controller - "
mLog.error( "FuncubeDonglePro Controller - "
+ "exception while applying Mixer gain value [" +
gain.toString() + "] - " +
e1.getLocalizedMessage() );
gain.toString() + "]", e1 );
}
save();
@@ -363,9 +363,8 @@ public class FCD1TunerConfigurationPanel extends JPanel
+ "apply frequency correction value: " + value +
e1.getLocalizedMessage() );
Log.error( "FuncubeDonglePro Controller - couldn't apply "
+ "frequency correction value: " + value +
e1.getLocalizedMessage() );
mLog.error( "FuncubeDonglePro Controller - couldn't apply "
+ "frequency correction value: " + value, e1 );
}
}
} );
@@ -522,9 +521,8 @@ public class FCD1TunerConfigurationPanel extends JPanel
+ "apply the tuner configuration settings - " +
e1.getLocalizedMessage() );
Log.error( "FuncubeDonglePro Controller - couldn't apply "
+ "config [" + config.getName() + "] - " +
e1.getLocalizedMessage() );
mLog.error( "FuncubeDonglePro Controller - couldn't apply "
+ "config [" + config.getName() + "]", e1 );
}
}
@@ -639,11 +637,10 @@ public class FCD1TunerConfigurationPanel extends JPanel
+ mCorrectionComponent.toString() +
" correction value [" + value + "]" );
Log.error( "FuncubeDonglePro Controller - usb claim "
mLog.error( "FuncubeDonglePro Controller - usb claim "
+ "exception while applying "
+ mCorrectionComponent.toString()
+ " correction value [" + value + "] - " +
e1.getLocalizedMessage() );
+ " correction value [" + value + "]", e1 );
}
catch ( UsbException e1 )
{
@@ -654,11 +651,10 @@ public class FCD1TunerConfigurationPanel extends JPanel
+ mCorrectionComponent.toString() +
" correction value [" + value + "]" );
Log.error( "FuncubeDonglePro Controller - usb "
mLog.error( "FuncubeDonglePro Controller - usb "
+ "exception while applying "
+ mCorrectionComponent.toString()
+ " correction value [" + value + "] - " +
e1.getLocalizedMessage() );
+ " correction value [" + value + "]", e1 );
}
}
} );

15
src/source/tuner/fcd/proV1/FCD1TunerController.java
View File

@@ -21,7 +21,9 @@ import javax.swing.JPanel;
import javax.usb.UsbClaimException;
import javax.usb.UsbException;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.TunerClass;
import source.tuner.TunerConfiguration;
@@ -34,6 +36,9 @@ import controller.ResourceManager;
public class FCD1TunerController extends FCDTunerController
{
private final static Logger mLog =
LoggerFactory.getLogger( FCD1TunerController.class );
public static final int sMINIMUM_TUNABLE_FREQUENCY = 64000000;
public static final int sMAXIMUM_TUNABLE_FREQUENCY = 1700000000;
public static final int sSAMPLE_RATE = 96000;
@@ -153,7 +158,7 @@ public class FCD1TunerController extends FCDTunerController
{
int gain = (int)send( FCDCommand.APP_GET_LNA_GAIN );
Log.info( "FCD1: lna gain setting is:" + gain );
mLog.info( "FCD1: lna gain setting is:" + gain );
mLNAGain = LNAGain.valueOf( gain );
}
@@ -301,7 +306,7 @@ public class FCD1TunerController extends FCDTunerController
mPhaseCorrection = ( (double)phase / (double)Short.MAX_VALUE );
Log.info( "FCD1: correction:" + correction + " gain:" + gain + " phase:" + phase );
mLog.info( "FCD1: correction:" + correction + " gain:" + gain + " phase:" + phase );
}
/**
@@ -440,7 +445,7 @@ public class FCD1TunerController extends FCDTunerController
{
int enhance = (int)send( FCDCommand.APP_GET_LNA_ENHANCE );
Log.info( "FCD1: lna enhance setting is: " + enhance );
mLog.info( "FCD1: lna enhance setting is: " + enhance );
mLNAEnhance = LNAEnhance.valueOf( enhance );
}
@@ -460,7 +465,7 @@ public class FCD1TunerController extends FCDTunerController
{
int gain = (int)send( FCDCommand.APP_GET_MIXER_GAIN );
Log.info( "FCD1: mixer gain setting is:" + gain );
mLog.info( "FCD1: mixer gain setting is:" + gain );
mMixerGain = MixerGain.valueOf( gain );
}

21
src/source/tuner/fcd/proV1/FCD1TunerEditorPanel.java
View File

@@ -17,27 +17,32 @@
******************************************************************************/
package source.tuner.fcd.proV1;
import java.awt.Color;
import gui.control.JFrequencyControl;
import javax.swing.BorderFactory;
import java.awt.Color;
import javax.swing.JLabel;
import javax.swing.JPanel;
import com.jidesoft.swing.JideTabbedPane;
import log.Log;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.FrequencyChangeListener;
import source.tuner.fcd.FCDTuner;
import source.tuner.fcd.FCDTunerDetailsPanel;
import com.jidesoft.swing.JideTabbedPane;
import controller.ResourceManager;
public class FCD1TunerEditorPanel extends JPanel implements FrequencyChangeListener
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( FCD1TunerEditorPanel.class );
private FCDTuner mTuner;
private FCD1TunerController mController;
@@ -95,8 +100,8 @@ public class FCD1TunerEditorPanel extends JPanel implements FrequencyChangeListe
}
catch ( SourceException e )
{
Log.error( "FCTProController - error setting frequency [" +
frequency + "] - " + e.getLocalizedMessage() );
mLog.error( "FCTProController - error setting frequency [" +
frequency + "]", e );
}
}
}

21
src/source/tuner/fcd/proplusV2/FCD2TunerConfigurationPanel.java
View File

@@ -25,7 +25,6 @@ import java.awt.event.FocusListener;
import java.text.DecimalFormat;
import java.util.ArrayList;
import javax.swing.BorderFactory;
import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton;
@@ -42,8 +41,11 @@ import javax.swing.SwingConstants;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import log.Log;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.TunerConfiguration;
import source.tuner.TunerConfigurationAssignment;
@@ -52,7 +54,10 @@ import controller.ResourceManager;
public class FCD2TunerConfigurationPanel extends JPanel
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( FCD2TunerConfigurationPanel.class );
private static final long serialVersionUID = 1L;
private ResourceManager mResourceManager;
private FCD2TunerController mController;
private FCD2TunerConfiguration mSelectedConfig;
@@ -158,9 +163,8 @@ public class FCD2TunerConfigurationPanel extends JPanel
+ "apply frequency correction value: " + value +
e1.getLocalizedMessage() );
Log.error( "FuncubeDongleProPlus Controller - couldn't apply "
+ "frequency correction value: " + value +
e1.getLocalizedMessage() );
mLog.error( "FuncubeDongleProPlus Controller - couldn't apply "
+ "frequency correction value: " + value, e1 );
}
}
} );
@@ -330,9 +334,8 @@ public class FCD2TunerConfigurationPanel extends JPanel
+ "apply the tuner configuration settings - " +
e1.getLocalizedMessage() );
Log.error( "FuncubeDongleProPlus Controller - couldn't apply "
+ "config [" + config.getName() + "] - " +
e1.getLocalizedMessage() );
mLog.error( "FuncubeDongleProPlus Controller - couldn't apply "
+ "config [" + config.getName() + "]", e1 );
}
}

42
src/source/tuner/fcd/proplusV2/FCD2TunerController.java
View File

@@ -21,7 +21,9 @@ import javax.swing.JPanel;
import javax.usb.UsbClaimException;
import javax.usb.UsbException;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.TunerClass;
import source.tuner.TunerConfiguration;
@@ -34,6 +36,9 @@ import controller.ResourceManager;
public class FCD2TunerController extends FCDTunerController
{
private final static Logger mLog =
LoggerFactory.getLogger( FCD2TunerController.class );
public static final int sMINIMUM_TUNABLE_FREQUENCY = 150000;
public static final int sMAXIMUM_TUNABLE_FREQUENCY = 2050000000;
public static final int sSAMPLE_RATE = 192000;
@@ -162,14 +167,13 @@ public class FCD2TunerController extends FCDTunerController
}
catch ( UsbClaimException e )
{
Log.error( "FCTTunerController - couldn't claim funcube HID to"
+ " get dc correction value" );
mLog.error( "FCTTunerController - couldn't claim funcube HID to"
+ " get dc correction value", e );
}
catch ( UsbException e )
{
Log.error( "FCTTunerController - error getting dc correction "
+ "value - " + e.getLocalizedMessage() );
mLog.error( "FCTTunerController - error getting dc correction "
+ "value", e );
}
return dcCorrection;
@@ -183,14 +187,13 @@ public class FCD2TunerController extends FCDTunerController
}
catch ( UsbClaimException e )
{
Log.error( "FCDTunerController - error claiming usb hid while "
+ "trying to set dc correction to [" + value + "]" );
mLog.error( "FCDTunerController - error claiming usb hid while "
+ "trying to set dc correction to [" + value + "]", e );
}
catch ( UsbException e )
{
Log.error( "FCDTunerController - error while "
+ "trying to set dc correction to [" + value + "] - " +
e.getLocalizedMessage() );
mLog.error( "FCDTunerController - error while "
+ "trying to set dc correction to [" + value + "]", e );
}
}
@@ -204,13 +207,13 @@ public class FCD2TunerController extends FCDTunerController
}
catch ( UsbClaimException e )
{
Log.error( "FCTTunerController - couldn't claim funcube HID to"
+ " get iq correction value" );
mLog.error( "FCTTunerController - couldn't claim funcube HID to"
+ " get iq correction value", e );
}
catch ( UsbException e )
{
Log.error( "FCTTunerController - error getting iq correction "
+ "value - " + e.getLocalizedMessage() );
mLog.error( "FCTTunerController - error getting iq correction "
+ "value", e );
}
@@ -225,14 +228,13 @@ public class FCD2TunerController extends FCDTunerController
}
catch ( UsbClaimException e )
{
Log.error( "FCDTunerController - error claiming usb hid while "
+ "trying to set iq correction to [" + value + "]" );
mLog.error( "FCDTunerController - error claiming usb hid while "
+ "trying to set iq correction to [" + value + "]", e );
}
catch ( UsbException e )
{
Log.error( "FCDTunerController - error while "
+ "trying to set iq correction to [" + value + "] - " +
e.getLocalizedMessage() );
mLog.error( "FCDTunerController - error while "
+ "trying to set iq correction to [" + value + "]", e );
}
}

21
src/source/tuner/fcd/proplusV2/FCD2TunerEditorPanel.java
View File

@@ -17,26 +17,31 @@
******************************************************************************/
package source.tuner.fcd.proplusV2;
import java.awt.Color;
import gui.control.JFrequencyControl;
import javax.swing.BorderFactory;
import java.awt.Color;
import javax.swing.JLabel;
import javax.swing.JPanel;
import com.jidesoft.swing.JideTabbedPane;
import log.Log;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.FrequencyChangeListener;
import source.tuner.fcd.FCDTuner;
import source.tuner.fcd.FCDTunerDetailsPanel;
import com.jidesoft.swing.JideTabbedPane;
import controller.ResourceManager;
public class FCD2TunerEditorPanel extends JPanel implements FrequencyChangeListener
{
private final static Logger mLog =
LoggerFactory.getLogger( FCD2TunerEditorPanel.class );
private static final long serialVersionUID = 1L;
private FCDTuner mTuner;
@@ -94,8 +99,8 @@ public class FCD2TunerEditorPanel extends JPanel implements FrequencyChangeListe
}
catch ( SourceException e )
{
Log.error( "FCTProController - error setting frequency [" +
frequency + "] - " + e.getLocalizedMessage() );
mLog.error( "FCTProController - error setting frequency [" +
frequency + "]", e );
}
}
}

10
src/source/tuner/rtl/RTL2832Tuner.java
View File

@@ -22,7 +22,9 @@ import java.util.concurrent.RejectedExecutionException;
import javax.swing.JPanel;
import javax.usb.UsbException;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import source.SourceException;
import source.tuner.FrequencyChangeListener;
@@ -38,6 +40,9 @@ import controller.ThreadPoolManager;
public class RTL2832Tuner extends Tuner
{
private final static Logger mLog =
LoggerFactory.getLogger( RTL2832Tuner.class );
private TunerClass mTunerClass;
protected RTL2832TunerController mController;
@@ -98,8 +103,7 @@ public class RTL2832Tuner extends Tuner
}
catch( SourceException e )
{
Log.error( "RTL2832 Tuner - couldn't get sample rate - " +
e.getLocalizedMessage() );
mLog.error( "RTL2832 Tuner - couldn't get sample rate", e );
}
return 0;

101
src/source/tuner/rtl/RTL2832TunerController.java
View File

@@ -54,8 +54,8 @@ import javax.usb.event.UsbPipeErrorEvent;
import javax.usb.event.UsbPipeListener;
import javax.usb.util.DefaultUsbControlIrp;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.usb4java.LibUsb;
import sample.Listener;
@@ -68,6 +68,9 @@ import controller.ResourceManager;
public abstract class RTL2832TunerController extends TunerController
{
private final static Logger mLog =
LoggerFactory.getLogger( RTL2832TunerController.class );
public final static int sINT_NULL_VALUE = -1;
public final static long sLONG_NULL_VALUE = -1l;
public final static double sDOUBLE_NULL_VALUE = -1.0D;
@@ -215,7 +218,7 @@ public abstract class RTL2832TunerController extends TunerController
+ "set default sample rate", e );
}
byte[] eeprom;
byte[] eeprom = null;
try
{
@@ -224,8 +227,7 @@ public abstract class RTL2832TunerController extends TunerController
}
catch( Exception e )
{
throw new SourceException( "RTL2832 Tuner Controller - couldn't "
+ "read EEPROM descriptor byte array", e );
mLog.error( "error while reading the EEPROM device descriptor", e );
}
try
@@ -234,14 +236,15 @@ public abstract class RTL2832TunerController extends TunerController
if( eeprom == null )
{
Log.error( "RTL2832 Tuner Controller - eeprom byte array was "
+ "null - constructed empty descriptor object" );
mLog.error( "eeprom byte array was null - constructed "
+ "empty descriptor object" );
}
}
catch( Exception e )
{
throw new SourceException( "RTL2832 Tuner Controller - error "
+ "constructing descriptor object from eeprom byte array", e );
mLog.error( "error while constructing device descriptor using "
+ "descriptor byte array " +
( eeprom == null ? "[null]" : Arrays.toString( eeprom )), e );
}
}
@@ -391,23 +394,23 @@ public abstract class RTL2832TunerController extends TunerController
if( claim( iface ) )
{
Log.debug( "RTL2832 - usb interface claimed" );
mLog.debug( "usb interface claimed" );
/* Perform a dummy write to see if the device needs reset */
writeRegister( device, Block.USB, Address.USB_SYSCTL.getAddress(), 0x09, 1 );
Log.debug( "RTL2832 - initializing baseband" );
mLog.debug( "initializing baseband" );
/* Initialize the baseband */
initBaseband( device );
Log.debug( "RTL2832 - enabling I2C repeater" );
mLog.debug( "enabling I2C repeater" );
enableI2CRepeater( device, true );
boolean controlI2CRepeater = false;
Log.debug( "RTL2832 - testing for tuner types" );
mLog.debug( "testing for tuner types" );
/* Test for each tuner type until we find the correct one */
if( isE4000Tuner( device, controlI2CRepeater ) )
@@ -435,19 +438,18 @@ public abstract class RTL2832TunerController extends TunerController
tunerClass = TunerType.FITIPOWER_FC0012;
}
Log.debug( "RTL2832 - disabling I2C repeater -- detected tuner type:" + tunerClass.toString() );
mLog.debug( "disabling I2C repeater -- detected tuner type:" + tunerClass.toString() );
enableI2CRepeater( device, false );
Log.debug( "RTL2832 - releasing USB interface" );
mLog.debug( "releasing USB interface" );
iface.release();
}
}
catch( Exception e )
{
Log.error( "RTL2832TunerController - error while determining "
+ "tuner type - ", e );
mLog.error( "error while determining tuner type", e );
}
return tunerClass;
@@ -518,8 +520,8 @@ public abstract class RTL2832TunerController extends TunerController
}
else
{
Log.error( "RTL2832 Tuner Controller - attempt to claim USB "
+ "interface failed - in use by another application" );
mLog.error( "attempt to claim USB interface failed - in use by "
+ "another application" );
}
return false;
@@ -556,8 +558,7 @@ public abstract class RTL2832TunerController extends TunerController
}
catch ( Exception e )
{
Log.error( "RTL2832 Tuner Controller - attempt to release USB "
+ "interface failed - " + e.getLocalizedMessage() );
mLog.error( "attempt to release USB interface failed", e );
}
}
@@ -962,7 +963,7 @@ public abstract class RTL2832TunerController extends TunerController
protected static boolean isE4000Tuner( UsbDevice device,
boolean controlI2CRepeater ) throws UsbClaimException
{
Log.debug( "RTL2832 - testing for E4000 tuner" );
mLog.debug( "testing for E4000 tuner" );
try
{
@@ -1011,7 +1012,8 @@ public abstract class RTL2832TunerController extends TunerController
boolean controlI2CRepeater )
throws UsbClaimException
{
Log.debug( "RTL2832 - testing for F0013 tuner" );
mLog.debug( "testing for F0013 tuner" );
try
{
int value = readI2CRegister( device, FC0013_I2C_ADDRESS,
@@ -1068,7 +1070,8 @@ public abstract class RTL2832TunerController extends TunerController
protected static boolean isR820TTuner( UsbDevice device,
boolean controlI2CRepeater ) throws UsbClaimException
{
Log.debug( "RTL2832 - testing for R820T tuner" );
mLog.debug( "testing for R820T tuner" );
try
{
int value = readI2CRegister( device, R820T_I2C_ADDRESS,
@@ -1210,24 +1213,44 @@ public abstract class RTL2832TunerController extends TunerController
* Label 4,5 ... (user defined)
*/
public byte[] readEEPROM( UsbDevice device, short offset, int length )
throws IllegalArgumentException, UsbDisconnectedException, UsbException
throws IllegalArgumentException
{
if( offset + length > 256 )
{
throw new IllegalArgumentException( "RTL2832 Tuner Controller - "
+ "cannot read more than 256 bytes from EEPROM" );
throw new IllegalArgumentException( "cannot read more than 256 "
+ "bytes from EEPROM - requested to read to byte [" +
( offset + length ) + "]" );
}
byte[] data = new byte[ length ];
byte[] onebyte = new byte[ 1 ];
/* Tell the RTL-2832 to address the EEPROM */
writeRegister( device, Block.IIC, EEPROM_ADDRESS, (byte)offset, 1 );
try
{
/* Tell the RTL-2832 to address the EEPROM */
writeRegister( device, Block.IIC, EEPROM_ADDRESS, (byte)offset, 1 );
}
catch( UsbException e )
{
mLog.error( "usb error while attempting to set read address to "
+ "EEPROM register, prior to reading the EEPROM device "
+ "descriptor", e );
}
for( int x = 0; x < length; x++ )
{
byte[] temp = read( device, Block.IIC, EEPROM_ADDRESS, onebyte );
data[ x ] = temp[ 0 ];
try
{
byte[] temp = read( device, Block.IIC, EEPROM_ADDRESS, onebyte );
data[ x ] = temp[ 0 ];
}
catch( Exception e )
{
mLog.error( "error while reading eeprom byte [" + x + "/" +
length + "] aborting eeprom read and returning partially "
+ "filled descriptor byte array", e );
x = length;
}
}
return data;
@@ -1514,7 +1537,8 @@ public abstract class RTL2832TunerController extends TunerController
{
if( mRunning.compareAndSet( false, true ) )
{
Log.debug( "RTL2832TunerController [" + getUniqueID() + "] - starting sample fetch thread" );
mLog.debug( "rtl2832 [" + getUniqueID() +
"] - starting sample fetch thread" );
ArrayList<UsbIrp> irps = new ArrayList<UsbIrp>();
@@ -1570,7 +1594,8 @@ public abstract class RTL2832TunerController extends TunerController
{
if( mRunning.compareAndSet( true, false ) )
{
Log.debug( "RTL2832TunerController - stopping sample fetch thread" );
mLog.debug( "rtl2832 [" + getUniqueID() +
"] - stopping sample fetch thread" );
mUSBPipe.abortAllSubmissions();
@@ -1626,8 +1651,7 @@ public abstract class RTL2832TunerController extends TunerController
| IllegalArgumentException | UsbDisconnectedException
| UsbException e )
{
Log.error( "RTL2832TunerController - error while "
+ "processing samples - " + e.getLocalizedMessage() );
mLog.error( "error while processing samples", e );
}
}
}
@@ -1640,9 +1664,8 @@ public abstract class RTL2832TunerController extends TunerController
* the reset process and ignore all subsequent errors */
if( mResetting.compareAndSet( false, true ) )
{
Log.error( "RTL2832TunerController - error during data transfer - "
+ "resetting USB pipe to RTL-2832 - " +
e.getUsbException().getLocalizedMessage() );
mLog.error( "error during data transfer resetting USB pipe to "
+ "RTL-2832", e );
stop();
@@ -1714,7 +1737,7 @@ public abstract class RTL2832TunerController extends TunerController
sb.append( " count:" );
sb.append( mSampleRateAverageCount );
Log.info( sb.toString() );
mLog.info( sb.toString() );
}
}

44
src/source/tuner/rtl/e4k/E4KTunerConfigurationPanel.java
View File

@@ -42,10 +42,11 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.usb.UsbException;
import com.jidesoft.swing.JideTabbedPane;
import log.Log;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.TunerConfiguration;
import source.tuner.TunerConfigurationAssignment;
@@ -60,7 +61,10 @@ import controller.ResourceManager;
public class E4KTunerConfigurationPanel extends JPanel
{
private static final long serialVersionUID = 1L;
private ResourceManager mResourceManager;
private final static Logger mLog =
LoggerFactory.getLogger( E4KTunerConfigurationPanel.class );
private ResourceManager mResourceManager;
private E4KTunerController mController;
private E4KTunerConfiguration mSelectedConfig;
@@ -223,9 +227,8 @@ public class E4KTunerConfigurationPanel extends JPanel
+ "frequency correction value: " + value +
e1.getLocalizedMessage() );
Log.error( "E4K Tuner Controller - couldn't apply "
+ "frequency correction value: " + value +
e1.getLocalizedMessage() );
mLog.error( "E4K Tuner Controller - couldn't apply "
+ "frequency correction value: " + value, e1 );
}
}
} );
@@ -263,9 +266,9 @@ public class E4KTunerConfigurationPanel extends JPanel
+ "rate setting [" + sampleRate.getLabel() + "] " +
eSampleRate.getLocalizedMessage() );
Log.error( "E4K Tuner Controller - couldn't apply sample "
+ "rate setting [" + sampleRate.getLabel() + "] " +
eSampleRate.getLocalizedMessage() );
mLog.error( "E4K Tuner Controller - couldn't apply sample "
+ "rate setting [" + sampleRate.getLabel() + "]",
eSampleRate );
}
}
} );
@@ -389,8 +392,8 @@ public class E4KTunerConfigurationPanel extends JPanel
"E4K Tuner Controller - couldn't apply the gain "
+ "setting - " + e.getLocalizedMessage() );
Log.error( "E4K Tuner Controller - couldn't apply "
+ "gain setting - " + e.getLocalizedMessage() );
mLog.error( "E4K Tuner Controller - couldn't apply "
+ "gain setting", e );
}
}
} );
@@ -435,8 +438,8 @@ public class E4KTunerConfigurationPanel extends JPanel
"E4K Tuner Controller - couldn't apply the mixer "
+ "gain setting - " + e.getLocalizedMessage() );
Log.error( "E4K Tuner Controller - couldn't apply mixer "
+ "gain setting - " + e.getLocalizedMessage() );
mLog.error( "E4K Tuner Controller - couldn't apply mixer "
+ "gain setting", e );
}
}
} );
@@ -475,8 +478,8 @@ public class E4KTunerConfigurationPanel extends JPanel
"E4K Tuner Controller - couldn't apply the LNA "
+ "gain setting - " + e.getLocalizedMessage() );
Log.error( "E4K Tuner Controller - couldn't apply LNA "
+ "gain setting - " + e.getLocalizedMessage() );
mLog.error( "E4K Tuner Controller - couldn't apply LNA "
+ "gain setting - ", e );
}
}
} );
@@ -514,8 +517,8 @@ public class E4KTunerConfigurationPanel extends JPanel
"E4K Tuner Controller - couldn't apply the enhance "
+ "gain setting - " + e.getLocalizedMessage() );
Log.error( "E4K Tuner Controller - couldn't apply enhance "
+ "gain setting - " + e.getLocalizedMessage() );
mLog.error( "E4K Tuner Controller - couldn't apply enhance "
+ "gain setting", e );
}
}
} );
@@ -630,9 +633,8 @@ public class E4KTunerConfigurationPanel extends JPanel
+ "apply the tuner configuration settings - " +
e1.getLocalizedMessage() );
Log.error( "E4K Tuner Controller - couldn't apply "
+ "config [" + config.getName() + "] - " +
e1.getLocalizedMessage() );
mLog.error( "E4K Tuner Controller - couldn't apply "
+ "config [" + config.getName() + "]", e1 );
}
}

12
src/source/tuner/rtl/e4k/E4KTunerEditorPanel.java
View File

@@ -25,8 +25,11 @@ import java.awt.EventQueue;
import javax.swing.JLabel;
import javax.swing.JPanel;
import log.Log;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.FrequencyChangeListener;
import source.tuner.rtl.RTL2832InfoPanel;
@@ -37,6 +40,9 @@ import controller.ResourceManager;
public class E4KTunerEditorPanel extends JPanel implements FrequencyChangeListener
{
private final static Logger mLog =
LoggerFactory.getLogger( E4KTunerEditorPanel.class );
private static final long serialVersionUID = 1L;
private E4KTunerController mController;
@@ -101,8 +107,8 @@ public class E4KTunerEditorPanel extends JPanel implements FrequencyChangeListen
}
catch ( SourceException e )
{
Log.error( "E4KTunerController - error setting frequency [" +
frequency + "] - " + e.getLocalizedMessage() );
mLog.error( "E4KTunerController - error setting frequency [" +
frequency + "]", e );
}
}
} );

42
src/source/tuner/rtl/r820t/R820TTunerConfigurationPanel.java
View File

@@ -42,8 +42,11 @@ import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.usb.UsbException;
import log.Log;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.TunerConfiguration;
import source.tuner.TunerConfigurationAssignment;
@@ -57,7 +60,10 @@ import controller.ResourceManager;
public class R820TTunerConfigurationPanel extends JPanel
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( R820TTunerConfigurationPanel.class );
private static final long serialVersionUID = 1L;
private static final R820TGain DEFAULT_GAIN = R820TGain.GAIN_279;
private ResourceManager mResourceManager;
@@ -214,9 +220,8 @@ public class R820TTunerConfigurationPanel extends JPanel
+ "frequency correction value: " + value +
e1.getLocalizedMessage() );
Log.error( "R820T Tuner Controller - couldn't apply "
+ "frequency correction value: " + value +
e1.getLocalizedMessage() );
mLog.error( "R820T Tuner Controller - couldn't apply "
+ "frequency correction value: " + value, e1 );
}
}
} );
@@ -254,9 +259,9 @@ public class R820TTunerConfigurationPanel extends JPanel
+ "rate setting [" + sampleRate.getLabel() + "] " +
eSampleRate.getLocalizedMessage() );
Log.error( "R820T Tuner Controller - couldn't apply sample "
+ "rate setting [" + sampleRate.getLabel() + "] " +
eSampleRate.getLocalizedMessage() );
mLog.error( "R820T Tuner Controller - couldn't apply sample "
+ "rate setting [" + sampleRate.getLabel() + "]",
eSampleRate );
}
}
} );
@@ -318,8 +323,8 @@ public class R820TTunerConfigurationPanel extends JPanel
"R820T Tuner Controller - couldn't apply the gain "
+ "setting - " + e.getLocalizedMessage() );
Log.error( "R820T Tuner Controller - couldn't apply "
+ "gain setting - " + e.getLocalizedMessage() );
mLog.error( "R820T Tuner Controller - couldn't apply "
+ "gain setting - ", e );
}
}
} );
@@ -369,8 +374,8 @@ public class R820TTunerConfigurationPanel extends JPanel
"R820T Tuner Controller - couldn't apply the mixer "
+ "gain setting - " + e.getLocalizedMessage() );
Log.error( "R820T Tuner Controller - couldn't apply mixer "
+ "gain setting - " + e.getLocalizedMessage() );
mLog.error( "R820T Tuner Controller - couldn't apply mixer "
+ "gain setting - ", e );
}
}
} );
@@ -415,8 +420,8 @@ public class R820TTunerConfigurationPanel extends JPanel
"R820T Tuner Controller - couldn't apply the LNA "
+ "gain setting - " + e.getLocalizedMessage() );
Log.error( "R820T Tuner Controller - couldn't apply LNA "
+ "gain setting - " + e.getLocalizedMessage() );
mLog.error( "R820T Tuner Controller - couldn't apply LNA "
+ "gain setting - ", e );
}
}
} );
@@ -459,8 +464,8 @@ public class R820TTunerConfigurationPanel extends JPanel
"R820T Tuner Controller - couldn't apply the VGA "
+ "gain setting - " + e.getLocalizedMessage() );
Log.error( "R820T Tuner Controller - couldn't apply VGA "
+ "gain setting - " + e.getLocalizedMessage() );
mLog.error( "R820T Tuner Controller - couldn't apply VGA "
+ "gain setting", e );
}
}
} );
@@ -575,9 +580,8 @@ public class R820TTunerConfigurationPanel extends JPanel
+ "apply the tuner configuration settings - " +
e1.getLocalizedMessage() );
Log.error( "R820T Tuner Controller - couldn't apply "
+ "config [" + config.getName() + "] - " +
e1.getLocalizedMessage() );
mLog.error( "R820T Tuner Controller - couldn't apply "
+ "config [" + config.getName() + "]", e1 );
}
}

30
src/source/tuner/rtl/r820t/R820TTunerController.java
View File

@@ -25,7 +25,9 @@ package source.tuner.rtl.r820t;
import javax.swing.JPanel;
import javax.usb.UsbException;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.TunerConfiguration;
import source.tuner.TunerType;
@@ -35,6 +37,9 @@ import controller.ResourceManager;
public class R820TTunerController extends RTL2832TunerController
{
private final static Logger mLog =
LoggerFactory.getLogger( R820TTunerController.class );
public static final long MIN_FREQUENCY = 3180000;
public static final long MAX_FREQUENCY = 1782030000;
public static final int R820T_IF_FREQUENCY = 3570000;
@@ -236,33 +241,32 @@ public class R820TTunerController extends RTL2832TunerController
{
try
{
Log.debug( "R820T Tuner Controller - testing USB interface" );
mLog.debug( "testing USB interface" );
/* Dummy write to test USB interface */
writeRegister( mUSBDevice, Block.USB,
Address.USB_SYSCTL.getAddress(), (short)0x09, 1 );
Log.debug( "R820T Tuner Controller - initializing RTL2832 tuner baseband" );
mLog.debug( "initializing RTL2832 tuner baseband" );
initBaseband( mUSBDevice );
Log.debug( "R820T Tuner Controller - enabling I2C repeater" );
mLog.debug( "enabling I2C repeater" );
enableI2CRepeater( mUSBDevice, true );
boolean i2CRepeaterControl = false;
Log.debug( "R820T Tuner Controller - initializing R820T tuner" );
mLog.debug( "initializing R820T tuner" );
initTuner( i2CRepeaterControl );
Log.debug( "R820T Tuner Controller - disabling I2C repeater" );
mLog.debug( "disabling I2C repeater" );
enableI2CRepeater( mUSBDevice, false );
Log.debug( "R820T Tuner Controller - initializing RTL tuner controller super class" );
mLog.debug( "initializing RTL2832 tuner controller super class" );
/* Initialize the super class */
super.init();
}
catch( UsbException e )
{
throw new SourceException( "R820T Tuner Controller - error during "
+ "init()", e );
throw new SourceException( "error during init()", e );
}
}
@@ -345,7 +349,8 @@ public class R820TTunerController extends RTL2832TunerController
if( !calibrationSuccessful( calibrationCode ) )
{
Log.error( "Calibration NOT successful!!" );
mLog.error( "Calibration NOT successful - code: " +
calibrationCode );
}
}
@@ -354,14 +359,11 @@ public class R820TTunerController extends RTL2832TunerController
calibrationCode = 0;
}
Log.debug( "Calibration Code is:" + calibrationCode );
/* Write calibration code */
byte filt_q = 0x10;
calibrationCode = calibrationCode | filt_q;
writeR820TRegister( Register.FILTER_CALIBRATION_CODE,
(byte)calibrationCode, controlI2C );
(byte)( calibrationCode | filt_q ), controlI2C );
/* Set BW, Filter gain & HP Corner */
writeR820TRegister( Register.BANDWIDTH_FILTER_GAIN_HIGHPASS_FILTER_CORNER,

21
src/source/tuner/rtl/r820t/R820TTunerEditorPanel.java
View File

@@ -22,23 +22,28 @@ import gui.control.JFrequencyControl;
import java.awt.Color;
import java.awt.EventQueue;
import javax.swing.BorderFactory;
import javax.swing.JLabel;
import javax.swing.JPanel;
import com.jidesoft.swing.JideTabbedPane;
import log.Log;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.SourceException;
import source.tuner.FrequencyChangeListener;
import source.tuner.rtl.RTL2832InfoPanel;
import source.tuner.rtl.e4k.E4KTunerConfigurationPanel;
import com.jidesoft.swing.JideTabbedPane;
import controller.ResourceManager;
public class R820TTunerEditorPanel extends JPanel implements FrequencyChangeListener
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( R820TTunerEditorPanel.class );
private static final long serialVersionUID = 1L;
private R820TTunerController mController;
private ResourceManager mResourceManager;
@@ -101,8 +106,8 @@ public class R820TTunerEditorPanel extends JPanel implements FrequencyChangeList
}
catch ( SourceException e )
{
Log.error( "R820T Tuner Controller - error setting frequency [" +
frequency + "] - " + e.getLocalizedMessage() );
mLog.error( "R820T Tuner Controller - error setting frequency [" +
frequency + "]", e );
}
}
} );