diff --git a/dvmconsole/Controls/AlertTone.xaml.cs b/dvmconsole/Controls/AlertTone.xaml.cs index 7a8717b..f4f8a18 100644 --- a/dvmconsole/Controls/AlertTone.xaml.cs +++ b/dvmconsole/Controls/AlertTone.xaml.cs @@ -23,9 +23,6 @@ namespace dvmconsole.Controls /// public partial class AlertTone : UserControl { - private Point startPoint; - private bool isDragging; - public static readonly DependencyProperty AlertFileNameProperty = DependencyProperty.Register("AlertFileName", typeof(string), typeof(AlertTone), new PropertyMetadata(string.Empty)); diff --git a/dvmconsole/Controls/VuMeterControl.xaml.cs b/dvmconsole/Controls/VuMeterControl.xaml.cs index 0245c86..856b7ef 100644 --- a/dvmconsole/Controls/VuMeterControl.xaml.cs +++ b/dvmconsole/Controls/VuMeterControl.xaml.cs @@ -149,9 +149,6 @@ namespace dvmconsole.Controls { private VuMeterViewModel viewModel; - private Brush borderColor; - private Shape fillColor; - /// /// /// diff --git a/dvmconsole/DVMConsole.csproj b/dvmconsole/DVMConsole.csproj index 45c7c32..1775aa0 100644 --- a/dvmconsole/DVMConsole.csproj +++ b/dvmconsole/DVMConsole.csproj @@ -4,6 +4,7 @@ WinExe net8.0-windows7.0 disable + False enable true AnyCPU;x64;x86 @@ -22,6 +23,7 @@ README.md https://github.com/DVMProject/dvmconsole git + 1.0.* diff --git a/dvmconsole/PeerSystem.cs b/dvmconsole/PeerSystem.cs index 6b2c8be..e513baa 100644 --- a/dvmconsole/PeerSystem.cs +++ b/dvmconsole/PeerSystem.cs @@ -13,8 +13,11 @@ */ using System.Net; +using System.Reflection; using fnecore; +using fnecore.Utility; +using NAudio.Mixer; namespace dvmconsole { @@ -66,6 +69,11 @@ namespace dvmconsole FnePeer peer = new FnePeer("DVMCONSOLE", system.PeerId, endpoint, key); + Assembly asm = Assembly.GetExecutingAssembly(); + SemVersion _SEM_VERSION = new SemVersion(asm); + + string software = $"CONSOLE_R{_SEM_VERSION.Major.ToString("D2")}A{_SEM_VERSION.Minor.ToString("D2")}"; + // set configuration parameters peer.Passphrase = system.Password; peer.Information = new PeerInformation @@ -73,7 +81,7 @@ namespace dvmconsole Details = new PeerDetails { ConventionalPeer = true, - Software = "DVMCONSOLE", + Software = software, Identity = system.Identity } }; diff --git a/dvmconsole/SettingsManager.cs b/dvmconsole/SettingsManager.cs index fb9d571..f5ca3f6 100644 --- a/dvmconsole/SettingsManager.cs +++ b/dvmconsole/SettingsManager.cs @@ -14,8 +14,12 @@ using System.Diagnostics; using System.IO; +using System.Reflection; + using Newtonsoft.Json; +using fnecore.Utility; + namespace dvmconsole { /// @@ -181,8 +185,19 @@ namespace dvmconsole if (SaveTraceLog) Log.SetupTextWriter(Environment.CurrentDirectory, "dvmconsole.log"); - Log.WriteLine("Digital Voice Modem - Desktop Dispatch Console"); - Log.WriteLine("Copyright (c) 2025 DVMProject (https://github.com/dvmproject) Authors."); + Assembly asm = Assembly.GetExecutingAssembly(); +#if DEBUG + SemVersion _SEM_VERSION = new SemVersion(asm, "DEBUG_FACTORY_LABTOOL"); +#else + SemVersion _SEM_VERSION = new SemVersion(asm); +#endif + + AssemblyProductAttribute asmProd = asm.GetCustomAttributes(typeof(AssemblyProductAttribute), false)[0] as AssemblyProductAttribute; + AssemblyCopyrightAttribute asmCopyright = asm.GetCustomAttributes(typeof(AssemblyCopyrightAttribute), false)[0] as AssemblyCopyrightAttribute; + DateTime buildDate = new DateTime(2000, 1, 1).AddDays(asm.GetName().Version.Build).AddSeconds(asm.GetName().Version.Revision * 2); + + Log.WriteLine($"{asmProd.Product} {_SEM_VERSION.ToString()} (Built: {buildDate.ToShortDateString() + " at " + buildDate.ToShortTimeString()})"); + Log.WriteLine($"{asmCopyright.Copyright}"); Log.WriteLine(">> Desktop Dispatch Console"); return true;