Skip to content
Open

2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
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
78 changes: 41 additions & 37 deletions NetSdrClientApp/NetSdrClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
using NetSdrClientApp.Networking;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Channels;
using System.Threading.Tasks;
using static NetSdrClientApp.Messages.NetSdrMessageHelper;
using static System.Runtime.InteropServices.JavaScript.JSType;

namespace NetSdrClientApp
{
public class NetSdrClient
{
private ITcpClient _tcpClient;
private IUdpClient _udpClient;
private readonly ITcpClient _tcpClient;
private readonly IUdpClient _udpClient;

public bool IQStarted { get; set; }
public bool IQStarted { get; private set; }

public event Action<byte[]>? UnsolicitedMessageReceived;

public NetSdrClient(ITcpClient tcpClient, IUdpClient udpClient)
{
Expand All @@ -38,12 +38,11 @@ public async Task ConnectAsync()
var automaticFilterMode = BitConverter.GetBytes((ushort)0).ToArray();
var adMode = new byte[] { 0x00, 0x03 };

//Host pre setup
var msgs = new List<byte[]>
{
NetSdrMessageHelper.GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.IQOutputDataSampleRate, sampleRate),
NetSdrMessageHelper.GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.RFFilter, automaticFilterMode),
NetSdrMessageHelper.GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.ADModes, adMode),
GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.IQOutputDataSampleRate, sampleRate),
GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.RFFilter, automaticFilterMode),
GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.ADModes, adMode),
};

foreach (var msg in msgs)
Expand All @@ -66,19 +65,15 @@ public async Task StartIQAsync()
return;
}

; var iqDataMode = (byte)0x80;
var iqDataMode = (byte)0x80;
var start = (byte)0x02;
var fifo16bitCaptureMode = (byte)0x01;
var n = (byte)1;

var args = new[] { iqDataMode, start, fifo16bitCaptureMode, n };

var msg = NetSdrMessageHelper.GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.ReceiverState, args);

var msg = GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.ReceiverState, args);
await SendTcpRequest(msg);

IQStarted = true;

_ = _udpClient.StartListeningAsync();
}

Expand All @@ -91,15 +86,10 @@ public async Task StopIQAsync()
}

var stop = (byte)0x01;

var args = new byte[] { 0, stop, 0, 0 };

var msg = NetSdrMessageHelper.GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.ReceiverState, args);

var msg = GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.ReceiverState, args);
await SendTcpRequest(msg);

IQStarted = false;

_udpClient.StopListening();
}

Expand All @@ -108,16 +98,14 @@ public async Task ChangeFrequencyAsync(long hz, int channel)
var channelArg = (byte)channel;
var frequencyArg = BitConverter.GetBytes(hz).Take(5);
var args = new[] { channelArg }.Concat(frequencyArg).ToArray();

var msg = NetSdrMessageHelper.GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.ReceiverFrequency, args);

var msg = GetControlItemMessage(MsgTypes.SetControlItem, ControlItemCodes.ReceiverFrequency, args);
await SendTcpRequest(msg);
}

private void _udpClient_MessageReceived(object? sender, byte[] e)
private static void _udpClient_MessageReceived(object? sender, byte[] e)
{
NetSdrMessageHelper.TranslateMessage(e, out MsgTypes type, out ControlItemCodes code, out ushort sequenceNum, out byte[] body);
var samples = NetSdrMessageHelper.GetSamples(16, body);
TranslateMessage(e, out _, out _, out _, out byte[] body);
var samples = GetSamples(16, body);

Console.WriteLine($"Samples recieved: " + body.Select(b => Convert.ToString(b, toBase: 16)).Aggregate((l, r) => $"{l} {r}"));

Expand All @@ -126,40 +114,56 @@ private void _udpClient_MessageReceived(object? sender, byte[] e)
{
foreach (var sample in samples)
{
sw.Write((short)sample); //write 16 bit per sample as configured
sw.Write((short)sample);
}
}
}

private TaskCompletionSource<byte[]> responseTaskSource;
private TaskCompletionSource<byte[]>? responseTaskSource;

private async Task<byte[]> SendTcpRequest(byte[] msg)
{
if (!_tcpClient.Connected)
{
Console.WriteLine("No active connection.");
return null;
return Array.Empty<byte>();
}

responseTaskSource = new TaskCompletionSource<byte[]>(TaskCreationOptions.RunContinuationsAsynchronously);
var responseTask = responseTaskSource.Task;

await _tcpClient.SendMessageAsync(msg);

var resp = await responseTask;

return resp;
using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
{
var completedTask = await Task.WhenAny(responseTask, Task.Delay(-1, cts.Token));
if (completedTask == responseTask)
{
await cts.CancelAsync();
return await responseTask;
}
else
{
responseTaskSource?.TrySetCanceled();
throw new TimeoutException("The request timed out.");
}
}
}

private void _tcpClient_MessageReceived(object? sender, byte[] e)
{
//TODO: add Unsolicited messages handling here
if (responseTaskSource != null)
var tcs = responseTaskSource;
if (tcs != null)
{
responseTaskSource.SetResult(e);
responseTaskSource = null;
tcs.SetResult(e);
}
else
{
UnsolicitedMessageReceived?.Invoke(e);
}
Console.WriteLine("Response recieved: " + e.Select(b => Convert.ToString(b, toBase: 16)).Aggregate((l, r) => $"{l} {r}"));
}
}
}

Loading
Loading