Digital_Voice_Modem_Project
/
dvmconsole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

until/if we implement a logger, instead of Console.WriteLine we'll use Trace.WriteLine, at least when in VS debug mode we'll see the output messages;

Browse Source
pull/1/head
Bryan Biedenkapp 11 months ago
parent a17e1e030e
commit a0bd556ebd
4 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File

10
dvmconsole/AudioConverter.cs
Unescape View File

@ -1,4 +1,8 @@
// SPDX-License-Identifier: AGPL-3.0-only // SPDX-License-Identifier: AGPL-3.0-only
using System.Diagnostics;
/** /**
* Digital Voice Modem - Desktop Dispatch Console * Digital Voice Modem - Desktop Dispatch Console
* AGPLv3 Open Source. Use is subject to license terms. * AGPLv3 Open Source. Use is subject to license terms.
@ -11,6 +15,8 @@
* *
*/ */
using System.Diagnostics;
namespace dvmconsole namespace dvmconsole
{ {
/// <summary> /// <summary>
@ -32,7 +38,7 @@ namespace dvmconsole
if (audioData.Length != OgLength) if (audioData.Length != OgLength)
{ {
Console.WriteLine($"Invalid PCM length: {audioData.Length}, expected: {OgLength}"); Trace.WriteLine($"Invalid PCM length: {audioData.Length}, expected: {OgLength}");
return chunks; return chunks;
} }
@ -55,7 +61,7 @@ namespace dvmconsole
{ {
if (chunks.Count * ExepcetedLength != OgLength) if (chunks.Count * ExepcetedLength != OgLength)
{ {
Console.WriteLine($"Invalid number of chunks: {chunks.Count}, expected total length: {OgLength}"); Trace.WriteLine($"Invalid number of chunks: {chunks.Count}, expected total length: {OgLength}");
return null; return null;
} }

14
dvmconsole/FneSystemBase.cs
Unescape View File

@ -12,6 +12,8 @@
* *
*/ */
using System.Diagnostics;
using fnecore; using fnecore;
using fnecore.DMR; using fnecore.DMR;
using fnecore.P25.kmm; using fnecore.P25.kmm;
@ -132,20 +134,20 @@ namespace dvmconsole
switch (level) switch (level)
{ {
case LogLevel.WARNING: case LogLevel.WARNING:
Console.WriteLine(message); Trace.WriteLine(message);
break; break;
case LogLevel.ERROR: case LogLevel.ERROR:
Console.WriteLine(message); Trace.WriteLine(message);
break; break;
case LogLevel.DEBUG: case LogLevel.DEBUG:
Console.WriteLine(message); Trace.WriteLine(message);
break; break;
case LogLevel.FATAL: case LogLevel.FATAL:
Console.WriteLine(message); Trace.WriteLine(message);
break; break;
case LogLevel.INFO: case LogLevel.INFO:
default: default:
Console.WriteLine(message); Trace.WriteLine(message);
break; break;
} }
}; };
@ -194,8 +196,6 @@ namespace dvmconsole
protected override void KeyResponse(object sender, KeyResponseEvent e) protected override void KeyResponse(object sender, KeyResponseEvent e)
{ {
byte[] payload = e.Data.Skip(11).ToArray(); byte[] payload = e.Data.Skip(11).ToArray();
//Console.WriteLine(FneUtils.HexDump(payload));
if (e.MessageId == (byte)KmmMessageType.MODIFY_KEY_CMD) if (e.MessageId == (byte)KmmMessageType.MODIFY_KEY_CMD)
mainWindow.KeyResponseReceived(e); mainWindow.KeyResponseReceived(e);
} }

42
dvmconsole/MainWindow.xaml.cs
Unescape View File

@ -245,8 +245,7 @@ namespace dvmconsole
peer.peer.PeerConnected += (sender, response) => peer.peer.PeerConnected += (sender, response) =>
{ {
Console.WriteLine("FNE Peer connected"); Trace.WriteLine("FNE Peer connected");
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
systemStatusBox.Background = (Brush)new BrushConverter().ConvertFrom("#FF00BC48"); systemStatusBox.Background = (Brush)new BrushConverter().ConvertFrom("#FF00BC48");
@ -257,8 +256,7 @@ namespace dvmconsole
peer.peer.PeerDisconnected += (response) => peer.peer.PeerDisconnected += (response) =>
{ {
Console.WriteLine("FNE Peer disconnected"); Trace.WriteLine("FNE Peer disconnected");
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {
systemStatusBox.Background = new SolidColorBrush(Colors.DarkRed); systemStatusBox.Background = new SolidColorBrush(Colors.DarkRed);
@ -500,7 +498,7 @@ namespace dvmconsole
handler.SendP25TSBK(callData, tsbk); handler.SendP25TSBK(callData, tsbk);
Console.WriteLine("sent page"); Trace.WriteLine("Transmitted Page");
} }
} }
@ -1243,7 +1241,7 @@ namespace dvmconsole
if (tone > 0) if (tone > 0)
{ {
MBEToneGenerator.IMBEEncodeSingleTone((ushort)tone, imbe); MBEToneGenerator.IMBEEncodeSingleTone((ushort)tone, imbe);
Console.WriteLine($"({system.Name}) P25D: {tone} HZ TONE DETECT"); Trace.WriteLine($"({system.Name}) P25D: {tone} HZ TONE DETECT");
} }
else else
{ {
@ -1376,7 +1374,7 @@ namespace dvmconsole
else else
pktSeq = peer.pktSeq(); pktSeq = peer.pktSeq();
//Console.WriteLine($"({channel.SystemName}) P25D: Traffic *VOICE FRAME * PEER {handler.PeerId} SRC_ID {srcId} TGID {dstId} [STREAM ID {channel.txStreamId}]"); //Trace.WriteLine($"({channel.SystemName}) P25D: Traffic *VOICE FRAME * PEER {handler.PeerId} SRC_ID {srcId} TGID {dstId} [STREAM ID {channel.txStreamId}]");
byte[] payload = new byte[200]; byte[] payload = new byte[200];
handler.CreateNewP25MessageHdr((byte)P25DUID.LDU1, callData, ref payload, cpgChannel.GetAlgoId(), cpgChannel.GetKeyId(), channel.mi); handler.CreateNewP25MessageHdr((byte)P25DUID.LDU1, callData, ref payload, cpgChannel.GetAlgoId(), cpgChannel.GetKeyId(), channel.mi);
@ -1394,7 +1392,7 @@ namespace dvmconsole
else else
pktSeq = peer.pktSeq(); pktSeq = peer.pktSeq();
//Console.WriteLine($"({channel.SystemName}) P25D: Traffic *VOICE FRAME * PEER {handler.PeerId} SRC_ID {srcId} TGID {dstId} [STREAM ID {channel.txStreamId}]"); //Trace.WriteLine($"({channel.SystemName}) P25D: Traffic *VOICE FRAME * PEER {handler.PeerId} SRC_ID {srcId} TGID {dstId} [STREAM ID {channel.txStreamId}]");
byte[] payload = new byte[200]; byte[] payload = new byte[200];
handler.CreateNewP25MessageHdr((byte)P25DUID.LDU2, callData, ref payload, cpgChannel.GetAlgoId(), cpgChannel.GetKeyId(), channel.mi); handler.CreateNewP25MessageHdr((byte)P25DUID.LDU2, callData, ref payload, cpgChannel.GetAlgoId(), cpgChannel.GetKeyId(), channel.mi);
@ -1480,7 +1478,7 @@ namespace dvmconsole
{ {
//Log.Logger.Debug($"({Config.Name}) P25D: Traffic *VOICE FRAME * PEER {e.PeerId} SRC_ID {e.SrcId} TGID {e.DstId} VC{n} ERRS {errs} [STREAM ID {e.StreamId}]"); //Log.Logger.Debug($"({Config.Name}) P25D: Traffic *VOICE FRAME * PEER {e.PeerId} SRC_ID {e.SrcId} TGID {e.DstId} VC{n} ERRS {errs} [STREAM ID {e.StreamId}]");
//Log.Logger.Debug($"IMBE {FneUtils.HexDump(imbe)}"); //Log.Logger.Debug($"IMBE {FneUtils.HexDump(imbe)}");
//Console.WriteLine($"SAMPLE BUFFER {FneUtils.HexDump(samples)}"); //Trace.WriteLine($"SAMPLE BUFFER {FneUtils.HexDump(samples)}");
int pcmIdx = 0; int pcmIdx = 0;
byte[] pcmData = new byte[samples.Length * 2]; byte[] pcmData = new byte[samples.Length * 2];
@ -1497,7 +1495,7 @@ namespace dvmconsole
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"Audio Decode Exception: {ex.Message}"); Trace.WriteLine($"Audio Decode Exception: {ex.Message}");
} }
} }
@ -1507,21 +1505,21 @@ namespace dvmconsole
/// <param name="e"></param> /// <param name="e"></param>
public void KeyResponseReceived(KeyResponseEvent e) public void KeyResponseReceived(KeyResponseEvent e)
{ {
//Console.WriteLine($"Message ID: {e.KmmKey.MessageId}"); //Trace.WriteLine($"Message ID: {e.KmmKey.MessageId}");
//Console.WriteLine($"Decrypt Info Format: {e.KmmKey.DecryptInfoFmt}"); //Trace.WriteLine($"Decrypt Info Format: {e.KmmKey.DecryptInfoFmt}");
//Console.WriteLine($"Algorithm ID: {e.KmmKey.AlgId}"); //Trace.WriteLine($"Algorithm ID: {e.KmmKey.AlgId}");
//Console.WriteLine($"Key ID: {e.KmmKey.KeyId}"); //Trace.WriteLine($"Key ID: {e.KmmKey.KeyId}");
//Console.WriteLine($"Keyset ID: {e.KmmKey.KeysetItem.KeysetId}"); //Trace.WriteLine($"Keyset ID: {e.KmmKey.KeysetItem.KeysetId}");
//Console.WriteLine($"Keyset Alg ID: {e.KmmKey.KeysetItem.AlgId}"); //Trace.WriteLine($"Keyset Alg ID: {e.KmmKey.KeysetItem.AlgId}");
//Console.WriteLine($"Keyset Key Length: {e.KmmKey.KeysetItem.KeyLength}"); //Trace.WriteLine($"Keyset Key Length: {e.KmmKey.KeysetItem.KeyLength}");
//Console.WriteLine($"Number of Keys: {e.KmmKey.KeysetItem.Keys.Count}"); //Trace.WriteLine($"Number of Keys: {e.KmmKey.KeysetItem.Keys.Count}");
foreach (var key in e.KmmKey.KeysetItem.Keys) foreach (var key in e.KmmKey.KeysetItem.Keys)
{ {
//Console.WriteLine($" Key Format: {key.KeyFormat}"); //Trace.WriteLine($" Key Format: {key.KeyFormat}");
//Console.WriteLine($" SLN: {key.Sln}"); //Trace.WriteLine($" SLN: {key.Sln}");
//Console.WriteLine($" Key ID: {key.KeyId}"); //Trace.WriteLine($" Key ID: {key.KeyId}");
//Console.WriteLine($" Key Data: {BitConverter.ToString(key.GetKey())}"); //Trace.WriteLine($" Key Data: {BitConverter.ToString(key.GetKey())}");
Dispatcher.Invoke(() => Dispatcher.Invoke(() =>
{ {

5
dvmconsole/SettingsManager.cs
Unescape View File

@ -11,6 +11,7 @@
* *
*/ */
using System.Diagnostics;
using System.IO; using System.IO;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -98,7 +99,7 @@ namespace dvmconsole
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"Error loading settings: {ex.Message}"); Trace.WriteLine($"Error loading settings: {ex.Message}");
} }
} }
@ -174,7 +175,7 @@ namespace dvmconsole
} }
catch (Exception ex) catch (Exception ex)
{ {
Console.WriteLine($"Error saving settings: {ex.Message}"); Trace.WriteLine($"Error saving settings: {ex.Message}");
} }
} }
} // public class SettingsManager } // public class SettingsManager

Write Preview
Loading…
Cancel
Save

Powered by TurnKey Linux.