From 7b2d3e7229ed4ccfef0d57a50f66973d5953b42c Mon Sep 17 00:00:00 2001
From: Nat Moore <natalie@natnat.xyz>
Date: Fri, 3 Dec 2021 23:57:17 -0600
Subject: [PATCH] fix comm w some arduinos; remove unnecessary ui

---
 fw/ino/kfd-avr/SerialProtocol.cpp             |  59 ++-
 fw/ino/kfd-avr/Versions.h                     |   4 +-
 .../Protocol/Serial/SerialProtocol.cs         |  99 ++--
 .../KFDtool.Gui/Control/UtilInitAdapter.xaml  |  16 -
 .../Control/UtilInitAdapter.xaml.cs           | 462 ------------------
 .../Control/UtilUpdateAdapterFw.xaml          |  15 -
 .../Control/UtilUpdateAdapterFw.xaml.cs       | 344 -------------
 sw/control/KFDtool.Gui/KFDtool.Gui.csproj     |  14 -
 sw/control/KFDtool.Gui/MainWindow.xaml        |   2 -
 sw/control/KFDtool.Gui/MainWindow.xaml.cs     |  16 +-
 .../TransferConstructs/InteractTwiKfdtool.cs  |   6 +-
 sw/driver/kfdtool.cat                         | Bin 9615 -> 0 bytes
 sw/driver/kfdtool.inf                         | 123 -----
 sw/installer/KFDtoolApp/KFDtoolApp.wixproj    |  59 ---
 sw/installer/KFDtoolApp/Product.wxs           | 176 -------
 sw/installer/KFDtoolApp/license.rtf           | Bin 1258 -> 0 bytes
 sw/installer/KFDtoolSetup.sln                 |  31 --
 17 files changed, 104 insertions(+), 1322 deletions(-)
 delete mode 100644 sw/control/KFDtool.Gui/Control/UtilInitAdapter.xaml
 delete mode 100644 sw/control/KFDtool.Gui/Control/UtilInitAdapter.xaml.cs
 delete mode 100644 sw/control/KFDtool.Gui/Control/UtilUpdateAdapterFw.xaml
 delete mode 100644 sw/control/KFDtool.Gui/Control/UtilUpdateAdapterFw.xaml.cs
 delete mode 100644 sw/driver/kfdtool.cat
 delete mode 100644 sw/driver/kfdtool.inf
 delete mode 100644 sw/installer/KFDtoolApp/KFDtoolApp.wixproj
 delete mode 100644 sw/installer/KFDtoolApp/Product.wxs
 delete mode 100644 sw/installer/KFDtoolApp/license.rtf
 delete mode 100644 sw/installer/KFDtoolSetup.sln

diff --git a/fw/ino/kfd-avr/SerialProtocol.cpp b/fw/ino/kfd-avr/SerialProtocol.cpp
index 916225b..6a974cd 100644
--- a/fw/ino/kfd-avr/SerialProtocol.cpp
+++ b/fw/ino/kfd-avr/SerialProtocol.cpp
@@ -1,14 +1,17 @@
 #include "SerialProtocol.h"
+#include "hal.h"
 #include <Arduino.h>
 
-#define SOM_EOM 0x61
-#define SOM_EOM_PLACEHOLDER 0x62
-#define ESC 0x63
-#define ESC_PLACEHOLDER 0x64
+
+#define SOM 0x61
+#define SOM_PLACEHOLDER 0x62
+#define EOM 0x63
+#define EOM_PLACEHOLDER 0x64
+#define ESC 0x70
+#define ESC_PLACEHOLDER 0x71
 
 uint16_t inDataCount = 0;
 uint8_t inData[128];
-bool messageStarted = false;
 
 void spConnect(void)
 {
@@ -24,13 +27,22 @@ void spDisconnect(void)
 
 uint16_t spRxData(uint8_t* outData)
 {
+  uint8_t inByte;
     while (Serial.available() > 0) {
-        inData[inDataCount] = Serial.read();
+        inByte = Serial.read();
+
+        // reset the buffer if we have a start of message flag coming in
+        if (inByte == SOM)
+        {
+          inDataCount = 0;
+        }
+        
+        inData[inDataCount] = inByte;
         inDataCount++;
     }
 
-    // don't process partial frames
-    if (inDataCount < 3 || inData[0] != SOM_EOM || inData[inDataCount - 1] != SOM_EOM)
+    // don't process until we receive EOM
+    if (inData[inDataCount - 1] != EOM)
     {
         return 0;
     }
@@ -45,14 +57,19 @@ uint16_t spRxData(uint8_t* outData)
         {
             inIndex++;
 
-            if (inData[inIndex] == SOM_EOM_PLACEHOLDER)
+            if (inData[inIndex] == SOM_PLACEHOLDER)
+            {
+                outData[outIndex] = SOM;
+            }
+            else if (inData[inIndex] == EOM_PLACEHOLDER)
             {
-                outData[outIndex] = SOM_EOM;
+                outData[outIndex] = EOM;
             }
             else if (inData[inIndex] == ESC_PLACEHOLDER)
             {
                 outData[outIndex] = ESC;
             }
+            
         }
         else
         {
@@ -64,8 +81,7 @@ uint16_t spRxData(uint8_t* outData)
 
     // we've already processed the message and set the pointer
     // reset the count (mark the buffer as free)
-    inDataCount = 0;
-    
+    inDataCount = 0;   
 
     return outIndex;
 }
@@ -79,7 +95,7 @@ uint16_t spFrameData(const uint8_t* inData,
 
     for (i = 0; i < inLength; i++)
     {
-        if ((inData[i] == SOM_EOM) || (inData[i] == ESC))
+        if ((inData[i] == SOM) || (inData[i] == EOM) || (inData[i] == ESC))
         {
             escCharsNeeded++;
         }
@@ -87,18 +103,25 @@ uint16_t spFrameData(const uint8_t* inData,
 
     uint16_t totalCharsNeeded = 1 + inLength + escCharsNeeded + 1;
 
-    *(outData + 0) = SOM_EOM;
+    *(outData + 0) = SOM;
 
     uint16_t j;
     uint16_t k = 1;
 
     for (j = 0; j < inLength; j++)
     {
-        if (inData[j] == SOM_EOM)
+        if (inData[j] == SOM)
         {
             *(outData + k) = ESC;
             k++;
-            *(outData + k) = SOM_EOM_PLACEHOLDER;
+            *(outData + k) = SOM_PLACEHOLDER;
+            k++;
+        }
+        else if (inData[j] == EOM)
+        {
+            *(outData + k) = ESC;
+            k++;
+            *(outData + k) = EOM_PLACEHOLDER;
             k++;
         }
         else if (inData[j] == ESC)
@@ -115,7 +138,7 @@ uint16_t spFrameData(const uint8_t* inData,
         }
     }
 
-    *(outData + (totalCharsNeeded - 1)) = SOM_EOM;
+    *(outData + (totalCharsNeeded - 1)) = EOM;
 
     return totalCharsNeeded;
 }
@@ -140,4 +163,4 @@ void spTxDataWait(const uint8_t* inData,
     outLength = spFrameData(inData, inLength, outData);
 
     Serial.write(outData, outLength);
-}
+}
\ No newline at end of file
diff --git a/fw/ino/kfd-avr/Versions.h b/fw/ino/kfd-avr/Versions.h
index 9b575bc..ecbfceb 100644
--- a/fw/ino/kfd-avr/Versions.h
+++ b/fw/ino/kfd-avr/Versions.h
@@ -3,11 +3,11 @@
 
 /* FIRMWARE VERSION */
 #define VER_FW_MAJOR 0x01
-#define VER_FW_MINOR 0x03
+#define VER_FW_MINOR 0x04
 #define VER_FW_PATCH 0x00
 
 /* ADAPTER PROTOCOL VERSION */
-#define VER_AP_MAJOR 0x01
+#define VER_AP_MAJOR 0x02
 #define VER_AP_MINOR 0x00
 #define VER_AP_PATCH 0x00
 
diff --git a/sw/control/KFDtool.Adapter/Protocol/Serial/SerialProtocol.cs b/sw/control/KFDtool.Adapter/Protocol/Serial/SerialProtocol.cs
index b37fbe3..56df7e0 100644
--- a/sw/control/KFDtool.Adapter/Protocol/Serial/SerialProtocol.cs
+++ b/sw/control/KFDtool.Adapter/Protocol/Serial/SerialProtocol.cs
@@ -12,10 +12,12 @@ public class SerialProtocol
     {
         private static NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
 
-        const byte SOM_EOM = 0x61;
-        const byte SOM_EOM_PLACEHOLDER = 0x62;
-        const byte ESC = 0x63;
-        const byte ESC_PLACEHOLDER = 0x64;
+        const byte SOM = 0x61;
+        const byte SOM_PLACEHOLDER = 0x62;
+        const byte EOM = 0x63;
+        const byte EOM_PLACEHOLDER = 0x64;
+        const byte ESC = 0x70;
+        const byte ESC_PLACEHOLDER = 0x71;
 
         private static AutoResetEvent CancelRead = new AutoResetEvent(false);
 
@@ -50,7 +52,15 @@ public SerialProtocol(string portName)
 
         public void Open()
         {
-            Port.Open();
+            // don't open the port if it is open already
+            if (!Port.IsOpen)
+            {
+                Port.Open();
+            }
+            else
+            {
+                Logger.Debug("Not opening already open serial port");
+            }
         }
 
         public void Close()
@@ -75,7 +85,7 @@ public void Send(List<byte> data)
         {
             List<byte> frameData = new List<byte>();
 
-            frameData.Add(SOM_EOM);
+            frameData.Add(SOM);
 
             foreach (byte b in data)
             {
@@ -84,10 +94,15 @@ public void Send(List<byte> data)
                     frameData.Add(ESC);
                     frameData.Add(ESC_PLACEHOLDER);
                 }
-                else if (b == SOM_EOM)
+                else if (b == SOM)
                 {
                     frameData.Add(ESC);
-                    frameData.Add(SOM_EOM_PLACEHOLDER);
+                    frameData.Add(SOM_PLACEHOLDER);
+                }
+                else if (b == EOM)
+                {
+                    frameData.Add(ESC);
+                    frameData.Add(EOM_PLACEHOLDER);
                 }
                 else
                 {
@@ -95,7 +110,7 @@ public void Send(List<byte> data)
                 }
             }
 
-            frameData.Add(SOM_EOM);
+            frameData.Add(EOM);
 
             byte[] outData = frameData.ToArray();
 
@@ -192,50 +207,54 @@ private void OnDataReceived(object sender, SerialDataReceivedEventArgs e)
             {
                 Logger.Trace("new byte: 0x{0:X2}", b);
 
-                if (b == SOM_EOM)
+                if (b == SOM)
                 {
                     FoundStart = true;
-
-                    if (FrameBuffer.Count > 0)
+                    Logger.Trace("found start byte");
+                }
+                else if (b == EOM)
+                {
+                    for (int i = 0; i < FrameBuffer.Count; i++)
                     {
-                        for (int i = 0; i < FrameBuffer.Count; i++)
+                        if (FrameBuffer[i] == ESC)
                         {
-                            if (FrameBuffer[i] == ESC)
+                            FrameBuffer.RemoveAt(i);
+
+                            if (i == FrameBuffer.Count)
                             {
-                                FrameBuffer.RemoveAt(i);
-
-                                if (i == FrameBuffer.Count)
-                                {
-                                    throw new Exception("escape character at end");
-                                }
-
-                                if (FrameBuffer[i] == ESC_PLACEHOLDER)
-                                {
-                                    FrameBuffer[i] = ESC;
-                                }
-                                else if (FrameBuffer[i] == SOM_EOM_PLACEHOLDER)
-                                {
-                                    FrameBuffer[i] = SOM_EOM;
-                                }
-                                else
-                                {
-                                    throw new Exception("invalid character after escape character");
-                                }
+                                throw new Exception("escape character at end");
+                            }
+
+                            if (FrameBuffer[i] == ESC_PLACEHOLDER)
+                            {
+                                FrameBuffer[i] = ESC;
+                            }
+                            else if (FrameBuffer[i] == SOM_PLACEHOLDER)
+                            {
+                                FrameBuffer[i] = SOM;
+                            }
+                            else if (FrameBuffer[i] == EOM_PLACEHOLDER)
+                            {
+                                FrameBuffer[i] = EOM;
+                            }
+                            else
+                            {
+                                throw new Exception("invalid character after escape character");
                             }
                         }
+                    }
 
-                        List<byte> packet = new List<byte>();
+                    List<byte> packet = new List<byte>();
 
-                        packet.AddRange(FrameBuffer);
+                    packet.AddRange(FrameBuffer);
 
-                        PacketBuffer.Add(packet);
+                    PacketBuffer.Add(packet);
 
-                        Logger.Debug("packet contents: {0}", BitConverter.ToString(packet.ToArray()));
+                    Logger.Debug("packet contents: {0}", BitConverter.ToString(packet.ToArray()));
 
-                        FrameBuffer.Clear();
+                    FrameBuffer.Clear();
 
-                        Logger.Debug("packet buffer length: {0}", PacketBuffer.Count);
-                    }
+                    Logger.Debug("packet buffer length: {0}", PacketBuffer.Count);
                 }
                 else
                 {
diff --git a/sw/control/KFDtool.Gui/Control/UtilInitAdapter.xaml b/sw/control/KFDtool.Gui/Control/UtilInitAdapter.xaml
deleted file mode 100644
index 3bbb2a3..0000000
--- a/sw/control/KFDtool.Gui/Control/UtilInitAdapter.xaml
+++ /dev/null
@@ -1,16 +0,0 @@
-<UserControl x:Class="KFDtool.Gui.Control.UtilInitAdapter"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:KFDtool.Gui.Control"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <Label Content="Update File" HorizontalAlignment="Left" Margin="41,42,0,0" VerticalAlignment="Top"/>
-        <Button Content="Select" Click="Select_Button_Click" HorizontalAlignment="Left" Margin="128,45,0,0" VerticalAlignment="Top" Width="75"/>
-        <Label Name="lblPath" Content="path" HorizontalAlignment="Left" Margin="223,42,0,0" VerticalAlignment="Top"/>
-        <ComboBox Name="cboAvailPkg" HorizontalAlignment="Left" Margin="128,82,0,0" VerticalAlignment="Top" Width="431"/>
-        <Button Name="btnInit" Content="Initialize" Click="Initialize_Button_Click" HorizontalAlignment="Left" Margin="128,122,0,0" VerticalAlignment="Top" Width="75"/>
-    </Grid>
-</UserControl>
diff --git a/sw/control/KFDtool.Gui/Control/UtilInitAdapter.xaml.cs b/sw/control/KFDtool.Gui/Control/UtilInitAdapter.xaml.cs
deleted file mode 100644
index 55b465d..0000000
--- a/sw/control/KFDtool.Gui/Control/UtilInitAdapter.xaml.cs
+++ /dev/null
@@ -1,462 +0,0 @@
-using KFDtool.Adapter.Bundle;
-using KFDtool.Adapter.Device;
-using KFDtool.Adapter.Protocol.Adapter;
-using KFDtool.P25.TransferConstructs;
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace KFDtool.Gui.Control
-{
-    class UpdateItem
-    {
-        public int PkgIndex { get; set; }
-
-        public byte MdlId { get; set; } 
-
-        public byte HwRevMaj { get; set; }
-
-        public byte HwRevMin { get; set; }
-    }
-
-    /// <summary>
-    /// Interaction logic for UtilInitAdapter.xaml
-    /// </summary>
-    public partial class UtilInitAdapter : UserControl
-    {
-        private static NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
-
-        private const string NO_FILE_SELECTED = "No File Selected";
-
-        private string UpdatePackage;
-
-        private Dictionary<int,UpdateItem> UpdItm;
-
-        public UtilInitAdapter()
-        {
-            InitializeComponent();
-
-            cboAvailPkg.IsEnabled = false;
-            btnInit.IsEnabled = false;
-
-            UpdatePackage = string.Empty;
-            lblPath.Content = NO_FILE_SELECTED;
-
-            UpdItm = new Dictionary<int, UpdateItem>();
-        }
-
-        private void Select_Button_Click(object sender, RoutedEventArgs e)
-        {
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Filter = "Compressed Fw Pkg (*.cfp)|*.cfp|Uncompressed Fw Pkg (*.ufp)|*.ufp|All files (*.*)|*.*";
-
-            if (openFileDialog.ShowDialog() == true)
-            {
-                UpdatePackage = openFileDialog.FileName;
-                lblPath.Content = UpdatePackage;
-
-                Logger.Debug("update package path: {0}", UpdatePackage);
-
-                if (UpdatePackage.Equals(string.Empty))
-                {
-                    Logger.Error("no file selected");
-                    MessageBox.Show("No file selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-
-                // file existed when it was selected but now doesn't
-                if (!File.Exists(UpdatePackage))
-                {
-                    Logger.Error("selected file does not exist");
-                    MessageBox.Show("Selected file does not exist", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    UpdatePackage = string.Empty;
-                    lblPath.Content = NO_FILE_SELECTED;
-                    return;
-                }
-
-                // check if package is cfp or ufp
-                string ext = System.IO.Path.GetExtension(UpdatePackage);
-
-                Logger.Debug("update package extension: {0}", ext);
-
-                List<Update> pkg = null;
-
-                if (ext == ".cfp")
-                {
-                    Logger.Debug("opening compressed update package");
-
-                    try
-                    {
-                        pkg = Firmware.OpenCompressedUpdatePackage(UpdatePackage);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.Error("unable to parse file: {0}", ex.Message);
-                        MessageBox.Show(string.Format("Unable to parse file: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                        return;
-                    }
-                }
-                else if (ext == ".ufp")
-                {
-                    Logger.Debug("opening uncompressed update package");
-
-                    try
-                    {
-                        pkg = Firmware.OpenUncompressedUpdatePackage(UpdatePackage);
-                    }
-                    catch (Exception ex)
-                    {
-                        Logger.Error("unable to parse file: {0}", ex.Message);
-                        MessageBox.Show(string.Format("Unable to parse file: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                        return;
-                    }
-                }
-                else
-                {
-                    Logger.Error("invalid file selected");
-                    MessageBox.Show("Invalid file selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-
-                Logger.Debug("items in update package: {0}", pkg.Count);
-
-                if (pkg.Count < 1)
-                {
-                    Logger.Error("update package does not contain any updates");
-                    MessageBox.Show("Update package does not contain any updates", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-
-                cboAvailPkg.Items.Clear();
-                UpdItm.Clear();
-
-                int cboIndex = 0;
-                int updIndex = 0;
-
-                foreach (Update cdu in pkg)
-                {
-                    foreach (Model cdm in cdu.ProductModel)
-                    {
-                        foreach (string cdr in cdm.Revision)
-                        {
-                            UpdateItem temp = new UpdateItem();
-                            temp.PkgIndex = updIndex;
-
-                            if (cdm.Name == "KFD100")
-                            {
-                                temp.MdlId = 0x01;
-                            }
-                            else if (cdm.Name == "KFD200")
-                            {
-                                temp.MdlId = 0x02;
-                            }
-                            else
-                            {
-                                Logger.Error("unknown model: {0}", cdm.Name);
-                                MessageBox.Show(string.Format("Unknown model: {0}", cdm.Name), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                                return;
-                            }
-
-                            try
-                            {
-                                Version ver = new Version(cdr);
-
-                                if (ver.Major < 0 || ver.Major > 255)
-                                {
-                                    Logger.Error("invalid major version: {0}", ver.Major);
-                                    MessageBox.Show(string.Format("Invalid major version: {0}", ver.Major), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                                    return;
-                                }
-
-                                temp.HwRevMaj = (byte)ver.Major;
-
-                                if (ver.Minor < 0 || ver.Minor > 255)
-                                {
-                                    Logger.Error("invalid minor version: {0}", ver.Minor);
-                                    MessageBox.Show(string.Format("Invalid minor version: {0}", ver.Minor), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                                    return;
-                                }
-
-                                temp.HwRevMin = (byte)ver.Minor;
-                            }
-                            catch (Exception ex)
-                            {
-                                Logger.Error("unable to parse hardware version: {0}", ex.Message);
-                                MessageBox.Show(string.Format("Unable to parse hardware version: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                                return;
-                            }
-
-                            UpdItm.Add(cboIndex, temp);
-                            cboAvailPkg.Items.Add(string.Format("Model: {0}, Hardware Revision: {1}", cdm.Name, cdr));
-
-                            cboIndex++;
-                        }
-                    }
-
-                    updIndex++;
-                }
-
-                cboAvailPkg.SelectedIndex = 0;
-                cboAvailPkg.IsEnabled = true;
-                btnInit.IsEnabled = true;
-            }
-        }
-
-        private void Initialize_Button_Click(object sender, RoutedEventArgs e)
-        {
-            if (Settings.SelectedDevice.DeviceType != BaseDevice.DeviceTypeOptions.TwiKfdtool)
-            {
-                MessageBox.Show("Please select the KFDtool device type to perform this function", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            if (MessageBox.Show(string.Format("This function is only to be used to bootstrap blank hardware that you built yourself{0}{0}You should only use this function if you know what it does{0}{0}Continue?", Environment.NewLine), "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.No)
-            {
-                return;
-            }
-
-            Logger.Debug("update package path: {0}", UpdatePackage);
-
-            if (UpdatePackage.Equals(string.Empty))
-            {
-                Logger.Error("no file selected");
-                MessageBox.Show("No file selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            // file existed when it was selected but now doesn't
-            if (!File.Exists(UpdatePackage))
-            {
-                Logger.Error("selected file does not exist");
-                MessageBox.Show("Selected file does not exist", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                UpdatePackage = string.Empty;
-                lblPath.Content = NO_FILE_SELECTED;
-                return;
-            }
-
-            // check if package is cfp or ufp
-            string ext = System.IO.Path.GetExtension(UpdatePackage);
-
-            Logger.Debug("update package extension: {0}", ext);
-
-            List<Update> pkg = null;
-
-            if (ext == ".cfp")
-            {
-                Logger.Debug("opening compressed update package");
-
-                try
-                {
-                    pkg = Firmware.OpenCompressedUpdatePackage(UpdatePackage);
-                }
-                catch (Exception ex)
-                {
-                    Logger.Error("unable to parse file: {0}", ex.Message);
-                    MessageBox.Show(string.Format("Unable to parse file: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-            }
-            else if (ext == ".ufp")
-            {
-                Logger.Debug("opening uncompressed update package");
-
-                try
-                {
-                    pkg = Firmware.OpenUncompressedUpdatePackage(UpdatePackage);
-                }
-                catch (Exception ex)
-                {
-                    Logger.Error("unable to parse file: {0}", ex.Message);
-                    MessageBox.Show(string.Format("Unable to parse file: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-            }
-            else
-            {
-                Logger.Error("invalid file selected");
-                MessageBox.Show("Invalid file selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            Logger.Debug("items in update package: {0}", pkg.Count);
-
-            if (pkg.Count < 1)
-            {
-                Logger.Error("update package does not contain any updates");
-                MessageBox.Show("Update package does not contain any updates", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            int selIndex = cboAvailPkg.SelectedIndex;
-
-            if (selIndex < 0)
-            {
-                Logger.Error("invalid selected update: {0}", selIndex);
-                MessageBox.Show(string.Format("Invalid selected update: {0}", selIndex), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            UpdateItem itm = UpdItm[selIndex];
-
-            Update fw = pkg[itm.PkgIndex];
-
-            if (fw != null)
-            {
-                Logger.Debug("found applicable firmware update in package");
-            }
-            else
-            {
-                Logger.Error("could not find applicable firmware update in package");
-                MessageBox.Show("Could not find applicable firmware update in package", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            Logger.Debug("firmware audience: {0}", fw.Audience);
-
-            // warn the user if the firmware audience is anything other than release
-            if (fw.Audience != "RELEASE")
-            {
-                string message = string.Format(
-                    "THIS FIRMWARE IS NOT FOR GENERAL USE{0}" +
-                    "{0}" +
-                    "IT MAY NOT WORK CORRECTLY OR AT ALL{0}" +
-                    "{0}" +
-                    "Audience: {1}{0}" +
-                    "{0}" +
-                    "DO NOT PROCEED UNLESS YOU HAVE BEEN{0}" +
-                    "DIRECTED TO DO SO IN ORDER TO TROUBLESHOOT AN ISSUE{0}" +
-                    "{0}" +
-                    "Continue?",
-                    Environment.NewLine, fw.Audience);
-
-                if (MessageBox.Show(message, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.No)
-                {
-                    return;
-                }
-            }
-
-            // check if any devices are in app mode
-            int appDeviceCount = ManualDetection.DetectConnectedAppDevices().Count;
-
-            Logger.Debug("app devices detected: {0}", appDeviceCount);
-
-            // check if any devices are in bsl mode
-            int bslDeviceCount = ManualDetection.DetectConnectedBslDevices();
-
-            Logger.Debug("bsl devices detected: {0}", bslDeviceCount);
-
-            // there should not be more than one device attached at the same time
-            if (appDeviceCount > 0)
-            {
-                Logger.Error("one or more devices is connected in APP mode");
-                MessageBox.Show("One or more devices is connected in APP mode", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-            else if (bslDeviceCount > 1)
-            {
-                Logger.Error("more than one device is connected in bsl mode");
-                MessageBox.Show("More than one device is connected in BSL mode", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-            else if (bslDeviceCount == 1)
-            {
-                Logger.Debug("device is already in bsl mode");
-            }
-            else
-            {
-                Logger.Debug("no device is connected in bsl mode");
-                MessageBox.Show("No device is connected in BSL mode", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            if (MessageBox.Show(string.Format("Make sure that you have selected the correct model and hardware revision - an incorrect choice may damage the device{0}{0}Continue?", Environment.NewLine), "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.No)
-            {
-                return;
-            }
-
-            Logger.Debug("updating device");
-
-            bool updateResult = false;
-
-            try
-            {
-                FirmwareUpdate upd = new FirmwareUpdate();
-
-                updateResult = upd.UpdateDevice(fw);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error("failed to load firmware: {0}", ex.Message);
-                MessageBox.Show(string.Format("Failed to load firmware: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            if (updateResult)
-            {
-                Logger.Debug("update success");
-            }
-            else
-            {
-                Logger.Error("update failed");
-                MessageBox.Show("Firmware update failed", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            Thread.Sleep(5000); // TODO do this better - added to fix catching the device as it first connects and is not ready yet
-
-            List<string> connected = ManualDetection.DetectConnectedAppDevices();
-
-            if (connected.Count > 1)
-            {
-                Logger.Error("more than one device detected");
-                MessageBox.Show("More than one device detected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-            else if (connected.Count == 1)
-            {
-                Logger.Debug("one device found");
-            }
-            else
-            {
-                Logger.Error("no device detected");
-                MessageBox.Show("No device detected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            try
-            {
-                AdapterProtocol ap = new AdapterProtocol(connected[0]);
-
-                ap.Open();
-
-                ap.Clear();
-
-                ap.WriteInfo(itm.MdlId, itm.HwRevMaj, itm.HwRevMin);
-
-                ap.Close();
-            }
-            catch (Exception ex)
-            {
-                Logger.Error("failed to write model and hardware revision: {0}", ex.Message);
-                MessageBox.Show(string.Format("Failed to write model and hardware revision: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            MessageBox.Show("Firmware Updated Successfully", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-    }
-}
diff --git a/sw/control/KFDtool.Gui/Control/UtilUpdateAdapterFw.xaml b/sw/control/KFDtool.Gui/Control/UtilUpdateAdapterFw.xaml
deleted file mode 100644
index 42cd027..0000000
--- a/sw/control/KFDtool.Gui/Control/UtilUpdateAdapterFw.xaml
+++ /dev/null
@@ -1,15 +0,0 @@
-<UserControl x:Class="KFDtool.Gui.Control.UtilUpdateAdapterFw"
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
-             xmlns:local="clr-namespace:KFDtool.Gui.Control"
-             mc:Ignorable="d" 
-             d:DesignHeight="450" d:DesignWidth="800">
-    <Grid>
-        <Label Content="Update File" HorizontalAlignment="Left" Margin="41,42,0,0" VerticalAlignment="Top"/>
-        <Button Content="Select" Click="Select_Button_Click" HorizontalAlignment="Left" Margin="128,45,0,0" VerticalAlignment="Top" Width="75"/>
-        <Label Name="lblPath" Content="path" HorizontalAlignment="Left" Margin="223,42,0,0" VerticalAlignment="Top"/>
-        <Button Content="Update" Click="Update_Button_Click" HorizontalAlignment="Left" Margin="128,82,0,0" VerticalAlignment="Top" Width="75"/>
-    </Grid>
-</UserControl>
diff --git a/sw/control/KFDtool.Gui/Control/UtilUpdateAdapterFw.xaml.cs b/sw/control/KFDtool.Gui/Control/UtilUpdateAdapterFw.xaml.cs
deleted file mode 100644
index d08423f..0000000
--- a/sw/control/KFDtool.Gui/Control/UtilUpdateAdapterFw.xaml.cs
+++ /dev/null
@@ -1,344 +0,0 @@
-using KFDtool.Adapter.Bundle;
-using KFDtool.Adapter.Device;
-using KFDtool.P25.TransferConstructs;
-using Microsoft.Win32;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
-using System.Windows.Input;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-using System.Windows.Navigation;
-using System.Windows.Shapes;
-
-namespace KFDtool.Gui.Control
-{
-    /// <summary>
-    /// Interaction logic for UtilUpdateAdapterFw.xaml
-    /// </summary>
-    public partial class UtilUpdateAdapterFw : UserControl
-    {
-        private static NLog.Logger Logger = NLog.LogManager.GetCurrentClassLogger();
-
-        private const string NO_FILE_SELECTED = "No File Selected";
-
-        private string UpdatePackage;
-
-        public UtilUpdateAdapterFw()
-        {
-            InitializeComponent();
-
-            UpdatePackage = string.Empty;
-            lblPath.Content = NO_FILE_SELECTED;
-        }
-
-        private void Select_Button_Click(object sender, RoutedEventArgs e)
-        {
-            OpenFileDialog openFileDialog = new OpenFileDialog();
-            openFileDialog.Filter = "Compressed Fw Pkg (*.cfp)|*.cfp|Uncompressed Fw Pkg (*.ufp)|*.ufp|All files (*.*)|*.*";
-
-            if (openFileDialog.ShowDialog() == true)
-            {
-                UpdatePackage = openFileDialog.FileName;
-                lblPath.Content = UpdatePackage;
-            }
-        }
-
-        private void Update_Button_Click(object sender, RoutedEventArgs e)
-        {
-            if (Settings.SelectedDevice.DeviceType != BaseDevice.DeviceTypeOptions.TwiKfdtool)
-            {
-                MessageBox.Show("Please select the KFDtool device type to perform this function", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            Logger.Debug("update package path: {0}", UpdatePackage);
-
-            if (UpdatePackage.Equals(string.Empty))
-            {
-                Logger.Error("no file selected");
-                MessageBox.Show("No file selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            // file existed when it was selected but now doesn't
-            if (!File.Exists(UpdatePackage))
-            {
-                Logger.Error("selected file does not exist");
-                MessageBox.Show("Selected file does not exist", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                UpdatePackage = string.Empty;
-                lblPath.Content = NO_FILE_SELECTED;
-                return;
-            }
-
-            // check if package is cfp or ufp
-            string ext = System.IO.Path.GetExtension(UpdatePackage);
-
-            Logger.Debug("update package extension: {0}", ext);
-
-            List<Update> pkg = null;
-
-            if (ext == ".cfp")
-            {
-                Logger.Debug("opening compressed update package");
-
-                try
-                {
-                    pkg = Firmware.OpenCompressedUpdatePackage(UpdatePackage);
-                }
-                catch (Exception ex)
-                {
-                    Logger.Error("unable to parse file: {0}", ex.Message);
-                    MessageBox.Show(string.Format("Unable to parse file: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-            }
-            else if (ext == ".ufp")
-            {
-                Logger.Debug("opening uncompressed update package");
-
-                try
-                {
-                    pkg = Firmware.OpenUncompressedUpdatePackage(UpdatePackage);
-                }
-                catch (Exception ex)
-                {
-                    Logger.Error("unable to parse file: {0}", ex.Message);
-                    MessageBox.Show(string.Format("Unable to parse file: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-            }
-            else
-            {
-                Logger.Error("invalid file selected");
-                MessageBox.Show("Invalid file selected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            Logger.Debug("items in update package: {0}", pkg.Count);
-
-            if (pkg.Count < 1)
-            {
-                Logger.Error("update package does not contain any updates");
-                MessageBox.Show("Update package does not contain any updates", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            string curVerStr = string.Empty;
-
-            try
-            {
-                curVerStr = Interact.ReadFirmwareVersion(Settings.SelectedDevice);
-                Logger.Debug("adapter version: {0}", curVerStr);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error("error reading firmware version from adapter -- {0}", ex.Message);
-                MessageBox.Show(string.Format("Error reading firmware version from adapter -- {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            string curModel = string.Empty;
-
-            try
-            {
-                curModel = Interact.ReadModel(Settings.SelectedDevice);
-                Logger.Debug("adapter model: {0}", curModel);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error("error reading model from adapter -- {0}", ex.Message);
-                MessageBox.Show(string.Format("Error reading model from adapter -- {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            string curHwRev = string.Empty;
-
-            try
-            {
-                curHwRev = Interact.ReadHardwareRevision(Settings.SelectedDevice);
-                Logger.Debug("adapter hardware revision: {0}", curHwRev);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error("error reading hardware revision from adapter -- {0}", ex.Message);
-                MessageBox.Show(string.Format("Error reading hardware revision from adapter -- {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            Version curVersion = new Version(curVerStr);
-
-            // select the correct firmware update item to install based on hardware
-
-            Update fw = null;
-
-            foreach (Update cdu in pkg)
-            {
-                Logger.Trace("update");
-
-                foreach (Model cdm in cdu.ProductModel)
-                {
-                    Logger.Trace("model: {0}", cdm.Name);
-
-                    if (cdm.Name == curModel)
-                    {
-                        foreach (string cdr in cdm.Revision)
-                        {
-                            Logger.Trace("revision: {0}", cdr);
-
-                            if (cdr == curHwRev)
-                            {
-                                fw = cdu;
-                            }
-                        }
-                    }
-                }
-            }
-
-            if (fw != null)
-            {
-                Logger.Debug("found applicable firmware update in package");
-            }
-            else
-            {
-                Logger.Error("could not find applicable firmware update in package");
-                MessageBox.Show("Could not find applicable firmware update in package", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            Version updVersion = new Version(fw.AppVersion);
-
-            Logger.Debug("firmware audience: {0}", fw.Audience);
-
-            // warn the user if the firmware audience is anything other than release
-            if (fw.Audience != "RELEASE")
-            {
-                string message = string.Format(
-                    "THIS FIRMWARE IS NOT FOR GENERAL USE{0}" +
-                    "{0}" +
-                    "IT MAY NOT WORK CORRECTLY OR AT ALL{0}" +
-                    "{0}" +
-                    "Audience: {1}{0}" +
-                    "{0}" +
-                    "DO NOT PROCEED UNLESS YOU HAVE BEEN{0}" +
-                    "DIRECTED TO DO SO IN ORDER TO TROUBLESHOOT AN ISSUE{0}" +
-                    "{0}" +
-                    "Continue?",
-                    Environment.NewLine, fw.Audience);
-
-                if (MessageBox.Show(message, "Warning", MessageBoxButton.YesNo, MessageBoxImage.Warning) == MessageBoxResult.No)
-                {
-                    return;
-                }
-            }
-
-            // adapter already has current firmware
-            if (updVersion.Equals(curVersion))
-            {
-                Logger.Error("the version of the firmware on the device is the same as the version that you are attempting to load");
-                MessageBox.Show("The version of the firmware on the device is the same as the version that you are attempting to load", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            // do not allow downgrades
-            if (updVersion.CompareTo(curVersion) < 0)
-            {
-                Logger.Error("the version of the firmware on the device is newer than the version that you are attempting to load");
-                MessageBox.Show("The version of the firmware on the device is newer than the version that you are attempting to load", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            // check if any devices are in app mode
-            int appDeviceCount = ManualDetection.DetectConnectedAppDevices().Count;
-
-            Logger.Debug("app devices detected: {0}", appDeviceCount);
-
-            // check if any devices are in bsl mode
-            int bslDeviceCount = ManualDetection.DetectConnectedBslDevices();
-
-            Logger.Debug("bsl devices detected: {0}", bslDeviceCount);
-
-            // there should not be more than one device attached at the same time
-            if (appDeviceCount > 1)
-            {
-                Logger.Error("more than one device is connected in app mode");
-                MessageBox.Show("More than one device is connected in APP mode", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-            else if (bslDeviceCount > 1)
-            {
-                Logger.Error("more than one device is connected in bsl mode");
-                MessageBox.Show("More than one device is connected in BSL mode", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-            else if (appDeviceCount == 1 && bslDeviceCount == 1)
-            {
-                Logger.Error("both a device in app mode and a device in bsl mode are connected");
-                MessageBox.Show("Both a device in APP mode and a device in BSL mode are connected", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-            else if (appDeviceCount == 1 && bslDeviceCount == 0)
-            {
-                Logger.Debug("requesting device to enter bsl mode");
-
-                try
-                {
-                    Interact.EnterBslMode(Settings.SelectedDevice);
-                }
-                catch (Exception ex)
-                {
-                    Logger.Error("error entering bsl mode -- {0}", ex.Message);
-                    MessageBox.Show(string.Format("Error entering BSL mode -- {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                    return;
-                }
-
-                Logger.Debug("device intends to enter bsl mode");
-            }
-            else if (appDeviceCount == 0 && bslDeviceCount == 1)
-            {
-                Logger.Debug("device is already in bsl mode");
-            }
-            else
-            {
-                Logger.Debug("no devices are connected in either app or bsl mode");
-                MessageBox.Show("No devices are connected in either APP or BSL mode", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            Logger.Debug("updating device");
-
-            bool updateResult = false;
-
-            try
-            {
-                FirmwareUpdate upd = new FirmwareUpdate();
-
-                updateResult = upd.UpdateDevice(fw);
-            }
-            catch (Exception ex)
-            {
-                Logger.Error("failed to load firmware: {0}", ex.Message);
-                MessageBox.Show(string.Format("Failed to load firmware: {0}", ex.Message), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-                return;
-            }
-
-            if (updateResult)
-            {
-                Logger.Debug("update success");
-                MessageBox.Show("Firmware Updated Successfully", "Information", MessageBoxButton.OK, MessageBoxImage.Information);
-            }
-            else
-            {
-                Logger.Error("update failed");
-                MessageBox.Show("Firmware update failed", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
-            }
-        }
-    }
-}
diff --git a/sw/control/KFDtool.Gui/KFDtool.Gui.csproj b/sw/control/KFDtool.Gui/KFDtool.Gui.csproj
index c2f8c4c..53e6cc7 100644
--- a/sw/control/KFDtool.Gui/KFDtool.Gui.csproj
+++ b/sw/control/KFDtool.Gui/KFDtool.Gui.csproj
@@ -101,12 +101,6 @@
     <Compile Include="Control\UtilFixDesKeyParity.xaml.cs">
       <DependentUpon>UtilFixDesKeyParity.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Control\UtilInitAdapter.xaml.cs">
-      <DependentUpon>UtilInitAdapter.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Control\UtilUpdateAdapterFw.xaml.cs">
-      <DependentUpon>UtilUpdateAdapterFw.xaml</DependentUpon>
-    </Compile>
     <Compile Include="Dialog\ContainerEdit.xaml.cs">
       <DependentUpon>ContainerEdit.xaml</DependentUpon>
     </Compile>
@@ -171,14 +165,6 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Control\UtilInitAdapter.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="Control\UtilUpdateAdapterFw.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
     <Page Include="Dialog\ContainerEdit.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/sw/control/KFDtool.Gui/MainWindow.xaml b/sw/control/KFDtool.Gui/MainWindow.xaml
index eb9c649..3f92b3d 100644
--- a/sw/control/KFDtool.Gui/MainWindow.xaml
+++ b/sw/control/KFDtool.Gui/MainWindow.xaml
@@ -41,8 +41,6 @@
                 </MenuItem>
                 <MenuItem Name="UtilityMenu" Header="_Utility">
                     <MenuItem Name="NavigateUtilityFixDesKeyParity" Header="_Fix DES Key Parity" IsCheckable="True" Click="Navigate_MenuItem_Click" />
-                    <MenuItem Name="NavigateUtilityUpdateAdapterFirmware" Header="_Update Adapter Firmware" IsCheckable="True" Click="Navigate_MenuItem_Click" />
-                    <MenuItem Name="NavigateUtilityInitializeAdapter" Header="_Initialize Adapter" IsCheckable="True" Click="Navigate_MenuItem_Click" />
                     <MenuItem Name="NavigateUtilityAdapterSelfTest" Header="_Adapter Self Test" IsCheckable="True" Click="Navigate_MenuItem_Click" />
                 </MenuItem>
                 <MenuItem Header="_Help">
diff --git a/sw/control/KFDtool.Gui/MainWindow.xaml.cs b/sw/control/KFDtool.Gui/MainWindow.xaml.cs
index 03bca72..57e4556 100644
--- a/sw/control/KFDtool.Gui/MainWindow.xaml.cs
+++ b/sw/control/KFDtool.Gui/MainWindow.xaml.cs
@@ -177,20 +177,6 @@ private void SwitchScreen(string item, bool changeControl)
                 Settings.ScreenCurrent = item;
                 UpdateTitle("Utility - Fix DES Key Parity");
             }
-            else if (item == "NavigateUtilityUpdateAdapterFirmware")
-            {
-                control = new Control.UtilUpdateAdapterFw();
-                NavigateUtilityUpdateAdapterFirmware.IsChecked = true;
-                Settings.ScreenCurrent = item;
-                UpdateTitle("Utility - Update Adapter Firmware");
-            }
-            else if (item == "NavigateUtilityInitializeAdapter")
-            {
-                control = new Control.UtilInitAdapter();
-                NavigateUtilityInitializeAdapter.IsChecked = true;
-                Settings.ScreenCurrent = item;
-                UpdateTitle("Utility - Initialize Adapter");
-            }
             else if (item == "NavigateUtilityAdapterSelfTest")
             {
                 control = new Control.UtilAdapterSelfTest();
@@ -694,7 +680,7 @@ private void SelectDevice(MenuItem mi)
 
                 Version apVersion = new Version(apVerStr);
 
-                if (apVersion.Major != 1)
+                if (apVersion.Major != 2)
                 {
                     MessageBox.Show(string.Format("Adapter protocol version not compatible ({0})", apVerStr), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
                     return;
diff --git a/sw/control/KFDtool.P25/TransferConstructs/InteractTwiKfdtool.cs b/sw/control/KFDtool.P25/TransferConstructs/InteractTwiKfdtool.cs
index 7f68dcf..8a1b526 100644
--- a/sw/control/KFDtool.P25/TransferConstructs/InteractTwiKfdtool.cs
+++ b/sw/control/KFDtool.P25/TransferConstructs/InteractTwiKfdtool.cs
@@ -5,7 +5,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
+using System.Threading;
 
 namespace KFDtool.P25.TransferConstructs
 {
@@ -276,7 +276,6 @@ public static string ReadSerialNumber(BaseDevice device)
             {
                 throw new ArgumentException("No device selected");
             }
-
             AdapterProtocol ap = null;
 
             try
@@ -326,7 +325,6 @@ public static void EnterBslMode(BaseDevice device)
             {
                 throw new ArgumentException("No device selected");
             }
-
             AdapterProtocol ap = null;
 
             try
@@ -437,7 +435,6 @@ public static void CheckTargetMrConnection(BaseDevice device)
             {
                 throw new ArgumentException("No device selected");
             }
-
             AdapterProtocol ap = null;
 
             try
@@ -478,7 +475,6 @@ public static void Keyload(BaseDevice device, List<CmdKeyItem> keys)
             {
                 throw new ArgumentException("No device selected");
             }
-
             AdapterProtocol ap = null;
 
             try
diff --git a/sw/driver/kfdtool.cat b/sw/driver/kfdtool.cat
deleted file mode 100644
index 11ffafd2ef51c28662b04726547b5477f325804e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 9615
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
X9aBMVKd8C=T|q-E)O1j~PC58Ls#0Ql

diff --git a/sw/driver/kfdtool.inf b/sw/driver/kfdtool.inf
deleted file mode 100644
index 6b1561e..0000000
--- a/sw/driver/kfdtool.inf
+++ /dev/null
@@ -1,123 +0,0 @@
-; KFDtool USB CDC VCP Driver
-; Copyright 2019 Daniel Dugger
-
-; Changelog:
-; 1.0.0.0 (2019-07-28) - Initial Release
-; 1.1.0.0 (2019-08-27) - Added digital signature
-
-; --COPYRIGHT--,BSD                                                           
-; Copyright (c) 2012, Texas Instruments Incorporated                          
-; All rights reserved.                                                        
-;                                                                             
-; Redistribution and use in source and binary forms, with or without          
-; modification, are permitted provided that the following conditions          
-; are met:                                                                    
-;                                                                             
-; *  Redistributions of source code must retain the above copyright           
-;    notice, this list of conditions and the following disclaimer.            
-;                                                                             
-; *  Redistributions in binary form must reproduce the above copyright        
-;    notice, this list of conditions and the following disclaimer in the      
-;    documentation and/or other materials provided with the distribution.     
-;                                                                             
-; *  Neither the name of Texas Instruments Incorporated nor the names of      
-;    its contributors may be used to endorse or promote products derived      
-;    from this software without specific prior written permission.            
-;                                                                             
-; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 'AS IS' 
-; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,       
-; THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR      
-; PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR            
-; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,       
-; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,         
-; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; 
-; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,    
-; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR     
-; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,              
-; EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.                          
-; --/COPYRIGHT--                                                              
-
-[Version]
-
-Signature="$Windows NT$" 
-CatalogFile=kfdtool.cat
-Class=Ports
-ClassGuid={4D36E978-E325-11CE-BFC1-08002BE10318}
-Provider=%TI%
-DriverVer=08/27/2019,1.1.0.0
-
-[Manufacturer]
-%TI%=DeviceList, NTamd64
-
-[DestinationDirs]
-FakeModemCopyFileSection=12
-DefaultDestDir=12
-
-[SourceDisksNames]
-
-[SourceDisksFiles]
-
-[DeviceList]
-%DESCRIPTION0%=TIUSB, USB\Vid_2047&Pid_0a7c
-
-[DeviceList.NTamd64]
-%DESCRIPTION0%=TIUSB.NTamd64, USB\Vid_2047&Pid_0a7c
-
-;------------------------------------------------------------------------------
-;  Windows 32-bit Sections
-;------------------------------------------------------------------------------
-
-[TIUSB.nt]
-include=mdmcpq.inf
-CopyFiles=FakeModemCopyFileSection
-AddReg=TIUSB.nt.AddReg 
-
-[TIUSB.nt.AddReg]
-HKR,,NTMPDriver,,*ntkern
-HKR,,NTMPDriver,,usbser.sys 
-HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
-HKR,,PortSubClass,1,01
-
-[TIUSB.nt.Services]
-AddService=usbser, 0x00000002, DriverService
-
-[TIUSB.nt.HW]
-include=mdmcpq.inf
-
-[DriverService]
-DisplayName=%DESCRIPTION%
-ServiceType=1
-StartType=3
-ErrorControl=1
-ServiceBinary=%12%\usbser.sys
-LoadOrderGroup=Base
-
-;------------------------------------------------------------------------------
-;  Windows 64-bit Sections
-;------------------------------------------------------------------------------
-
-[TIUSB.NTamd64]
-include=mdmcpq.inf
-CopyFiles=FakeModemCopyFileSection
-AddReg=TIUSB.NTamd64.AddReg 
-
-[TIUSB.NTamd64.AddReg]
-HKR,,NTMPDriver,,*ntkern 
-HKR,,NTMPDriver,,usbser.sys 
-HKR,,EnumPropPages32,,"MsPorts.dll,SerialPortPropPageProvider"
-HKR,,PortSubClass,1,01
-
-[TIUSB.NTamd64.Services]
-AddService=usbser, 0x00000002, DriverService
-
-[TIUSB.NTamd64.HW]
-include=mdmcpq.inf
-
-;------------------------------------------------------------------------------
-;  String Definitions
-;------------------------------------------------------------------------------
-
-[Strings]
-TI="KFDtool"
-DESCRIPTION="KFDtool"
-DESCRIPTION0="KFDtool"
diff --git a/sw/installer/KFDtoolApp/KFDtoolApp.wixproj b/sw/installer/KFDtoolApp/KFDtoolApp.wixproj
deleted file mode 100644
index f127e14..0000000
--- a/sw/installer/KFDtoolApp/KFDtoolApp.wixproj
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>3.10</ProductVersion>
-    <ProjectGuid>5c62bd2e-bb98-4f86-a65c-aa9791179cd3</ProjectGuid>
-    <SchemaVersion>2.0</SchemaVersion>
-    <OutputName>KFDtool</OutputName>
-    <OutputType>Package</OutputType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-    <DefineConstants>Debug</DefineConstants>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
-    <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <Compile Include="Product.wxs" />
-  </ItemGroup>
-  <ItemGroup>
-    <WixExtension Include="WixNetFxExtension">
-      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
-      <Name>WixNetFxExtension</Name>
-    </WixExtension>
-    <WixExtension Include="WixUIExtension">
-      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
-      <Name>WixUIExtension</Name>
-    </WixExtension>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="license.rtf" />
-  </ItemGroup>
-  <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
-  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
-  <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
-    <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
-  </Target>
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
-	</Target>
-	<Target Name="AfterBuild">
-	</Target>
-	-->
-</Project>
\ No newline at end of file
diff --git a/sw/installer/KFDtoolApp/Product.wxs b/sw/installer/KFDtoolApp/Product.wxs
deleted file mode 100644
index 17bbe3e..0000000
--- a/sw/installer/KFDtoolApp/Product.wxs
+++ /dev/null
@@ -1,176 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-  <Product Id="*" UpgradeCode="{FD26DA57-FC28-486B-8E68-FABDB446C437}" Version="1.5.0" Language="1033" Name="KFDtool" Manufacturer="Daniel Dugger">
-    <Package InstallerVersion="300" Compressed="yes" InstallScope="perMachine" />
-    <Media Id="1" Cabinet="KFDtool.cab" EmbedCab="yes" />
-
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-
-    <!-- do not allow the 32-bit installer to run on 64-bit machines -->
-    <!-- this is to (1) allow installation into the correct native program files directory -->
-    <!-- and (2) allow for pnputil to be run from the correct native system32 directory -->
-    <?if $(var.Platform) = x86 ?>
-    <Condition Message="The 32-bit [ProductName] installer can not be run on 64-bit machines.">NOT VersionNT64</Condition>
-    <?endif?>
-
-    <!-- do not install on anything earlier than Windows 7 -->
-    <!-- this is because (1) .NET Framework 4.7.2 only runs on Windows 7 or later -->
-    <!-- and (2) pnputil is only included on Windows Vista or later -->
-    <?if $(var.Platform) = x64 ?>
-    <Condition Message="This application is only supported on Windows 7 or later.">Installed OR (VersionNT64 >= 601)</Condition>
-    <?elseif $(var.Platform) = x86 ?>
-    <Condition Message="This application is only supported on Windows 7 or later.">Installed OR (VersionNT >= 601)</Condition>
-    <?endif?>
-
-    <!-- only allow installation if .NET Framework 4.7.2 or later is installed -->
-    <PropertyRef Id="NETFRAMEWORK45" />
-    <Condition Message="This application requires .NET Framework 4.7.2. Please install the .NET Framework then run this installer again.">Installed OR (NETFRAMEWORK45 >= "#461808")</Condition>
-
-    <!-- icon for control panel add/remove programs -->
-    <Icon Id="KFDtool.ico" SourceFile="..\..\control\KFDtool.Gui\KFDtool.ico" />
-    <Property Id="ARPPRODUCTICON" Value="KFDtool.ico" />
-
-    <!-- links for control panel add/remove programs -->
-    <Property Id="ARPURLINFOABOUT" Value="https://www.kfdtool.com/" />
-    <Property Id="ARPHELPLINK" Value="https://www.kfdtool.com/" />
-    
-    <!-- remove modify link in control panel add/remove programs -->
-    <Property Id="ARPNOREPAIR" Value="yes" Secure="yes" />
-
-    <Directory Id="TARGETDIR" Name="SourceDir">
-      <?if $(var.Platform) = x64 ?>
-      <Directory Id="ProgramFiles64Folder">
-        <Directory Id="APPLICATIONROOTDIRECTORY" Name="KFDtool">
-          <Directory Id="DriverFolder" Name="driver" />
-        </Directory>
-      </Directory>
-      <?elseif $(var.Platform) = x86 ?>
-      <Directory Id="ProgramFilesFolder">
-        <Directory Id="APPLICATIONROOTDIRECTORY" Name="KFDtool">
-          <Directory Id="DriverFolder" Name="driver" />
-        </Directory>
-      </Directory>
-      <?endif ?>
-      <Directory Id="ProgramMenuFolder" />
-      <Directory Id="DesktopFolder" />
-    </Directory>
-
-    <DirectoryRef Id="APPLICATIONROOTDIRECTORY">
-      <Component Id="HidLibrary.dll" Guid="{88846A84-923B-4E47-AB93-02ED7DA32AA1}">
-        <File Id="HidLibrary.dll" Source="..\..\control\KFDtool.Gui\bin\Release\HidLibrary.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="KFDtool.Adapter.dll" Guid="{38CE9ADD-A926-446D-8A9A-65E13F5ECA24}">
-        <File Id="KFDtool.Adapter.dll" Source="..\..\control\KFDtool.Gui\bin\Release\KFDtool.Adapter.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="KFDtool.BSL430.dll" Guid="{D5A0D738-E327-46AE-9AA3-668201ABBE58}">
-        <File Id="KFDtool.BSL430.dll" Source="..\..\control\KFDtool.Gui\bin\Release\KFDtool.BSL430.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="KFDtool.Container.dll" Guid="{59F1F7EE-B5FE-4CF2-8257-0B3DC1BE10CD}">
-        <File Id="KFDtool.Container.dll" Source="..\..\control\KFDtool.Gui\bin\Release\KFDtool.Container.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="KFDtool.P25.dll" Guid="{02C09380-097D-4D2A-A492-53E379CFE385}">
-        <File Id="KFDtool.P25.dll" Source="..\..\control\KFDtool.Gui\bin\Release\KFDtool.P25.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="KFDtool.Shared.dll" Guid="{02D352FB-F70A-48AD-9C21-9AB2C8344E5C}">
-        <File Id="KFDtool.Shared.dll" Source="..\..\control\KFDtool.Gui\bin\Release\KFDtool.Shared.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="KFDtool_Manual.pdf" Guid="{FC1E4B85-5454-4CA2-BB1F-7FD8256CFA0F}">
-        <File Id="KFDtool_Manual.pdf" Source="..\..\..\doc\KFDtool_Manual.pdf" KeyPath="yes" />
-      </Component>
-      <Component Id="KFDtoolCmd.exe" Guid="{F06A948F-C3D1-4780-B0AB-082D331DB928}">
-        <File Id="KFDtoolCmd.exe" Source="..\..\control\KFDtool.Cmd\bin\Release\KFDtoolCmd.exe" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="KFDtoolCmd.exe.config" Guid="{6895BFD5-BBA2-47C8-9D4C-0C4F2091F68E}">
-        <File Id="KFDtoolCmd.exe.config" Source="..\..\control\KFDtool.Cmd\bin\Release\KFDtoolCmd.exe.config" KeyPath="yes" />
-      </Component>
-      <Component Id="KFDtoolGui.exe" Guid="{9EE0E9D9-5A9A-439F-A2C9-C66C27216CEF}">
-        <File Id="KFDtoolGui.exe" Source="..\..\control\KFDtool.Gui\bin\Release\KFDtoolGui.exe" KeyPath="yes" Checksum="yes">
-          <Shortcut Id="AppStartMenuShortcut" Directory="DesktopFolder" Name="KFDtool" Icon="KFDtool.ico" WorkingDirectory="APPLICATIONROOTDIRECTORY" Advertise="yes" />
-          <Shortcut Id="AppDesktopShortcut" Directory="ProgramMenuFolder" Name="KFDtool" Icon="KFDtool.ico" WorkingDirectory="APPLICATIONROOTDIRECTORY" Advertise="yes" />
-        </File>
-      </Component>
-      <Component Id="KFDtoolGui.exe.config" Guid="{A12D9EEE-3991-4475-BD20-83FFA9C38838}">
-        <File Id="KFDtoolGui.exe.config" Source="..\..\control\KFDtool.Gui\bin\Release\KFDtoolGui.exe.config" KeyPath="yes" />
-      </Component>
-      <Component Id="Mono.Options.dll" Guid="{78F068B8-8174-49D6-99B4-AF88C3CFE44C}">
-        <File Id="Mono.Options.dll" Source="..\..\control\KFDtool.Cmd\bin\Release\Mono.Options.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="NLog.config" Guid="{AD4C2E20-6B9D-48B8-A649-C2BDB02CCB02}">
-        <File Id="NLog.config" Source="..\..\control\KFDtool.Gui\bin\Release\NLog.config" KeyPath="yes" />
-      </Component>
-      <Component Id="NLog.dll" Guid="{3F24DF7F-17D0-4DCB-8CFB-20D2C15EB5AE}">
-        <File Id="NLog.dll" Source="..\..\control\KFDtool.Gui\bin\Release\NLog.dll" KeyPath="yes" Checksum="yes" />
-      </Component>
-      <Component Id="SW_CHANGELOG.txt" Guid="{69789050-602D-479E-B191-7468CE12C6EC}">
-        <File Id="SW_CHANGELOG.txt" Source="..\..\..\doc\SW_CHANGELOG.txt" KeyPath="yes" />
-      </Component>
-      <Component Id="SW_LICENSE.txt" Guid="{2AA6432C-3571-4D86-A986-FAFB301CC312}">
-        <File Id="SW_LICENSE.txt" Source="..\..\..\doc\SW_LICENSE.txt" KeyPath="yes" />
-      </Component>
-    </DirectoryRef>
-
-    <DirectoryRef Id="DriverFolder">
-      <Component Id="kfdtool.cat" Guid="{964A518D-2AC6-4B17-9F8D-68509B969806}">
-        <File Id="kfdtool.cat" Source="..\..\driver\kfdtool.cat" KeyPath="yes" />
-      </Component>
-      <Component Id="kfdtool.inf" Guid="{1996F07B-C709-4785-A559-3A5E4B80AECB}">
-        <File Id="kfdtool.inf" Source="..\..\driver\kfdtool.inf" KeyPath="yes" />
-      </Component>
-    </DirectoryRef>
-
-    <Feature Id="ProductFeature" Title="KFDtool" Level="1">
-      <ComponentRef Id="HidLibrary.dll" />
-      <ComponentRef Id="KFDtool.Adapter.dll" />
-      <ComponentRef Id="KFDtool.BSL430.dll" />
-      <ComponentRef Id="KFDtool.Container.dll" />
-      <ComponentRef Id="KFDtool.P25.dll" />
-      <ComponentRef Id="KFDtool.Shared.dll" />
-      <ComponentRef Id="KFDtool_Manual.pdf" />
-      <ComponentRef Id="KFDtoolCmd.exe" />
-      <ComponentRef Id="KFDtoolCmd.exe.config" />
-      <ComponentRef Id="KFDtoolGui.exe" />
-      <ComponentRef Id="KFDtoolGui.exe.config" />
-      <ComponentRef Id="Mono.Options.dll" />
-      <ComponentRef Id="NLog.config" />
-      <ComponentRef Id="NLog.dll" />
-      <ComponentRef Id="SW_CHANGELOG.txt" />
-      <ComponentRef Id="SW_LICENSE.txt" />
-      <ComponentRef Id="kfdtool.cat" />
-      <ComponentRef Id="kfdtool.inf" />
-    </Feature>
-
-    <!-- use the legacy flags as the pnputil version in Windows 7 does not support the new flags -->
-    <!-- do not check the return code as Windows 10 sometimes throws a 0x00000103 error for some reason (not a documented return code) -->
-    <!-- this is fine as Windows 10 uses the generic usbser.inf driver -->
-    <!-- however, the user may decline the driver installation and the installation will complete sucessfully -->
-    <CustomAction Id="InstallDriver32"
-                  Directory="DriverFolder"
-                  ExeCommand="[SystemFolder]pnputil.exe -i -a &quot;[DriverFolder]kfdtool.inf&quot;"
-                  Return="ignore"
-                  Execute="deferred"
-                  Impersonate="no"
-                  />
-    <CustomAction Id="InstallDriver64"
-                  Directory="DriverFolder"
-                  ExeCommand="[System64Folder]pnputil.exe -i -a &quot;[DriverFolder]kfdtool.inf&quot;"
-                  Return="ignore"
-                  Execute="deferred"
-                  Impersonate="no"
-                  />
-
-    <!-- there is no supported way to differentiate between Windows 8.1 and Windows 10, so just install the driver on everything -->
-    <!-- the built in usbser.ini driver in Windows 10 will supersede the installed driver -->
-    <InstallExecuteSequence>
-      <?if $(var.Platform) = x64 ?>
-      <Custom Action="InstallDriver64" Before="InstallFinalize">NOT Installed AND NOT PATCH</Custom>
-      <?elseif $(var.Platform) = x86 ?>
-      <Custom Action="InstallDriver32" Before="InstallFinalize">NOT Installed AND NOT PATCH</Custom>
-      <?endif ?>
-    </InstallExecuteSequence>
-
-    <!-- show ui with eula and install directory pages -->
-    <Property Id="WIXUI_INSTALLDIR" Value="APPLICATIONROOTDIRECTORY" />
-    <WixVariable Id="WixUILicenseRtf" Value="license.rtf" />
-    <UIRef Id="WixUI_InstallDir" />
-  </Product>
-</Wix>
diff --git a/sw/installer/KFDtoolApp/license.rtf b/sw/installer/KFDtoolApp/license.rtf
deleted file mode 100644
index 4b03fdef427da6cb4369fa241d3cc78ccf25b741..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1258
zcmZ8h&2Hm15bilZ-eHhaTd1k*v>R-DVk|l)R+bD(-ZX$Nv_wg4Wzrz2HG&}T-l43d
z*aC)Z4rji<5&T+N-!3Ylothr?saq_6UsjE5+qlwZRJA#tgb#&5=x!0;-Mv<=(cT{h
z{1I2JRzua+y|7OD7>HG3`19@U`s%g%x$2~rR(NB9tGbuXGKNKb8{aPO??2tWRo|36
z|D$yCTQ$}TxW1}R!Zwu?%Q&vwu)P0-&*M1wMb)}xTm=E2VP#G)R&~9HWxV+O%Q8mL
zL}(=kNXD*{HlSQz?W8>_=akW)9Q4x4!wYm)XfK-xS}P@(7J}|hM&Jzy{Q@Ux9S)d-
z7fLJLfq)w6LZ|N$#+lZig_YRcfN;*#N+2FIrXG({d*K6Ls|M-dN8d}hDdvfrpC*z<
ziUE{HGzsrla8|xIqX#RUx2g^p5jNGs*aQvl*MmB$nIVi%8MvT)bm$=HjNoV*)rN05
z**cAfLAgGHMg{1@=&{p<Vl8!;LLa~4cAOlBfS^$K<n=#wQ%_*QY><DBXyQHh=J>r6
zjHn&0MoJ6?XBvZ%O^kob+J{O|-kM=B=U}Zix>3Qe`{S~;60gO<e3O%(%bK<ED0hl{
zTEZmcvf25{^#b)D<Qy7uW5l8KZV4TZ2j_A5_;$j{*opK1R&Qqw8wy3fE}saezzW#$
z{3}an0ym_<^GyU#tlZ@L60n1ltbB%i4J3PpFDy$UpnvT+Eegmvu<b5o6l*M7rTc_s
zkMMwVSzbcQwyZ?ZGKUfgXDCK-ZVg+?R~tko4=iQna|CNvW&v}Jpagb=mu$6935VUD
z@A85oeS)wV%hnuO=$2;XEwW+_=vO>Iu_0+XQIS2W=aarwzI*2EaZ|!3PZNs82a3wb
zLrO1HXlj)bwv8YmTk;sxamZ0HpW0@1Pa8UwkdNSJRkAz_Hdc97ay&-pl9wN&PpqI3
z5YCDa$eQN}AL7J`kXaVyGI~J?QBSHrHi9i7usxdo(2`J+A{MSE`>uK3DE=G$@Gk*g
BmvsOD

diff --git a/sw/installer/KFDtoolSetup.sln b/sw/installer/KFDtoolSetup.sln
deleted file mode 100644
index 42ecafc..0000000
--- a/sw/installer/KFDtoolSetup.sln
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.779
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "KFDtoolApp", "KFDtoolApp\KFDtoolApp.wixproj", "{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}.Debug|x64.ActiveCfg = Debug|x64
-		{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}.Debug|x64.Build.0 = Debug|x64
-		{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}.Debug|x86.ActiveCfg = Debug|x86
-		{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}.Debug|x86.Build.0 = Debug|x86
-		{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}.Release|x64.ActiveCfg = Release|x64
-		{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}.Release|x64.Build.0 = Release|x64
-		{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}.Release|x86.ActiveCfg = Release|x86
-		{5C62BD2E-BB98-4F86-A65C-AA9791179CD3}.Release|x86.Build.0 = Release|x86
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {F9549209-56E3-476F-B9D3-7F20B838D28D}
-	EndGlobalSection
-EndGlobal