mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-15 01:57:39 -05:00
#2127 DMR capacity plus wide area voice channel user link control messages now create a call event (#2201)
Co-authored-by: Dennis Sheirer <dsheirer@github.com>
This commit is contained in:
@@ -1246,21 +1246,22 @@ public class DMRDecoderState extends TimeslotDecoderState
|
|||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case FULL_CAPACITY_PLUS_WIDE_AREA_VOICE_CHANNEL_USER:
|
case FULL_CAPACITY_PLUS_WIDE_AREA_VOICE_CHANNEL_USER:
|
||||||
if(message instanceof CapacityPlusWideAreaVoiceChannelUser)
|
if(message instanceof CapacityPlusWideAreaVoiceChannelUser cpwavcu)
|
||||||
{
|
{
|
||||||
CapacityPlusWideAreaVoiceChannelUser cpuo4 = (CapacityPlusWideAreaVoiceChannelUser)message;
|
updateRestChannel(cpwavcu.getRestChannel());
|
||||||
|
|
||||||
updateRestChannel(cpuo4.getRestChannel());
|
|
||||||
|
|
||||||
if(isTerminator)
|
if(isTerminator)
|
||||||
{
|
{
|
||||||
closeCurrentCallEvent(message.getTimestamp());
|
closeCurrentCallEvent(message.getTimestamp());
|
||||||
getIdentifierCollection().remove(Role.FROM);
|
getIdentifierCollection().remove(Role.FROM);
|
||||||
getIdentifierCollection().update(cpuo4.getTalkgroup());
|
getIdentifierCollection().update(cpwavcu.getTalkgroup());
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
getIdentifierCollection().update(message.getIdentifiers());
|
getIdentifierCollection().update(message.getIdentifiers());
|
||||||
|
ServiceOptions serviceOptions = cpwavcu.getServiceOptions();
|
||||||
|
updateCurrentCall(serviceOptions.isEncrypted() ? DecodeEventType.CALL_GROUP_ENCRYPTED :
|
||||||
|
DecodeEventType.CALL_GROUP, serviceOptions.toString(), message.getTimestamp());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|||||||
Reference in New Issue
Block a user