GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#1362 Updates heterodyne channelizer with alternate sorted set implementation to resolve issue when determining if the tuner can tune a requested channel. (#1363)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2022-12-17 09:28:29 -05:00
committed by GitHub
parent 9af593a785
commit dc327a2855
1 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/io/github/dsheirer/source/tuner/manager/CenterFrequencyCalculator.java
View File

@@ -20,15 +20,17 @@ package io.github.dsheirer.source.tuner.manager;
import io.github.dsheirer.source.tuner.TunerController;
import io.github.dsheirer.source.tuner.channel.TunerChannel;
import java.util.SortedSet;
import java.util.TreeSet;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Calculates tuner center frequency for a set of tuner channels.
*/
public class CenterFrequencyCalculator
{
private static final Logger mLog = LoggerFactory.getLogger(CenterFrequencyCalculator.class);
public static final long INVALID_FREQUENCY = -1;
/**
@@ -145,7 +147,20 @@ public class CenterFrequencyCalculator
}
else
{
SortedSet<TunerChannel> allChannels = new TreeSet<>(channels);
SortedSet<TunerChannel> allChannels = new TreeSet<>();
for(TunerChannel tunerChannel: allChannels)
{
if(tunerChannel != null)
{
allChannels.add(tunerChannel);
}
else
{
mLog.error("Null tuner channel encountered - continuing");
}
}
allChannels.add(channel);
//If the bandwidth of the channel set is less than or equal to the tuner's usable bandwidth, then