mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 10:37:26 -05:00
#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)
Co-authored-by: Denny <denny@denny-desktop>
This commit is contained in:
@@ -287,7 +287,19 @@ public class RadioReferenceDecoder
|
|||||||
*/
|
*/
|
||||||
public boolean isLSM(Site site)
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -479,20 +479,19 @@ public class SiteEditor extends GridPane
|
|||||||
|
|
||||||
private void createControlChannel()
|
private void createControlChannel()
|
||||||
{
|
{
|
||||||
SiteFrequency control = null;
|
List<SiteFrequency> controls = new ArrayList<>();
|
||||||
|
|
||||||
for(SiteFrequency siteFrequency: getSiteFrequencyTableView().getItems())
|
for(SiteFrequency siteFrequency: getSiteFrequencyTableView().getItems())
|
||||||
{
|
{
|
||||||
if(isControl(siteFrequency) && siteFrequency.getFrequency() > 0.01)
|
if(isControl(siteFrequency) && siteFrequency.getFrequency() > 0.01)
|
||||||
{
|
{
|
||||||
control = siteFrequency;
|
controls.add(siteFrequency);
|
||||||
continue;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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.setTitle("Create Channel Configuration");
|
||||||
alert.setHeaderText("Can't Create Channel Configuration");
|
alert.setHeaderText("Can't Create Channel Configuration");
|
||||||
alert.initOwner((getCreateChannelConfigurationButton()).getScene().getWindow());
|
alert.initOwner((getCreateChannelConfigurationButton()).getScene().getWindow());
|
||||||
@@ -514,9 +513,24 @@ public class SiteEditor extends GridPane
|
|||||||
|
|
||||||
channel.setDecodeConfiguration(getDecodeConfiguration(decoderType, mCurrentSite.getSite(), mCurrentSystemInformation));
|
channel.setDecodeConfiguration(getDecodeConfiguration(decoderType, mCurrentSite.getSite(), mCurrentSystemInformation));
|
||||||
|
|
||||||
SourceConfigTuner sourceConfigTuner = new SourceConfigTuner();
|
if(controls.size() == 1)
|
||||||
sourceConfigTuner.setFrequency((long)(control.getFrequency() * 1E6));
|
{
|
||||||
channel.setSourceConfiguration(sourceConfigTuner);
|
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);
|
mPlaylistManager.getChannelModel().addChannel(channel);
|
||||||
|
|
||||||
if(getGoToChannelEditorCheckBox().isSelected())
|
if(getGoToChannelEditorCheckBox().isSelected())
|
||||||
@@ -548,7 +562,7 @@ public class SiteEditor extends GridPane
|
|||||||
|
|
||||||
if(siteFrequencies.isEmpty())
|
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.setTitle("Create Channel Configuration");
|
||||||
alert.setHeaderText("Can't Create Channel Configuration");
|
alert.setHeaderText("Can't Create Channel Configuration");
|
||||||
alert.initOwner((getCreateChannelConfigurationButton()).getScene().getWindow());
|
alert.initOwner((getCreateChannelConfigurationButton()).getScene().getWindow());
|
||||||
|
|||||||
Reference in New Issue
Block a user