From 7d14daf1d5fce4d09471a3abe2aca49cf7680816 Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Wed, 2 Dec 2020 05:25:19 -0500 Subject: embed version info into assemblies check app versions against lib, lib against driver add an 'about' dialog which displays version details, accessible from menu refactor error handling + add check for negative offset --- writer/Program.cs | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'writer/Program.cs') diff --git a/writer/Program.cs b/writer/Program.cs index 2d4128f..ec8706b 100644 --- a/writer/Program.cs +++ b/writer/Program.cs @@ -21,18 +21,21 @@ namespace writer return; } - foreach (var err in errors.x) + Console.Write("Bad settings: \n\n{0}", errors); + } + + static void Main(string[] args) + { + try { - Console.WriteLine(err + (settings.combineMagnitudes ? "" : " (x)")); + VersionHelper.ValidateAndGetDriverVersion(typeof(Program).Assembly.GetName().Version); } - foreach (var err in errors.y) + catch (VersionException e) { - Console.WriteLine(err + " (y)"); + Console.WriteLine(e.Message); + return; } - } - static void Main(string[] args) - { if (args.Length != 1 || args[0].Equals("help")) { Console.WriteLine("USAGE: {0} ", System.AppDomain.CurrentDomain.FriendlyName); @@ -59,15 +62,11 @@ namespace writer } catch (JsonException e) { - Console.WriteLine("Settings invalid:\n{0}", e.Message.ToString()); - } - catch (DriverNotInstalledException) - { - Console.WriteLine("Driver is not installed"); + Console.WriteLine("Settings invalid:\n{0}", e.Message); } catch (Exception e) { - Console.WriteLine("Error: {0}", e.Message.ToString()); + Console.WriteLine("Error: {0}", e); } } } -- cgit v1.2.3 From a5f00995dd48c2a83937e3503257d1b9fba2096f Mon Sep 17 00:00:00 2001 From: a1xd <68629610+a1xd@users.noreply.github.com> Date: Wed, 2 Dec 2020 06:20:43 -0500 Subject: update writer - use messagebox instead of console --- writer/Program.cs | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'writer/Program.cs') diff --git a/writer/Program.cs b/writer/Program.cs index ec8706b..37e384c 100644 --- a/writer/Program.cs +++ b/writer/Program.cs @@ -1,15 +1,21 @@ -using Microsoft.CSharp.RuntimeBinder; -using Newtonsoft.Json; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using System; using System.IO; +using System.Windows.Forms; namespace writer { class Program { + + static void Show(string msg) + { + MessageBox.Show(msg, "Raw Accel writer"); + } + static void Send(JToken settingsToken) { var settings = settingsToken.ToObject(); @@ -21,7 +27,7 @@ namespace writer return; } - Console.Write("Bad settings: \n\n{0}", errors); + Show($"Bad settings:\n\n{errors}"); } static void Main(string[] args) @@ -32,19 +38,19 @@ namespace writer } catch (VersionException e) { - Console.WriteLine(e.Message); + Show(e.Message); return; } - if (args.Length != 1 || args[0].Equals("help")) + if (args.Length != 1) { - Console.WriteLine("USAGE: {0} ", System.AppDomain.CurrentDomain.FriendlyName); + Show($"Usage: {System.AppDomain.CurrentDomain.FriendlyName} "); return; } if (!File.Exists(args[0])) { - Console.WriteLine("Settings file not found at {0}", args[0]); + Show($"Settings file not found at {args[0]}"); return; } @@ -62,11 +68,11 @@ namespace writer } catch (JsonException e) { - Console.WriteLine("Settings invalid:\n{0}", e.Message); + Show($"Settings invalid:\n\n{e.Message}"); } catch (Exception e) { - Console.WriteLine("Error: {0}", e); + Show($"Error:\n\n{e}"); } } } -- cgit v1.2.3