yuysh/ExtInstrument_Cal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix conflict bug & Add some comment

Browse Source
This commit is contained in:
YuYang Shen
2025-03-24 10:33:19 +08:00
parent 8a70c0e962
commit cc41b6d6f0
17 changed files with 67 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.vs/Testrong.User.Program/FileContentIndex/ba92b8af-5167-4ed7-9e50-e749e26c11c9.vsidx
BIN
View File
Binary file not shown.
.vs/Testrong.User.Program/FileContentIndex/fab4bd8e-08d0-4d87-a65d-e650a3edf3a9.vsidx
BIN
View File
Binary file not shown.
.vs/Testrong.User.Program/v17/.suo
BIN
View File
Binary file not shown.
.vs/Testrong.User.Program/v17/DocumentLayout.backup.json
+1 -1
View File
@@ -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": "AgIAAMwDAAAAAAAAAAAmwOoDAAAyAAAAAAAAAA==",
"ViewState": "AgIAAOwMAAAAAAAAAAA4wJgHAABBAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-06-18T12:27:43.78Z",
"EditorCaption": ""
.vs/Testrong.User.Program/v17/DocumentLayout.json
+1 -1
View File
@@ -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": "AgIAAOwMAAAAAAAAAAA4wJgHAABBAAAAAAAAAA==",
"ViewState": "AgIAADwGAAAAAAAAAAAYwJgHAABBAAAAAAAAAA==",
"Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
"WhenOpened": "2024-06-18T12:27:43.78Z",
"EditorCaption": ""
Testrong.User.Program/UserProgram.cs
+11 -7
View File
@@ -968,6 +968,7 @@ namespace Testrong.User.Program
/// <summary>
/// Write Data To File, Need import StreamWriter and close FileHandler after using this func
/// !!! If you want to Do CUSTOM format, add new case for contextFormat
/// </summary>
/// <param name="sw">StreamWriter, Need to be initialized first</param>
/// <param name="slot">Slot Number</param>
@@ -1053,7 +1054,7 @@ namespace Testrong.User.Program
sw.Write("Meas_Range,13V\n");
sw.Write("\n");
sw.Write("Force Value,ATE Measure,DMM Measure,Temperature\n");
for (int writeLine = SampliCount; writeLine < SampliCount; writeLine++)
for (int writeLine = 0; writeLine < SampliCount; writeLine++)
{
if (mode == "FVMV" || mode == "FZMV")
@@ -1466,6 +1467,9 @@ namespace Testrong.User.Program
int SlotNum = context.Communicator.SlotNo;
double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv");
//Folder Related
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
//-----Start Slot Number-----
StreamWriter swdata;
swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8)
@@ -1493,12 +1497,10 @@ namespace Testrong.User.Program
dmm.InitDMM(ksightConnStr);
#endregion
//Folder Related
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
string filetime = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
#region Test
#region The Test
for (int loopk = 0; loopk < 256; loopk++)
{
#region Test Config
@@ -1627,6 +1629,9 @@ namespace Testrong.User.Program
string arm_dna = BitConverter.ToUInt64(armDnaRaw, 0).ToString();
int SlotNum = context.Communicator.SlotNo;
//-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
//-----Start Write MetaData-----
StreamWriter swdata;
swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8)
@@ -1657,15 +1662,14 @@ namespace Testrong.User.Program
//-----Read R File-----
double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv");
//-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
extCaliHandle.SetPpmuExternalCalibration(extConnStr, extPort, 1, ExternalCalibrationMode.Channel, 1, ExtCaliVI.V, ExtCaliLoad.RC_RL7, 0);
double rload = GetRloadValue(dmm, 2000, 5);
string filetime = DateTime.Now.ToString("yyyy-MM-dd HH-mm-ss");
#region Test
#region The Test
for (int loopk = 0; loopk < 256; loopk++)
{
#region Test Config
Testrong.User.Program/bin/x64/Debug/Testrong.Core.Common.dll
BIN
View File
Binary file not shown.
Testrong.User.Program/bin/x64/Debug/Testrong.Core.Communicate.dll
BIN
View File
Binary file not shown.
Testrong.User.Program/bin/x64/Debug/Testrong.Core.Model.dll
BIN
View File
Binary file not shown.
Testrong.User.Program/bin/x64/Debug/Testrong.Core.Primitives.dll
BIN
View File
Binary file not shown.
Testrong.User.Program/bin/x64/Debug/UserProgram.dll
BIN
View File
Binary file not shown.
Testrong.User.Program/bin/x64/Debug/UserProgram.pdb
BIN
View File
Binary file not shown.
Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.AssemblyReference.cache
BIN
View File
Binary file not shown.
Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.CoreCompileInputs.cache
+1 -1
View File
@@ -1 +1 @@
1c5e67c428e7ea9ad83db74e3225f3a6ee4bdaaf429227caea859a4df23e5fee
e22cab61aa47f7f86ab40c847a6a130a00a4b8a3
Testrong.User.Program/obj/x64/Debug/Testrong.User.Program.csproj.FileListAbsolute.txt
+53
View File
@@ -2422,3 +2422,56 @@ D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testr
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.dll
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\obj\x64\Debug\UserProgram.pdb
D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\UserProgram.pdb
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Ivi.Visa.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\NationalInstruments.Visa.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Common.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Communicate.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Model.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Primitives.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\NLog.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Buffers.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Globalization.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Bcl.HashCode.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Datalog.Interfaces.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Hardware.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MxFFTCalc.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MWArray.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MathNet.Numerics.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Gramar.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Extensions.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.Abstractions.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.ValueTuple.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Antlr4.Runtime.Standard.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Options.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Primitives.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Memory.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Numerics.Vectors.dll
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Model.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Primitives.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.xml
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Program.csproj.AssemblyReference.cache
D:\LZ\00000zd\UserProgram_ReWorked\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Program.csproj.CoreCompileInputs.cache
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
Testrong.User.Program/obj/x64/Debug/UserProgram.dll
BIN
View File
Binary file not shown.
Testrong.User.Program/obj/x64/Debug/UserProgram.pdb
BIN
View File
Binary file not shown.