diff --git a/.vs/Testrong.User.Program/v17/.suo b/.vs/Testrong.User.Program/v17/.suo index a2e3518..9038db4 100644 Binary files a/.vs/Testrong.User.Program/v17/.suo and b/.vs/Testrong.User.Program/v17/.suo differ diff --git a/.vs/Testrong.User.Program/v17/DocumentLayout.backup.json b/.vs/Testrong.User.Program/v17/DocumentLayout.backup.json index 7f93a8f..615bfde 100644 --- a/.vs/Testrong.User.Program/v17/DocumentLayout.backup.json +++ b/.vs/Testrong.User.Program/v17/DocumentLayout.backup.json @@ -28,7 +28,7 @@ "RelativeDocumentMoniker": "Testrong.User.Program\\UserProgram.cs", "ToolTip": "D:\\WORK\\ManLin\\Verify\\UserProgram_time\\Testrong.User.Program\\UserProgram.cs", "RelativeToolTip": "Testrong.User.Program\\UserProgram.cs", - "ViewState": "AgIAAG8KAAAAAAAAAAAUwHQKAABBAAAAAAAAAA==", + "ViewState": "AgIAAJUDAAAAAAAAAAAiwLEDAAANAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-06-18T12:27:43.78Z", "EditorCaption": "" diff --git a/.vs/Testrong.User.Program/v17/DocumentLayout.json b/.vs/Testrong.User.Program/v17/DocumentLayout.json index 615bfde..ff4fb63 100644 --- a/.vs/Testrong.User.Program/v17/DocumentLayout.json +++ b/.vs/Testrong.User.Program/v17/DocumentLayout.json @@ -28,7 +28,7 @@ "RelativeDocumentMoniker": "Testrong.User.Program\\UserProgram.cs", "ToolTip": "D:\\WORK\\ManLin\\Verify\\UserProgram_time\\Testrong.User.Program\\UserProgram.cs", "RelativeToolTip": "Testrong.User.Program\\UserProgram.cs", - "ViewState": "AgIAAJUDAAAAAAAAAAAiwLEDAAANAAAAAAAAAA==", + "ViewState": "AgIAAK8DAAAAAAAAAAAkwLEDAAANAAAAAAAAAA==", "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", "WhenOpened": "2024-06-18T12:27:43.78Z", "EditorCaption": "" diff --git a/Testrong.User.Program/UserProgram.cs b/Testrong.User.Program/UserProgram.cs index afdcea0..cc4dee4 100644 --- a/Testrong.User.Program/UserProgram.cs +++ b/Testrong.User.Program/UserProgram.cs @@ -1681,11 +1681,12 @@ namespace Testrong.User.Program - extCaliHandle.SetPpmuExternalCalibration(extConnStr, extPort, 1, ExternalCalibrationMode.Channel, 1, ExtCaliVI.V, ExtCaliLoad.RC_RL7, 0); + extCaliHandle.SetPpmuExternalCalibration(extConnStr, extPort, 1, ExternalCalibrationMode.Channel, 1, ExtCaliVI.V, ExtCaliLoad.RC_RL7, 0); //1kΩ double rload = GetRloadValue(dmm, 2000, 5); string filetime = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss"); - + #region The Test + for (int loopk = 0; loopk < 256; loopk++) { #region Test Config @@ -1744,7 +1745,7 @@ namespace Testrong.User.Program type: "PMU", channel: ch, mode: "FVMV", - rload: "Hi-Z", + rload: rload.ToString(), extR: ExtBoard_Res, range: "2mA", ForceValue: ForceValue, @@ -1772,7 +1773,7 @@ namespace Testrong.User.Program } #endregion - + swdata.Flush(); swdata.Close(); Thread.Sleep(1000); diff --git a/Testrong.User.Program/bin/x64/Debug/UserProgram.dll b/Testrong.User.Program/bin/x64/Debug/UserProgram.dll index 7e7085e..aa5ad60 100644 Binary files a/Testrong.User.Program/bin/x64/Debug/UserProgram.dll and b/Testrong.User.Program/bin/x64/Debug/UserProgram.dll differ diff --git a/Testrong.User.Program/bin/x64/Debug/UserProgram.pdb b/Testrong.User.Program/bin/x64/Debug/UserProgram.pdb index bd30ca8..f2745ce 100644 Binary files a/Testrong.User.Program/bin/x64/Debug/UserProgram.pdb and b/Testrong.User.Program/bin/x64/Debug/UserProgram.pdb differ diff --git a/Testrong.User.Program/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Testrong.User.Program/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 0bd30f8..e011ed5 100644 Binary files a/Testrong.User.Program/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Testrong.User.Program/obj/x64/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.AssemblyReference.cache b/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.AssemblyReference.cache index 674eee6..4c122f1 100644 Binary files a/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.AssemblyReference.cache and b/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.AssemblyReference.cache differ diff --git a/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.CoreCompileInputs.cache b/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.CoreCompileInputs.cache index 5e43543..8c93ce3 100644 --- a/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.CoreCompileInputs.cache +++ b/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -1c5e67c428e7ea9ad83db74e3225f3a6ee4bdaaf429227caea859a4df23e5fee +d21702e1f0131c64a3bf3ae1e7990262e428a3f3 diff --git a/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.FileListAbsolute.txt b/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.FileListAbsolute.txt index 7aa72a1..936b21b 100644 --- a/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.FileListAbsolute.txt +++ b/Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.FileListAbsolute.txt @@ -2475,3 +2475,56 @@ D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\obj\x6 D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Program.csproj.CopyComplete D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.dll D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.pdb +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.pdb +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Ivi.Visa.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\NationalInstruments.Visa.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Common.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Communicate.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Model.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Primitives.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\NLog.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Buffers.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Globalization.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Bcl.HashCode.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Datalog.Interfaces.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Hardware.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MxFFTCalc.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MWArray.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MathNet.Numerics.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Gramar.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Extensions.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.Abstractions.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.ValueTuple.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Antlr4.Runtime.Standard.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Options.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Primitives.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Memory.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Numerics.Vectors.dll +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Model.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Primitives.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.xml +F:\syy\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.xml +F:\syy\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Program.csproj.AssemblyReference.cache +F:\syy\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Program.csproj.CoreCompileInputs.cache +F:\syy\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Program.csproj.CopyComplete +F:\syy\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.dll +F:\syy\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.pdb diff --git a/Testrong.User.Program/obj/x64/Debug/UserProgram.dll b/Testrong.User.Program/obj/x64/Debug/UserProgram.dll index 7e7085e..aa5ad60 100644 Binary files a/Testrong.User.Program/obj/x64/Debug/UserProgram.dll and b/Testrong.User.Program/obj/x64/Debug/UserProgram.dll differ diff --git a/Testrong.User.Program/obj/x64/Debug/UserProgram.pdb b/Testrong.User.Program/obj/x64/Debug/UserProgram.pdb index bd30ca8..f2745ce 100644 Binary files a/Testrong.User.Program/obj/x64/Debug/UserProgram.pdb and b/Testrong.User.Program/obj/x64/Debug/UserProgram.pdb differ