Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Inherit P25 Trunked Preferred Tuner To Traffic Channels #1808

Merged
merged 2 commits into from Jan 30, 2024
Merged

Inherit P25 Trunked Preferred Tuner To Traffic Channels #1808

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc97d76
Inherit preferred tuner configuration to P25 traffic channels
Nokoa Jan 25, 2024
1667895
Added java code braces
Nokoa Jan 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java
View file
Open in desktop
Expand Up @@ -309,6 +309,10 @@ private void processPhase1ChannelGrant(APCO25Channel apco25Channel, ServiceOptio
broadcast(event);
SourceConfigTuner sourceConfig = new SourceConfigTuner();
sourceConfig.setFrequency(frequency);
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
{
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
DSheirer marked this conversation as resolved.
Show resolved Hide resolved
}
trafficChannel.setSourceConfiguration(sourceConfig);
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);

Expand Down Expand Up @@ -356,6 +360,10 @@ private void processPhase1ChannelGrant(APCO25Channel apco25Channel, ServiceOptio

SourceConfigTuner sourceConfig = new SourceConfigTuner();
sourceConfig.setFrequency(frequency);
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
{
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
}
trafficChannel.setSourceConfiguration(sourceConfig);
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);

Expand Down Expand Up @@ -455,6 +463,10 @@ else if(timeslot == 1)
broadcast(event);
SourceConfigTuner sourceConfig = new SourceConfigTuner();
sourceConfig.setFrequency(frequency);
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
{
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
}
trafficChannel.setSourceConfiguration(sourceConfig);
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);

Expand Down Expand Up @@ -517,6 +529,10 @@ else if(timeslot == 1)

SourceConfigTuner sourceConfig = new SourceConfigTuner();
sourceConfig.setFrequency(frequency);
if(mParentChannel.getSourceConfiguration() instanceof SourceConfigTuner parentConfigTuner)
{
sourceConfig.setPreferredTuner(parentConfigTuner.getPreferredTuner());
}
trafficChannel.setSourceConfiguration(sourceConfig);
mAllocatedTrafficChannelMap.put(frequency, trafficChannel);

Expand Down