diff --git a/dvmconsole/FneSystemBase.P25.cs b/dvmconsole/FneSystemBase.P25.cs index e26bb6a..c2167b6 100644 --- a/dvmconsole/FneSystemBase.P25.cs +++ b/dvmconsole/FneSystemBase.P25.cs @@ -64,12 +64,8 @@ namespace dvmconsole /// /// /// - public void SendP25TDU(uint srcId, uint dstId, bool grantDemand = false, bool callTerm = false) + public void SendP25TDU(uint srcId, uint dstId, bool grantDemand = false) { - // if this is a call terminator -- also send the internal DVM call termination - if (callTerm) - SendDVMCallTermination(srcId, dstId); - RemoteCallData callData = new RemoteCallData() { SrcId = srcId, diff --git a/dvmconsole/MainWindow.xaml.cs b/dvmconsole/MainWindow.xaml.cs index 52bd3f7..2af34a0 100644 --- a/dvmconsole/MainWindow.xaml.cs +++ b/dvmconsole/MainWindow.xaml.cs @@ -1332,7 +1332,7 @@ namespace dvmconsole double totalDurationMs = ((double)pcmData.Length / 16000) + 250; await Task.Delay((int)totalDurationMs + 3000); - fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false, true); + fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false); ResetChannel(channel); @@ -2174,7 +2174,7 @@ namespace dvmconsole double totalDurationMs = (toneADuration + toneBDuration) * 1000 + 750; await Task.Delay((int)totalDurationMs + 4000); - fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false, true); + fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false); Dispatcher.Invoke(() => { @@ -2499,7 +2499,7 @@ namespace dvmconsole if (e.PageState) fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), true); else - fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false, true); + fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false); } /// @@ -2564,7 +2564,7 @@ namespace dvmconsole e.VolumeMeterLevel = 0; Log.WriteLine($"({system.Name}) {e.ChannelMode.ToUpperInvariant()} Traffic *CALL END * SRC_ID {srcId} TGID {dstId} [STREAM ID {e.TxStreamId}]"); if (cpgChannel.GetChannelMode() == Codeplug.ChannelMode.P25) - fne.SendP25TDU(srcId, dstId, false, true); + fne.SendP25TDU(srcId, dstId, false); else if (cpgChannel.GetChannelMode() == Codeplug.ChannelMode.DMR) fne.SendDMRTerminator(srcId, dstId, 1, e.dmrSeqNo, e.dmrN, e.embeddedData); @@ -2683,7 +2683,7 @@ namespace dvmconsole Log.WriteLine($"({system.Name}) {e.ChannelMode.ToUpperInvariant()} Traffic *CALL END * SRC_ID {srcId} TGID {dstId} [STREAM ID {e.TxStreamId}]"); e.VolumeMeterLevel = 0; if (cpgChannel.GetChannelMode() == Codeplug.ChannelMode.P25) - fne.SendP25TDU(srcId, dstId, false, true); + fne.SendP25TDU(srcId, dstId, false); else if (cpgChannel.GetChannelMode() == Codeplug.ChannelMode.DMR) fne.SendDMRTerminator(srcId, dstId, 1, e.dmrSeqNo, e.dmrN, e.embeddedData); @@ -2972,7 +2972,7 @@ namespace dvmconsole channel.PttState = false; }); - fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false, true); + fne.SendP25TDU(uint.Parse(system.Rid), uint.Parse(cpgChannel.Tgid), false); } } } diff --git a/fnecore b/fnecore index 89ca601..7129cc3 160000 --- a/fnecore +++ b/fnecore @@ -1 +1 @@ -Subproject commit 89ca6012ce9aa60d26283084fdb1a45a686e526f +Subproject commit 7129cc30e9737bd71df3f97233160cfbe920d7dd