暂存

.gitignore

@@ -5,4 +5,3 @@
 /exe/apps/Tps_LQ_Transmitter/发射机/9B发射机/测试数据/常温测试
 /exe/发射机/9B发射机/测试数据/常温测试
 /tps/TpsLabStudio/obj/Debug
-/exe0902001.zip

exe/apps/DevicesApp/commands/程控命令.xml

@@ -243,6 +243,7 @@
 		<Command Key="NextPeakRight" Value=":CALC:MARK{0}:MAX:RIGHT" Description="标记右峰值,{0}MARK点"/>
 		
         <Command Key="MARK打开" Value=":CALC:MARK{0}:STAT ON" Description="打开MARK，{0}MARK点"/>
+		<Command Key="MARK关闭" Value=":CALC:MARK{0}:STAT OFF" Description="关闭MARK，{0}MARK点"/>
 		
 		<Command Key="打开MARK精度" Value=":CALC:MARK{0}:FCO ON" Description="设置MARK显示精度，{0}MARK点"/>
 		<Command Key="读MARK高精度频率" Value=":CALC:MARK{0}:FCO:X?" Description="读MARK频率,{0}MARK点，读MARK高精度频率，仅在MARK显示精度打开模式下"/>

tps/TpsLabStudio/MainTps.cs

@@ -863,22 +863,22 @@ namespace Tps_LQ_Transmitter
                 tableInfo.table.ProductCode = Product;
                 tableInfo.table.ProductName = Product;
                 tableInfo.table.Name = TestProject + "#" + Product;
-                //try
-                //{
-                //    if (report.WriteAndReplaceTable(tableInfo))
-                //    {
-                //        ShowMessage(MsgType.Info, "自动测试记录表保存成功");
-                //    }
-                //    else
-                //    {
-                //        ShowMessage(MsgType.Info, "自动测试记录表保存失败");
-                //    }
-                //}
-                //catch (Exception ex)
-                //{
-
-                //    ShowMessage(MsgType.Error, "自动测试记录表保存失败");
-                //}
+                try
+                {
+                    if (report.WriteAndReplaceTable(tableInfo))
+                    {
+                        ShowMessage(MsgType.Info, "自动测试记录表保存成功");
+                    }
+                    else
+                    {
+                        ShowMessage(MsgType.Info, "自动测试记录表保存失败");
+                    }
+                }
+                catch (Exception ex)
+                {
+
+                    ShowMessage(MsgType.Error, "自动测试记录表保存失败");
+                }
              
             }
             else

tps/TpsLabStudio/TpsLabStudio.csproj.user

@@ -5,6 +5,6 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
     <StartAction>Program</StartAction>
-    <StartProgram>D:\000Code\0.TpsLabStudio_LTS\Tps_LQ_Transmitter\TpsLabStudio_LTS\exe\JGWorks.exe</StartProgram>
+    <StartProgram>F:\Project\Launch\new%288.24%29\TpsLabStudio_LTS\exe\JGWorks.exe</StartProgram>
   </PropertyGroup>
 </Project>

tps/TpsLabStudio/models/PowerAndFreqStability.cs

@@ -155,15 +155,18 @@ namespace Tps_LQ_Transmitter.models
                     SA.Write("SingleOrCont", "1"); SA.Query("OPC");
                     Thread.Sleep(500);
                     SA.Write("MARK打开", "1"); SA.Query("OPC");
+                    Thread.Sleep(200);
                     SA.Write("打开MARK精度", "1"); SA.Query("OPC");
-                    Thread.Sleep(100);
+                    Thread.Sleep(200);
                     SA.Write("PEAK", "1"); SA.Query("OPC");
-                    SA.Write("SingleOrCont", "0"); SA.Query("OPC");
-                    SA.Write("单次扫描"); SA.Query("OPC");
-                    Thread.Sleep(100);
+                    Thread.Sleep(200);
+                    // SA.Write("SingleOrCont", "0"); SA.Query("OPC");
+                    //   SA.Write("单次扫描"); SA.Query("OPC");
+                    //   Thread.Sleep(100);
                     // string i=SA.Query("读MARK高精度频率", "1");
-                    TestFreq = double.Parse(SA.Query("读MARK高精度频率", "1")); SA.Query("OPC"); ;
-                    
+                    TestFreq = double.Parse(SA.Query("读MARK高精度频率", "1"));
+                    SA.Write("MARK关闭", "1"); SA.Query("OPC");
+
 
                     SA.Write("设置通道功率模式"); SA.Query("OPC");
                     SA.Write("SingleOrCont", "0"); SA.Query("OPC");