GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 08:37:25 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

#2092 Adjust P25 P1 Motorola Talker Alias Dispatch Sequencing (#2317)

Browse Source 
* Add logic to ensure last Motorola talker alias block is handled before the completed alias.

* Return removed comment.
This commit is contained in:
tadscottsmith
2025-12-25 03:25:51 -06:00
committed by GitHub
parent d8e2e0ac57
commit b83f77c7c6
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/io/github/dsheirer/module/decode/p25/phase1/P25P1MessageProcessor.java
View File

@@ -179,6 +179,7 @@ public class P25P1MessageProcessor implements Listener<IMessage>
}
else if(message instanceof TDULCMessage tdulc)
{
boolean motorolaTalkerAliasComplete = false;
LinkControlWord lcw = tdulc.getLinkControlWord();
if(lcw instanceof IExtendedSourceMessage esm)
@@ -198,13 +199,19 @@ public class P25P1MessageProcessor implements Listener<IMessage>
//Motorola carries the talker alias in the TDULC
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.
mHarrisTalkerAliasAssembler.reset();
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)
{