yang/logicanalyzer
1
0
Fork 0
mirror of https://github.com/JasonYANG170/logicanalyzer.git synced 2024-11-23 12:06:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update to V5.1

Browse Source
This commit is contained in:
Agustín Gimenez 2024-05-05 13:26:11 +02:00
parent c13c6fcbd3
commit 5838d0360e
1 changed files with 31 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Software/LogicAnalyzer/SharedDriver/LogicAnalyzerDriver.cs
View File

@ -84,27 +84,10 @@ namespace SharedDriver
baseStream.ReadTimeout = 10000; baseStream.ReadTimeout = 10000;
DeviceVersion = readResponse.ReadLine(); DeviceVersion = readResponse.ReadLine();
var verMatch = regVersion.Match(DeviceVersion ?? ""); if (!ValidateVersion())
if (verMatch == null || !verMatch.Success || !verMatch.Groups[2].Success)
{ {
Dispose(); Dispose();
throw new DeviceConnectionException($"Invalid device version V{ (string.IsNullOrWhiteSpace(verMatch?.Value) ? "(unknown)" : verMatch?.Value) }, minimum supported version: V{MAJOR_VERSION}_{MINOR_VERSION}"); throw new DeviceConnectionException($"Invalid device version {DeviceVersion}, minimum supported version: V{MAJOR_VERSION}_{MINOR_VERSION}");
}
int majorVer = int.Parse(verMatch.Groups[2].Value);
int minorVer = int.Parse(verMatch.Groups[3].Value);
if (majorVer < MAJOR_VERSION)
{
Dispose();
throw new DeviceConnectionException($"Invalid device version V{verMatch.Value}, minimum supported version: V{MAJOR_VERSION}_{MINOR_VERSION}");
}
if (majorVer == MAJOR_VERSION && minorVer < MINOR_VERSION)
{
Dispose();
throw new DeviceConnectionException($"Invalid device version V{verMatch.Value}, minimum supported version: V{MAJOR_VERSION}_{MINOR_VERSION}");
} }
baseStream.ReadTimeout = Timeout.Infinite; baseStream.ReadTimeout = Timeout.Infinite;
@ -139,10 +122,38 @@ namespace SharedDriver
baseStream.ReadTimeout = 10000; baseStream.ReadTimeout = 10000;
DeviceVersion = readResponse.ReadLine(); DeviceVersion = readResponse.ReadLine();
if (!ValidateVersion())
{
Dispose();
throw new DeviceConnectionException($"Invalid device version {DeviceVersion}, minimum supported version: V{MAJOR_VERSION}_{MINOR_VERSION}");
}
baseStream.ReadTimeout = Timeout.Infinite; baseStream.ReadTimeout = Timeout.Infinite;
isNetwork = true; isNetwork = true;
} }
private bool ValidateVersion()
{
var verMatch = regVersion.Match(DeviceVersion ?? "");
if (verMatch == null || !verMatch.Success || !verMatch.Groups[2].Success)
return false;
int majorVer = int.Parse(verMatch.Groups[2].Value);
int minorVer = int.Parse(verMatch.Groups[3].Value);
if (majorVer < MAJOR_VERSION)
return false;
if (majorVer == MAJOR_VERSION && minorVer < MINOR_VERSION)
return false;
return true;
}
public unsafe bool SendNetworkConfig(string AccesPointName, string Password, string IPAddress, ushort Port) public unsafe bool SendNetworkConfig(string AccesPointName, string Password, string IPAddress, ushort Port)
{ {
if(isNetwork) if(isNetwork)
@ -525,7 +536,6 @@ namespace SharedDriver
readData = null; readData = null;
readData = null; readData = null;
DeviceVersion = null;
CaptureCompleted = null; CaptureCompleted = null;
} }