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
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