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

Fix Freq File Content Logic

Browse Source
This commit is contained in:
YuYang Shen
2025-06-19 16:51:10 +08:00
parent 094e6bec2e
commit 89aec53990
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Testrong.User.Program/UserProgram.cs
+11 -13
View File
@@ -76,6 +76,7 @@ namespace Testrong.User.Program
const string EXT_CAL_HISTORY_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\ExtCal_History\\"; const string EXT_CAL_HISTORY_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\ExtCal_History\\";
const string EXT_CAL_INIT_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\CalibrationLog\\Init_Files\\"; const string EXT_CAL_INIT_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\CalibrationLog\\Init_Files\\";
const string EXT_CAL_FREQ_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\Ext_Freq\\"; const string EXT_CAL_FREQ_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\Ext_Freq\\";
const string EXT_CAL_FREQ_MV_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\Ext_Freq_bak\\";
const string EXT_CAL_FREQ_HISTORY_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\Ext_FreqHistory\\"; const string EXT_CAL_FREQ_HISTORY_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\Ext_FreqHistory\\";
const string EXT_CAL_INITVALUE_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\DPSPPMUParam\\"; const string EXT_CAL_INITVALUE_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\DPSPPMUParam\\";
const string DOWN_INITVALUE_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\CalibrationLog\\DownInitValue\\"; const string DOWN_INITVALUE_PATH = "C:\\ProgramData\\Testrong\\ATE_Tester\\CalibrationLog\\DownInitValue\\";
@@ -623,7 +624,7 @@ namespace Testrong.User.Program
case "Freq": case "Freq":
WritePath = EXT_CAL_FREQ_PATH; WritePath = EXT_CAL_FREQ_PATH;
HistoryPath = EXT_CAL_FREQ_HISTORY_PATH; HistoryPath = EXT_CAL_FREQ_HISTORY_PATH;
BakPath = "C:\\ProgramData\\Testrong\\ATE_Tester"; BakPath = EXT_CAL_FREQ_MV_PATH;
break; break;
default: default:
WritePath = EXT_CAL_PATH; WritePath = EXT_CAL_PATH;
@@ -1039,15 +1040,12 @@ namespace Testrong.User.Program
{ {
case "Freq": case "Freq":
sw.Write("Channel_No,Freq_Force,Freq_Measure\n"); sw.Write("Channel_No,Freq_Force,Freq_Measure\n");
for (int fCount = 0; fCount < SampliCount; fCount++) // 625K - 32M for(int ch=0; ch<channel;ch ++)
{ {
for(int ch=0; ch<channel;ch ++) sw.Write($"{ch + 1},");
{ sw.Write($"{customData[2 * ch]:F3},");
sw.Write($"{ch},"); sw.Write($"{customData[2 * ch + 1]:F5}\n");
sw.Write($"{customData[2 * (fCount)]:F3},"); sw.Flush();
sw.Write($"{customData[2 * (fCount+1)]:F5}\n");
sw.Flush();
}
} }
break; break;
case "RintGND": case "RintGND":
@@ -1290,10 +1288,10 @@ namespace Testrong.User.Program
} }
FreqCounter53220A.InitDMM53220A(addressFreq, Keysight53220A.KeysightMeasMode.FREQ); FreqCounter53220A.InitDMM53220A(addressFreq, Keysight53220A.KeysightMeasMode.FREQ);
} }
Thread.Sleep(100); Thread.Sleep(100);
double[] customData = new double[2 * (FreqStr.Length + 1)];
for (int fCount = 0; fCount < FreqStr.Length; fCount++) // 625K - 32M for (int fCount = 0; fCount < FreqStr.Length; fCount++) // 625K - 32M
{ {
double[] customData = new double[2 * PmuChannelCount];
string FreqFileNmae = EXT_CAL_FREQ_PATH + "Slot" + SlotNum + "_" + "Freq" + "_" + FreqStr[fCount] + ".csv"; string FreqFileNmae = EXT_CAL_FREQ_PATH + "Slot" + SlotNum + "_" + "Freq" + "_" + FreqStr[fCount] + ".csv";
StreamWriter sw = new StreamWriter(FreqFileNmae, true, Encoding.UTF8); StreamWriter sw = new StreamWriter(FreqFileNmae, true, Encoding.UTF8);
Thread.Sleep(10); Thread.Sleep(10);
@@ -1344,8 +1342,8 @@ namespace Testrong.User.Program
break; break;
} }
} }
customData[2 * (fCount)] = FreqForce[fCount]; customData[2 * loopk] = FreqForce[fCount];
customData[2 * (fCount + 1)] = freqValue; customData[2 * loopk + 1] = freqValue;
sw.Flush(); sw.Flush();
} }
double[,] ZeroExtR = { double[,] ZeroExtR = {