diff --git a/dvm-firmware-hs.vcxproj b/dvm-firmware-hs.vcxproj
deleted file mode 100644
index f3c2a71..0000000
--- a/dvm-firmware-hs.vcxproj
+++ /dev/null
@@ -1,201 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <VCProjectVersion>16.0</VCProjectVersion>
-    <Keyword>Win32Proj</Keyword>
-    <ProjectGuid>{3733f055-083f-4bf4-9233-25d471de58d9}</ProjectGuid>
-    <RootNamespace>dvmfirmwarehs</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
-    <ProjectName>firmware-hs</ProjectName>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v142</PlatformToolset>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>Unicode</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="Shared">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LinkIncremental>true</LinkIncremental>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <LinkIncremental>false</LinkIncremental>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>MMDVM_HS_DUAL_HAT_REV10;DUPLEX;STM32F10X_MD;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>$(ProjectDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <ClCompile>
-      <WarningLevel>Level3</WarningLevel>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <ConformanceMode>true</ConformanceMode>
-    </ClCompile>
-    <Link>
-      <SubSystem>Console</SubSystem>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <OptimizeReferences>true</OptimizeReferences>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClInclude Include="ADF7021.h" />
-    <ClInclude Include="BitBuffer.h" />
-    <ClInclude Include="CalRSSI.h" />
-    <ClInclude Include="CWIdTX.h" />
-    <ClInclude Include="Defines.h" />
-    <ClInclude Include="dmr\CalDMR.h" />
-    <ClInclude Include="dmr\DMRDefines.h" />
-    <ClInclude Include="dmr\DMRDMORX.h" />
-    <ClInclude Include="dmr\DMRDMOTX.h" />
-    <ClInclude Include="dmr\DMRIdleRX.h" />
-    <ClInclude Include="dmr\DMRRX.h" />
-    <ClInclude Include="dmr\DMRSlotRX.h" />
-    <ClInclude Include="dmr\DMRSlotType.h" />
-    <ClInclude Include="dmr\DMRTX.h" />
-    <ClInclude Include="Globals.h" />
-    <ClInclude Include="IO.h" />
-    <ClInclude Include="p25\CalP25.h" />
-    <ClInclude Include="p25\P25Defines.h" />
-    <ClInclude Include="p25\P25RX.h" />
-    <ClInclude Include="p25\P25TX.h" />
-    <ClInclude Include="SerialPort.h" />
-    <ClInclude Include="SerialBuffer.h" />
-    <ClInclude Include="STM_UART.h" />
-    <ClInclude Include="Utils.h" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="ADF7021.cpp" />
-    <ClCompile Include="BitBuffer.cpp" />
-    <ClCompile Include="CalRSSI.cpp" />
-    <ClCompile Include="CWIdTX.cpp" />
-    <ClCompile Include="dmr\CalDMR.cpp" />
-    <ClCompile Include="dmr\DMRDMORX.cpp" />
-    <ClCompile Include="dmr\DMRDMOTX.cpp" />
-    <ClCompile Include="dmr\DMRIdleRX.cpp" />
-    <ClCompile Include="dmr\DMRRX.cpp" />
-    <ClCompile Include="dmr\DMRSlotRX.cpp" />
-    <ClCompile Include="dmr\DMRSlotType.cpp" />
-    <ClCompile Include="dmr\DMRTX.cpp" />
-    <ClCompile Include="FirmwareMain.cpp" />
-    <ClCompile Include="IO.cpp" />
-    <ClCompile Include="IOSTM.cpp" />
-    <ClCompile Include="p25\CalP25.cpp" />
-    <ClCompile Include="p25\P25RX.cpp" />
-    <ClCompile Include="p25\P25TX.cpp" />
-    <ClCompile Include="SerialPort.cpp" />
-    <ClCompile Include="SerialBuffer.cpp" />
-    <ClCompile Include="SerialSTM.cpp" />
-    <ClCompile Include="STM_UART.cpp" />
-    <ClCompile Include="Utils.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-    <None Include="Makefile.STM32FX" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
\ No newline at end of file
diff --git a/dvm-firmware-hs.vcxproj.filters b/dvm-firmware-hs.vcxproj.filters
deleted file mode 100644
index 8d5607c..0000000
--- a/dvm-firmware-hs.vcxproj.filters
+++ /dev/null
@@ -1,178 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Source Files">
-      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
-      <Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
-    </Filter>
-    <Filter Include="Header Files">
-      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
-      <Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
-    </Filter>
-    <Filter Include="Resource Files">
-      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
-      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
-    </Filter>
-    <Filter Include="Source Files\dmr">
-      <UniqueIdentifier>{03e2c302-d472-4e33-8ab9-53296423a641}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Source Files\p25">
-      <UniqueIdentifier>{19296f3e-bc16-4bc8-9faf-158ab22b8dc0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\dmr">
-      <UniqueIdentifier>{493de3cc-83da-49f4-ab01-a199ac989d23}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Header Files\p25">
-      <UniqueIdentifier>{ce2a5db1-59c6-4fdc-8774-f1d85651cd34}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="dmr\CalDMR.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRDefines.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRDMORX.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRDMOTX.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRIdleRX.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRRX.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRSlotRX.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRSlotType.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="dmr\DMRTX.h">
-      <Filter>Header Files\dmr</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\P25Defines.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\P25RX.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\P25TX.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-    <ClInclude Include="ADF7021.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="BitBuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CalRSSI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="CWIdTX.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Globals.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="IO.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SerialPort.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="SerialBuffer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Utils.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="Defines.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="STM_UART.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="p25\CalP25.h">
-      <Filter>Header Files\p25</Filter>
-    </ClInclude>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="dmr\CalDMR.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\DMRDMORX.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\DMRDMOTX.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\DMRIdleRX.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\DMRRX.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\DMRSlotRX.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\DMRSlotType.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="dmr\DMRTX.cpp">
-      <Filter>Source Files\dmr</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\P25RX.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\P25TX.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-    <ClCompile Include="ADF7021.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="BitBuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CalRSSI.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="CWIdTX.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="FirmwareMain.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IO.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="IOSTM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SerialPort.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SerialBuffer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="SerialSTM.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="Utils.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="STM_UART.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="p25\CalP25.cpp">
-      <Filter>Source Files\p25</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Makefile" />
-    <None Include="Makefile.STM32FX" />
-  </ItemGroup>
-</Project>
\ No newline at end of file