GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-13 09:07:27 -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

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 );
}
}
}