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

13
src/instrument/gui/DecoderViewFrame.java
View File

@@ -42,9 +42,12 @@ import javax.swing.JMenuItem;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import log.Log;
import message.Message;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import sample.Listener;
import source.Source.SampleType;
import source.wave.FloatWaveSource;
@@ -56,6 +59,8 @@ public class DecoderViewFrame extends JInternalFrame
implements PositionListener, Listener<Message>
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( DecoderViewFrame.class );
private Decoder mDecoder;
private WaveSource mWaveSource;
@@ -70,7 +75,7 @@ public class DecoderViewFrame extends JInternalFrame
if( source.getSampleType() == SampleType.COMPLEX )
{
Log.error( "Hey, we're not wired up yet for complex" );
mLog.error( "Hey, we're not wired up yet for complex" );
}
else if( source.getSampleType() == SampleType.FLOAT )
{
@@ -181,7 +186,7 @@ public class DecoderViewFrame extends JInternalFrame
}
else
{
Log.info( "Tap panel is null, couldn't add for tap " +
mLog.info( "Tap panel is null, couldn't add for tap " +
tap.getName() + "[" + tap.getType().toString() + "]" );
}
}
@@ -272,6 +277,6 @@ public class DecoderViewFrame extends JInternalFrame
@Override
public void receive( Message message )
{
Log.info( "Decoder message: " + message.toString() );
mLog.info( "Decoder message: " + message.toString() );
}
}

7
src/instrument/gui/SampleModel.java
View File

@@ -24,11 +24,14 @@ import java.util.Collections;
import java.util.List;
import java.util.Observable;
import log.Log;
import dsp.fsk.SymbolEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class SampleModel<T> extends Observable implements TapListener<T>
{
private final static Logger mLog =
LoggerFactory.getLogger( SampleModel.class );
private int mSampleCount = 2000;
private int mDelay = 0;
private ArrayList<T> mSamples = new ArrayList<T>();

18
src/instrument/gui/Viewer.java
View File

@@ -31,7 +31,9 @@ import javax.swing.JMenuItem;
import javax.swing.JSeparator;
import javax.swing.filechooser.FileFilter;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.Source;
import source.wave.ComplexWaveSource;
import source.wave.FloatWaveSource;
@@ -39,6 +41,8 @@ import source.wave.WaveSource;
public class Viewer
{
private final static Logger mLog = LoggerFactory.getLogger( Viewer.class );
private JFrame mFrame;
private JDesktopPane mDesktop;
@@ -129,7 +133,7 @@ public class Viewer
private void setSourceFile( File file )
{
Log.info( "File selected [" + file.getAbsolutePath() + "]");
mLog.info( "File selected [" + file.getAbsolutePath() + "]");
WaveSource source = null;
@@ -141,12 +145,11 @@ public class Viewer
source = floatSource;
Log.info( "File opened as float wave file" );
mLog.info( "File opened as float wave file" );
}
catch( Exception e )
{
Log.error( "Couldn't open file as float source - " +
e.getLocalizedMessage() );
mLog.error( "Couldn't open file as float source", e);
}
if( source == null )
@@ -159,12 +162,11 @@ public class Viewer
source = complex;
Log.info( "File opened as complex wave file" );
mLog.info( "File opened as complex wave file" );
}
catch( Exception e )
{
Log.error( "Couldn't open file as float source - " +
e.getLocalizedMessage() );
mLog.error( "Couldn't open file as float source", e);
}
}

19
src/instrument/gui/WaveSourceFrame.java
View File

@@ -34,9 +34,12 @@ import javax.swing.JOptionPane;
import javax.swing.JPanel;
import javax.swing.JTextField;
import log.Log;
import message.MessageDirection;
import net.miginfocom.swing.MigLayout;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import source.Source.SampleType;
import source.wave.WaveSource;
import source.wave.WaveSource.PositionListener;
@@ -52,6 +55,10 @@ import decode.passport.PassportDecoder;
public class WaveSourceFrame extends JInternalFrame implements PositionListener
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( WaveSourceFrame.class );
private WaveSource mSource;
private JDesktopPane mDesktop;
@@ -128,7 +135,7 @@ public class WaveSourceFrame extends JInternalFrame implements PositionListener
DecoderType selected =
(DecoderType)mComboDecoders.getSelectedItem();
Log.info( "Selected:" + selected.getDisplayString() );
mLog.info( "Selected:" + selected.getDisplayString() );
Decoder decoder = null;
@@ -189,8 +196,8 @@ public class WaveSourceFrame extends JInternalFrame implements PositionListener
}
catch ( IOException e )
{
Log.error( "Viewer - error trying to fetch next [" +
mCount + "] samples - " + e.getLocalizedMessage() );
mLog.error( "Viewer - error trying to fetch next [" +
mCount + "] samples", e );
JOptionPane.showMessageDialog( WaveSourceFrame.this,
"Cannot read " + mCount + " more samples [" +
@@ -230,8 +237,8 @@ public class WaveSourceFrame extends JInternalFrame implements PositionListener
}
catch( Exception e )
{
Log.error( "WaveSourceFrame - exception during jump "
+ "to - " + e.getLocalizedMessage() );
mLog.error( "WaveSourceFrame - exception during jump "
+ "to", e );
JOptionPane.showMessageDialog( WaveSourceFrame.this,
"Can't jump to position [" + getText() + "]",

11
src/instrument/tap/stream/FloatTapPhaseViewPanel.java
View File

@@ -17,6 +17,7 @@
******************************************************************************/
package instrument.tap.stream;
import gui.SDRTrunk;
import instrument.gui.SampleModel;
import instrument.tap.Tap;
import instrument.tap.TapViewPanel;
@@ -29,11 +30,15 @@ import java.awt.geom.Point2D;
import java.util.List;
import java.util.Observable;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FloatTapPhaseViewPanel extends TapViewPanel
{
private static final long serialVersionUID = 1L;
private final static Logger mLog =
LoggerFactory.getLogger( FloatTapPhaseViewPanel.class );
private static final long serialVersionUID = 1L;
private Tap mTap;
private List<Float> mSamples;
private int mSampleCount;
@@ -50,7 +55,7 @@ public class FloatTapPhaseViewPanel extends TapViewPanel
getModel().setSampleCount( mSampleCount );
getModel().setDelay( tap.getDelay() );
Log.info( "Float Tap Panel [" + tap.getName() + "] count: " +
mLog.info( "Float Tap Panel [" + tap.getName() + "] count: " +
getModel().getSampleCount() + " delay:" + getModel().getDelay() );
}

10
src/instrument/tap/stream/FloatTapViewPanel.java
View File

@@ -17,6 +17,7 @@
******************************************************************************/
package instrument.tap.stream;
import gui.SDRTrunk;
import instrument.gui.SampleModel;
import instrument.tap.Tap;
import instrument.tap.TapViewPanel;
@@ -29,11 +30,14 @@ import java.awt.geom.Point2D;
import java.util.List;
import java.util.Observable;
import log.Log;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class FloatTapViewPanel extends TapViewPanel
{
private static final long serialVersionUID = 1L;
private final static Logger mLog = LoggerFactory.getLogger( SDRTrunk.class );
private Tap mTap;
private List<Float> mSamples;
private int mSampleCount;
@@ -50,7 +54,7 @@ public class FloatTapViewPanel extends TapViewPanel
getModel().setSampleCount( mSampleCount );
getModel().setDelay( tap.getDelay() );
Log.info( "Float Tap Panel [" + tap.getName() + "] count: " +
mLog.info( "Float Tap Panel [" + tap.getName() + "] count: " +
getModel().getSampleCount() + " delay:" + getModel().getDelay() );
}
@@ -109,7 +113,7 @@ public class FloatTapViewPanel extends TapViewPanel
float scaledValue = value / (float)Short.MAX_VALUE;
Log.info( "Float value is:" + scaledValue );
// mLog.info( "Float value is:" + scaledValue );
float y = middle - ( middle * scaledValue * mVerticalZoom );
/* Clip y to zero as necessary */

1
src/instrument/tap/stream/SymbolEventTap.java
View File

@@ -17,7 +17,6 @@
******************************************************************************/
package instrument.tap.stream;
import log.Log;
import instrument.tap.TapListener;
import instrument.tap.TapType;
import sample.Listener;

1
src/instrument/tap/stream/SymbolEventTapViewPanel.java
View File

@@ -29,7 +29,6 @@ import java.awt.geom.Rectangle2D;
import java.util.List;
import java.util.Observable;
import log.Log;
import dsp.fsk.SymbolEvent;
public class SymbolEventTapViewPanel extends TapViewPanel