diff --git a/.vs/Testrong.User.Program/v17/.suo b/.vs/Testrong.User.Program/v17/.suo index 6b6bfcf..2c35095 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 615bfde..64aca2d 100644 --- a/.vs/Testrong.User.Program/v17/DocumentLayout.backup.json +++ b/.vs/Testrong.User.Program/v17/DocumentLayout.backup.json @@ -5,6 +5,9 @@ { "AbsoluteMoniker": "D:0:0:{E96B1A19-D109-4F67-B1AA-5BF15E580D77}|Testrong.User.Program\\Testrong.User.Program.csproj|d:\\work\\manlin\\verify\\userprogram_time\\testrong.user.program\\userprogram.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{E96B1A19-D109-4F67-B1AA-5BF15E580D77}|Testrong.User.Program\\Testrong.User.Program.csproj|solutionrelative:testrong.user.program\\userprogram.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ly0koS\\Documents\\WXWork\\1688856239523711\\Cache\\File\\2025-03\\UserProgram\u002BComment.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -17,8 +20,15 @@ "SelectedChildIndex": 1, "Children": [ { - "$type": "Bookmark", - "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + "$type": "Document", + "DocumentIndex": 1, + "Title": "UserProgram\u002BComment.cs", + "DocumentMoniker": "C:\\Users\\ly0koS\\Documents\\WXWork\\1688856239523711\\Cache\\File\\2025-03\\UserProgram\u002BComment.cs", + "ToolTip": "C:\\Users\\ly0koS\\Documents\\WXWork\\1688856239523711\\Cache\\File\\2025-03\\UserProgram\u002BComment.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-31T02:24:51.68Z", + "EditorCaption": "" }, { "$type": "Document", @@ -28,7 +38,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": "AgIAAOsKAAAAAAAAAAAQwAULAABNAAAAAAAAAA==", "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 ff4fb63..64aca2d 100644 --- a/.vs/Testrong.User.Program/v17/DocumentLayout.json +++ b/.vs/Testrong.User.Program/v17/DocumentLayout.json @@ -5,6 +5,9 @@ { "AbsoluteMoniker": "D:0:0:{E96B1A19-D109-4F67-B1AA-5BF15E580D77}|Testrong.User.Program\\Testrong.User.Program.csproj|d:\\work\\manlin\\verify\\userprogram_time\\testrong.user.program\\userprogram.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}", "RelativeMoniker": "D:0:0:{E96B1A19-D109-4F67-B1AA-5BF15E580D77}|Testrong.User.Program\\Testrong.User.Program.csproj|solutionrelative:testrong.user.program\\userprogram.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" + }, + { + "AbsoluteMoniker": "D:0:0:{A2FE74E1-B743-11D0-AE1A-00A0C90FFFC3}|\u003CMiscFiles\u003E|C:\\Users\\ly0koS\\Documents\\WXWork\\1688856239523711\\Cache\\File\\2025-03\\UserProgram\u002BComment.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}" } ], "DocumentGroupContainers": [ @@ -17,8 +20,15 @@ "SelectedChildIndex": 1, "Children": [ { - "$type": "Bookmark", - "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}" + "$type": "Document", + "DocumentIndex": 1, + "Title": "UserProgram\u002BComment.cs", + "DocumentMoniker": "C:\\Users\\ly0koS\\Documents\\WXWork\\1688856239523711\\Cache\\File\\2025-03\\UserProgram\u002BComment.cs", + "ToolTip": "C:\\Users\\ly0koS\\Documents\\WXWork\\1688856239523711\\Cache\\File\\2025-03\\UserProgram\u002BComment.cs", + "ViewState": "AgIAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA==", + "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|", + "WhenOpened": "2025-03-31T02:24:51.68Z", + "EditorCaption": "" }, { "$type": "Document", @@ -28,7 +38,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": "AgIAAK8DAAAAAAAAAAAkwLEDAAANAAAAAAAAAA==", + "ViewState": "AgIAAOsKAAAAAAAAAAAQwAULAABNAAAAAAAAAA==", "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 14c41e8..5e60db7 100644 --- a/Testrong.User.Program/UserProgram.cs +++ b/Testrong.User.Program/UserProgram.cs @@ -93,7 +93,7 @@ namespace Testrong.User.Program #region FVMV - Dictionary avgDelays_fvmv_pmu = new Dictionary() + readonly Dictionary avgDelays_fvmv_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 40, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, @@ -102,7 +102,7 @@ namespace Testrong.User.Program {"60mA", new TestParaSet{delayMs = 15, avgTimes = 64, samDelay = 100 } }, }; - Dictionary avgDelays_fvmv_dps = new Dictionary() + readonly Dictionary avgDelays_fvmv_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 40, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, @@ -113,7 +113,7 @@ namespace Testrong.User.Program }; #endregion #region FZMV - Dictionary avgDelays_fzmv_pmu = new Dictionary() + readonly Dictionary avgDelays_fzmv_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 30, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 10, avgTimes = 64, samDelay = 100 } }, @@ -123,7 +123,7 @@ namespace Testrong.User.Program }; #endregion #region FIMV PMU - Dictionary avgDelays_1kft_fimv_pmu = new Dictionary() + readonly Dictionary avgDelays_1kft_fimv_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 60, avgTimes = 128, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, @@ -131,7 +131,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 15, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_1kcp_fimv_pmu = new Dictionary() + readonly Dictionary avgDelays_1kcp_fimv_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 60, avgTimes = 128, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, @@ -139,7 +139,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 15, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_2kft_fimv_pmu = new Dictionary() + readonly Dictionary avgDelays_2kft_fimv_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 60, avgTimes = 128, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, @@ -147,7 +147,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 15, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 30, avgTimes = 128, samDelay = 100 } }, }; - Dictionary avgDelays_ppmucp_fimv_pmu = new Dictionary() + readonly Dictionary avgDelays_ppmucp_fimv_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 60, avgTimes = 255, samDelay = 300 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 128, samDelay = 300 } }, @@ -155,7 +155,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 15, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_ppmuft_fimv_pmu = new Dictionary() + readonly Dictionary avgDelays_ppmuft_fimv_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 60, avgTimes = 255, samDelay = 300 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 128, samDelay = 300 } }, @@ -163,7 +163,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 15, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_2km_fimv_pmu = new Dictionary() + readonly Dictionary avgDelays_2km_fimv_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 60, avgTimes = 255, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 128, samDelay = 100 } }, @@ -173,7 +173,7 @@ namespace Testrong.User.Program }; #endregion #region FIMV DPS - Dictionary avgDelays_1kft_fimv_dps = new Dictionary() + readonly Dictionary avgDelays_1kft_fimv_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 250, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 70, avgTimes = 64, samDelay = 100 } }, @@ -181,7 +181,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, }; - Dictionary avgDelays_1kcp_fimv_dps = new Dictionary() + readonly Dictionary avgDelays_1kcp_fimv_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 250, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 70, avgTimes = 64, samDelay = 100 } }, @@ -189,7 +189,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, }; - Dictionary avgDelays_2kft_fimv_dps = new Dictionary() + readonly Dictionary avgDelays_2kft_fimv_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 250, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 70, avgTimes = 32, samDelay = 100 } }, @@ -197,7 +197,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 15, avgTimes = 32, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 15, avgTimes = 32, samDelay = 100 } }, }; - Dictionary avgDelays_ppmucp_fimv_dps = new Dictionary() + readonly Dictionary avgDelays_ppmucp_fimv_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 250, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 70, avgTimes = 64, samDelay = 100 } }, @@ -205,7 +205,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, }; - Dictionary avgDelays_ppmuft_fimv_dps = new Dictionary() + readonly Dictionary avgDelays_ppmuft_fimv_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 250, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 70, avgTimes = 64, samDelay = 100 } }, @@ -213,7 +213,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 20, avgTimes = 64, samDelay = 100 } }, }; - Dictionary avgDelays_2km_fimv_dps = new Dictionary() + readonly Dictionary avgDelays_2km_fimv_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 250, avgTimes = 64, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 70, avgTimes = 64, samDelay = 100 } }, @@ -223,7 +223,7 @@ namespace Testrong.User.Program }; #endregion #region FVMI PMU - Dictionary avgDelays_1kft_fvmi_pmu = new Dictionary() + readonly Dictionary avgDelays_1kft_fvmi_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 128, samDelay = 100 } }, @@ -231,7 +231,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 10, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 10, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_1kcp_fvmi_pmu = new Dictionary() + readonly Dictionary avgDelays_1kcp_fvmi_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 200 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 128, samDelay = 100 } }, @@ -239,7 +239,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 10, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 10, avgTimes = 128, samDelay = 100 } }, }; - Dictionary avgDelays_2kft_fvmi_pmu = new Dictionary() + readonly Dictionary avgDelays_2kft_fvmi_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 500 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 128, samDelay = 300 } }, @@ -247,7 +247,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 10, avgTimes = 64, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 10, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_ppmucp_fvmi_pmu = new Dictionary() + readonly Dictionary avgDelays_ppmucp_fvmi_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 500 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 255, samDelay = 300 } }, @@ -255,7 +255,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 30, avgTimes = 128, samDelay = 200 } }, {"60mA", new TestParaSet{delayMs = 10, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_ppmuft_fvmi_pmu = new Dictionary() + readonly Dictionary avgDelays_ppmuft_fvmi_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 300 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 255, samDelay = 300 } }, @@ -263,7 +263,7 @@ namespace Testrong.User.Program {"2mA", new TestParaSet{delayMs = 10, avgTimes = 128, samDelay = 100 } }, {"60mA", new TestParaSet{delayMs = 10, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_2km_fvmi_pmu = new Dictionary() + readonly Dictionary avgDelays_2km_fvmi_pmu = new Dictionary() { {"5uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 500 } }, {"20uA", new TestParaSet{delayMs = 20, avgTimes = 255, samDelay = 500 } }, @@ -273,7 +273,7 @@ namespace Testrong.User.Program }; #endregion #region FVMI DPS - Dictionary avgDelays_1kft_fvmi_dps = new Dictionary() + readonly Dictionary avgDelays_1kft_fvmi_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 70, avgTimes = 255, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, @@ -282,7 +282,7 @@ namespace Testrong.User.Program {"60mA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, {"1A", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_1kcp_fvmi_dps = new Dictionary() + readonly Dictionary avgDelays_1kcp_fvmi_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 70, avgTimes = 255, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 70, avgTimes = 255, samDelay = 100 } }, @@ -291,7 +291,7 @@ namespace Testrong.User.Program {"60mA", new TestParaSet{delayMs = 30, avgTimes = 64, samDelay = 100 } }, {"1A", new TestParaSet{delayMs = 30, avgTimes = 64, samDelay = 100 } }, }; - Dictionary avgDelays_2kft_fvmi_dps = new Dictionary() + readonly Dictionary avgDelays_2kft_fvmi_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 70, avgTimes = 255, samDelay = 200 } }, {"20uA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, @@ -300,7 +300,7 @@ namespace Testrong.User.Program {"60mA", new TestParaSet{delayMs = 20, avgTimes = 128, samDelay = 100 } }, {"1A", new TestParaSet{delayMs = 20, avgTimes = 128, samDelay = 100 } }, }; - Dictionary avgDelays_ppmucp_fvmi_dps = new Dictionary() + readonly Dictionary avgDelays_ppmucp_fvmi_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 70, avgTimes = 255, samDelay = 100 } }, {"20uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 300 } }, @@ -309,7 +309,7 @@ namespace Testrong.User.Program {"60mA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 200 } }, {"1A", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 200 } }, }; - Dictionary avgDelays_ppmuft_fvmi_dps = new Dictionary() + readonly Dictionary avgDelays_ppmuft_fvmi_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 70, avgTimes = 255, samDelay = 500 } }, {"20uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 500 } }, @@ -318,7 +318,7 @@ namespace Testrong.User.Program {"60mA", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, {"1A", new TestParaSet{delayMs = 30, avgTimes = 255, samDelay = 100 } }, }; - Dictionary avgDelays_2km_fvmi_dps = new Dictionary() + readonly Dictionary avgDelays_2km_fvmi_dps = new Dictionary() { {"5uA", new TestParaSet{delayMs = 70, avgTimes = 255, samDelay = 500 } }, {"20uA", new TestParaSet{delayMs = 50, avgTimes = 255, samDelay = 100 } }, @@ -330,11 +330,11 @@ namespace Testrong.User.Program #endregion #region Variables Definition - List testRangesPmu = new List { "5uA", "20uA", "200uA", "2mA", "60mA" }; - List testRangesDps = new List { "5uA", "20uA", "200uA", "2mA", "60mA", "1A" }; - string[] FreqStr_Test = { "1M", "2M", "2.5M", "5M", "10M" }; - double[] FreqForce_Test = { 1000000, 2000000, 2500000, 5000000, 10000000 }; - Dictionary FreqInfo = new Dictionary() + readonly List testRangesPmu = new List { "5uA", "20uA", "200uA", "2mA", "60mA" }; + readonly List testRangesDps = new List { "5uA", "20uA", "200uA", "2mA", "60mA", "1A" }; + readonly string[] FreqStr_Test = { "1M", "2M", "2.5M", "5M", "10M" }; + readonly double[] FreqForce_Test = { 1000000, 2000000, 2500000, 5000000, 10000000 }; + readonly Dictionary FreqInfo = new Dictionary() { {"0.625M", "NOR_Pattern_1" }, {"1M", "NOR_Pattern_1" }, @@ -344,25 +344,27 @@ namespace Testrong.User.Program {"10M","NOR_Pattern_4"}, {"20M","NOR_Pattern_5"} }; - List testChannelDps_1K = new List() + readonly List testChannelDps_1K = new List() { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16, 17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32, }; - List testChannelDps_2K = new List() + readonly List testChannelDps_2K = new List() { 1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16, 17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32, 33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48, 49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64 }; - string[] allDpsPinNames_1K = { + public static class DpsPinConfig + { + public static readonly string[] allDpsPinNames_1K = { "DPS1","DPS2","DPS3","DPS4","DPS5","DPS6","DPS7","DPS8","DPS9","DPS10", "DPS11","DPS12","DPS13","DPS14","DPS15","DPS16","DPS17","DPS18","DPS19","DPS20", "DPS21","DPS22","DPS23","DPS24","DPS25","DPS26","DPS27","DPS28","DPS29","DPS30", "DPS31","DPS32" - }; - string[] allDpsPinNames_2K = { + }; + public static readonly string[] allDpsPinNames_2K = { "DPS1","DPS2","DPS3","DPS4","DPS5","DPS6","DPS7","DPS8","DPS9","DPS10", "DPS11","DPS12","DPS13","DPS14","DPS15","DPS16","DPS17","DPS18","DPS19","DPS20", "DPS21","DPS22","DPS23","DPS24","DPS25","DPS26","DPS27","DPS28","DPS29","DPS30", @@ -370,8 +372,20 @@ namespace Testrong.User.Program "DPS41","DPS42","DPS43","DPS44","DPS45","DPS46","DPS47","DPS48","DPS49","DPS50", "DPS51","DPS52","DPS53","DPS54","DPS55","DPS56","DPS57","DPS58","DPS59","DPS60", "DPS61","DPS62","DPS63","DPS64" - }; - Dictionary Select_IP = new Dictionary() + }; + public static readonly Dictionary Select_DpsPin = new Dictionary() + { + { TestVersion.Board_1K_FT, allDpsPinNames_1K }, + { TestVersion.Board_1K_CP, allDpsPinNames_1K }, + { TestVersion.Board_2K_FT, allDpsPinNames_2K }, + { TestVersion.Board_2K_CP, allDpsPinNames_2K }, + { TestVersion.Board_Ppmu_CP, allDpsPinNames_1K }, + { TestVersion.Board_Ppmu_FT, allDpsPinNames_1K }, + { TestVersion.KM_2, allDpsPinNames_2K} + }; + } + + readonly Dictionary Select_IP = new Dictionary() { { TestVersion.Board_1K_FT, "192.168.100.110" }, { TestVersion.Board_1K_CP, "192.168.100.110" }, @@ -381,7 +395,7 @@ namespace Testrong.User.Program { TestVersion.Board_Ppmu_FT, "192.168.100.10" }, { TestVersion.KM_2, "192.168.100.10"} }; - Dictionary Select_Temp = new Dictionary() + readonly Dictionary Select_Temp = new Dictionary() { { TestVersion.Board_1K_FT, 4 }, { TestVersion.Board_1K_CP, 4 }, @@ -401,15 +415,15 @@ namespace Testrong.User.Program {6, TestVersion.Board_Ppmu_CP}, {7, TestVersion.KM_2 } }; - Dictionary ModesPmu = new Dictionary() + readonly Dictionary ModesPmu = new Dictionary() { {"FVMV",PpmuMode.FVMV},{"FVMI",PpmuMode.FVMI},{"FIMV",PpmuMode.FIMV}, {"FZMV",PpmuMode.FZMV} }; - Dictionary ModesDps = new Dictionary() + readonly Dictionary ModesDps = new Dictionary() { {"FVMV",DpsMode.FVMV},{"FVMI",DpsMode.FVMI},{"FIMV",DpsMode.FIMV} }; - Dictionary RangesPmu = new Dictionary() + readonly Dictionary RangesPmu = new Dictionary() { {"5uA", PpmuIRange._5uA}, {"20uA", PpmuIRange._20uA}, @@ -417,7 +431,7 @@ namespace Testrong.User.Program {"2mA", PpmuIRange._2mA}, {"60mA", PpmuIRange._60mA}, }; - Dictionary RangesDps = new Dictionary() + readonly Dictionary RangesDps = new Dictionary() { {"5uA", DpsIRange._5uA}, {"20uA", DpsIRange._20uA}, @@ -426,21 +440,21 @@ namespace Testrong.User.Program {"60mA", DpsIRange._60mA}, {"1A", DpsIRange._1A} }; - Dictionary DmmCurrRanges = new Dictionary() + readonly Dictionary DmmCurrRanges = new Dictionary() { {"5uA",0.000005},{"20uA",0.00002},{"200uA",0.0002},{"2mA",0.002},{"60mA",0.06},{"1A",1 } }; - Dictionary Rname = new Dictionary() + readonly Dictionary Rname = new Dictionary() { {"R1","5uA"},{"R2","20uA"},{"R3","200uA"},{"R4","2mA"},{"R5","60mA"},{"R6","1A"} }; - Dictionary FiRanges = new Dictionary() + readonly Dictionary FiRanges = new Dictionary() { {"5uA",0.000005},{"20uA",0.000015},{"200uA",0.0001},{"2mA",0.001},{"60mA",0.03} }; - double[] rLimit = { 50, 120, 110, 1, 1, 1 }; - double[] CurrScale = { -0.8, -0.5, 0, 0.5, 0.8 }; - Dictionary strRloadFvmi = new Dictionary() + readonly double[] rLimit = { 50, 120, 110, 1, 1, 1 }; + readonly double[] CurrScale = { -0.8, -0.5, 0, 0.5, 0.8 }; + readonly Dictionary strRloadFvmi = new Dictionary() { {"5uA", "1M"}, {"20uA", "402K"}, @@ -449,7 +463,7 @@ namespace Testrong.User.Program {"60mA", "150"}, {"1A", "10"}, }; - Dictionary Rcut_MIFI = new Dictionary() + readonly Dictionary Rcut_MIFI = new Dictionary() { {"5uA", ExtCaliLoad.RC_RL13}, {"20uA", ExtCaliLoad.RC_RL12}, @@ -458,20 +472,23 @@ namespace Testrong.User.Program {"60mA", ExtCaliLoad.RC_RL5}, {"1A", ExtCaliLoad.RC_RL3}, }; - double VoltageInitialDefault = -7.5; - double VoltageStepDefault = 3.75; - double VoltageInitialDps1A = 1.5; - double VoltageStepDps1A = 0.75; - double VoltageInitialSet = -5; - double VoltageStepSet = 2.5; - double[] VoltageStep20uA = { 2.5, 2.5, 3.75, 3.75, 3.75 }; - int SampliCount = 5; - List TestInfo = new List(); - int port = 200; - string ksightConnStr = "GPIB1::22::INSTR"; - TestVersion SelectTestVersion = Select_Version[Readjson(CONFIG_JSON_PATH).Version]; + readonly double VoltageInitialDefault = -7.5; + readonly double VoltageStepDefault = 3.75; + readonly double VoltageInitialDps1A = 1.5; + readonly double VoltageStepDps1A = 0.75; + readonly double VoltageInitialSet = -5; + readonly double VoltageStepSet = 2.5; + readonly double[] VoltageStep20uA = { 2.5, 2.5, 3.75, 3.75, 3.75 }; + readonly int SampliCount = 5; + readonly List TestInfo = new List(); + readonly int port = 200; + readonly string ksightConnStr = "GPIB1::22::INSTR"; + readonly TestVersion SelectTestVersion = Select_Version[Readjson(CONFIG_JSON_PATH).Version]; const int ChannelCount = 256; - double[] rInt = new double[ChannelCount]; + readonly double[] rInt = new double[ChannelCount]; + + + #endregion #region 函数定义 @@ -1677,9 +1694,6 @@ namespace Testrong.User.Program //-----Read R File----- double[,] ExtBoard_Res = ReadRext(EXT_CAL_INIT_PATH + "ExtBoardRes.csv"); - - - extCaliHandle.SetPpmuExternalCalibration(extConnStr, extPort, 1, ExternalCalibrationMode.Channel, 1, ExtCaliVI.V, ExtCaliLoad.RC_RL7, 0); //1kΩ double rload = GetRloadValue(dmm, 2000, 5); @@ -2083,10 +2097,10 @@ namespace Testrong.User.Program double ResValue = 0; StreamWriter ResWriter = new StreamWriter(res_path, true, Encoding.UTF8); ResWriter.AutoFlush = true; - string[] dpsPinName = { "DPS1" }; - string[] pmuPinName = { "A01" }; - DPS.Force(dpsPinName, 0, DpsMode.FZMV, DpsIRange._2mA, VRange.Normal); - PPMU.Force(pmuPinName, 0, PpmuMode.FZMV, PpmuIRange._2mA, VRange.Normal); + string[] alldpsPinName = DpsPinConfig.Select_DpsPin[testVersion]; + string[] allpmuPinName = GetAllPmuPins(); + DPS.Force(alldpsPinName, 0, DpsMode.FZMV, DpsIRange._2mA, VRange.Normal); //We Shall Force ALL DPS channel to Hi-Z + PPMU.Force(allpmuPinName, 0, PpmuMode.FZMV, PpmuIRange._2mA, VRange.Normal); //Just in case, Let's force ALL PMU Hi-Z for (int i = 0; i < RLoad_Pmu_FV.Length; i++) { @@ -2160,16 +2174,7 @@ namespace Testrong.User.Program { TestVersion.Board_Ppmu_FT, testChannelDps_1K }, { TestVersion.KM_2, testChannelDps_2K } }; - Dictionary Select_DpsPin = new Dictionary() - { - { TestVersion.Board_1K_FT, allDpsPinNames_1K }, - { TestVersion.Board_1K_CP, allDpsPinNames_1K }, - { TestVersion.Board_2K_FT, allDpsPinNames_2K }, - { TestVersion.Board_2K_CP, allDpsPinNames_2K }, - { TestVersion.Board_Ppmu_CP, allDpsPinNames_1K }, - { TestVersion.Board_Ppmu_FT, allDpsPinNames_1K }, - { TestVersion.KM_2, allDpsPinNames_2K} - }; + List ChannelDps = new List(); @@ -2756,7 +2761,7 @@ namespace Testrong.User.Program else if (Type == "DPS") { string[] DpsPinName = { ("DPS" + ListChannels[loopk]) }; - string[] allDpsPinNames = Select_DpsPin[testVersion]; + string[] allDpsPinNames = DpsPinConfig.Select_DpsPin[testVersion]; double ForceVoltage = (RangesDps[Range] == DpsIRange._1A) ? VoltageInitialDps1A : VoltageInitialDefault;//1A for range double VoltageStep = (RangesDps[Range] == DpsIRange._1A) ? VoltageStepDps1A : VoltageStepDefault; if (ModesDps[Mode] == DpsMode.FVMI) @@ -2806,7 +2811,16 @@ namespace Testrong.User.Program List siList = DPS.Measure(DpsPinName, true, context.BinHandler.GetBinningByTestSuite("ExtCalibration_FVMV"), testParaSet_dps_fvmv[Range].avgTimes, testParaSet_dps_fvmv[Range].samDelay); double chResult = GetATEChannelMeasure(siList, DpsPinName); double[] readTemp = DPS.ReadTemperature(); - double chTemp = readTemp[GetDPSTempSensorIndex(ch)]; + int TempIndex = GetDPSTempSensorIndex(ch); + double chTemp; + if (TempIndex > readTemp.Length + 1) + { + chTemp = -65535; + } + else + { + chTemp = readTemp[TempIndex]; + } TempValue[p] = chTemp; ForceValue[p] = ForceVoltage; AteMeasure[p] = chResult; @@ -2836,7 +2850,16 @@ namespace Testrong.User.Program List siList = DPS.Measure(DpsPinName, true, context.BinHandler.GetBinningByTestSuite("ExtCalibration_FVMI"), testParaSet_dps_fvmi[Range].avgTimes, testParaSet_dps_fvmi[Range].samDelay); double chResult = GetATEChannelMeasure(siList, DpsPinName); double[] readTemp = DPS.ReadTemperature(); - double chTemp = readTemp[GetDPSTempSensorIndex(ch)]; + int TempIndex = GetDPSTempSensorIndex(ch); + double chTemp; + if (TempIndex > readTemp.Length + 1) + { + chTemp = -65535; + } + else + { + chTemp = readTemp[TempIndex]; + } TempValue[p] = chTemp; ForceValue[p] = CurrValue; AteMeasure[p] = chResult; @@ -2875,7 +2898,16 @@ namespace Testrong.User.Program List siList = DPS.Measure(DpsPinName, true, context.BinHandler.GetBinningByTestSuite("ExtCalibration_FVMI"), testParaSet_dps_fvmi[Range].avgTimes, testParaSet_dps_fvmi[Range].samDelay); double chResult = GetATEChannelMeasure(siList, DpsPinName); double[] readTemp = DPS.ReadTemperature(); - double chTemp = readTemp[GetDPSTempSensorIndex(ch)]; + int TempIndex = GetDPSTempSensorIndex(ch); + double chTemp; + if (TempIndex > readTemp.Length + 1) + { + chTemp = -65535; + } + else + { + chTemp = readTemp[TempIndex]; + } TempValue[p] = chTemp; ForceValue[p] = CurrValue; AteMeasure[p] = chResult; @@ -2932,7 +2964,16 @@ namespace Testrong.User.Program List siList = DPS.Measure(DpsPinName, true, context.BinHandler.GetBinningByTestSuite("ExtCalibration_FIMV"), testParaSet_dps_fimv[Range].avgTimes, testParaSet_dps_fimv[Range].samDelay); double chResult = GetATEChannelMeasure(siList, DpsPinName); double[] readTemp = DPS.ReadTemperature(); - double chTemp = readTemp[GetDPSTempSensorIndex(ch)]; + int TempIndex = GetDPSTempSensorIndex(ch); + double chTemp; + if (TempIndex > readTemp.Length + 1) + { + chTemp = -65535; + } + else + { + chTemp = readTemp[TempIndex]; + } TempValue[p] = chTemp; ForceValue[p] = ForceCurrent; AteMeasure[p] = chResult / Convert.ToDouble(RlDpsFi[Range]); diff --git a/Testrong.User.Program/bin/x64/Debug/UserProgram.dll b/Testrong.User.Program/bin/x64/Debug/UserProgram.dll index 0e61058..0843170 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 d4fd939..3627f45 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 e011ed5..0bd30f8 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 4c122f1..cf872ab 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 8c93ce3..e461646 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 @@ -d21702e1f0131c64a3bf3ae1e7990262e428a3f3 +8336289dafd7be8d8ceb71ec0bfb414b5e10ce0020e044e9f7d2ae18b0c1e638 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 936b21b..1599e47 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 @@ -2528,3 +2528,41 @@ F:\syy\UserProgram_time\Testrong.User.Program\obj\x64\Debug\Testrong.User.Progra 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 +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\NLog.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Globalization.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Bcl.HashCode.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Datalog.Interfaces.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Hardware.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MxFFTCalc.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MWArray.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\MathNet.Numerics.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Gramar.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Extensions.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Runtime.CompilerServices.Unsafe.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.Abstractions.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Logging.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.ValueTuple.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Antlr4.Runtime.Standard.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.Abstractions.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Options.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.DependencyInjection.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Extensions.Primitives.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Microsoft.Bcl.AsyncInterfaces.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Memory.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Numerics.Vectors.dll +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Model.xml +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\Testrong.Core.Primitives.xml +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Transport.xml +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Buffers.xml +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Codecs.xml +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\System.Threading.Tasks.Dataflow.xml +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\DotNetty.Common.xml +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\AutoMapper.xml +D:\WORK\ManLin\Verify\UserProgram_time\Testrong.User.Program\bin\x64\Debug\STDF.Library.xml diff --git a/Testrong.User.Program/obj/x64/Debug/UserProgram.dll b/Testrong.User.Program/obj/x64/Debug/UserProgram.dll index 0e61058..0843170 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 d4fd939..3627f45 100644 Binary files a/Testrong.User.Program/obj/x64/Debug/UserProgram.pdb and b/Testrong.User.Program/obj/x64/Debug/UserProgram.pdb differ