Corrected driver to work properly under Linux

gusmanb · Feb 7, 2023 · bba03c6 · bba03c6
1 parent ab32e4f
commit bba03c6
Show file tree

Hide file tree

Showing 10 changed files with 204 additions and 127 deletions.
diff --git a/Software/LogicAnalyzer/CLCapture/CLCapture.csproj b/Software/LogicAnalyzer/CLCapture/CLCapture.csproj
@@ -6,6 +6,7 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <ApplicationIcon>window.ico</ApplicationIcon>
+    <Version>3.5.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Software/LogicAnalyzer/CLCapture/Program.cs b/Software/LogicAnalyzer/CLCapture/Program.cs
@@ -186,6 +186,9 @@ async Task<int> Capture(CLCaptureOptions opts)
                 case CaptureError.HardwareError:
                     Console.WriteLine("Device reported error starting capture. Restart the device and try again.");
                     return -1;
+                case CaptureError.UnexpectedError:
+                    Console.WriteLine("Unexpected error. Restart the device and try again.");
+                    return -1;
             }
         }
 
@@ -223,6 +226,9 @@ async Task<int> Capture(CLCaptureOptions opts)
                 case CaptureError.HardwareError:
                     Console.WriteLine("Device reported error starting capture. Restart the device and try again.");
                     return -1;
+                case CaptureError.UnexpectedError:
+                    Console.WriteLine("Unexpected error. Restart the device and try again.");
+                    return -1;
             }
         }
 

diff --git a/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj b/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CProtocolAnalyzer.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>3.5.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj b/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj
@@ -8,6 +8,7 @@
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
     <ApplicationIcon>Assets\window.ico</ApplicationIcon>
     <AllowUnsafeBlocks>True</AllowUnsafeBlocks>
+    <Version>3.5.0.1</Version>
   </PropertyGroup>
   <ItemGroup>
     <None Remove=".gitignore" />

diff --git a/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj.user b/Software/LogicAnalyzer/LogicAnalyzer/LogicAnalyzer.csproj.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <_LastSelectedProfileId>C:\Users\geniw\source\repos\LogicAnalyzer\LogicAnalyzer\Properties\PublishProfiles\Windows-Arm64.pubxml</_LastSelectedProfileId>
+    <_LastSelectedProfileId>C:\Users\geniw\source\repos\LogicAnalyzer\LogicAnalyzer\Properties\PublishProfiles\Linux-Arm.pubxml</_LastSelectedProfileId>
   </PropertyGroup>
 </Project>
diff --git a/Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml.cs b/Software/LogicAnalyzer/LogicAnalyzer/MainWindow.axaml.cs
@@ -561,6 +561,9 @@ private async Task ShowError(CaptureError error)
                 case CaptureError.HardwareError:
                     await ShowError("Error", "Device reported error starting capture. Restart the device and try again.");
                     return;
+                case CaptureError.UnexpectedError:
+                    await ShowError("Error", "Unexpected error, restart the application and the device and try again.");
+                    return;
             }
         }
 

diff --git a/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIProtocolAnalyzer.csproj b/Software/LogicAnalyzer/SPIProtocolAnalyzer/SPIProtocolAnalyzer.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>3.5.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/Software/LogicAnalyzer/SerialProtocolAnalyzer/SerialProtocolAnalyzer.csproj b/Software/LogicAnalyzer/SerialProtocolAnalyzer/SerialProtocolAnalyzer.csproj
@@ -4,6 +4,7 @@
     <TargetFramework>net6.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Version>3.5.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>