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

Bug Fix: ThreadLocker

Browse Source
This commit is contained in:
YuYang Shen
2025-06-11 19:01:32 +08:00
parent 7af77b7cfe
commit 094e6bec2e
1 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Testrong.User.Program/UserProgram.cs
+15 -14
View File
@@ -1506,10 +1506,11 @@ namespace Testrong.User.Program
int SlotNum = context.Communicator.SlotNo; int SlotNum = context.Communicator.SlotNo;
double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv"); double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv");
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true);
//Folder Related //Folder Related
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true);
//-----Start Slot Number----- //-----Start Slot Number-----
StreamWriter swdata; StreamWriter swdata;
@@ -1670,12 +1671,12 @@ namespace Testrong.User.Program
string arm_dna = BitConverter.ToUInt64(armDnaRaw, 0).ToString(); string arm_dna = BitConverter.ToUInt64(armDnaRaw, 0).ToString();
int SlotNum = context.Communicator.SlotNo; int SlotNum = context.Communicator.SlotNo;
//-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
//---------Thread Locker-------- //---------Thread Locker--------
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true);
//-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
//-----Start Write MetaData----- //-----Start Write MetaData-----
StreamWriter swdata; StreamWriter swdata;
swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8) swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8)
@@ -2376,12 +2377,11 @@ namespace Testrong.User.Program
double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv"); double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv");
#region File/Folder Prepartion #region File/Folder Prepartion
//-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Normal", isPreCheck: isPreCheck);
//---------Thread Locker-------- //---------Thread Locker--------
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true);
//-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Normal", isPreCheck: isPreCheck);
//-----Start Slot Number----- //-----Start Slot Number-----
// Write MetaData.csv Header // Write MetaData.csv Header
@@ -3183,11 +3183,11 @@ namespace Testrong.User.Program
int SlotNum = context.Communicator.SlotNo; int SlotNum = context.Communicator.SlotNo;
double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv"); double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv");
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true);
//Folder Related //Folder Related
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL",lockFlag:true);
//-----Start Slot Number----- //-----Start Slot Number-----
StreamWriter swdata; StreamWriter swdata;
swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8) swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8)
@@ -3346,11 +3346,12 @@ namespace Testrong.User.Program
{232,240 }, {232,240 },
{233,239 } {233,239 }
}; };
//---------Thread Locker--------
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true);
//-----Move File To History----- //-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single"); File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
//---------Thread Locker--------
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true);
//-----Start Write MetaData----- //-----Start Write MetaData-----
StreamWriter swdata; StreamWriter swdata;
@@ -3679,12 +3680,12 @@ namespace Testrong.User.Program
string arm_dna = BitConverter.ToUInt64(armDnaRaw, 0).ToString(); string arm_dna = BitConverter.ToUInt64(armDnaRaw, 0).ToString();
int SlotNum = context.Communicator.SlotNo; int SlotNum = context.Communicator.SlotNo;
//-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
//---------Thread Locker-------- //---------Thread Locker--------
SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true); SlotThreadLocker(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL", lockFlag: true);
//-----Move File To History-----
File_Mover(SlotNum: SlotNum, slotList: slotList, pathFlag: "CAL_Single");
//-----Start Write MetaData----- //-----Start Write MetaData-----
StreamWriter swdata; StreamWriter swdata;
swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8) swdata = new StreamWriter(METADATA_PATH, true, Encoding.UTF8)