Resolves issue from merging master branch into polyphase channelizer branch.

This commit is contained in:
Denny
2017-10-15 07:26:17 -04:00
parent c21f3fca23
commit 3be65d5e9a
4 changed files with 22 additions and 3 deletions

View File

@@ -18,8 +18,10 @@
******************************************************************************/ ******************************************************************************/
package dsp.filter.channelizer; package dsp.filter.channelizer;
import channel.heartbeat.Heartbeat;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import sample.Listener;
import sample.OverflowableTransferQueue; import sample.OverflowableTransferQueue;
import sample.complex.ComplexBuffer; import sample.complex.ComplexBuffer;
import sample.real.IOverflowListener; import sample.real.IOverflowListener;
@@ -184,6 +186,18 @@ public class PolyphaseChannelSource extends ComplexChannelSource
mLog.debug("Request for frequency correction: " + correction + " -- not yet implemented"); mLog.debug("Request for frequency correction: " + correction + " -- not yet implemented");
} }
@Override
public void setHeartbeatListener(Listener<Heartbeat> listener)
{
//TODO: implement this
}
@Override
public void removeHeartbeatListener()
{
//TODO: implement this
}
@Override @Override
public void reset() public void reset()
{ {

View File

@@ -79,6 +79,6 @@ public class TwoChannelOutputProcessor extends ChannelOutputProcessor
// float i = channels[mChannelOffset]; // float i = channels[mChannelOffset];
// float q = channels[mChannelOffset + 1]; // float q = channels[mChannelOffset + 1];
listener.receive(getFrequencyCorrectedInphase(i, q), getFrequencyCorrectedQuadrature(i, q)); // listener.receive(getFrequencyCorrectedInphase(i, q), getFrequencyCorrectedQuadrature(i, q));
} }
} }

View File

@@ -93,7 +93,7 @@ public class BinaryTapViewPanel extends TapViewPanel
* Paints a polyline representing a boolean value with a 0 or 1 label in * Paints a polyline representing a boolean value with a 0 or 1 label in
* the middle of it * the middle of it
* *
* @param graphics * @param graphics object
* @param index - index of the sample int the sample buffer * @param index - index of the sample int the sample buffer
* @param value - bit value, 0 or 1 * @param value - bit value, 0 or 1
*/ */

View File

@@ -320,7 +320,12 @@ public class ProcessingChain implements IChannelEventListener
if(module instanceof ISourceEventListener) if(module instanceof ISourceEventListener)
{ {
mFrequencyChangeEventBroadcaster.addListener(frequencyChangeEventListener); Listener<SourceEvent> listener = ((ISourceEventListener)module).getSourceEventListener();
if(listener != null)
{
mFrequencyChangeEventBroadcaster.addListener(listener);
}
} }
if(module instanceof IHeartbeatListener) if(module instanceof IHeartbeatListener)