mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-16 18:47:33 -05:00
* Add logic to ensure last Motorola talker alias block is handled before the completed alias. * Return removed comment.
This commit is contained in:
@@ -179,6 +179,7 @@ public class P25P1MessageProcessor implements Listener<IMessage>
|
|||||||
}
|
}
|
||||||
else if(message instanceof TDULCMessage tdulc)
|
else if(message instanceof TDULCMessage tdulc)
|
||||||
{
|
{
|
||||||
|
boolean motorolaTalkerAliasComplete = false;
|
||||||
LinkControlWord lcw = tdulc.getLinkControlWord();
|
LinkControlWord lcw = tdulc.getLinkControlWord();
|
||||||
|
|
||||||
if(lcw instanceof IExtendedSourceMessage esm)
|
if(lcw instanceof IExtendedSourceMessage esm)
|
||||||
@@ -198,13 +199,19 @@ public class P25P1MessageProcessor implements Listener<IMessage>
|
|||||||
//Motorola carries the talker alias in the TDULC
|
//Motorola carries the talker alias in the TDULC
|
||||||
else if(mMotorolaTalkerAliasAssembler.add(lcw, message.getTimestamp()))
|
else if(mMotorolaTalkerAliasAssembler.add(lcw, message.getTimestamp()))
|
||||||
{
|
{
|
||||||
dispatch(mMotorolaTalkerAliasAssembler.assemble());
|
motorolaTalkerAliasComplete = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
//Harris carries the talker alias in the LDU1 link control messages, so reset the assembler on TDULC.
|
//Harris carries the talker alias in the LDU1 link control messages, so reset the assembler on TDULC.
|
||||||
mHarrisTalkerAliasAssembler.reset();
|
mHarrisTalkerAliasAssembler.reset();
|
||||||
|
|
||||||
dispatch(tdulc);
|
dispatch(tdulc);
|
||||||
|
|
||||||
|
// Dispatch the complete talker alias after the TDULC to ensure correct log sequencing.
|
||||||
|
if(motorolaTalkerAliasComplete)
|
||||||
|
{
|
||||||
|
dispatch(mMotorolaTalkerAliasAssembler.assemble());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else if(message instanceof HDUMessage hdu && mHeldTDULCMessage != null)
|
else if(message instanceof HDUMessage hdu && mHeldTDULCMessage != null)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user