diff --git a/rc2-dvm/VirtualChannel.P25.cs b/rc2-dvm/VirtualChannel.P25.cs
index d69a1f0..f0e87fe 100644
--- a/rc2-dvm/VirtualChannel.P25.cs
+++ b/rc2-dvm/VirtualChannel.P25.cs
@@ -498,7 +498,7 @@ public void P25DataReceived(P25DataReceivedEvent e, DateTime pktTime)
// Start source ID display callback
lastSourceId = e.SrcId;
- sourceIdTimer.Start();
+ dvmRadio.Status.CallerId = lastSourceId.ToString();
// Start RX data timeout timer
rxDataTimer.Start();
// Status update
@@ -527,10 +527,10 @@ public void P25DataReceived(P25DataReceivedEvent e, DateTime pktTime)
// Update state
dvmRadio.Status.State = rc2_core.RadioState.Idle;
// Stop source ID callback
- sourceIdTimer.Stop();
dvmRadio.Status.ChannelName = CurrentTalkgroup.Name;
// Stop RX data timeout timer
rxDataTimer.Stop();
+ dvmRadio.Status.CallerId = "";
// Status update
dvmRadio.StatusCallback();
// Log
diff --git a/rc2-dvm/VirtualChannel.cs b/rc2-dvm/VirtualChannel.cs
index 708a5e0..6940062 100644
--- a/rc2-dvm/VirtualChannel.cs
+++ b/rc2-dvm/VirtualChannel.cs
@@ -58,7 +58,7 @@ public partial class VirtualChannel
// Variables for displaying active source ID
private bool showingSourceId;
private uint lastSourceId;
- private System.Timers.Timer sourceIdTimer;
+
private DVMRadio dvmRadio;
@@ -185,10 +185,7 @@ public VirtualChannel(VirtualChannelConfigObject config, KeyContainer keyContain
}
- // Init source ID display stuff
- sourceIdTimer = new System.Timers.Timer(1000);
- sourceIdTimer.Elapsed += sourceIdTimerCallback;
- //sourceIdTimer.Enabled = true;
+
// Init rx data timeout timer
rxDataTimer = new System.Timers.Timer(1000);
@@ -281,26 +278,6 @@ public VirtualChannel(VirtualChannelConfigObject config, KeyContainer keyContain
dvmRadio.Status.ChannelName = CurrentTalkgroup.Name;
}
- ///
- /// Callback to alternate between TG name and source ID
- ///
- ///
- ///
- private void sourceIdTimerCallback(Object source, ElapsedEventArgs e)
- {
- if (showingSourceId)
- {
- dvmRadio.Status.ChannelName = CurrentTalkgroup.Name;
- dvmRadio.StatusCallback();
- showingSourceId = false;
- }
- else
- {
- dvmRadio.Status.ChannelName = $"ID: {lastSourceId}";
- dvmRadio.StatusCallback();
- showingSourceId = true;
- }
- }
///
/// Function called when the rx data timeout timer is hit, will force-reset the call data on loss of LDUs
@@ -500,8 +477,6 @@ private void resetAffTimer()
///
private void resetCall()
{
- // Stop source ID callback
- sourceIdTimer.Stop();
// Stop rx data timeout timer
rxDataTimer.Stop();
// Reset P25 counter