暂存

tps/TpsLabStudio/FrmMain.cs

@@ -350,12 +350,10 @@ namespace Tps_LQ_Transmitter
             DCPower.Write($"CURRent {Current} A\n"); DCPower.Query("*OPC?\n");//设置电流
             DCPower.Write("GLOBal:OUTPut:STATe 1\n"); DCPower.Query("*OPC?\n");
             ShowMessage(MsgType.Info, string.Format("打开TDK电源."));
-
-
-
+           
 
             TransmitterSerialPort SerialClient = new TransmitterSerialPort();
-            
+           
             int ControlDelay = currFileNode.Tps.TestNodes[0].Parameters.GetParameter<int>("控制延时");
             currFileNode.Tps.ControlDelay = ControlDelay;
             task = new Task(new Action(() => {
@@ -381,15 +379,30 @@ namespace Tps_LQ_Transmitter
                     if (IsRuning == false)
                     {
                         //控制断电
-                        SerialClient.DUT_Transmitter_Ctrol(0x00, 0x00,0x55);
+                        if (currFileNode.Tps.Product.Contains("YZH16A"))//针对YZH16A的产品
+                        {
+                            SerialClient.DUT_Transmitter_Ctrol(0x00, 0x00, 0x55);
+                        }
+                        else
+                        {
+                            SerialClient.DUT_Transmitter_Ctrol1(0x00, 0x00);
+                        }
+                        
                         SerialClient.SerialClose();
                         DCPower.Write("GLOBal:OUTPut:STATe 0\n"); DCPower.Query("*OPC?\n");
                         ShowMessage(MsgType.Info, string.Format("关闭6YYC信号源，关闭串口，关闭TDK电源."));
                         return;
                     }
                     //控制
-                   
-                    SerialClient.DUT_Transmitter_Ctrol(ThridByte, FourthByte,0x55);//需要取消注释
+                    if (currFileNode.Tps.Product.Contains("YZH16A"))//针对YZH16A的产品
+                    {
+                        SerialClient.DUT_Transmitter_Ctrol(ThridByte, FourthByte, 0x55);
+                    }
+                    else
+                    {
+                        SerialClient.DUT_Transmitter_Ctrol1(ThridByte, FourthByte);
+                    }
+                  
                     ShowMessage(MsgType.Info, string.Format("发送串口指令EB 90 {0} {1}.", ThridByte, FourthByte));
                     testMin = TimesCounter.ElapsedMilliseconds/1000f / 60f;
 
@@ -408,9 +421,17 @@ namespace Tps_LQ_Transmitter
                     labRemainTime.Text = $"测试结束，共计耗时{Math.Round(testMin,2)}分钟";
                 }));
                 #endregion
+          
+
                 //控制断电
-               
-                SerialClient.DUT_Transmitter_Ctrol(0x00, 0x00,0x55);//需要取消注释
+                if (currFileNode.Tps.Product.Contains("YZH16A"))//针对YZH16A的产品
+                {
+                    SerialClient.DUT_Transmitter_Ctrol(0x00, 0x00, 0x55);
+                }
+                else
+                {
+                    SerialClient.DUT_Transmitter_Ctrol1(0x00, 0x00);
+                }
                 SerialClient.SerialClose();//需要取消注释
                 DCPower.Write("GLOBal:OUTPut:STATe 0\n"); DCPower.Query("*OPC?\n");//需要取消注释
                 ShowMessage(MsgType.Info, string.Format("关闭6YYC信号源，关闭串口，关闭TDK电源."));

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_1112\TpsLabStudio_LTS\exe\JGWorks.exe</StartProgram>
+    <StartProgram>F:\Project\Launch\code\TpsLabStudio_LTS\exe\JGWorks.exe</StartProgram>
   </PropertyGroup>
 </Project>

tps/TpsLabStudio/com/SerialPort.cs

@@ -33,6 +33,39 @@ namespace Tps_LQ_Transmitter.com
             }
 
         }
+        public void DUT_Transmitter_Ctrol1(byte ModeSelect, byte FreqSelect)
+        {
+            try
+            {
+                if (!sp.IsOpen)
+                {
+                    sp.Open();  //打开串口
+                }
+            }
+            catch (Exception e2)
+            {
+                Console.WriteLine("open err:" + e2.Message);
+            }
+            byte[] JGbuffer = new byte[4];
+
+            int offset = 0;
+            JGbuffer[offset++] = 0xEB;
+            JGbuffer[offset++] = 0x90;
+            JGbuffer[offset++] = ModeSelect;//切模式
+            JGbuffer[offset++] = FreqSelect;//切频点
+           
+
+            try
+            {
+                sp.Write(JGbuffer, 0, JGbuffer.Length);
+            }
+            catch (Exception ex)
+            {
+                MessageBox.Show($"串口控制频点失败:{ex.Message}");
+                throw new Exception($"write com error msg:{ex.Message}");
+
+            }
+        }
         public void DUT_Transmitter_Ctrol(byte ModeSelect,byte FreqSelect,byte FskSet)
         {
             try