Skip to content

Adding Caller Id Features #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
djshadowxm82 wants to merge 5 commits into
base: main
Choose a base branch
from
+4 −29
Open

Adding Caller Id Features #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
00fda65
Adding Caller Id Features
djshadowxm82 May 1, 2025
7686709
Missed some timer comments
djshadowxm82 May 1, 2025
4001e45
Missed a bracket
djshadowxm82 May 9, 2025
3592758
I clearly missed somethings on last merge. Fixing the actual loading …
djshadowxm82 May 9, 2025
163e9b7
Remove unused source ID timer and related comments
djshadowxm82 Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions rc2-dvm/VirtualChannel.P25.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
29 changes: 2 additions & 27 deletions rc2-dvm/VirtualChannel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -281,26 +278,6 @@ public VirtualChannel(VirtualChannelConfigObject config, KeyContainer keyContain
dvmRadio.Status.ChannelName = CurrentTalkgroup.Name;
}

/// <summary>
/// Callback to alternate between TG name and source ID
/// </summary>
/// <param name="source"></param>
/// <param name="e"></param>
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;
}
}

/// <summary>
/// Function called when the rx data timeout timer is hit, will force-reset the call data on loss of LDUs
Expand Down Expand Up @@ -500,8 +477,6 @@ private void resetAffTimer()
/// </summary>
private void resetCall()
{
// Stop source ID callback
sourceIdTimer.Stop();
// Stop rx data timeout timer
rxDataTimer.Stop();
// Reset P25 counter
Expand Down