diff --git a/src/audio/AudioChannelPanel.java b/src/audio/AudioChannelPanel.java index aa2a9226..0f217211 100644 --- a/src/audio/AudioChannelPanel.java +++ b/src/audio/AudioChannelPanel.java @@ -47,11 +47,11 @@ public class AudioChannelPanel extends JPanel private IAudioController mController; private String mChannel; - private JLabel mToLabel = new JLabel( "To:" ); + private JLabel mToLabel = new JLabel( "TO:" ); private JLabel mTo = new JLabel( "" ); private JLabel mToAlias = new JLabel( "" ); - private JLabel mFromLabel = new JLabel( "From:" ); + private JLabel mFromLabel = new JLabel( "FROM:" ); private JLabel mFrom = new JLabel( "" ); private JLabel mFromAlias = new JLabel( "" ); diff --git a/src/audio/AudioModule.java b/src/audio/AudioModule.java index 25c3e1f5..4fb091d2 100644 --- a/src/audio/AudioModule.java +++ b/src/audio/AudioModule.java @@ -201,6 +201,8 @@ public class AudioModule extends Module implements IAudioPacketProvider, @Override public void receive( SquelchState state ) { + mLog.debug( "Squelch State:" + state ); + if( state == SquelchState.SQUELCH && mAudioPacketListener != null ) { mAudioPacketListener.receive( new AudioPacket( AudioPacket.Type.END, diff --git a/src/dsp/fsk/FSK2Decoder.java b/src/dsp/fsk/FSK2Decoder.java index 13646d06..e54c3aae 100644 --- a/src/dsp/fsk/FSK2Decoder.java +++ b/src/dsp/fsk/FSK2Decoder.java @@ -19,6 +19,7 @@ package dsp.fsk; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.SymbolEventTap; import java.util.ArrayList; @@ -58,7 +59,7 @@ public class FSK2Decoder implements Instrumentable, Listener /* Instrumentation taps */ private static final String INSTRUMENT_DECISION = "Tap Point: FSK2 Symbol Decision"; - private ArrayList mAvailableTaps; + private List mAvailableTaps; private ArrayList mTaps = new ArrayList(); private Listener mListener; @@ -257,13 +258,16 @@ public class FSK2Decoder implements Instrumentable, Listener * Get instrumentation taps */ @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); - mAvailableTaps.add( - new SymbolEventTap( INSTRUMENT_DECISION, 0, .025f ) ); + mAvailableTaps = new ArrayList(); + + TapGroup tapGroup = new TapGroup( "FSK2 Decoder" ); + tapGroup.add( new SymbolEventTap( INSTRUMENT_DECISION, 0, .025f ) ); + + mAvailableTaps.add( tapGroup ); } return mAvailableTaps; @@ -273,7 +277,7 @@ public class FSK2Decoder implements Instrumentable, Listener * Add instrumentation tap */ @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { if( tap instanceof SymbolEventTap && !mTaps.contains( tap ) ) { @@ -285,7 +289,7 @@ public class FSK2Decoder implements Instrumentable, Listener * Remove instrumentation tap */ @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { mTaps.remove( tap ); } diff --git a/src/dsp/fsk/LTRFSKDecoder.java b/src/dsp/fsk/LTRFSKDecoder.java index 089be152..d7745bf0 100644 --- a/src/dsp/fsk/LTRFSKDecoder.java +++ b/src/dsp/fsk/LTRFSKDecoder.java @@ -19,6 +19,7 @@ package dsp.fsk; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.BinaryTap; import instrument.tap.stream.FloatTap; import instrument.tap.stream.SymbolEventTap; @@ -50,7 +51,7 @@ public class LTRFSKDecoder implements Listener, Instrumentable private LTRPulseShapingFilter mPulseShaper; private Slicer mSlicer; - private List mAvailableTaps; + private List mAvailableTaps; private final String TAP_F1_F2 = "LTR FSK Demod Filter1 >< Filter2"; private final String TAP_F2_F3 = "LTR FSK Demod Filter2 >< Filter3"; private final String TAP_F3_F4 = "LTR FSK Demod Filter3 >< Filter4"; @@ -124,28 +125,33 @@ public class LTRFSKDecoder implements Listener, Instrumentable } @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); - mAvailableTaps.add( new FloatTap( TAP_F1_F2, 0, 1.0f ) ); - mAvailableTaps.add( new FloatTap( TAP_F2_F3, 8, 0.5f ) ); - mAvailableTaps.add( new FloatTap( TAP_F3_F4, 12, 0.25f ) ); - mAvailableTaps.add( new FloatTap( TAP_F4_F5, 14, 0.125f ) ); - mAvailableTaps.add( new FloatTap( TAP_F5_F6, 15, 0.0625f ) ); - mAvailableTaps.add( new FloatTap( TAP_F6_DT, 31, 0.0625f ) ); - mAvailableTaps.add( new FloatTap( TAP_DT_SF1, 31, 0.0625f ) ); - mAvailableTaps.add( new BinaryTap( TAP_SF1_PS, 33, 0.0625f ) ); - mAvailableTaps.add( new BinaryTap( TAP_PS_SLICER, 33, 0.0625f ) ); - mAvailableTaps.add( new SymbolEventTap( TAP_SYMBOL_EVENT, 7, 0.0125f ) ); + mAvailableTaps = new ArrayList(); + + TapGroup group = new TapGroup( "LTR FSK Decoder" ); + + group.add( new FloatTap( TAP_F1_F2, 0, 1.0f ) ); + group.add( new FloatTap( TAP_F2_F3, 8, 0.5f ) ); + group.add( new FloatTap( TAP_F3_F4, 12, 0.25f ) ); + group.add( new FloatTap( TAP_F4_F5, 14, 0.125f ) ); + group.add( new FloatTap( TAP_F5_F6, 15, 0.0625f ) ); + group.add( new FloatTap( TAP_F6_DT, 31, 0.0625f ) ); + group.add( new FloatTap( TAP_DT_SF1, 31, 0.0625f ) ); + group.add( new BinaryTap( TAP_SF1_PS, 33, 0.0625f ) ); + group.add( new BinaryTap( TAP_PS_SLICER, 33, 0.0625f ) ); + group.add( new SymbolEventTap( TAP_SYMBOL_EVENT, 7, 0.0125f ) ); + + mAvailableTaps.add( group ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { switch( tap.getName() ) { @@ -192,7 +198,7 @@ public class LTRFSKDecoder implements Listener, Instrumentable } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { switch( tap.getName() ) { diff --git a/src/dsp/psk/CQPSKDemodulator.java b/src/dsp/psk/LSMDemodulator.java similarity index 95% rename from src/dsp/psk/CQPSKDemodulator.java rename to src/dsp/psk/LSMDemodulator.java index 5fe83468..12c27eb8 100644 --- a/src/dsp/psk/CQPSKDemodulator.java +++ b/src/dsp/psk/LSMDemodulator.java @@ -32,6 +32,7 @@ package dsp.psk; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.EyeDiagramData; import instrument.tap.stream.EyeDiagramDataTap; @@ -51,17 +52,19 @@ import dsp.filter.interpolator.RealInterpolator; import dsp.symbol.Dibit; /** - * Implements a LSM (CQPSK) demodulator using a Gardner Detector to determine + * Implements a LSM (Pi/4) demodulator using a Gardner Detector to determine * optimal sampling timing and a Costas Loop as a phase locked loop synchronized * with the incoming signal carrier frequency. * * Sample Rate: 48000 * Symbol Rate: 4800 */ -public class CQPSKDemodulator implements Instrumentable, ComplexSampleListener +public class LSMDemodulator implements Instrumentable, ComplexSampleListener { private final static Logger mLog = - LoggerFactory.getLogger( CQPSKDemodulator.class ); + LoggerFactory.getLogger( LSMDemodulator.class ); + + private List mAvailableTaps; /* 45 degree rotation angle */ public static final float THETA = (float)( Math.PI / 4.0d ); @@ -80,7 +83,7 @@ public class CQPSKDemodulator implements Instrumentable, ComplexSampleListener private EyeDiagramDataTap mEyeDiagramDataTap; - public CQPSKDemodulator() + public LSMDemodulator() { } @@ -556,17 +559,24 @@ public class CQPSKDemodulator implements Instrumentable, ComplexSampleListener } @Override - public List getTaps() + public List getTapGroups() { - List taps = new ArrayList(); + if( mAvailableTaps == null ) + { + mAvailableTaps = new ArrayList<>(); + + TapGroup group = new TapGroup( "LSM Demodulator" ); + + group.add( new EyeDiagramDataTap( "Eye Diagram", 0, 4800 ) ); + + mAvailableTaps.add( group ); + } - taps.add( new EyeDiagramDataTap( "Eye Diagram", 0, 4800 ) ); - - return taps; + return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { if( tap instanceof EyeDiagramDataTap ) { @@ -575,7 +585,7 @@ public class CQPSKDemodulator implements Instrumentable, ComplexSampleListener } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { if( tap instanceof EyeDiagramDataTap ) { diff --git a/src/dsp/psk/CQPSKDemodulator2.java b/src/dsp/psk/LSMDemodulator2.java similarity index 94% rename from src/dsp/psk/CQPSKDemodulator2.java rename to src/dsp/psk/LSMDemodulator2.java index c242ef34..1df263f1 100644 --- a/src/dsp/psk/CQPSKDemodulator2.java +++ b/src/dsp/psk/LSMDemodulator2.java @@ -32,6 +32,7 @@ package dsp.psk; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.EyeDiagramData; import instrument.tap.stream.EyeDiagramDataTap; @@ -53,18 +54,20 @@ import dsp.filter.interpolator.RealInterpolator; import dsp.symbol.Dibit; /** - * Implements a CQPSK demodulator using an early/late symbol timing error detector - * and a Costas Loop as a phase locked loop synchronized with the incoming - * signal carrier frequency. + * Implements an LSM (Pi/4) demodulator using an early/late symbol timing error + * detector and a Costas Loop as a phase locked loop synchronized with the + * incoming signal carrier frequency. * * Sample Rate: 48000 * Symbol Rate: 4800 */ -public class CQPSKDemodulator2 implements Instrumentable, ComplexSampleListener, +public class LSMDemodulator2 implements Instrumentable, ComplexSampleListener, Provider { + private List mAvailableTaps; + private final static Logger mLog = - LoggerFactory.getLogger( CQPSKDemodulator2.class ); + LoggerFactory.getLogger( LSMDemodulator2.class ); /* 45 degree rotation angle */ public static final float THETA = (float)( Math.PI / 4.0d ); @@ -85,7 +88,7 @@ public class CQPSKDemodulator2 implements Instrumentable, ComplexSampleListener, private EyeDiagramDataTap mEyeDiagramDataTap; - public CQPSKDemodulator2() + public LSMDemodulator2() { } @@ -534,17 +537,23 @@ public class CQPSKDemodulator2 implements Instrumentable, ComplexSampleListener, } @Override - public List getTaps() + public List getTapGroups() { - List taps = new ArrayList(); - - taps.add( new EyeDiagramDataTap( "Eye Diagram", 0, 4800 ) ); - - return taps; + if( mAvailableTaps == null ) + { + mAvailableTaps = new ArrayList<>(); + + TapGroup group = new TapGroup( "LSM Demodulator 2" ); + group.add( new EyeDiagramDataTap( "Eye Diagram", 0, 4800 ) ); + + mAvailableTaps.add( group ); + } + + return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { if( tap instanceof EyeDiagramDataTap ) { @@ -553,7 +562,7 @@ public class CQPSKDemodulator2 implements Instrumentable, ComplexSampleListener, } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { if( tap instanceof EyeDiagramDataTap ) { diff --git a/src/instrument/Instrumentable.java b/src/instrument/Instrumentable.java index ab98d1d1..f6b743ea 100644 --- a/src/instrument/Instrumentable.java +++ b/src/instrument/Instrumentable.java @@ -18,6 +18,7 @@ package instrument; import instrument.tap.Tap; +import instrument.tap.TapGroup; import java.util.List; @@ -28,11 +29,11 @@ import java.util.List; public interface Instrumentable { /** - * Returns the list of available tap points. Use the addTap() and + * Returns the list of available tap point groups. Use the addTap() and * removeTap() to register a tap on the instrumentable class and then add * your TapListener(s) to the registered tap. */ - public List getTaps(); + public List getTapGroups(); /** * Registers a tap on the instrumentable object. @@ -40,7 +41,7 @@ public interface Instrumentable * @param tap - one of the tap(s) obtained from getTaps() from the * instrumentable source */ - public void addTap( Tap tap ); + public void registerTap( Tap tap ); /** * Unregisters a tap on the instrumentable object, if the tap is currently @@ -49,5 +50,5 @@ public interface Instrumentable * @param tap - one of the tap(s) obtained from getTaps() from the * instrumentable source */ - public void removeTap( Tap tap ); + public void unregisterTap( Tap tap ); } diff --git a/src/instrument/gui/AudioSourceFrame.java b/src/instrument/gui/AudioSourceFrame.java deleted file mode 100644 index 109b64f1..00000000 --- a/src/instrument/gui/AudioSourceFrame.java +++ /dev/null @@ -1,312 +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 - ******************************************************************************/ -package instrument.gui; - -import java.awt.Dimension; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.io.IOException; - -import javax.swing.DefaultComboBoxModel; -import javax.swing.JButton; -import javax.swing.JComboBox; -import javax.swing.JDesktopPane; -import javax.swing.JInternalFrame; -import javax.swing.JLabel; -import javax.swing.JOptionPane; -import javax.swing.JPanel; -import javax.swing.JTextField; - -import module.decode.Decoder; -import module.decode.DecoderType; -import module.decode.fleetsync2.Fleetsync2Decoder; -import module.decode.lj1200.LJ1200Decoder; -import module.decode.mdc1200.MDCDecoder; -import module.decode.p25.P25Decoder.Modulation; -import module.decode.tait.Tait1200Decoder; -import net.miginfocom.swing.MigLayout; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import source.wave.WaveSource; -import source.wave.WaveSource.PositionListener; -import controller.ResourceManager; - -public class AudioSourceFrame extends JInternalFrame implements PositionListener -{ - private static final long serialVersionUID = 1L; - private final static Logger mLog = - LoggerFactory.getLogger( AudioSourceFrame.class ); - - private WaveSource mSource; - private JDesktopPane mDesktop; - - private JLabel mCurrentPosition = new JLabel( "0" ); - private JComboBox mComboDecoders; - private JComboBox mComboModulations; - private JLabel mModulationLabel = new JLabel( "Modulation:" ); - - public AudioSourceFrame( WaveSource source, JDesktopPane desktop ) - { - mSource = source; - mSource.addListener( this ); - - mDesktop = desktop; - - initGui(); - } - - private void initGui() - { - setTitle( "Audio Source [" + mSource.getSampleType().toString() + "]" ); - setPreferredSize( new Dimension( 700, 150 ) ); - setSize( 700, 150 ); - - setResizable( true ); - setClosable( true ); - setIconifiable( true ); - setMaximizable( false ); - - JPanel panel = new JPanel(); - panel.setLayout( new MigLayout() ); - - JLabel fileLabel = new JLabel( "File: " + mSource.getFile().getName() ); - fileLabel.setToolTipText( mSource.getFile().getName() ); - panel.add( fileLabel, "span,wrap" ); - - panel.add( new JLabel( "Jump:" ) ); - panel.add( new JumpToField( mSource ) ); - panel.add( new NextSampleButton( mSource, ">", 1 ) ); - panel.add( new NextSampleButton( mSource, "> 10 >", 10 ) ); - panel.add( new NextSampleButton( mSource, "> 100 >", 100 ) ); - panel.add( new NextSampleButton( mSource, "> 1000 >", 1000 ) ); - panel.add( new JLabel( "Posn:" ) ); - panel.add( mCurrentPosition, "wrap" ); - - /* ComboBox: Decoders */ - mComboDecoders = new JComboBox(); - - DefaultComboBoxModel model = - new DefaultComboBoxModel(); - - for( DecoderType type: DecoderType.getInstrumentableDecoders() ) - { - model.addElement( type ); - } - - mComboDecoders.setModel( model ); - - mComboDecoders.addActionListener( new ActionListener() - { - @Override - public void actionPerformed( ActionEvent e ) - { - DecoderType selected = (DecoderType)mComboDecoders.getSelectedItem(); - - if( selected == DecoderType.P25_PHASE1 ) - { - mComboModulations.setVisible( true ); - mModulationLabel.setVisible( true ); - } - else - { - mComboModulations.setVisible( false ); - mModulationLabel.setVisible( false ); - } - } - - }); - - panel.add( new JLabel( "Decoders:" ) ); - panel.add( mComboDecoders, "span 3,grow" ); - panel.add( new AddDecoderButton(), "grow,wrap" ); - - mComboModulations = new JComboBox( - new DefaultComboBoxModel( Modulation.values() ) ); - mComboModulations.setVisible( false ); - mModulationLabel.setVisible( false ); - - panel.add( mModulationLabel ); - panel.add( mComboModulations ); - - add( panel ); - } - - public class AddDecoderButton extends JButton - { - private static final long serialVersionUID = 1L; - - public AddDecoderButton() - { - super( "Add" ); - - addActionListener( new ActionListener() - { - @Override - public void actionPerformed( ActionEvent arg0 ) - { - DecoderType selected = - (DecoderType)mComboDecoders.getSelectedItem(); - - mLog.info( "Selected:" + selected.getDisplayString() ); - - Decoder decoder = null; - - switch( selected ) - { - case FLEETSYNC2: - decoder = new Fleetsync2Decoder( null ); - break; - case LJ_1200: - decoder = new LJ1200Decoder( null ); - break; - case LTR_NET: -// decoder = new LTRNetDecoder( new DecodeConfigLTRNet(), -// mSource.getSampleType(), null, MessageDirection.OSW ); - break; - case MDC1200: - decoder = new MDCDecoder( null ); - break; - case MPT1327: -// decoder = new MPT1327Decoder( new DecodeConfigMPT1327(), -// mSource.getSampleType(), null, Sync.NORMAL ); - break; - case PASSPORT: -// decoder = new PassportDecoder( new DecodeConfigPassport(), -// mSource.getSampleType(), null ); - break; - case P25_PHASE1: - ResourceManager rm = new ResourceManager(); - -// decoder = new P25Decoder( rm, mSource.getSampleType(), -// (Modulation)mComboModulations.getSelectedItem(), null ); - break; - case TAIT_1200: - decoder = new Tait1200Decoder( null ); - break; - default: - break; - } - - if( decoder != null ) - { - DecoderViewFrame decoderFrame = - new DecoderViewFrame( decoder, mSource ); - - decoderFrame.setVisible( true ); - mDesktop.add( decoderFrame ); - } - } - } ); - } - } - - public class NextSampleButton extends JButton - { - private static final long serialVersionUID = 1L; - - private WaveSource mSource; - private int mCount; - - public NextSampleButton( WaveSource source, String label, int count ) - { - super( label ); - mSource = source; - mCount = count; - - addActionListener( new ActionListener() - { - @Override - public void actionPerformed( ActionEvent arg0 ) - { - try - { - mSource.next( mCount ); - } - catch ( IOException e ) - { - mLog.error( "Viewer - error trying to fetch next [" + - mCount + "] samples", e ); - - JOptionPane.showMessageDialog( AudioSourceFrame.this, - "Cannot read " + mCount + " more samples [" + - e.getLocalizedMessage() + "]", - "Wave File Error", - JOptionPane.ERROR_MESSAGE ); - } - } - } ); - } - } - - public class JumpToField extends JTextField - { - private static final long serialVersionUID = 1L; - - private WaveSource mSource; - - public JumpToField( WaveSource source ) - { - super( "0" ); - - mSource = source; - - setMinimumSize( new Dimension( 100, getHeight() ) ); - - addFocusListener( new FocusListener() - { - @Override - public void focusGained( FocusEvent arg0 ) {} - - @Override - public void focusLost( FocusEvent arg0 ) - { - try - { - long position = Long.parseLong( getText() ); - mSource.jumpTo( position ); - } - catch( Exception e ) - { - mLog.error( "WaveSourceFrame - exception during jump " - + "to", e ); - - JOptionPane.showMessageDialog( AudioSourceFrame.this, - "Can't jump to position [" + getText() + "]", - "Error", - JOptionPane.ERROR_MESSAGE ); - } - } - } ); - } - } - - @Override - public void positionUpdated( long position, boolean reset ) - { - mCurrentPosition.setText( String.valueOf( position ) ); - - if( reset ) - { - - } - } -} diff --git a/src/instrument/gui/ConstellationPanel.java b/src/instrument/gui/ConstellationPanel.java index 615bda8a..3ddeea54 100644 --- a/src/instrument/gui/ConstellationPanel.java +++ b/src/instrument/gui/ConstellationPanel.java @@ -30,10 +30,10 @@ import org.slf4j.LoggerFactory; import sample.Listener; import sample.complex.Complex; -import source.wave.WaveSource.PositionListener; +import source.IFrameLocationListener; public class ConstellationPanel extends JInternalFrame - implements PositionListener, Listener + implements IFrameLocationListener, Listener { private static final long serialVersionUID = 1L; private final static Logger mLog = @@ -63,10 +63,20 @@ public class ConstellationPanel extends JInternalFrame add( mConstellation ); } + @Override - public void positionUpdated( long position, boolean reset ) - { - } + public void frameLocationUpdated( int location ) + { + // TODO Auto-generated method stub + + } + + @Override + public void frameLocationReset() + { + // TODO Auto-generated method stub + + } @Override public void receive( Complex sample ) diff --git a/src/instrument/gui/DecoderViewFrame.java b/src/instrument/gui/DecoderViewFrame.java index 494652f6..f9e9762c 100644 --- a/src/instrument/gui/DecoderViewFrame.java +++ b/src/instrument/gui/DecoderViewFrame.java @@ -18,7 +18,9 @@ package instrument.gui; import instrument.Instrumentable; +import instrument.InstrumentableProcessingChain; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.TapViewPanel; import instrument.tap.stream.BinaryTap; import instrument.tap.stream.BinaryTapViewPanel; @@ -53,49 +55,67 @@ import javax.swing.JPopupMenu; import javax.swing.JSeparator; import message.Message; -import module.decode.Decoder; +import module.Module; +import module.decode.DecoderFactory; +import module.decode.config.AuxDecodeConfiguration; +import module.decode.config.DecodeConfiguration; import net.miginfocom.swing.MigLayout; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import record.config.RecordConfiguration; import sample.Listener; -import sample.SampleType; -import source.wave.ComplexWaveSource; -import source.wave.FloatWaveSource; -import source.wave.WaveSource; -import source.wave.WaveSource.PositionListener; +import source.IControllableFileSource; +import source.Source; +import alias.AliasList; +import controller.ResourceManager; +import controller.channel.Channel.ChannelType; +import controller.site.Site; +import controller.system.System; public class DecoderViewFrame extends JInternalFrame - implements PositionListener, Listener + implements Listener { private static final long serialVersionUID = 1L; private final static Logger mLog = LoggerFactory.getLogger( DecoderViewFrame.class ); - private Decoder mDecoder; - private WaveSource mWaveSource; + private DecodeConfiguration mDecodeConfig; + private InstrumentableProcessingChain mProcessingChain; + private IControllableFileSource mSource; private HashMap mPanelMap = new HashMap(); - public DecoderViewFrame( Decoder decoder, WaveSource source ) + public DecoderViewFrame( ResourceManager resourceManager, + DecodeConfiguration decodeConfig, + RecordConfiguration recordConfig, + AuxDecodeConfiguration auxConfig, + AliasList aliasList, + IControllableFileSource source ) { - mDecoder = decoder; - mWaveSource = source; + mSource = source; - if( source.getSampleType() == SampleType.COMPLEX ) - { - ComplexWaveSource cws = (ComplexWaveSource)mWaveSource; -// cws.addListener( mDecoder.getComplexReceiver() ); - } - else if( source.getSampleType() == SampleType.REAL ) - { - FloatWaveSource fws = (FloatWaveSource)mWaveSource; -// fws.setListener( mDecoder.getRealReceiver() ); - } + mDecodeConfig = decodeConfig; - mDecoder.addMessageListener( this ); + mProcessingChain = new InstrumentableProcessingChain(); + + List modules = DecoderFactory + .getModules( ChannelType.STANDARD, + resourceManager, + decodeConfig, + recordConfig, + auxConfig, + aliasList, + new System( "Instrumented" ), + new Site( "Instrumented" ) ); + + mProcessingChain.addModules( modules ); + + mProcessingChain.addMessageListener( this ); + + mProcessingChain.setSource( (Source)mSource ); initGui(); } @@ -104,7 +124,7 @@ public class DecoderViewFrame extends JInternalFrame { setLayout( new MigLayout( "insets 0 0 0 0 ", "[grow,fill]", "[grow,fill]" ) ); - setTitle( "Decoder [" + mDecoder.getDecoderType().getDisplayString() + "]" ); + setTitle( "Decoder [" + mDecodeConfig.getDecoderType().getDisplayString() + "]" ); setPreferredSize( new Dimension( 450, 250 ) ); setSize( 450, 250 ); @@ -121,23 +141,8 @@ public class DecoderViewFrame extends JInternalFrame if( me.getButton() == MouseEvent.BUTTON3 ) { JPopupMenu popup = new JPopupMenu(); - - if( mDecoder instanceof Instrumentable ) - { - JMenu tapMenu = new JMenu( "Taps" ); - popup.add( tapMenu ); - - Instrumentable i = (Instrumentable)mDecoder; - tapMenu.add( new AddAllTapsItem( i.getTaps() ) ); - - tapMenu.add( new JSeparator() ); - - for( Tap tap: i.getTaps() ) - { - tapMenu.add( new TapSelectionItem( tap ) ); - } - } + popup.add( getTapContextMenu() ); if( !mPanelMap.values().isEmpty() ) { @@ -165,6 +170,41 @@ public class DecoderViewFrame extends JInternalFrame } ); } + private JMenu getTapContextMenu() + { + JMenu menu = new JMenu( "Modules" ); + + if( mProcessingChain != null ) + { + for( Module module: mProcessingChain.getModules() ) + { + if( module instanceof Instrumentable ) + { + List groups = ((Instrumentable)module).getTapGroups(); + + for( TapGroup group: groups ) + { + List taps = group.getTaps(); + + if( !taps.isEmpty() ) + { + JMenu groupMenu = new JMenu( group.getName() ); + + for( Tap tap: taps ) + { + groupMenu.add( new TapSelectionItem( tap ) ); + } + + menu.add( groupMenu ); + } + } + } + } + } + + return menu; + } + public void add( Tap tap ) { TapViewPanel panel = null; @@ -207,7 +247,13 @@ public class DecoderViewFrame extends JInternalFrame mPanelMap.put( tap, panel ); - ((Instrumentable)mDecoder).addTap( tap ); + for( Module module: mProcessingChain.getModules() ) + { + if( module instanceof Instrumentable ) + { + ((Instrumentable)module).registerTap( tap ); + } + } } else { @@ -218,7 +264,13 @@ public class DecoderViewFrame extends JInternalFrame public void remove( Tap tap ) { - ((Instrumentable)mDecoder).removeTap( tap ); + for( Module module: mProcessingChain.getModules() ) + { + if( module instanceof Instrumentable ) + { + ((Instrumentable)module).unregisterTap( tap ); + } + } TapViewPanel panel = mPanelMap.get( tap ); @@ -289,18 +341,6 @@ public class DecoderViewFrame extends JInternalFrame } } - @Override - public void positionUpdated( long position, boolean reset ) - { - if( reset ) - { - for( TapViewPanel panel: mPanelMap.values() ) - { - panel.reset(); - } - } - } - @Override public void receive( Message message ) { diff --git a/src/instrument/gui/SourceControllerFrame.java b/src/instrument/gui/SourceControllerFrame.java new file mode 100644 index 00000000..c2eca173 --- /dev/null +++ b/src/instrument/gui/SourceControllerFrame.java @@ -0,0 +1,225 @@ +/******************************************************************************* + * 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 + ******************************************************************************/ +package instrument.gui; + +import java.awt.Dimension; +import java.awt.EventQueue; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.io.IOException; + +import javax.swing.JButton; +import javax.swing.JDesktopPane; +import javax.swing.JInternalFrame; +import javax.swing.JLabel; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.JTextField; + +import net.miginfocom.swing.MigLayout; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import source.IControllableFileSource; +import source.IFrameLocationListener; + +public class SourceControllerFrame extends JInternalFrame + implements IFrameLocationListener +{ + private static final long serialVersionUID = 1L; + private final static Logger mLog = + LoggerFactory.getLogger( SourceControllerFrame.class ); + + private IControllableFileSource mSource; + private JDesktopPane mDesktop; + + private JLabel mCurrentPosition = new JLabel( "0" ); + + public SourceControllerFrame( IControllableFileSource source, + JDesktopPane desktop ) + { + mSource = source; + mSource.setListener( this ); + + mDesktop = desktop; + + initGui(); + } + + private void initGui() + { + setTitle( "Source [" + mSource.getFile().getAbsolutePath() + "]" ); + setPreferredSize( new Dimension( 670, 70 ) ); + setSize( 670, 70 ); + + setResizable( true ); + setClosable( true ); + setIconifiable( true ); + setMaximizable( false ); + + JPanel panel = new JPanel(); + panel.setLayout( new MigLayout() ); + + JButton decoderButton = new JButton( "Decoders" ); + decoderButton.addActionListener( new ActionListener() + { + @Override + public void actionPerformed( ActionEvent e ) + { + EventQueue.invokeLater( new Runnable() + { + @Override + public void run() + { + DecoderSelectionFrame frame = + new DecoderSelectionFrame( mDesktop, mSource ); + + frame.setVisible( true ); + + mDesktop.add( frame ); + } + } ); + } + } ); + + panel.add( decoderButton ); + + panel.add( new JLabel( "Skip:" ) ); + panel.add( new SkipFramesField( mSource ) ); + panel.add( new NextFrameButton( mSource, "> 1", 1 ) ); + panel.add( new NextFrameButton( mSource, "> 10", 10 ) ); + panel.add( new NextFrameButton( mSource, "> 100", 100 ) ); + panel.add( new NextFrameButton( mSource, "> 1000", 1000 ) ); + panel.add( new JLabel( "Posn:" ) ); + panel.add( mCurrentPosition, "wrap" ); + + add( panel ); + } + + public class NextFrameButton extends JButton + { + private static final long serialVersionUID = 1L; + + private IControllableFileSource mSource; + private int mFrames; + + public NextFrameButton( IControllableFileSource source, + String label, int frames ) + { + super( label ); + mSource = source; + mFrames = frames; + + addActionListener( new ActionListener() + { + @Override + public void actionPerformed( ActionEvent arg0 ) + { + EventQueue.invokeLater( new Runnable() + { + @Override + public void run() + { + try + { + mSource.next( mFrames ); + } + catch ( IOException e ) + { + mLog.error( "Viewer - reading frames [" + mFrames + + "] from source", e ); + + JOptionPane.showMessageDialog( SourceControllerFrame.this, + "Can't read " + mFrames + " more frames [" + + e.getLocalizedMessage() + "]", + "Wave File Error", + JOptionPane.ERROR_MESSAGE ); + } + } + } ); + } + } ); + } + } + + public class SkipFramesField extends JTextField + { + private static final long serialVersionUID = 1L; + + private IControllableFileSource mSource; + + public SkipFramesField( IControllableFileSource source ) + { + super( "0" ); + + mSource = source; + + setMinimumSize( new Dimension( 100, getHeight() ) ); + + addFocusListener( new FocusListener() + { + @Override + public void focusGained( FocusEvent arg0 ) {} + + @Override + public void focusLost( FocusEvent arg0 ) + { + try + { + int framesToSkip = Integer.parseInt( getText() ); + + mSource.next( framesToSkip, false ); + } + catch( Exception e ) + { + mLog.error( "WaveSourceFrame - error skipping frames", e ); + + JOptionPane.showMessageDialog( SourceControllerFrame.this, + "Can't skip [" + getText() + "] frames.", + "Error", + JOptionPane.ERROR_MESSAGE ); + } + } + } ); + } + } + + + @Override + public void frameLocationUpdated( final int location ) + { + EventQueue.invokeLater( new Runnable() + { + @Override + public void run() + { + mCurrentPosition.setText( String.valueOf( location ) ); + } + } ); + } + + @Override + public void frameLocationReset() + { + // TODO Auto-generated method stub + + } +} diff --git a/src/instrument/gui/Viewer.java b/src/instrument/gui/Viewer.java index d7808b58..a7fbfc03 100644 --- a/src/instrument/gui/Viewer.java +++ b/src/instrument/gui/Viewer.java @@ -42,10 +42,9 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import properties.SystemProperties; -import source.Source; +import source.IControllableFileSource; import source.wave.ComplexWaveSource; -import source.wave.FloatWaveSource; -import source.wave.WaveSource; +import source.wave.RealWaveSource; import util.TimeStamp; public class Viewer @@ -55,7 +54,7 @@ public class Viewer private JFrame mFrame; private JDesktopPane mDesktop; - private Source mSource; + private IControllableFileSource mSource; public Viewer() { @@ -82,13 +81,6 @@ public class Viewer mDesktop = new JDesktopPane(); mFrame.add( mDesktop ); -// JInternalFrame frame = -// new JInternalFrame( "New", true, true, true, true ); -// frame.add( new JLabel( "This is a test" ) ); -// frame.pack(); -// mDesktop.add( frame ); -// frame.setVisible( true ); - /* Menu items */ JMenuBar menuBar = new JMenuBar(); mFrame.setJMenuBar( menuBar ); @@ -110,79 +102,19 @@ public class Viewer fileMenu.add( exitMenu ); - JMenuItem screenCaptureItem = new JMenuItem( "Screen Capture" ); - screenCaptureItem.addActionListener( new ActionListener() - { - @Override - public void actionPerformed( ActionEvent arg0 ) - { - try - { - Robot robot = new Robot(); - - final BufferedImage image = - robot.createScreenCapture( mFrame.getBounds() ); - - SystemProperties props = SystemProperties.getInstance(); - - Path capturePath = props.getApplicationFolder( "screen_captures" ); - - if( !Files.exists( capturePath ) ) - { - try - { - Files.createDirectory( capturePath ); - } - catch ( IOException e ) - { - mLog.error( "Couldn't create 'screen_captures' " - + "subdirectory in the " + - "SDRTrunk application directory", e ); - } - } - - String filename = TimeStamp.getTimeStamp( "_" ) + - "_screen_capture.png"; - - final Path captureFile = capturePath.resolve( filename ); - - EventQueue.invokeLater( new Runnable() - { - @Override - public void run() - { - try - { - ImageIO.write( image, "png", - captureFile.toFile() ); - } - catch ( IOException e ) - { - mLog.error( "Couldn't write screen capture to " - + "file [" + captureFile.toString() + "]", e ); - } - }} ); - } - catch ( AWTException e ) - { - mLog.error( "Exception while taking screen capture", e ); - } - } - } ); - - menuBar.add( screenCaptureItem ); + menuBar.add( new ScreenCaptureItem() ); } private void setSourceFile( File file ) { mLog.info( "File selected [" + file.getAbsolutePath() + "]"); - WaveSource source = null; + IControllableFileSource source = null; /* Attempt to open file as a 1-channel float source */ try { - FloatWaveSource floatSource = new FloatWaveSource( file, false ); + RealWaveSource floatSource = new RealWaveSource( file ); floatSource.open(); source = floatSource; @@ -200,7 +132,7 @@ public class Viewer /* Attempt to open file as a 2-channel complex source */ try { - ComplexWaveSource complex = new ComplexWaveSource( file, false ); + ComplexWaveSource complex = new ComplexWaveSource( file ); complex.open(); source = complex; @@ -217,8 +149,8 @@ public class Viewer { mSource = source; - AudioSourceFrame sourcePanel = - new AudioSourceFrame( source, mDesktop ); + SourceControllerFrame sourcePanel = + new SourceControllerFrame( source, mDesktop ); sourcePanel.setVisible( true ); mDesktop.add( sourcePanel ); } @@ -294,4 +226,80 @@ public class Viewer } ); } } + + public class ScreenCaptureItem extends JMenuItem + { + private static final long serialVersionUID = 1L; + + public ScreenCaptureItem() + { + super( "Screen Capture" ); + + addActionListener( new ActionListener() + { + @Override + public void actionPerformed( ActionEvent arg0 ) + { + EventQueue.invokeLater( new Runnable() + { + @Override + public void run() + { + try + { + Robot robot = new Robot(); + + final BufferedImage image = + robot.createScreenCapture( mFrame.getBounds() ); + + SystemProperties props = SystemProperties.getInstance(); + + Path capturePath = props.getApplicationFolder( "screen_captures" ); + + if( !Files.exists( capturePath ) ) + { + try + { + Files.createDirectory( capturePath ); + } + catch ( IOException e ) + { + mLog.error( "Couldn't create 'screen_captures' " + + "subdirectory in the " + + "SDRTrunk application directory", e ); + } + } + + String filename = TimeStamp.getTimeStamp( "_" ) + + "_screen_capture.png"; + + final Path captureFile = capturePath.resolve( filename ); + + EventQueue.invokeLater( new Runnable() + { + @Override + public void run() + { + try + { + ImageIO.write( image, "png", + captureFile.toFile() ); + } + catch ( IOException e ) + { + mLog.error( "Couldn't write screen capture to " + + "file [" + captureFile.toString() + "]", e ); + } + }} ); + } + catch ( AWTException e ) + { + mLog.error( "Exception while taking screen capture", e ); + } + } + } ); + } + } ); + } + } } diff --git a/src/module/ProcessingChain.java b/src/module/ProcessingChain.java index f98ccf5b..9c94d622 100644 --- a/src/module/ProcessingChain.java +++ b/src/module/ProcessingChain.java @@ -109,7 +109,7 @@ public class ProcessingChain implements IChannelEventListener private ScheduledFuture mBufferProcessingTask; private AtomicBoolean mRunning = new AtomicBoolean(); - private Source mSource; + protected Source mSource; private List mModules = new ArrayList<>(); private IFrequencyCorrectionController mFrequencyCorrectionController; diff --git a/src/module/decode/DecodeComponentEditor.java b/src/module/decode/DecodeComponentEditor.java index 6f35e569..065e3f6f 100644 --- a/src/module/decode/DecodeComponentEditor.java +++ b/src/module/decode/DecodeComponentEditor.java @@ -26,11 +26,12 @@ import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.SwingUtilities; -import net.miginfocom.swing.MigLayout; import module.decode.config.DecodeConfigFactory; import module.decode.config.DecodeConfiguration; +import net.miginfocom.swing.MigLayout; import controller.Editor; import controller.channel.AbstractChannelEditor; +import controller.channel.Channel; import controller.channel.ChannelNode; import controller.channel.ChannelValidationException; @@ -41,6 +42,11 @@ public class DecodeComponentEditor extends AbstractChannelEditor private JComboBox mComboDecoders; private DecodeEditor mEditor; + + public DecodeComponentEditor() + { + this( new ChannelNode( new Channel() ) ); + } public DecodeComponentEditor( ChannelNode channelNode ) { @@ -95,7 +101,7 @@ public class DecodeComponentEditor extends AbstractChannelEditor } //Change to the new one - mEditor = DecoderFactory.getPanel( config, mChannelNode ); + mEditor = DecoderFactory.getEditorPanel( config, mChannelNode ); add( mEditor, "span 2,center" ); @@ -127,6 +133,11 @@ public class DecodeComponentEditor extends AbstractChannelEditor } }); } + + public DecodeConfiguration getDecodeConfig() + { + return mEditor.getConfig(); + } @Override public void save() diff --git a/src/module/decode/DecoderFactory.java b/src/module/decode/DecoderFactory.java index a7ea21d6..aedfebce 100644 --- a/src/module/decode/DecoderFactory.java +++ b/src/module/decode/DecoderFactory.java @@ -24,11 +24,15 @@ import java.util.List; import message.Message; import message.MessageDirection; import module.Module; +import module.decode.am.AMDecoder; +import module.decode.am.AMDecoderPanel; import module.decode.config.AuxDecodeConfiguration; import module.decode.config.DecodeConfiguration; import module.decode.fleetsync2.Fleetsync2Decoder; +import module.decode.fleetsync2.Fleetsync2DecoderPanel; import module.decode.fleetsync2.FleetsyncMessageFilter; import module.decode.lj1200.LJ1200Decoder; +import module.decode.lj1200.LJ1200DecoderPanel; import module.decode.lj1200.LJ1200MessageFilter; import module.decode.ltrnet.DecodeConfigLTRNet; import module.decode.ltrnet.LTRNetDecoder; @@ -41,6 +45,7 @@ import module.decode.ltrstandard.LTRStandardDecoderPanel; import module.decode.ltrstandard.LTRStandardEditor; import module.decode.ltrstandard.LTRStandardMessageFilter; import module.decode.mdc1200.MDCDecoder; +import module.decode.mdc1200.MDCDecoderPanel; import module.decode.mdc1200.MDCMessageFilter; import module.decode.mpt1327.DecodeConfigMPT1327; import module.decode.mpt1327.MPT1327ConfigEditor; @@ -60,11 +65,14 @@ import module.decode.p25.P25_C4FMDecoder; import module.decode.p25.P25_LSMDecoder; import module.decode.p25.audio.P25AudioModule; import module.decode.p25.message.filter.P25MessageFilterSet; +import module.decode.passport.PassportDecoder; +import module.decode.passport.PassportDecoderPanel; import module.decode.passport.PassportEditor; import module.decode.passport.PassportMessageFilter; import module.decode.state.DecoderPanel; import module.decode.state.TrafficChannelManager; import module.decode.tait.Tait1200Decoder; +import module.decode.tait.Tait1200DecoderPanel; import module.demodulate.fm.FMDemodulatorModule; import org.slf4j.Logger; @@ -295,34 +303,32 @@ public class DecoderFactory { switch( decoder.getDecoderType() ) { -// case AM: -// break; -// case FLEETSYNC2: -// break; -// case LJ_1200: -// break; + case AM: + return new AMDecoderPanel( settingsManager, (AMDecoder)decoder ); + case FLEETSYNC2: + return new Fleetsync2DecoderPanel( settingsManager, (Fleetsync2Decoder)decoder ); + case LJ_1200: + return new LJ1200DecoderPanel( settingsManager, (LJ1200Decoder)decoder ); case LTR_NET: return new LTRNetDecoderPanel( settingsManager, (LTRNetDecoder)decoder ); case LTR_STANDARD: return new LTRStandardDecoderPanel( settingsManager, (LTRStandardDecoder)decoder ); -// case MDC1200: -// break; + case MDC1200: + return new MDCDecoderPanel( settingsManager, (MDCDecoder)decoder ); case MPT1327: return new MPT1327DecoderPanel( settingsManager, (MPT1327Decoder)decoder ); case NBFM: return new NBFMDecoderPanel( settingsManager, decoder ); case P25_PHASE1: return new P25DecoderPanel( settingsManager, (P25Decoder)decoder ); -// case PASSPORT: -// break; + case PASSPORT: + return new PassportDecoderPanel( settingsManager, (PassportDecoder)decoder ); case TAIT_1200: - break; + return new Tait1200DecoderPanel( settingsManager, (Tait1200Decoder)decoder ); default: throw new IllegalArgumentException( "Unrecognized decoder: " + decoder.getDecoderType().getDisplayString() ); } - - return null; } /** @@ -393,7 +399,7 @@ public class DecoderFactory return filters; } - public static DecodeEditor getPanel( DecodeConfiguration config, + public static DecodeEditor getEditorPanel( DecodeConfiguration config, ChannelNode channelNode ) { DecodeEditor configuredPanel; diff --git a/src/module/decode/fleetsync2/Fleetsync2Decoder.java b/src/module/decode/fleetsync2/Fleetsync2Decoder.java index f9c3bb44..e9f04fde 100644 --- a/src/module/decode/fleetsync2/Fleetsync2Decoder.java +++ b/src/module/decode/fleetsync2/Fleetsync2Decoder.java @@ -19,6 +19,7 @@ package module.decode.fleetsync2; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.BinaryTap; import instrument.tap.stream.FloatBufferTap; @@ -56,7 +57,7 @@ public class Fleetsync2Decoder extends Decoder implements IRealBufferListener, private static final int sMESSAGE_LENGTH = 537; /* Instrumentation Taps */ - private ArrayList mAvailableTaps; + private ArrayList mAvailableTaps; private static final String INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD = "Tap Point: Bandpass Filter > < FSK2 Decoder"; private static final String INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER = @@ -113,26 +114,31 @@ public class Fleetsync2Decoder extends Decoder implements IRealBufferListener, } @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList(); + + TapGroup group = new TapGroup( "Fleetsync 2 Decoder" ); - mAvailableTaps.add( new FloatBufferTap( + group.add( new FloatBufferTap( INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD, 0, 0.5f ) ); - mAvailableTaps.addAll( mFSKDecoder.getTaps() ); - mAvailableTaps.add( new BinaryTap( + group.add( new BinaryTap( INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER, 0, 0.025f ) ); + + mAvailableTaps.add( group ); + + mAvailableTaps.addAll( mFSKDecoder.getTapGroups() ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { - mFSKDecoder.addTap( tap ); + mFSKDecoder.registerTap( tap ); switch( tap.getName() ) { @@ -150,9 +156,9 @@ public class Fleetsync2Decoder extends Decoder implements IRealBufferListener, } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { - mFSKDecoder.removeTap( tap ); + mFSKDecoder.unregisterTap( tap ); switch( tap.getName() ) { diff --git a/src/module/decode/fleetsync2/Fleetsync2DecoderPanel.java b/src/module/decode/fleetsync2/Fleetsync2DecoderPanel.java index 1da74da3..79ac23db 100644 --- a/src/module/decode/fleetsync2/Fleetsync2DecoderPanel.java +++ b/src/module/decode/fleetsync2/Fleetsync2DecoderPanel.java @@ -20,8 +20,13 @@ package module.decode.fleetsync2; import java.awt.EventQueue; import javax.swing.JLabel; +import javax.swing.JSeparator; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import alias.Alias; +import module.decode.DecoderFactory; import module.decode.state.ChangedAttribute; import module.decode.state.DecoderPanel; import net.miginfocom.swing.MigLayout; @@ -32,23 +37,25 @@ import settings.SettingsManager; public class Fleetsync2DecoderPanel extends DecoderPanel { - private static final long serialVersionUID = 1L; + private final static Logger mLog = LoggerFactory.getLogger( Fleetsync2DecoderPanel.class ); + + private static final long serialVersionUID = 1L; private static final String PROTOCOL = "FSync II"; - private JLabel mFromLabel = new JLabel( " " ); - private JLabel mFrom = new JLabel(); - private JLabel mFromAlias = new JLabel(); - - private JLabel mToLabel = new JLabel(); + private JLabel mToLabel = new JLabel( " " ); private JLabel mTo = new JLabel( " " ); - private JLabel mToAlias = new JLabel(); + private JLabel mToAlias = new JLabel( " " ); + private JLabel mFromLabel = new JLabel( " " ); + private JLabel mFrom = new JLabel( " " ); + private JLabel mFromAlias = new JLabel( " " ); + private JLabel mProtocol = new JLabel( PROTOCOL ); - private JLabel mMessage = new JLabel(); - private JLabel mMessageType = new JLabel(); + private JLabel mMessage = new JLabel( " " ); + private JLabel mMessageType = new JLabel( " " ); public Fleetsync2DecoderPanel( SettingsManager settingsManager, - Fleetsync2Decoder decoder ) + Fleetsync2Decoder decoder ) { super( settingsManager, decoder ); @@ -73,25 +80,40 @@ public class Fleetsync2DecoderPanel extends DecoderPanel setLayout( new MigLayout( "insets 1 0 0 0", "[grow,fill]", "[]0[]0[]") ); - mFromLabel.setFont( mFontAuxDecoder ); - add( mFromLabel ); - mFrom.setFont( mFontAuxDecoder ); - add( mFrom ); - mFromAlias.setFont( mFontAuxDecoder ); - add( mFromAlias, "wrap" ); - mToLabel.setFont( mFontAuxDecoder ); + mToLabel.setForeground( mColorLabelAuxDecoder ); add( mToLabel ); + mTo.setFont( mFontAuxDecoder ); + mTo.setForeground( mColorLabelAuxDecoder ); add( mTo ); + mToAlias.setFont( mFontAuxDecoder ); + mToAlias.setForeground( mColorLabelAuxDecoder ); add( mToAlias, "wrap" ); + mFromLabel.setFont( mFontAuxDecoder ); + mFromLabel.setForeground( mColorLabelAuxDecoder ); + add( mFromLabel ); + + mFrom.setFont( mFontAuxDecoder ); + mFrom.setForeground( mColorLabelAuxDecoder ); + add( mFrom ); + + mFromAlias.setFont( mFontAuxDecoder ); + mFromAlias.setForeground( mColorLabelAuxDecoder ); + add( mFromAlias, "wrap" ); + mProtocol.setFont( mFontAuxDecoder ); + mProtocol.setForeground( mColorLabelAuxDecoder ); add( mProtocol ); + mMessageType.setFont( mFontAuxDecoder ); + mMessageType.setForeground( mColorLabelAuxDecoder ); add( mMessageType ); + mMessage.setFont( mFontAuxDecoder ); + mMessage.setForeground( mColorLabelAuxDecoder ); add( mMessage, "wrap" ); } @@ -110,21 +132,23 @@ public class Fleetsync2DecoderPanel extends DecoderPanel if( from != null ) { - mFromLabel.setText( "FM:" ); + mFromLabel.setText( "FROM:" ); + mFrom.setText( from ); } else { mFromLabel.setText( " " ); + mFrom.setText( " " ); } - mFrom.setText( from ); break; case FROM_TALKGROUP_ALIAS: - Alias fromAlias = getState().getFromIDAlias(); - - if( fromAlias != null ) - { - mFromAlias.setText( fromAlias.getName() ); - } + setAliasLabel( mFromAlias, getState().getFromIDAlias() ); + break; + case MESSAGE: + mMessage.setText( getState().getMessage() ); + break; + case MESSAGE_TYPE: + mMessageType.setText( getState().getMessageType() ); break; case TO_TALKGROUP: String to = getState().getToID(); @@ -132,26 +156,16 @@ public class Fleetsync2DecoderPanel extends DecoderPanel if( to != null ) { mToLabel.setText( "TO:" ); + mTo.setText( to ); } else { mToLabel.setText( " " ); + mTo.setText( " " ); } - mTo.setText( to ); break; case TO_TALKGROUP_ALIAS: - Alias toAlias = getState().getToIDAlias(); - - if( toAlias != null ) - { - mToAlias.setText( toAlias.getName() ); - } - break; - case MESSAGE: - mMessage.setText( getState().getMessage() ); - break; - case MESSAGE_TYPE: - mMessageType.setText( getState().getMessageType() ); + setAliasLabel( mToAlias, getState().getToIDAlias() ); break; default: break; diff --git a/src/module/decode/fleetsync2/FleetsyncDecoderState.java b/src/module/decode/fleetsync2/FleetsyncDecoderState.java index ae40ecb0..b52c037e 100644 --- a/src/module/decode/fleetsync2/FleetsyncDecoderState.java +++ b/src/module/decode/fleetsync2/FleetsyncDecoderState.java @@ -52,8 +52,6 @@ public class FleetsyncDecoderState extends DecoderState public void dispose() { super.dispose(); - - } @Override @@ -96,6 +94,8 @@ public class FleetsyncDecoderState extends DecoderState if( fleetsync.isValid() ) { + State state = State.CALL; + setFromID( fleetsync.getFromID() ); setFromIDAlias( fleetsync.getFromIDAlias() ); mIdents.add( fleetsync.getFromID() ); @@ -115,6 +115,7 @@ public class FleetsyncDecoderState extends DecoderState { case GPS: setMessage( fleetsync.getGPSLocation() ); + state = State.DATA; break; case STATUS: StringBuilder sb = new StringBuilder(); @@ -129,10 +130,12 @@ public class FleetsyncDecoderState extends DecoderState } setMessage( sb.toString() ); + state = State.DATA; break; case EMERGENCY: case LONE_WORKER_EMERGENCY: mEmergencyIdents.add( fleetsync.getFromID() ); + state = State.DATA; break; default: break; @@ -145,9 +148,9 @@ public class FleetsyncDecoderState extends DecoderState broadcast( fsCallEvent ); - /* Broadcast decode event. If the primary state is not already - * in a call state, then we'll use a default decoded data state */ - broadcast( new DecoderStateEvent( this, Event.DECODE, State.DATA ) ); + /* Broadcast decode event so that the channel state will + * kick in and reset everything */ + broadcast( new DecoderStateEvent( this, Event.DECODE, state ) ); } } } diff --git a/src/module/decode/lj1200/LJ1200Decoder.java b/src/module/decode/lj1200/LJ1200Decoder.java index 2454657c..b66ca470 100644 --- a/src/module/decode/lj1200/LJ1200Decoder.java +++ b/src/module/decode/lj1200/LJ1200Decoder.java @@ -19,6 +19,7 @@ package module.decode.lj1200; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.BinaryTap; import instrument.tap.stream.FloatBufferTap; import instrument.tap.stream.FloatTap; @@ -58,7 +59,7 @@ public class LJ1200Decoder extends Decoder implements IRealBufferListener, private static final int MESSAGE_LENGTH = 80; /* Instrumentation Taps */ - private ArrayList mAvailableTaps; + private ArrayList mAvailableTaps; private static final String INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD = "Tap Point: Bandpass Filter > < FSK2 Decoder"; private static final String INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER = @@ -131,26 +132,30 @@ public class LJ1200Decoder extends Decoder implements IRealBufferListener, } @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList(); + + TapGroup group = new TapGroup( "LJ-1200 Decoder" ); - mAvailableTaps.add( new FloatTap( + group.add( new FloatTap( INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD, 0, 0.5f ) ); - mAvailableTaps.addAll( mFSKDecoder.getTaps() ); - mAvailableTaps.add( new BinaryTap( + group.add( new BinaryTap( INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER, 0, 0.025f ) ); + + mAvailableTaps.add( group ); + mAvailableTaps.addAll( mFSKDecoder.getTapGroups() ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { - mFSKDecoder.addTap( tap ); + mFSKDecoder.registerTap( tap ); switch( tap.getName() ) { @@ -168,9 +173,9 @@ public class LJ1200Decoder extends Decoder implements IRealBufferListener, } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { - mFSKDecoder.removeTap( tap ); + mFSKDecoder.unregisterTap( tap ); switch( tap.getName() ) { diff --git a/src/module/decode/lj1200/LJ1200Panel.java b/src/module/decode/lj1200/LJ1200DecoderPanel.java similarity index 95% rename from src/module/decode/lj1200/LJ1200Panel.java rename to src/module/decode/lj1200/LJ1200DecoderPanel.java index 49e76030..241b1810 100644 --- a/src/module/decode/lj1200/LJ1200Panel.java +++ b/src/module/decode/lj1200/LJ1200DecoderPanel.java @@ -28,7 +28,7 @@ import settings.ColorSetting.ColorSettingName; import settings.Setting; import settings.SettingsManager; -public class LJ1200Panel extends DecoderPanel +public class LJ1200DecoderPanel extends DecoderPanel { private static final long serialVersionUID = 1L; private static final String PROTOCOL = "LJ-1200"; @@ -37,7 +37,7 @@ public class LJ1200Panel extends DecoderPanel private JLabel mTo = new JLabel(); private JLabel mToAlias = new JLabel(); - public LJ1200Panel( SettingsManager settingsManager, LJ1200Decoder decoder ) + public LJ1200DecoderPanel( SettingsManager settingsManager, LJ1200Decoder decoder ) { super( settingsManager, decoder ); diff --git a/src/module/decode/ltrnet/LTRNetDecoder.java b/src/module/decode/ltrnet/LTRNetDecoder.java index 47636daa..0852be4a 100644 --- a/src/module/decode/ltrnet/LTRNetDecoder.java +++ b/src/module/decode/ltrnet/LTRNetDecoder.java @@ -19,6 +19,7 @@ package module.decode.ltrnet; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import java.util.ArrayList; import java.util.List; @@ -42,7 +43,7 @@ public class LTRNetDecoder extends Decoder private MessageFramer mLTRMessageFramer; private LTRNetMessageProcessor mLTRMessageProcessor; - private List mAvailableTaps; + private List mAvailableTaps; public LTRNetDecoder( DecodeConfigLTRNet config, AliasList aliasList ) { @@ -87,27 +88,27 @@ public class LTRNetDecoder extends Decoder } @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList(); - mAvailableTaps.addAll( mLTRFSKDecoder.getTaps() ); + mAvailableTaps.addAll( mLTRFSKDecoder.getTapGroups() ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { - mLTRFSKDecoder.addTap( tap ); + mLTRFSKDecoder.registerTap( tap ); } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { - mLTRFSKDecoder.removeTap( tap ); + mLTRFSKDecoder.unregisterTap( tap ); } } diff --git a/src/module/decode/ltrnet/LTRNetDecoderPanel.java b/src/module/decode/ltrnet/LTRNetDecoderPanel.java index 5b680021..b68162e1 100644 --- a/src/module/decode/ltrnet/LTRNetDecoderPanel.java +++ b/src/module/decode/ltrnet/LTRNetDecoderPanel.java @@ -98,19 +98,7 @@ public class LTRNetDecoderPanel extends DecoderPanel break; case TO_TALKGROUP_ALIAS: Alias tgAlias = state.getToTalkgroupAlias(); - - if( tgAlias != null ) - { - mTalkgroupAlias.setText( tgAlias.getName() ); - String iconNameString = tgAlias.getIconName(); - mTalkgroupAlias.setIcon( mSettingsManager - .getImageIcon( iconNameString, SettingsManager.DEFAULT_ICON_SIZE ) ); - } - else - { - mTalkgroupAlias.setText( null ); - mTalkgroupAlias.setIcon( null ); - } + setAliasLabel( mTalkgroupAlias, tgAlias ); break; case DESCRIPTION: mDescription.setText( state.getDescription() ); diff --git a/src/module/decode/ltrnet/LTRNetDecoderState.java b/src/module/decode/ltrnet/LTRNetDecoderState.java index e5d1463f..aa84e683 100644 --- a/src/module/decode/ltrnet/LTRNetDecoderState.java +++ b/src/module/decode/ltrnet/LTRNetDecoderState.java @@ -22,8 +22,12 @@ import java.util.HashMap; import java.util.Iterator; import java.util.TreeSet; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import message.Message; import module.decode.event.CallEvent.CallEventType; +import module.decode.mpt1327.MPT1327DecoderState; import module.decode.state.ChangedAttribute; import module.decode.state.DecoderState; import module.decode.state.DecoderStateEvent; @@ -34,6 +38,8 @@ import alias.AliasList; public class LTRNetDecoderState extends DecoderState { + private final static Logger mLog = LoggerFactory.getLogger( LTRNetDecoderState.class ); + private DecimalFormat mDecimalFormatter = new DecimalFormat( "0.00000" ); private TreeSet mTalkgroups = new TreeSet(); @@ -530,6 +536,7 @@ public class LTRNetDecoderState extends DecoderState private void processCallMessage( LTRNetMessage message ) { + mLog.debug( "Processing Call Message [" + message.getMessage() + "]" ); LTRCallEvent current = getCurrentLTRCallEvent(); int group = message.getGroup(); @@ -589,11 +596,15 @@ public class LTRNetDecoderState extends DecoderState broadcast( mCurrentCallEvent ); + mLog.debug( "Decoder State: Call Start" ); + broadcast( new DecoderStateEvent( this, Event.START, ( type == CallEventType.CALL ) ? State.CALL : State.DATA ) ); } else { + mLog.debug( "Decoder State: Call Continuation Group:" + group ); + broadcast( new DecoderStateEvent( this, Event.CONTINUATION, ( group == 253 || group == 254 ) ? State.DATA : State.CALL ) ); } @@ -611,6 +622,7 @@ public class LTRNetDecoderState extends DecoderState mCurrentCallEvent = null; + mLog.debug( "Decoder State: Call End" ); broadcast( new DecoderStateEvent( this, Event.END, State.FADE ) ); } diff --git a/src/module/decode/mdc1200/MDCDecoder.java b/src/module/decode/mdc1200/MDCDecoder.java index 55bf1e68..cfffd4b6 100644 --- a/src/module/decode/mdc1200/MDCDecoder.java +++ b/src/module/decode/mdc1200/MDCDecoder.java @@ -19,6 +19,7 @@ package module.decode.mdc1200; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.BinaryTap; import instrument.tap.stream.FloatBufferTap; import instrument.tap.stream.FloatTap; @@ -58,7 +59,7 @@ public class MDCDecoder extends Decoder implements IRealBufferListener, private static final int sMESSAGE_LENGTH = 304; /* Instrumentation Taps */ - private ArrayList mAvailableTaps; + private ArrayList mAvailableTaps; private static final String INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD = "Tap Point: Bandpass Filter > < FSK2 Decoder"; private static final String INSTRUMENT_FSK2_DECODER_TO_NRZ_DECODER = @@ -120,28 +121,32 @@ public class MDCDecoder extends Decoder implements IRealBufferListener, /* Instrumentation */ @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList(); + + TapGroup group = new TapGroup( "MDC-1200 Decoder" ); - mAvailableTaps.add( + group.add( new FloatTap( INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD, 0, 0.5f ) ); - mAvailableTaps.addAll( mFSKDecoder.getTaps() ); - mAvailableTaps.add( + group.add( new BinaryTap( INSTRUMENT_FSK2_DECODER_TO_NRZ_DECODER, 0, 0.025f ) ); - mAvailableTaps.add( + group.add( new BinaryTap( INSTRUMENT_NRZI_DECODER_TO_MESSAGE_FRAMER, 0, 0.025f ) ); + + mAvailableTaps.add( group ); + mAvailableTaps.addAll( mFSKDecoder.getTapGroups() ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { - mFSKDecoder.addTap( tap ); + mFSKDecoder.registerTap( tap ); switch( tap.getName() ) { @@ -168,9 +173,9 @@ public class MDCDecoder extends Decoder implements IRealBufferListener, } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { - mFSKDecoder.removeTap( tap ); + mFSKDecoder.unregisterTap( tap ); switch( tap.getName() ) { diff --git a/src/module/decode/mdc1200/MDCPanel.java b/src/module/decode/mdc1200/MDCDecoderPanel.java similarity index 97% rename from src/module/decode/mdc1200/MDCPanel.java rename to src/module/decode/mdc1200/MDCDecoderPanel.java index 4f87897b..a1a718d1 100644 --- a/src/module/decode/mdc1200/MDCPanel.java +++ b/src/module/decode/mdc1200/MDCDecoderPanel.java @@ -30,7 +30,7 @@ import settings.ColorSetting.ColorSettingName; import settings.Setting; import settings.SettingsManager; -public class MDCPanel extends DecoderPanel +public class MDCDecoderPanel extends DecoderPanel { private static final long serialVersionUID = 1L; private static final String sPROTOCOL = "MDC-1200"; @@ -47,7 +47,7 @@ public class MDCPanel extends DecoderPanel private JLabel mMessage = new JLabel(); private JLabel mMessageType = new JLabel(); - public MDCPanel( SettingsManager settingsManager, MDCDecoder decoder ) + public MDCDecoderPanel( SettingsManager settingsManager, MDCDecoder decoder ) { super( settingsManager, decoder ); diff --git a/src/module/decode/mpt1327/MPT1327Decoder.java b/src/module/decode/mpt1327/MPT1327Decoder.java index 6bd1a3dc..c0328070 100644 --- a/src/module/decode/mpt1327/MPT1327Decoder.java +++ b/src/module/decode/mpt1327/MPT1327Decoder.java @@ -19,6 +19,7 @@ package module.decode.mpt1327; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.BinaryTap; import instrument.tap.stream.FloatBufferTap; import instrument.tap.stream.FloatTap; @@ -26,11 +27,12 @@ import instrument.tap.stream.FloatTap; import java.util.ArrayList; import java.util.List; +import module.decode.Decoder; +import module.decode.DecoderType; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import module.decode.Decoder; -import module.decode.DecoderType; import sample.Broadcaster; import sample.Listener; import sample.real.IRealBufferListener; @@ -38,7 +40,6 @@ import sample.real.RealBuffer; import alias.AliasList; import bits.MessageFramer; import bits.SyncPattern; -import controller.channel.Channel; import controller.channel.Channel.ChannelType; import controller.channel.map.ChannelMap; import dsp.filter.FilterFactory; @@ -77,7 +78,7 @@ public class MPT1327Decoder extends Decoder "Tap Point: Low Pass Filter > < Decoder"; private static final String INSTRUMENT_DECODER_TO_FRAMER = "Tap Point: Decoder > < Sync Detect/Message Framer"; - private List mAvailableTaps; + private List mAvailableTaps; private HalfBandFilter_RB_RB mDecimationFilter; private RealFIRFilter_RB_RB mLowPassFilter; @@ -191,31 +192,35 @@ public class MPT1327Decoder extends Decoder /* Instrumentation Taps */ @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList(); + + TapGroup group = new TapGroup( "MPT-1327 Decoder" ); - mAvailableTaps.add( + group.add( new FloatTap( INSTRUMENT_HB1_FILTER_TO_LOW_PASS, 0, 0.5f ) ); - mAvailableTaps.add( + group.add( new FloatTap( INSTRUMENT_LOW_PASS_TO_DECODER, 0, 0.5f ) ); - mAvailableTaps.add( + group.add( new BinaryTap( INSTRUMENT_DECODER_TO_FRAMER, 0, 0.025f ) ); + mAvailableTaps.add( group ); + /* Add the taps from the FSK decoder */ - mAvailableTaps.addAll( mFSKDecoder.getTaps() ); + mAvailableTaps.addAll( mFSKDecoder.getTapGroups() ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { /* Send request to decoder */ - mFSKDecoder.addTap( tap ); + mFSKDecoder.registerTap( tap ); switch( tap.getName() ) { @@ -238,9 +243,9 @@ public class MPT1327Decoder extends Decoder } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { - mFSKDecoder.removeTap( tap ); + mFSKDecoder.unregisterTap( tap ); switch( tap.getName() ) { diff --git a/src/module/decode/mpt1327/MPT1327DecoderPanel.java b/src/module/decode/mpt1327/MPT1327DecoderPanel.java index 0fcd37f0..c7ffc150 100644 --- a/src/module/decode/mpt1327/MPT1327DecoderPanel.java +++ b/src/module/decode/mpt1327/MPT1327DecoderPanel.java @@ -27,7 +27,6 @@ import net.miginfocom.swing.MigLayout; import settings.ColorSetting; import settings.Setting; import settings.SettingsManager; -import alias.Alias; import controller.channel.Channel.ChannelType; public class MPT1327DecoderPanel extends DecoderPanel @@ -119,43 +118,6 @@ public class MPT1327DecoderPanel extends DecoderPanel } } - private void setAliasLabel( final JLabel label, final Alias alias ) - { - setAliasLabel( label, alias, true ); - } - - private void setAliasLabel( final JLabel label, final Alias alias, boolean includeIcon ) - { - if( alias != null ) - { - label.setText( alias.getName() ); - - if( includeIcon ) - { - String iconName = alias.getIconName(); - - if( iconName != null ) - { - label.setIcon( mSettingsManager - .getImageIcon( iconName, SettingsManager.DEFAULT_ICON_SIZE ) ); - } - else - { - label.setIcon( null ); - } - } - else - { - label.setIcon( null ); - } - } - else - { - label.setText( "" ); - label.setIcon( null ); - } - } - @Override public void receive( final ChangedAttribute changedAttribute ) { diff --git a/src/module/decode/p25/C4FMSymbolFilter.java b/src/module/decode/p25/C4FMSymbolFilter.java index 15f24b9b..281489dd 100644 --- a/src/module/decode/p25/C4FMSymbolFilter.java +++ b/src/module/decode/p25/C4FMSymbolFilter.java @@ -2,6 +2,7 @@ package module.decode.p25; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.AdditiveFloatTap; import instrument.tap.stream.FloatTap; @@ -18,7 +19,6 @@ import sample.real.RealSampleProvider; import source.tuner.frequency.FrequencyCorrectionControl; import source.tuner.frequency.FrequencyCorrectionControl.FrequencyCorrectionResetListener; import dsp.gain.DirectGainControl; -import dsp.gain.GainController; public class C4FMSymbolFilter implements FrequencyCorrectionResetListener, Listener, @@ -164,7 +164,7 @@ public class C4FMSymbolFilter implements FrequencyCorrectionResetListener, /* Instrumentation Taps */ private static final String INSTRUMENT_SYMBOL_SPREAD = "Tap Point: Symbol Spread (Goal=2.0)"; private FloatTap mSymbolSpreadTap; - private List mAvailableTaps; + private List mAvailableTaps; private static final int NUMBER_FILTER_TAPS = 8; private static final int NUMBER_FILTER_STEPS = 128; @@ -427,25 +427,29 @@ public class C4FMSymbolFilter implements FrequencyCorrectionResetListener, } @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList<>(); /* * Since the target is 2.0, we subtract 2.0 from the value so that * a good value is plotted right on the zero center line */ - mAvailableTaps.add( + TapGroup group = new TapGroup( "C4FM Symbol Filter" ); + + group.add( new AdditiveFloatTap( INSTRUMENT_SYMBOL_SPREAD, 0, 0.1f, -2.0f ) ); + + mAvailableTaps.add( group ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { if( tap.getName().contentEquals( INSTRUMENT_SYMBOL_SPREAD ) ) { @@ -454,7 +458,7 @@ public class C4FMSymbolFilter implements FrequencyCorrectionResetListener, } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { if( tap.getName().contentEquals( INSTRUMENT_SYMBOL_SPREAD ) ) { diff --git a/src/module/decode/p25/P25MessageFramer.java b/src/module/decode/p25/P25MessageFramer.java index d76ecd8c..227eba43 100644 --- a/src/module/decode/p25/P25MessageFramer.java +++ b/src/module/decode/p25/P25MessageFramer.java @@ -30,7 +30,7 @@ import bits.ISyncDetectListener; import bits.MultiSyncPatternMatcher; import bits.SoftSyncDetector; import bits.SyncDetector; -import dsp.psk.CQPSKDemodulator; +import dsp.psk.LSMDemodulator; import dsp.symbol.Dibit; import dsp.symbol.FrameSync; import edac.BCH_63_16_11; @@ -122,7 +122,7 @@ public class P25MessageFramer implements Listener mAssemblers.add( new P25MessageAssembler() ); } - public P25MessageFramer( AliasList aliasList, CQPSKDemodulator demodulator ) + public P25MessageFramer( AliasList aliasList, LSMDemodulator demodulator ) { this( aliasList ); @@ -675,11 +675,11 @@ public class P25MessageFramer implements Listener */ public class CostasPhaseErrorDetector extends SyncDetector { - private CQPSKDemodulator mDemodulator; + private LSMDemodulator mDemodulator; private double mCorrection; public CostasPhaseErrorDetector( FrameSync frameSync, - CQPSKDemodulator demodulator, double correction ) + LSMDemodulator demodulator, double correction ) { super( frameSync.getSync() ); diff --git a/src/module/decode/p25/P25_C4FMDecoder.java b/src/module/decode/p25/P25_C4FMDecoder.java index 5647fa25..776eb8cd 100644 --- a/src/module/decode/p25/P25_C4FMDecoder.java +++ b/src/module/decode/p25/P25_C4FMDecoder.java @@ -18,6 +18,7 @@ package module.decode.p25; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.DibitTap; import instrument.tap.stream.FloatBufferTap; import instrument.tap.stream.FloatTap; @@ -49,7 +50,7 @@ public class P25_C4FMDecoder extends P25Decoder implements IRealBufferListener private final static int MAXIMUM_FREQUENCY_CORRECTION = 3000; //Hertz, +/- - private List mAvailableTaps; + private List mAvailableTaps; private RealFIRFilter_RB_RB mC4FMPreFilter; private FrequencyCorrectionControl mFrequencyCorrectionControl; private C4FMSymbolFilter mSymbolFilter; @@ -146,21 +147,25 @@ public class P25_C4FMDecoder extends P25Decoder implements IRealBufferListener * Instrumentation taps for monitoring internal processing */ @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList<>(); - mAvailableTaps.add( new FloatTap( INSTRUMENT_FILTER_OUTPUT, 0, 1.0f ) ); + TapGroup group = new TapGroup( "P25 C4FM Decoder" ); + + group.add( new FloatTap( 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 ) ); + + mAvailableTaps.add( group ); if( mSymbolFilter != null ) { - mAvailableTaps.addAll( mSymbolFilter.getTaps() ); + mAvailableTaps.addAll( mSymbolFilter.getTapGroups() ); } - - mAvailableTaps.add( new FloatTap( INSTRUMENT_C4FM_SYMBOL_FILTER_OUTPUT, 0, 0.1f ) ); - mAvailableTaps.add( new DibitTap( INSTRUMENT_C4FM_SLICER_OUTPUT, 0, 0.1f ) ); } return mAvailableTaps; @@ -170,11 +175,11 @@ public class P25_C4FMDecoder extends P25Decoder implements IRealBufferListener * Adds an instrumentation tap to monitor internal processing. */ @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { if( mSymbolFilter != null ) { - mSymbolFilter.addTap( tap ); + mSymbolFilter.registerTap( tap ); } switch( tap.getName() ) @@ -207,11 +212,11 @@ public class P25_C4FMDecoder extends P25Decoder implements IRealBufferListener * Removes the instrumentation tap. */ @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { if( mSymbolFilter != null ) { - mSymbolFilter.removeTap( tap ); + mSymbolFilter.unregisterTap( tap ); } switch( tap.getName() ) diff --git a/src/module/decode/p25/P25_LSMDecoder.java b/src/module/decode/p25/P25_LSMDecoder.java index af581ae3..ff1b49ac 100644 --- a/src/module/decode/p25/P25_LSMDecoder.java +++ b/src/module/decode/p25/P25_LSMDecoder.java @@ -18,6 +18,7 @@ package module.decode.p25; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.ComplexSampleTap; import instrument.tap.stream.ComplexTap; import instrument.tap.stream.DibitTap; @@ -40,7 +41,7 @@ import dsp.filter.FilterFactory; import dsp.filter.Window.WindowType; import dsp.filter.fir.complex.ComplexFIRFilter_CB_CB; import dsp.gain.ComplexFeedForwardGainControl; -import dsp.psk.CQPSKDemodulator; +import dsp.psk.LSMDemodulator; import dsp.psk.QPSKPolarSlicer; public class P25_LSMDecoder extends P25Decoder implements IComplexBufferListener @@ -53,14 +54,14 @@ public class P25_LSMDecoder extends P25Decoder implements IComplexBufferListener private static final String INSTRUMENT_QPSK_DEMODULATOR_OUTPUT = "Tap Point: CQPSK Demodulator Output"; private static final String INSTRUMENT_CQPSK_SLICER_OUTPUT = "Tap Point: CQPSK Slicer Output"; - private List mAvailableTaps; - + private List mAvailableTaps; + private ComplexFIRFilter_CB_CB mBasebandFilter; private ComplexBufferToStreamConverter mStreamConverter = new ComplexBufferToStreamConverter(); private ComplexFeedForwardGainControl mAGC = new ComplexFeedForwardGainControl( 32 ); - private CQPSKDemodulator mCQPSKDemodulator = new CQPSKDemodulator(); + private LSMDemodulator mCQPSKDemodulator = new LSMDemodulator(); private QPSKPolarSlicer mCQPSKSlicer = new QPSKPolarSlicer(); private P25MessageFramer mMessageFramer; @@ -137,20 +138,24 @@ public class P25_LSMDecoder extends P25Decoder implements IComplexBufferListener * Provides a list of instrumentation taps for monitoring internal processing */ @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList<>(); - mAvailableTaps.add( new ComplexTap( INSTRUMENT_BASEBAND_FILTER_OUTPUT, 0, 1.0f ) ); - mAvailableTaps.add( new ComplexTap( INSTRUMENT_AGC_OUTPUT, 0, 1.0f ) ); - mAvailableTaps.add( new QPSKTap( INSTRUMENT_QPSK_DEMODULATOR_OUTPUT, 0, 1.0f ) ); - mAvailableTaps.add( new DibitTap( INSTRUMENT_CQPSK_SLICER_OUTPUT, 0, 0.1f ) ); + TapGroup group = new TapGroup( "P25 LSM Decoder" ); + + group.add( new ComplexTap( INSTRUMENT_BASEBAND_FILTER_OUTPUT, 0, 1.0f ) ); + group.add( new ComplexTap( INSTRUMENT_AGC_OUTPUT, 0, 1.0f ) ); + group.add( new QPSKTap( INSTRUMENT_QPSK_DEMODULATOR_OUTPUT, 0, 1.0f ) ); + group.add( new DibitTap( INSTRUMENT_CQPSK_SLICER_OUTPUT, 0, 0.1f ) ); + mAvailableTaps.add( group ); + if( mCQPSKDemodulator != null ) { - mAvailableTaps.addAll( mCQPSKDemodulator.getTaps() ); + mAvailableTaps.addAll( mCQPSKDemodulator.getTapGroups() ); } } @@ -161,11 +166,11 @@ public class P25_LSMDecoder extends P25Decoder implements IComplexBufferListener * Adds the instrumentation tap */ @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { if( mCQPSKDemodulator != null ) { - mCQPSKDemodulator.addTap( tap ); + mCQPSKDemodulator.registerTap( tap ); } switch( tap.getName() ) @@ -198,11 +203,11 @@ public class P25_LSMDecoder extends P25Decoder implements IComplexBufferListener * Removes the instrumentation tap */ @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { if( mCQPSKDemodulator != null ) { - mCQPSKDemodulator.removeTap( tap ); + mCQPSKDemodulator.unregisterTap( tap ); } switch( tap.getName() ) diff --git a/src/module/decode/passport/PassportDecoder.java b/src/module/decode/passport/PassportDecoder.java index 0f76acb1..8c73207b 100644 --- a/src/module/decode/passport/PassportDecoder.java +++ b/src/module/decode/passport/PassportDecoder.java @@ -19,6 +19,7 @@ package module.decode.passport; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import java.util.ArrayList; import java.util.List; @@ -44,7 +45,7 @@ public class PassportDecoder extends Decoder private MessageFramer mPassportMessageFramer; private PassportMessageProcessor mPassportMessageProcessor; - private List mAvailableTaps; + private List mAvailableTaps; public PassportDecoder( DecodeConfiguration config, AliasList aliasList ) @@ -77,27 +78,27 @@ public class PassportDecoder extends Decoder } @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList<>(); - mAvailableTaps.addAll( mPassportFSKDecoder.getTaps() ); + mAvailableTaps.addAll( mPassportFSKDecoder.getTapGroups() ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { - mPassportFSKDecoder.addTap( tap ); + mPassportFSKDecoder.registerTap( tap ); } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { - mPassportFSKDecoder.removeTap( tap ); + mPassportFSKDecoder.unregisterTap( tap ); } } diff --git a/src/module/decode/state/ChannelState.java b/src/module/decode/state/ChannelState.java index 8f094bc8..f93ec5f4 100644 --- a/src/module/decode/state/ChannelState.java +++ b/src/module/decode/state/ChannelState.java @@ -224,13 +224,19 @@ public class ChannelState extends Module implements ICallEventProvider, * don't have signaling on the traffic channel that can be used to * update the fade timeout, so we set the timeout value larger to ensure * the channel doesn't fade before the end of the call. */ - long timeout = System.currentTimeMillis() + + long current = System.currentTimeMillis(); + + long timeout = current + ( mChannelType == ChannelType.STANDARD ? FADE_TIMEOUT_DELAY : mTrafficChannelTimeout ); - + + mLog.debug( "Updating Fade Timeout - previous [" + mFadeTimeout + "] new [" + timeout + "] current [" + current + "] delay [" + ( mChannelType == ChannelType.STANDARD ? FADE_TIMEOUT_DELAY : + mTrafficChannelTimeout ) + "]" ); + if( timeout > mFadeTimeout ) { mFadeTimeout = timeout; + mLog.debug( "Timeout updated to: " + mFadeTimeout ); } } @@ -301,6 +307,7 @@ public class ChannelState extends Module implements ICallEventProvider, case CONTROL: case DATA: case ENCRYPTED: + mLog.debug( "Squelching for [" + state + "]" ); broadcast( SquelchState.SQUELCH ); updateFadeTimeout(); startMonitor(); @@ -311,16 +318,19 @@ public class ChannelState extends Module implements ICallEventProvider, startMonitor(); break; case FADE: + mLog.debug( "Squelching for [" + state + "]" ); broadcast( SquelchState.SQUELCH ); updateResetTimeout(); startMonitor(); break; case END: + mLog.debug( "Squelching for [" + state + "]" ); broadcast( SquelchState.SQUELCH ); broadcast( new DecoderStateEvent( this, Event.RESET, State.IDLE ) ); broadcast( new MetadataReset() ); break; case IDLE: + mLog.debug( "Squelching for [" + state + "]" ); broadcast( SquelchState.SQUELCH ); stopMonitor(); @@ -371,6 +381,7 @@ public class ChannelState extends Module implements ICallEventProvider, { if( mFadeTimeout <= System.currentTimeMillis() ) { + mLog.debug( "Fading for timeout [" + mFadeTimeout + "] current [" + System.currentTimeMillis() + "]" ); setState( State.FADE ); } } diff --git a/src/module/decode/state/DecoderPanel.java b/src/module/decode/state/DecoderPanel.java index f766c007..e15b4f43 100644 --- a/src/module/decode/state/DecoderPanel.java +++ b/src/module/decode/state/DecoderPanel.java @@ -20,8 +20,10 @@ package module.decode.state; import java.awt.Color; import java.awt.Font; +import javax.swing.JLabel; import javax.swing.JPanel; +import alias.Alias; import module.decode.Decoder; import sample.Listener; import settings.ColorSetting; @@ -37,7 +39,7 @@ public abstract class DecoderPanel extends JPanel protected Font mFontDetails = new Font( Font.MONOSPACED, Font.PLAIN, 12 ); protected Font mFontDecoder = new Font( Font.MONOSPACED, Font.PLAIN, 12 ); - protected Font mFontAuxDecoder = new Font( Font.MONOSPACED, Font.PLAIN, 12 ); + protected Font mFontAuxDecoder = new Font( Font.MONOSPACED, Font.PLAIN, 10 ); public static final int ICON_SIZE = 12; protected Color mColorLabelDetails; @@ -118,4 +120,42 @@ public abstract class DecoderPanel extends JPanel @Override public void settingDeleted( Setting setting ) {} + + protected void setAliasLabel( final JLabel label, final Alias alias ) + { + setAliasLabel( label, alias, true ); + } + + protected void setAliasLabel( final JLabel label, final Alias alias, boolean includeIcon ) + { + if( alias != null ) + { + label.setText( alias.getName() ); + + if( includeIcon ) + { + String iconName = alias.getIconName(); + + if( iconName != null ) + { + label.setIcon( mSettingsManager + .getImageIcon( iconName, SettingsManager.DEFAULT_ICON_SIZE ) ); + } + else + { + label.setIcon( null ); + } + } + else + { + label.setIcon( null ); + } + } + else + { + label.setText( "" ); + label.setIcon( null ); + } + } + } diff --git a/src/module/decode/tait/Tait1200Decoder.java b/src/module/decode/tait/Tait1200Decoder.java index 0a328bda..ba2e5ec8 100644 --- a/src/module/decode/tait/Tait1200Decoder.java +++ b/src/module/decode/tait/Tait1200Decoder.java @@ -19,6 +19,7 @@ package module.decode.tait; import instrument.Instrumentable; import instrument.tap.Tap; +import instrument.tap.TapGroup; import instrument.tap.stream.BinaryTap; import instrument.tap.stream.FloatBufferTap; import instrument.tap.stream.FloatTap; @@ -57,7 +58,7 @@ public class Tait1200Decoder extends Decoder implements IRealBufferListener, private static final int MESSAGE_LENGTH = 440; /* Instrumentation Taps */ - private ArrayList mAvailableTaps; + private ArrayList mAvailableTaps; private static final String INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD = "Tap Point: Bandpass Filter > < FSK2 Decoder"; private static final String INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER = @@ -123,26 +124,31 @@ public class Tait1200Decoder extends Decoder implements IRealBufferListener, } @Override - public List getTaps() + public List getTapGroups() { if( mAvailableTaps == null ) { - mAvailableTaps = new ArrayList(); + mAvailableTaps = new ArrayList<>(); + + TapGroup group = new TapGroup( "Tait 1200 Decoder" ); - mAvailableTaps.add( new FloatTap( + group.add( new FloatTap( INSTRUMENT_BANDPASS_FILTER_TO_FSK2_DEMOD, 0, 0.5f ) ); - mAvailableTaps.addAll( mFSKDecoder.getTaps() ); - mAvailableTaps.add( new BinaryTap( + group.add( new BinaryTap( INSTRUMENT_FSK2_DECODER_TO_MESSAGE_FRAMER, 0, 0.025f ) ); + + mAvailableTaps.add( group ); + + mAvailableTaps.addAll( mFSKDecoder.getTapGroups() ); } return mAvailableTaps; } @Override - public void addTap( Tap tap ) + public void registerTap( Tap tap ) { - mFSKDecoder.addTap( tap ); + mFSKDecoder.registerTap( tap ); switch( tap.getName() ) { @@ -159,9 +165,9 @@ public class Tait1200Decoder extends Decoder implements IRealBufferListener, } @Override - public void removeTap( Tap tap ) + public void unregisterTap( Tap tap ) { - mFSKDecoder.removeTap( tap ); + mFSKDecoder.unregisterTap( tap ); switch( tap.getName() ) { diff --git a/src/module/decode/tait/Tait1200Panel.java b/src/module/decode/tait/Tait1200DecoderPanel.java similarity index 96% rename from src/module/decode/tait/Tait1200Panel.java rename to src/module/decode/tait/Tait1200DecoderPanel.java index 88e86c57..54bbb213 100644 --- a/src/module/decode/tait/Tait1200Panel.java +++ b/src/module/decode/tait/Tait1200DecoderPanel.java @@ -30,7 +30,7 @@ import settings.ColorSetting.ColorSettingName; import settings.Setting; import settings.SettingsManager; -public class Tait1200Panel extends DecoderPanel +public class Tait1200DecoderPanel extends DecoderPanel { private static final long serialVersionUID = 1L; private static final String PROTOCOL = "TAIT-1200"; @@ -47,7 +47,7 @@ public class Tait1200Panel extends DecoderPanel private JLabel mMessage = new JLabel(); private JLabel mMessageType = new JLabel(); - public Tait1200Panel( SettingsManager settingsManager, Tait1200Decoder decoder ) + public Tait1200DecoderPanel( SettingsManager settingsManager, Tait1200Decoder decoder ) { super( settingsManager, decoder ); diff --git a/src/module/log/EventLogManager.java b/src/module/log/EventLogManager.java index 2b43522c..47b78a33 100644 --- a/src/module/log/EventLogManager.java +++ b/src/module/log/EventLogManager.java @@ -21,6 +21,10 @@ import java.nio.file.Path; import java.util.ArrayList; import java.util.List; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import controller.channel.Channel; import module.Module; import module.log.MessageEventLogger.Type; import module.log.config.EventLogConfiguration; @@ -28,6 +32,8 @@ import properties.SystemProperties; public class EventLogManager { + private final static Logger mLog = LoggerFactory.getLogger( EventLogManager.class ); + private Path mDirectory; public EventLogManager() diff --git a/src/record/wave/ComplexBufferWaveRecorder.java b/src/record/wave/ComplexBufferWaveRecorder.java index 4c14eb3c..defbf357 100644 --- a/src/record/wave/ComplexBufferWaveRecorder.java +++ b/src/record/wave/ComplexBufferWaveRecorder.java @@ -18,8 +18,6 @@ package record.wave; import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; import java.nio.file.Path; import java.nio.file.Paths; import java.util.concurrent.LinkedBlockingQueue; @@ -33,6 +31,7 @@ import module.Module; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sample.ConversionUtils; import sample.Listener; import sample.complex.ComplexBuffer; import sample.complex.IComplexBufferListener; @@ -73,25 +72,6 @@ public class ComplexBufferWaveRecorder extends Module mFilePrefix = filePrefix; } - /** - * Converts the float samples in a complex buffer to a little endian 16-bit - * buffer - */ - public static ByteBuffer convert( ComplexBuffer buffer ) - { - float[] samples = buffer.getSamples(); - - ByteBuffer converted = ByteBuffer.allocate( samples.length * 2 ); - converted.order( ByteOrder.LITTLE_ENDIAN ); - - for( float sample: samples ) - { - converted.putShort( (short)( sample * Short.MAX_VALUE ) ); - } - - return converted; - } - public Path getFile() { return mFile; @@ -208,7 +188,7 @@ public class ComplexBufferWaveRecorder extends Module while( buffer != null ) { - mWriter.write( convert( buffer ) ); + mWriter.write( ConversionUtils.convertToSigned16BitSamples( buffer ) ); buffer = mBuffers.poll(); } } diff --git a/src/record/wave/RealBufferWaveRecorder.java b/src/record/wave/RealBufferWaveRecorder.java index 179d2cc1..f609220d 100644 --- a/src/record/wave/RealBufferWaveRecorder.java +++ b/src/record/wave/RealBufferWaveRecorder.java @@ -18,13 +18,12 @@ package record.wave; import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; import java.nio.file.Path; import java.nio.file.Paths; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicBoolean; import javax.sound.sampled.AudioFormat; @@ -33,6 +32,7 @@ import module.Module; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import sample.ConversionUtils; import sample.Listener; import sample.real.IRealBufferListener; import sample.real.RealBuffer; @@ -61,6 +61,8 @@ public class RealBufferWaveRecorder extends Module new LinkedBlockingQueue<>( 500 ); private long mLastBufferReceived; + private AtomicBoolean mRunning = new AtomicBoolean(); + public RealBufferWaveRecorder( ThreadPoolManager threadPoolManager, int sampleRate, String filePrefix ) { @@ -83,25 +85,6 @@ public class RealBufferWaveRecorder extends Module return mLastBufferReceived; } - /** - * Converts the float samples in a complex buffer to a little endian 16-bit - * buffer - */ - public static ByteBuffer convert( RealBuffer buffer ) - { - float[] samples = buffer.getSamples(); - - ByteBuffer converted = ByteBuffer.allocate( samples.length * 2 ); - converted.order( ByteOrder.LITTLE_ENDIAN ); - - for( float sample: samples ) - { - converted.putShort( (short)( sample * Short.MAX_VALUE ) ); - } - - return converted; - } - public Path getFile() { return mFile; @@ -109,7 +92,7 @@ public class RealBufferWaveRecorder extends Module public void start() { - if( !running() ) + if( mRunning.compareAndSet( false, true ) ) { if( mBufferProcessor == null ) { @@ -140,14 +123,9 @@ public class RealBufferWaveRecorder extends Module } } - public boolean running() - { - return mProcessorHandle != null; - } - public void stop() { - if( running() ) + if( mRunning.compareAndSet( true, false ) ) { mThreadPoolManager.cancel( mProcessorHandle ); @@ -157,6 +135,8 @@ public class RealBufferWaveRecorder extends Module { try { + /* Flush remaining buffers */ + writeAudio(); mWriter.close(); } catch( IOException io ) @@ -176,7 +156,7 @@ public class RealBufferWaveRecorder extends Module @Override public void receive( RealBuffer buffer ) { - if( running() ) + if( mRunning.get() ) { boolean success = mBuffers.offer( buffer ); @@ -210,19 +190,24 @@ public class RealBufferWaveRecorder extends Module { } + private void writeAudio() throws IOException + { + RealBuffer buffer = mBuffers.poll(); + + while( buffer != null ) + { + mWriter.write( ConversionUtils.convertToSigned16BitSamples( buffer ) ); + buffer = mBuffers.poll(); + } + } + public class BufferProcessor implements Runnable { public void run() { try { - RealBuffer buffer = mBuffers.poll(); - - while( buffer != null ) - { - mWriter.write( convert( buffer ) ); - buffer = mBuffers.poll(); - } + writeAudio(); } catch ( IOException ioe ) { diff --git a/src/source/wave/ComplexWaveSource.java b/src/source/wave/ComplexWaveSource.java index 8dfd8895..235c4717 100644 --- a/src/source/wave/ComplexWaveSource.java +++ b/src/source/wave/ComplexWaveSource.java @@ -1,6 +1,6 @@ /******************************************************************************* * SDR Trunk - * Copyright (C) 2014 Dennis Sheirer + * Copyright (C) 2014,2015 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 @@ -18,11 +18,7 @@ package source.wave; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.ShortBuffer; import java.util.Arrays; import javax.sound.sampled.AudioFormat; @@ -33,59 +29,49 @@ import javax.sound.sampled.UnsupportedAudioFileException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import sample.Broadcaster; +import sample.ConversionUtils; import sample.Listener; -import sample.SampleType; -import sample.complex.Complex; +import sample.complex.ComplexBuffer; +import source.ComplexSource; +import source.IControllableFileSource; +import source.IFrameLocationListener; -public class ComplexWaveSource extends WaveSource +public class ComplexWaveSource extends ComplexSource implements IControllableFileSource { private final static Logger mLog = LoggerFactory.getLogger( ComplexWaveSource.class ); - private boolean mRunning = false; - private boolean mLoop = false; - - private AudioInputStream mInputStream = null; - private int mBytesPerFrame = 0; + private IFrameLocationListener mFrameLocationListener; + private int mBytesPerFrame; + private int mFrameCounter = 0; private long mFrequency = 0; + private Listener mListener; + private AudioInputStream mInputStream; + private File mFile; - private byte[] mBuffer; - private int mBufferPointer = 0; - private int mBufferLength; - private ShortBuffer mBufferWrapper; - - private static int BUFFER_SAMPLE_SIZE = 2000; - - private Broadcaster mBroadcaster = new Broadcaster(); - - /** - * Single channel (mono) wave file playback source with optional looping - * for continous playback. - * - * Playback can be invoked manually with the next() and next(x) methods to - * get sample(s). - * - * Plaback can be run automatically by invoking the start() and stop() - * methods. - * - * Registered float sample listener(s) will receive any samples produced - * by the manual or automatic methods. - * - * @param loop - true for looping - * - * @throws FileNotFoundException if filename is not found - */ - public ComplexWaveSource( File file, boolean loop ) throws IOException + public ComplexWaveSource( File file ) throws IOException { - super( file, SampleType.COMPLEX ); - mLoop = loop; + super( file.getAbsolutePath() ); + + mFile = file; } + + @Override + public long getFrameCount() throws IOException + { + // TODO Auto-generated method stub + return 0; + } @Override public int getSampleRate() { - return (int)mInputStream.getFormat().getSampleRate(); + if( mInputStream != null ) + { + return (int)mInputStream.getFormat().getSampleRate(); + } + + return 0; } /** @@ -106,35 +92,41 @@ public class ComplexWaveSource extends WaveSource } /** - * Closes the audio input stream - * @throws IOException + * Closes the source file */ public void close() throws IOException { - if( mInputStream != null ) - { - mInputStream.close(); - } - - mInputStream = null; + if( mInputStream != null ) + { + mInputStream.close(); + } + else + { + throw new IOException( "Can't close wave source - was not opened" ); + } + + mInputStream = null; } - public void open() throws IOException + /** + * Opens the source file for reading + */ + public void open() throws IOException, UnsupportedAudioFileException { - try - { - mInputStream = AudioSystem.getAudioInputStream( getFile() ); - } - catch( UnsupportedAudioFileException e ) - { - throw new IOException( "MonoWaveSource - unsupported audio file " - + "exception - ", e ); - } + if( mInputStream == null ) + { + mInputStream = AudioSystem.getAudioInputStream( mFile ); + } + else + { + throw new IOException( "Can't open wave source - is already opened" ); + } - mBytesPerFrame = mInputStream.getFormat().getFrameSize(); AudioFormat format = mInputStream.getFormat(); + mBytesPerFrame = format.getFrameSize(); + if( format.getChannels() != 2 || format.getSampleSizeInBits() != 16 ) { throw new IOException( "Unsupported Wave Format - EXPECTED: 2 " + @@ -143,163 +135,99 @@ public class ComplexWaveSource extends WaveSource mInputStream.getFormat().getSampleSizeInBits() + "-bit samples" ); } - mBuffer = new byte[ mBytesPerFrame * BUFFER_SAMPLE_SIZE ]; - - readBuffer(); + /* Broadcast that we're at frame location 0 */ + broadcast( 0 ); } + /** + * Reads the number of frames and sends a buffer to the listener + */ + @Override + public void next( int frames ) throws IOException + { + next( frames, true ); + } - /** - * Reads a sample from the wave file and broadcasts the sample to all - * registered float listeners. - * - * @return - true if data was read or false if no more data. If loop is - * set to true, then this method will continue to produce samples as long - * as there are not IO exceptions. - * - * @throws IOException if unable to read data from the wave file - */ - /** - * Reads the next buffer from the wave file. - * @throws IOException - */ - public void readBuffer() throws IOException + /** + * Reads the number of frames and optionally sends the buffer to the listener + */ + public void next( int frames, boolean broadcast ) throws IOException { if( mInputStream != null ) { - /* reset the buffer pointer and fill the buffer with zeros */ - mBufferPointer = 0; - mBufferLength = 0; - Arrays.fill( mBuffer, (byte)0 ); - - while( mBufferLength == 0 ) - { - boolean reset = false; - - /* Fill the buffer with samples from the file */ - mBufferLength = (int)( mInputStream.read( mBuffer ) / - mBytesPerFrame ); - - if( reset && mBufferLength == 0 ) - { - return; - } - - /* If we get a partial buffer, reset the file for the next read */ - if( mBufferLength < mBuffer.length && mLoop ) - { - close(); - open(); - - reset = true; - } - } + byte[] buffer = new byte[ mBytesPerFrame * frames ]; - if( mBufferLength > 0 ) + /* Fill the buffer with samples from the file */ + int samplesRead = mInputStream.read( buffer ); + + mFrameCounter += samplesRead; + + broadcast( mFrameCounter ); + + if( broadcast && mListener != null ) { - mBufferWrapper = ByteBuffer.wrap( mBuffer ).order( - ByteOrder.LITTLE_ENDIAN ).asShortBuffer(); - } - else - { - mBufferWrapper = null; + if( samplesRead < buffer.length ) + { + buffer = Arrays.copyOf( buffer, samplesRead ); + } + + float[] samples = ConversionUtils + .convertFromSigned16BitSamples( buffer ); + + mListener.receive( new ComplexBuffer( samples ) ); } } } - private boolean next( boolean broadcast ) throws IOException - { - boolean success = false; - - if( mBufferPointer >= mBufferLength ) - { - readBuffer(); - } - - if( mBufferLength != 0 && - mBufferWrapper != null && - mBufferWrapper.hasRemaining() ) - { - short i = mBufferWrapper.get(); - short q = mBufferWrapper.get(); - - mBufferPointer++; - incrementCurrentLocation( 1, false ); - - if( broadcast ) - { - send( new Complex( (float)i / 32767.0f, (float)q / 32767.0f ) ); - } - - success = true; - } - - return success; - } - - public boolean next() throws IOException - { - return next( true ); - } - /** - * Reads the next (count) samples from the wave file and broadcasts them - * to the registered listeners. - * @param count - number of samples to broadcast - * @return - true if successful - * @throws IOException for any IO issues + * Registers the listener to receive sample buffers as they are read from + * the wave file */ - public boolean next( int count ) throws IOException - { - for( int x = 0; x < count; x++ ) - { - next(); - } - - return true; - } - @Override - public void jumpTo( long index ) throws IOException - { - if( index < mCurrentPosition ) - { - close(); - open(); - } - - while( mCurrentPosition < index ) - { - next( false ); - } - - incrementCurrentLocation( 0, true ); - } + public void setListener( Listener listener ) + { + mListener = listener; + } /** - * Broadcasts a sample to the registered listeners - */ - private void send( Complex sample ) + * Unregisters the listener from receiving sample buffers + */ + public void removeListener( Listener listener ) { - mBroadcaster.broadcast( sample ); - } - - /** - * Adds a new listener to receive samples as they are read from the wave file - */ - public void addListener( Listener listener ) - { - mBroadcaster.addListener( listener ); - } - - public void removeListener( Listener listener ) - { - mBroadcaster.removeListener( listener ); + mListener = null; } @Override public void dispose() { - /* Method not implemented */ + mListener = null; } + + @Override + public File getFile() + { + return mFile; + } + + private void broadcast( int byteLocation ) + { + int frameLocation = (int)( byteLocation / mBytesPerFrame ); + + if( mFrameLocationListener != null ) + { + mFrameLocationListener.frameLocationUpdated( frameLocation ); + } + } + + @Override + public void setListener( IFrameLocationListener listener ) + { + mFrameLocationListener = listener; + } + + @Override + public void removeListener( IFrameLocationListener listener ) + { + mFrameLocationListener = null; + } } diff --git a/src/source/wave/FloatWaveSource.java b/src/source/wave/FloatWaveSource.java deleted file mode 100644 index a660679d..00000000 --- a/src/source/wave/FloatWaveSource.java +++ /dev/null @@ -1,293 +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 - ******************************************************************************/ -package source.wave; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.nio.ByteBuffer; -import java.nio.ByteOrder; -import java.nio.ShortBuffer; -import java.util.Arrays; - -import javax.sound.sampled.AudioInputStream; -import javax.sound.sampled.AudioSystem; -import javax.sound.sampled.UnsupportedAudioFileException; - -import sample.SampleType; -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; - - private AudioInputStream mInputStream = null; - private int mBytesPerFrame = 0; - private long mFrequency = 0; - - private byte[] mBuffer; - private int mBufferPointer = 0; - private int mBufferLength; - private ShortBuffer mBufferWrapper; - private RealSampleListener mListener; - - private static int BUFFER_SAMPLE_SIZE = 2000; - - - /** - * Single channel (mono) wave file playback source with optional looping - * for continous playback. - * - * Playback can be invoked manually with the next() and next(x) methods to - * get sample(s). - * - * Plaback can be run automatically by invoking the start() and stop() - * methods. - * - * Registered float sample listener(s) will receive any samples produced - * by the manual or automatic methods. - * - * @param filename - wave filename - * - * @param loop - true for looping - * - * @throws FileNotFoundException if filename is not found - */ - public FloatWaveSource( File file, boolean loop ) throws IOException - { - super( file, SampleType.REAL ); - mLoop = loop; - } - - @Override - public int getSampleRate() - { - return (int)mInputStream.getFormat().getSampleRate(); - } - - /** - * Returns the frequency set for this file. Normally returns zero, but - * the value can be set with setFrequency() method. - */ - public long getFrequency() - { - return mFrequency; - } - - /** - * Changes the value returned from getFrequency() for this source. - */ - public void setFrequency( int frequency ) - { - mFrequency = frequency; - } - - /** - * Closes the audio input stream - * @throws IOException - */ - public void close() throws IOException - { - if( mInputStream != null ) - { - mInputStream.close(); - } - - mInputStream = null; - } - - public void open() throws IOException - { - if( mFile == null || !mFile.isFile() ) - { - throw new IOException( "Empty or null file" ); - } - - try - { - mInputStream = AudioSystem.getAudioInputStream( getFile() ); - } - catch( UnsupportedAudioFileException e ) - { - throw new IOException( "MonoWaveSource - unsupported audio file " - + "exception - ", e ); - } - - mBytesPerFrame = mInputStream.getFormat().getFrameSize(); - - if( mBytesPerFrame != 2 || mInputStream.getFormat().getChannels() != 1 ) - { - throw new IOException( "Unsupported Wave Format - requires mono " - + "channel with 16-bit samples" ); - } - - mBuffer = new byte[ mBytesPerFrame * BUFFER_SAMPLE_SIZE ]; - - readBuffer(); - } - - - /** - * Reads a sample from the wave file and broadcasts the sample to all - * registered float listeners. - * - * @return - true if data was read or false if no more data. If loop is - * set to true, then this method will continue to produce samples as long - * as there are not IO exceptions. - * - * @throws IOException if unable to read data from the wave file - */ - /** - * Reads the next buffer from the wave file. - * @throws IOException - */ - public void readBuffer() throws IOException - { - if( mInputStream != null ) - { - /* reset the buffer pointer and fill the buffer with zeros */ - mBufferPointer = 0; - mBufferLength = 0; - Arrays.fill( mBuffer, (byte)0 ); - - while( mBufferLength == 0 ) - { - boolean reset = false; - - /* Fill the buffer with samples from the file */ - mBufferLength = (int)( mInputStream.read( mBuffer ) / - mBytesPerFrame ); - - if( reset && mBufferLength == 0 ) - { - return; - } - - /* If we get a partial buffer, reset the file for the next read */ - if( mBufferLength < mBuffer.length && mLoop ) - { - close(); - open(); - - reset = true; - } - } - - if( mBufferLength > 0 ) - { - mBufferWrapper = ByteBuffer.wrap( mBuffer ).order( - ByteOrder.LITTLE_ENDIAN ).asShortBuffer(); - } - else - { - mBufferWrapper = null; - } - } - } - - private boolean next( boolean broadcast ) throws IOException - { - boolean success = false; - - if( mBufferPointer >= mBufferLength ) - { - readBuffer(); - } - - if( mBufferLength != 0 && - mBufferWrapper != null && - mBufferWrapper.hasRemaining() ) - { - short sample = mBufferWrapper.get(); - - mBufferPointer++; - incrementCurrentLocation( 1, false ); - - if( broadcast && mListener != null ) - { - /* Convert the short into a float value */ - mListener.receive( mMap.get( sample ) ); - } - - success = true; - } - - return success; - } - - public boolean next() throws IOException - { - return next( true ); - } - - /** - * Reads the next (count) samples from the wave file and broadcasts them - * to the registered listeners. - * @param count - number of samples to broadcast - * @return - true if successful - * @throws IOException for any IO issues - */ - public boolean next( int count ) throws IOException - { - for( int x = 0; x < count; x++ ) - { - next(); - } - - return true; - } - - @Override - public void jumpTo( long index ) throws IOException - { - if( index < mCurrentPosition ) - { - close(); - open(); - } - - while( mCurrentPosition < index ) - { - next( false ); - } - - incrementCurrentLocation( 0, true ); - } - - /** - * Adds a new listener to receive samples as they are read from the wave file - */ - public void setListener( RealSampleListener listener ) - { - mListener = listener; - } - - public void removeListener( RealSampleListener listener ) - { - mListener = null; - } - - @Override - public void dispose() - { - mListener = null; - } -} diff --git a/src/source/wave/WaveSource.java b/src/source/wave/WaveSource.java deleted file mode 100644 index f3470d1c..00000000 --- a/src/source/wave/WaveSource.java +++ /dev/null @@ -1,77 +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 - ******************************************************************************/ -package source.wave; - -import java.io.File; -import java.io.IOException; - -import sample.SampleType; -import source.Source; - -public abstract class WaveSource extends Source -{ - protected File mFile; - protected long mCurrentPosition = 0; - protected PositionListener mListener; - - public WaveSource( File file, SampleType sampleType ) - { - super( sampleType.toString() + " Wave Source", sampleType ); - mFile = file; - } - - public File getFile() - { - return mFile; - } - - public long getCurrentPosition() - { - return mCurrentPosition; - } - - public void incrementCurrentLocation( long value, boolean reset ) - { - mCurrentPosition += value; - - if( mListener != null ) - { - mListener.positionUpdated( mCurrentPosition, reset ); - } - } - - public void addListener( PositionListener listener ) - { - mListener = listener; - } - - public abstract void open() throws IOException; - - public abstract void close() throws IOException; - - public abstract boolean next() throws IOException; - - public abstract boolean next( int count ) throws IOException; - - public abstract void jumpTo( long index ) throws IOException; - - public interface PositionListener - { - public void positionUpdated( long position, boolean reset ); - } -}