From cc97d76e5073ec5b047e3c6689f1fe0b0a73f4fd Mon Sep 17 00:00:00 2001 From: Shahar Hart Date: Thu, 25 Jan 2024 22:56:38 +0200 Subject: [PATCH 1/2] Inherit preferred tuner configuration to P25 traffic channels --- .../module/decode/p25/P25TrafficChannelManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java b/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java index 5018f079d..e6d1e26ff 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java @@ -309,6 +309,8 @@ 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()); trafficChannel.setSourceConfiguration(sourceConfig); mAllocatedTrafficChannelMap.put(frequency, trafficChannel); @@ -356,6 +358,8 @@ 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); @@ -455,6 +459,8 @@ 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); @@ -517,6 +523,8 @@ 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); From 16678953e5225bcc7b44148b59e38bd4359b6666 Mon Sep 17 00:00:00 2001 From: Shahar Hart Date: Mon, 29 Jan 2024 12:33:25 +0200 Subject: [PATCH 2/2] Added java code braces --- .../module/decode/p25/P25TrafficChannelManager.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java b/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java index e6d1e26ff..6e668be7d 100644 --- a/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java +++ b/src/main/java/io/github/dsheirer/module/decode/p25/P25TrafficChannelManager.java @@ -310,7 +310,9 @@ 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); @@ -359,7 +361,9 @@ 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); @@ -460,7 +464,9 @@ 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); @@ -524,7 +530,9 @@ 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);