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

MPT1327: Fix decoding of calls to past talkgroups (#824)

Browse Source 
* MPT1327: Fix decoding of calls to past talkgroups

* Fixed updating event in case of teardown. Other improvements.
This commit is contained in:
Andrzej Pańkowski
2020-05-21 11:22:12 +02:00
committed by GitHub
parent e1194d26bd
commit 3d816c3570
1 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/main/java/io/github/dsheirer/module/decode/mpt1327/MPT1327TrafficChannelManager.java
View File

@@ -325,23 +325,14 @@ public class MPT1327TrafficChannelManager extends Module implements IDecodeEvent
switch(channelEvent.getEvent())
{
case NOTIFICATION_PROCESSING_STOP:
MPT1327Channel toRemove = null;
for(Map.Entry<MPT1327Channel,Channel> entry : mAllocatedTrafficChannelMap.entrySet())
{
if(entry.getValue() == channel)
{
toRemove = entry.getKey();
continue;
}
}
final var toRemove = mptChannelForChannel(channel);
if(toRemove != null)
{
mAllocatedTrafficChannelMap.remove(toRemove);
mAvailableTrafficChannelQueue.add(channel);
MPT1327ChannelGrantEvent event = mChannelGrantEventMap.get(toRemove);
final var event = mChannelGrantEventMap.remove(toRemove);
if(event != null)
{
@@ -351,23 +342,14 @@ public class MPT1327TrafficChannelManager extends Module implements IDecodeEvent
}
break;
case NOTIFICATION_PROCESSING_START_REJECTED:
MPT1327Channel rejected = null;
for(Map.Entry<MPT1327Channel,Channel> entry : mAllocatedTrafficChannelMap.entrySet())
{
if(entry.getValue() == channel)
{
rejected = entry.getKey();
continue;
}
}
final var rejected = mptChannelForChannel(channel);
if(rejected != null)
{
mAllocatedTrafficChannelMap.remove(rejected);
mAvailableTrafficChannelQueue.add(channel);
MPT1327ChannelGrantEvent event = mChannelGrantEventMap.get(rejected);
final var event = mChannelGrantEventMap.remove(rejected);
if(event != null)
{
@@ -386,5 +368,17 @@ public class MPT1327TrafficChannelManager extends Module implements IDecodeEvent
}
}
}
private MPT1327Channel mptChannelForChannel(final Channel channel)
{
for (final var entry : mAllocatedTrafficChannelMap.entrySet())
{
if (entry.getValue() == channel)
{
return entry.getKey();
}
}
return null;
}
}
}