mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-19 20:17:25 -05:00
330-WIP - adds the message decoder to see the P25 messages being decoded
as we step through the recording.
This commit is contained in:
@@ -20,9 +20,11 @@ import io.github.dsheirer.instrument.gui.viewer.chart.DoubleLineChart;
|
|||||||
import io.github.dsheirer.instrument.gui.viewer.chart.EyeDiagramChart;
|
import io.github.dsheirer.instrument.gui.viewer.chart.EyeDiagramChart;
|
||||||
import io.github.dsheirer.instrument.gui.viewer.chart.PhaseLineChart;
|
import io.github.dsheirer.instrument.gui.viewer.chart.PhaseLineChart;
|
||||||
import io.github.dsheirer.instrument.gui.viewer.chart.SymbolChart;
|
import io.github.dsheirer.instrument.gui.viewer.chart.SymbolChart;
|
||||||
|
import io.github.dsheirer.message.Message;
|
||||||
import io.github.dsheirer.module.decode.DecoderType;
|
import io.github.dsheirer.module.decode.DecoderType;
|
||||||
import io.github.dsheirer.module.decode.p25.P25_C4FMDecoder2Instrumented;
|
import io.github.dsheirer.module.decode.p25.P25_C4FMDecoder2Instrumented;
|
||||||
import io.github.dsheirer.sample.Broadcaster;
|
import io.github.dsheirer.sample.Broadcaster;
|
||||||
|
import io.github.dsheirer.sample.Listener;
|
||||||
import io.github.dsheirer.sample.complex.ComplexBuffer;
|
import io.github.dsheirer.sample.complex.ComplexBuffer;
|
||||||
import javafx.scene.layout.HBox;
|
import javafx.scene.layout.HBox;
|
||||||
import javafx.scene.layout.Priority;
|
import javafx.scene.layout.Priority;
|
||||||
@@ -65,6 +67,16 @@ public class P25Phase1Pane extends DecoderPane
|
|||||||
HBox.setHgrow(getSampleChartBox(), Priority.ALWAYS);
|
HBox.setHgrow(getSampleChartBox(), Priority.ALWAYS);
|
||||||
HBox.setHgrow(getDecoderChartBox(), Priority.ALWAYS);
|
HBox.setHgrow(getDecoderChartBox(), Priority.ALWAYS);
|
||||||
getChildren().addAll(getSampleChartBox(), getDecoderChartBox());
|
getChildren().addAll(getSampleChartBox(), getDecoderChartBox());
|
||||||
|
|
||||||
|
mDecoder.setMessageListener(new Listener<Message>()
|
||||||
|
{
|
||||||
|
@Override
|
||||||
|
public void receive(Message message)
|
||||||
|
{
|
||||||
|
mLog.debug(message.getMessage());
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -42,10 +42,10 @@ public class P25_C4FMDecoder2 extends P25Decoder implements IComplexBufferListen
|
|||||||
protected InterpolatingSampleBuffer mInterpolatingSampleBuffer;
|
protected InterpolatingSampleBuffer mInterpolatingSampleBuffer;
|
||||||
protected DQPSKDemodulator mQPSKDemodulator;
|
protected DQPSKDemodulator mQPSKDemodulator;
|
||||||
protected CostasLoop mCostasLoop;
|
protected CostasLoop mCostasLoop;
|
||||||
|
protected P25MessageFramer mMessageFramer;
|
||||||
protected double mSampleRate;
|
protected double mSampleRate;
|
||||||
private Map<Double,float[]> mBasebandFilters = new HashMap<>();
|
private Map<Double,float[]> mBasebandFilters = new HashMap<>();
|
||||||
private ComplexFIRFilter mBasebandFilter;
|
private ComplexFIRFilter mBasebandFilter;
|
||||||
private P25MessageFramer mMessageFramer;
|
|
||||||
|
|
||||||
public P25_C4FMDecoder2(AliasList aliasList)
|
public P25_C4FMDecoder2(AliasList aliasList)
|
||||||
{
|
{
|
||||||
@@ -84,7 +84,6 @@ public class P25_C4FMDecoder2 extends P25Decoder implements IComplexBufferListen
|
|||||||
protected ComplexBuffer filter(ComplexBuffer complexBuffer)
|
protected ComplexBuffer filter(ComplexBuffer complexBuffer)
|
||||||
{
|
{
|
||||||
return mBasebandFilter.filter(complexBuffer);
|
return mBasebandFilter.filter(complexBuffer);
|
||||||
// return complexBuffer;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private double getSampleRate()
|
private double getSampleRate()
|
||||||
|
|||||||
@@ -69,6 +69,7 @@ public class P25_C4FMDecoder2Instrumented extends P25_C4FMDecoder2
|
|||||||
instrumented.setPLLFrequencyListener(mPLLFrequencyListener);
|
instrumented.setPLLFrequencyListener(mPLLFrequencyListener);
|
||||||
instrumented.setSymbolDecisionDataListener(mSymbolDecisionDataListener);
|
instrumented.setSymbolDecisionDataListener(mSymbolDecisionDataListener);
|
||||||
instrumented.setSamplesPerSymbolListener(mSamplesPerSymbolListener);
|
instrumented.setSamplesPerSymbolListener(mSamplesPerSymbolListener);
|
||||||
|
instrumented.setDibitListener(mMessageFramer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setSymbolListener(Listener<Complex> listener)
|
public void setSymbolListener(Listener<Complex> listener)
|
||||||
|
|||||||
Reference in New Issue
Block a user