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

#890 Resolves issue where radio reference channel import only imports 1 of multiple listed control channels and adds improved detection for P25P2 simulcast sites to set the decoder type to LSM. (#892)

Browse Source 
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
Denny Sheirer
2020-07-25 08:26:19 -04:00
committed by GitHub
parent 7962758e05
commit de3ba5529a
2 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/io/github/dsheirer/gui/playlist/radioreference/RadioReferenceDecoder.java
View File

@@ -287,7 +287,19 @@ public class RadioReferenceDecoder
*/
public boolean isLSM(Site site)
{
return site != null && site.getModulation() != null && site.getModulation().contentEquals("LSM");
if(site != null)
{
if(site.getModulation() != null && site.getModulation().contentEquals("LSM"))
{
return true;
}
else if(site.getDescription() != null && site.getDescription().contains("Simulcast"))
{
return true;
}
}
return false;
}
/**

32
src/main/java/io/github/dsheirer/gui/playlist/radioreference/SiteEditor.java
View File

@@ -479,20 +479,19 @@ public class SiteEditor extends GridPane
private void createControlChannel()
{
SiteFrequency control = null;
List<SiteFrequency> controls = new ArrayList<>();
for(SiteFrequency siteFrequency: getSiteFrequencyTableView().getItems())
{
if(isControl(siteFrequency) && siteFrequency.getFrequency() > 0.01)
{
control = siteFrequency;
continue;
controls.add(siteFrequency);
}
}
if(control == null)
if(controls.isEmpty())
{
Alert alert = new Alert(Alert.AlertType.ERROR, "Site Has No Control Channel", ButtonType.OK);
Alert alert = new Alert(Alert.AlertType.ERROR, "Site Has No Control Channel(s)", ButtonType.OK);
alert.setTitle("Create Channel Configuration");
alert.setHeaderText("Can't Create Channel Configuration");
alert.initOwner((getCreateChannelConfigurationButton()).getScene().getWindow());
@@ -514,9 +513,24 @@ public class SiteEditor extends GridPane
channel.setDecodeConfiguration(getDecodeConfiguration(decoderType, mCurrentSite.getSite(), mCurrentSystemInformation));
SourceConfigTuner sourceConfigTuner = new SourceConfigTuner();
sourceConfigTuner.setFrequency((long)(control.getFrequency() * 1E6));
channel.setSourceConfiguration(sourceConfigTuner);
if(controls.size() == 1)
{
SourceConfigTuner sourceConfigTuner = new SourceConfigTuner();
sourceConfigTuner.setFrequency((long)(controls.get(0).getFrequency() * 1E6));
channel.setSourceConfiguration(sourceConfigTuner);
}
else
{
SourceConfigTunerMultipleFrequency sourceConfig = new SourceConfigTunerMultipleFrequency();
for(SiteFrequency control: controls)
{
sourceConfig.addFrequency((long)(control.getFrequency() * 1E6));
}
channel.setSourceConfiguration(sourceConfig);
}
mPlaylistManager.getChannelModel().addChannel(channel);
if(getGoToChannelEditorCheckBox().isSelected())
@@ -548,7 +562,7 @@ public class SiteEditor extends GridPane
if(siteFrequencies.isEmpty())
{
Alert alert = new Alert(Alert.AlertType.ERROR, "Site Has No Control or Alternate Channels", ButtonType.OK);
Alert alert = new Alert(Alert.AlertType.ERROR, "Site Has No Control or Alternate Channel(s)", ButtonType.OK);
alert.setTitle("Create Channel Configuration");
alert.setHeaderText("Can't Create Channel Configuration");
alert.initOwner((getCreateChannelConfigurationButton()).getScene().getWindow());