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

#1104 Resolves issue where all assembled DMR packet sequences are occurring only on timeslot 2 (#1105)

Browse Source 
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
Denny Sheirer
2021-11-20 06:04:49 -05:00
committed by GitHub
parent 0c7dd192b0
commit b8bbe9264a
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/io/github/dsheirer/module/decode/dmr/message/data/packet/PacketSequenceAssembler.java
View File

@@ -1,6 +1,6 @@
/*
* *****************************************************************************
* Copyright (C) 2014-2020 Dennis Sheirer
* Copyright (C) 2014-2021 Dennis Sheirer
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -32,8 +32,8 @@ import io.github.dsheirer.sample.Listener;
public class PacketSequenceAssembler
{
private Listener<IMessage> mMessageListener;
private PacketSequence mTimeslot0Sequence;
private PacketSequence mTimeslot1Sequence;
private PacketSequence mTimeslot2Sequence;
/**
* Constructs an instance
@@ -49,24 +49,24 @@ public class PacketSequenceAssembler
*/
private PacketSequence getPacketSequence(int timeslot)
{
if(timeslot == 0)
{
if(mTimeslot0Sequence == null)
{
mTimeslot0Sequence = new PacketSequence(1);
}
return mTimeslot0Sequence;
}
else
if(timeslot == 1)
{
if(mTimeslot1Sequence == null)
{
mTimeslot1Sequence = new PacketSequence(2);
mTimeslot1Sequence = new PacketSequence(1);
}
return mTimeslot1Sequence;
}
else
{
if(mTimeslot2Sequence == null)
{
mTimeslot2Sequence = new PacketSequence(2);
}
return mTimeslot2Sequence;
}
}
/**
@@ -84,7 +84,7 @@ public class PacketSequenceAssembler
*/
private void dispatchPacketSequence(int timeslot)
{
PacketSequence packetSequence = (timeslot == 0 ? mTimeslot0Sequence : mTimeslot1Sequence);
PacketSequence packetSequence = (timeslot == 1 ? mTimeslot1Sequence : mTimeslot2Sequence);
if(mMessageListener != null && packetSequence != null && packetSequence.isComplete())
{
@@ -96,13 +96,13 @@ public class PacketSequenceAssembler
}
}
if(timeslot == 0)
if(timeslot == 1)
{
mTimeslot0Sequence = null;
mTimeslot1Sequence = null;
}
else
{
mTimeslot1Sequence = null;
mTimeslot2Sequence = null;
}
}