CH2

GKHTRBC16P.Bll/CreateTbBll.cs

@@ -43,6 +43,10 @@ namespace GKHTRBC16P.Bll
             Csql2 = Csql2 + string.Format("'F_WMD' float(10,3),");
             Csql2 = Csql2 + string.Format("'F_WMP' float(10,3),");
             Csql2 = Csql2 + string.Format("'F_WMA' float(10,3),");
+            Csql2 = Csql2 + string.Format("'F_WMF2' float(10,3),");
+            Csql2 = Csql2 + string.Format("'F_WMD2' float(10,3),");
+            Csql2 = Csql2 + string.Format("'F_WMP2' float(10,3),");
+            Csql2 = Csql2 + string.Format("'F_WMA2' float(10,3),");
             if (Csql2.Length > 0)
                 Csql2 = Csql2.Substring(0, Csql2.Length - 1);
             string Csql3 = string.Format(@");CREATE TABLE 'Summary'( 'Id' integer PRIMARY KEY AUTOINCREMENT,'Invalid' int,'RecordNum' integer,'MaxStatin'varchar,'Transfinite'varchar,'AgvStatin'varchar);

GKHTRBC16P.Bll/DeviceBll.cs

@@ -41,8 +41,8 @@ namespace GKHTRBC16P.Bll
             int result = 0;
             using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
             {
-                result = cnn.Execute("insert into Dev_Device(MainId,DevName,TestId,AgingNo,AgingTime,EleLower,EleUpper,BackVol,TjUpper,Rqaw,AgeingImage,F_WMF,F_WMD,F_WMP,F_WMA,Vdd,Vcc,Vee,Idd,Icc,Iee,Devimage,VgsP,VgsN,Vg,PowerIf,OvenIf,Stage,OnVoltage1,OnVoltage2,OffVoltage1,OffVoltage2,WhereTemp,OnTemp,OnHimi,OffTemp,OffHimi,ReachTime,HimiReachTime,Status,UserId,Createtime) " +
-                    "values(@MainId,@DevName,@TestId,@AgingNo,@AgingTime,@EleLower,@EleUpper,@BackVol,@TjUpper,@Rqaw,@AgeingImage,@F_WMF,@F_WMD,@F_WMP,@F_WMA,@Vdd,@Vcc,@Vee,@Idd,@Icc,@Iee,@Devimage,@VgsP,@VgsN,@Vg,@PowerIf,@OvenIf,@Stage,@OnVoltage1,@OnVoltage2,@OffVoltage1,@OffVoltage2,@WhereTemp,@OnTemp,@OnHimi,@OffTemp,@OffHimi,@ReachTime,@HimiReachTime,@Status,@UserId,@Createtime)", dev_Device);
+                result = cnn.Execute("insert into Dev_Device(MainId,DevName,TestId,AgingNo,AgingTime,EleLower,EleUpper,BackVol,TjUpper,Rqaw,AgeingImage,F_WMF,F_WMD,F_WMP,F_WMA,F_WMF2,F_WMD2,F_WMP2,F_WMA2,Vdd,Vcc,Vee,Idd,Icc,Iee,Devimage,VgsP,VgsN,Vg,PowerIf,OvenIf,Stage,OnVoltage1,OnVoltage2,OffVoltage1,OffVoltage2,WhereTemp,OnTemp,OnHimi,OffTemp,OffHimi,ReachTime,HimiReachTime,Status,UserId,Createtime) " +
+                    "values(@MainId,@DevName,@TestId,@AgingNo,@AgingTime,@EleLower,@EleUpper,@BackVol,@TjUpper,@Rqaw,@AgeingImage,@F_WMF,@F_WMD,@F_WMP,@F_WMA,@F_WMF2,@F_WMD2,@F_WMP2,@F_WMA2,@Vdd,@Vcc,@Vee,@Idd,@Icc,@Iee,@Devimage,@VgsP,@VgsN,@Vg,@PowerIf,@OvenIf,@Stage,@OnVoltage1,@OnVoltage2,@OffVoltage1,@OffVoltage2,@WhereTemp,@OnTemp,@OnHimi,@OffTemp,@OffHimi,@ReachTime,@HimiReachTime,@Status,@UserId,@Createtime)", dev_Device);
             }
             return result;
         }
@@ -51,7 +51,7 @@ namespace GKHTRBC16P.Bll
             int result = 0;
             using (IDbConnection cnn = new SQLiteConnection(DapperConntionData.Conectionvoidstring()))
             {
-                result = cnn.Execute("update Dev_Device set MainId = @MainId,DevName=@DevName,TestId =@TestId,AgingNo = @AgingNo,AgingTime = @AgingTime,F_WMF=@F_WMF,F_WMD=@F_WMD,F_WMP=@F_WMP,F_WMA=@F_WMA,Vdd=@Vdd,Vcc=@Vcc,Vee=@Vee,Idd=@Idd,Icc=@Icc,Iee=@Iee,EleLower=@EleLower,EleUpper=@EleUpper,BackVol=@BackVol,VgsP=@VgsP,VgsN=@VgsN,Vg=@Vg," +
+                result = cnn.Execute("update Dev_Device set MainId = @MainId,DevName=@DevName,TestId =@TestId,AgingNo = @AgingNo,AgingTime = @AgingTime,F_WMF=@F_WMF,F_WMD=@F_WMD,F_WMP=@F_WMP,F_WMA=@F_WMA,F_WMF2=@F_WMF2,F_WMD2=@F_WMD2,F_WMP2=@F_WMP2,F_WMA2=@F_WMA2,Vdd=@Vdd,Vcc=@Vcc,Vee=@Vee,Idd=@Idd,Icc=@Icc,Iee=@Iee,EleLower=@EleLower,EleUpper=@EleUpper,BackVol=@BackVol,VgsP=@VgsP,VgsN=@VgsN,Vg=@Vg," +
                     "PowerIf=@PowerIf,OvenIf=@OvenIf,Stage=@Stage,OnVoltage1=@OnVoltage1,OnVoltage2=@OnVoltage2,OffVoltage1=@OffVoltage1,OffVoltage2=@OffVoltage2,WhereTemp=@WhereTemp,OnTemp=@OnTemp,OnHimi=@OnHimi,OffTemp=@OffTemp,OffHimi=@OffHimi,ReachTime=@ReachTime,HimiReachTime=@HimiReachTime," +
                     "TjUpper=@TjUpper,Rqaw=@Rqaw,AgeingImage=@AgeingImage,Devimage=@Devimage,Status=@Status,UserId=@UserId,Createtime=@Createtime " +
                     "where Id=" + dev_Device.Id, dev_Device);

GKHTRBC16P.Bll/StationDataBll.cs

@@ -150,7 +150,7 @@ namespace GKHTRBC16P.Bll
                 listsq.Add("Vg");
             }
             dic_StationSp.Dlen = list0.Count;
-            string[] st = { "F_WMF", "F_WMD", "F_WMP", "F_WMA" };
+            string[] st = { "F_WMF", "F_WMD", "F_WMP", "F_WMA", "F_WMF2", "F_WMD2", "F_WMP2", "F_WMA2" };
             for (int i = 0; i < station; i++)
             {
                 list0.Add(st[i]);
@@ -447,6 +447,10 @@ namespace GKHTRBC16P.Bll
             station_Data.F_WMD = SaveStation[1] / 1000;
             station_Data.F_WMP = SaveStation[2] / 1000;
             station_Data.F_WMA = SaveStation[3] / 10000;
+            station_Data.F_WMF2 = SaveStation[10];
+            station_Data.F_WMD2 = SaveStation[11] / 1000;
+            station_Data.F_WMP2 = SaveStation[12] / 1000;
+            station_Data.F_WMA2 = SaveStation[13] / 10000;
 
             DataTable StationList = new DataTable(test_Parameter.BatchName);
             DevAlarmLogBll devAlarmLogBll = new DevAlarmLogBll();

GKHTRBC16P.Bll/TestParmBll.cs

@@ -31,7 +31,7 @@ namespace GKHTRBC16P.Bll
             {
                 result = cnn.Execute("update Test_Parameter set Id = @Id, DeviceId = @DeviceId,Ishtrb =@Ishtrb,BatStatus=@BatStatus,PowerUnit=@PowerUnit,BatchName =@BatchName,LotInfo = @LotInfo,BoardInfo = @BoardInfo,SrefStart=@SrefStart,SrefEnd=@SrefEnd," +
                     "SingeRefresh=@SingeRefresh,EleLower=@EleLower,EleUpper=@EleUpper,TjUpper=@TjUpper,Rqaw=@Rqaw,SupplyRGPW=@SupplyRGPW,PolarityRG=@PolarityRG,BeginTime=@BeginTime,SupTime=@SupTime,SupSeconds=@SupSeconds,EndTime=@EndTime," +
-                    "RecordNum=@RecordNum,BatchFileName=@BatchFileName,PowerNo=@PowerNo,OvenNo=@OvenNo,VgsP=@VgsP,VgsN=@VgsN,Ch1=@Ch1,Ch2=@Ch1," +
+                    "RecordNum=@RecordNum,BatchFileName=@BatchFileName,PowerNo=@PowerNo,OvenNo=@OvenNo,VgsP=@VgsP,VgsN=@VgsN,Ch1=@Ch1,Ch2=@Ch2," +
                     "TestTime=@TestTime,Remarks=@Remarks,Status=@Status,UserId=@UserId,CreateTime=@CreateTime where ParmId=" + test_Parameter.ParmId, test_Parameter);
             }
             return result;

GKHTRBC16P.Model/Dev_Device.cs

@@ -23,6 +23,10 @@ namespace GKHTRBC16P.Model
         public decimal F_WMD { get; set; }
         public decimal F_WMP { get; set; }
         public decimal F_WMA { get; set; }
+        public decimal F_WMF2 { get; set; }
+        public decimal F_WMD2 { get; set; }
+        public decimal F_WMP2 { get; set; }
+        public decimal F_WMA2 { get; set; }
 
         public string Vdd { get; set; }
         public string Vcc { get; set; }
@@ -70,6 +74,7 @@ namespace GKHTRBC16P.Model
     {
         public string Item { get; set; }
         public string Value { get; set; }
+        public string Value2 { get; set; }
     }
     public class Dev_Devicest_Grid
     {

GKHTRBC16P.Model/Station_Data.cs

@@ -231,6 +231,10 @@ namespace GKHTRBC16P.Model
         public double F_WMD { get; set; }
         public double F_WMP { get; set; }
         public double F_WMA { get; set; }
+        public double F_WMF2 { get; set; }
+        public double F_WMD2 { get; set; }
+        public double F_WMP2 { get; set; }
+        public double F_WMA2 { get; set; }
 
     }
 }

GKHTRBC16P/FunMov/Home_Status.cs

@@ -421,27 +421,31 @@ namespace GKHTRBC16P.FunMov
                 Txt_direction.Visible = false;
                 EdZFConfig.Visible = false;
                 List<Dev_Station_Grid> dev_Device_Grids = new List<Dev_Station_Grid>();
-                string[] htitle = new string[12]{ "波形", "主波频率(Hz)", "主波占空(%)", "主波相位(°)", "主波幅度(V)","Vdd(V)", "Vcc(V)", "Vee(V)", "Idd(A)", "Icc(A)", "Iee(A)", "时间" };
+                string[] htitle = new string[12]{ "波形", "频率(Hz)", "占空(%)", "相位(°)", "幅度(V)","Vdd(V)", "Vcc(V)", "Vee(V)", "Idd(A)", "Icc(A)", "Iee(A)", "时间" };
                 for (int i = 0; i < htitle.Length; i++)
                 {
                     Dev_Station_Grid device_Grid = new Dev_Station_Grid();
                     device_Grid.Item = htitle[i];
                     device_Grid.Value = "0";
+                    device_Grid.Value2 = "";
                     dev_Device_Grids.Add(device_Grid);
                 }
-                uiDataGridView2.Columns[0].Width = 140;
+                uiDataGridView2.Columns[0].Width = 130;
+                var valueht = (uiDataGridView2.Width - uiDataGridView2.Columns[0].Width - 5) / 2;
                 //uiDataGridView2.Columns[j].CellTemplate.Style.BackColor = Color.Gainsboro;
-                uiDataGridView2.Columns[1].Width = uiDataGridView2.Width - uiDataGridView2.Columns[0].Width - 5;
+                uiDataGridView2.Columns[1].Width = valueht;
+                uiDataGridView2.Columns[2].Width = valueht;
                 //uiDataGridView2.Columns[j + 1].HeaderText = CalculationAo.Thorous[board].PowerUnit;
                 uiDataGridView2.Columns[0].CellTemplate.Style.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Italic);
                 uiDataGridView2.Columns[1].CellTemplate.Style.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
+                uiDataGridView2.Columns[2].CellTemplate.Style.Font = new System.Drawing.Font("Arial", 12F, System.Drawing.FontStyle.Bold);
                 HeadShowLocal();
                 uiDataGridView2.RowTemplate.Height = 32;
                 uiDataGridView2.DataSource = dev_Device_Grids;
                 uiDataGridView2.AllowUserToResizeColumns = false;
                 uiDataGridView2.AllowUserToResizeRows = false;
                 uiDataGridView2.AllowUserToAddRows = false;
-
+                uiDataGridView2.Rows[5].Cells[1].AdjustCellBorderStyle(new DataGridViewAdvancedBorderStyle(), new DataGridViewAdvancedBorderStyle(), false, false, false, false);
                 Txt_direction.Visible = false;
                 StationPost.Nodes.Clear();
                 if ((CalculationAo.Thorous[board].Waytype == 7 || CalculationAo.Thorous[board].Waytype == 6)&& CalculationAo.Thorous[board].Vg == 1)

GKHTRBC16P/FunMov/Home_Status.resx

@@ -174,6 +174,9 @@
   <metadata name="Column12.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
+  <metadata name="Column1.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
   <metadata name="uiContextMenuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>

GKHTRBC16P/Languages/ChineseSimplified.xml

@@ -361,10 +361,10 @@
 			<Control name="uiLabel3" text="创建时间："/>
 			<Control name="uiLabel4" text="器件库："/>
 			<Control name="uiLabel2" text="器件名称："/>
-			<Control name="uiLabel7" text="主波频率(Hz)："/>
+			<Control name="uiLabel7" text="CH1波形频率(Hz)："/>
 			<Control name="uiLabel9" text="反偏电压值(V)："/>
 			<Control name="uiLabel6" text="老化时间(h)："/>
-			<Control name="uiLabel8" text="占空(%)："/>
+			<Control name="uiLabel8" text="CH1占空(%)："/>
 			<Control name="Com_Text_Type" text="0"/>
 			<Control name="uiLabel10" text="上电电压(上桥):"/>
 			<Control name="uiLabel11" text="下电电压(上桥):"/>

GKHTRBC16P/Languages/English.xml

@@ -359,10 +359,10 @@
 			<Control name="uiLabel3" text="Create Time："/>
 			<Control name="uiLabel4" text="Device Library："/>
 			<Control name="uiLabel2" text="Device Name："/>
-			<Control name="uiLabel7" text="IR-min(uA)："/>
+			<Control name="uiLabel7" text="Main wave frequency："/>
 			<Control name="uiLabel9" text="VR(V)："/>
 			<Control name="uiLabel6" text="Burn-in Time(h)："/>
-			<Control name="uiLabel8" text="IR-max(uA)："/>
+			<Control name="uiLabel8" text="Duty cycle："/>
 			<Control name="Com_Text_Type" text="0"/>
 			<Control name="uiLabel10" text="Power on voltage:"/>
 			<Control name="uiLabel11" text="Power down voltage:"/>

GKHTRBC16P/RunLibrary/DriverBoardCom.cs

@@ -443,6 +443,13 @@ namespace GKHTRBC16P.RunLibrary
                         bok = Feelelec.Instance.Fboarddata(uIForm, thor.ComId - 1, WayId + 1, "RMP", 2, 20);//读取主波相位
                         bok = Feelelec.Instance.Fboarddata(uIForm, thor.ComId - 1, WayId + 1, "RMA", 3, 20);//读取主波幅度
                         bok = Feelelec.Instance.Fboarddata(uIForm, thor.ComId - 1, WayId + 1, "RMN", 4, 20);//读取主波输出开始/停止
+
+                        bok = Feelelec.Instance.Fboarddata(uIForm, thor.ComId - 1, WayId + 1, "RFF", 10, 20);//读取副波频率(单位Hz)
+                        bok = Feelelec.Instance.Fboarddata(uIForm, thor.ComId - 1, WayId + 1, "RFD", 11, 20);//读取副波占空(比例50.1%)
+                        bok = Feelelec.Instance.Fboarddata(uIForm, thor.ComId - 1, WayId + 1, "RFP", 12, 20);//读取副波相位
+                        bok = Feelelec.Instance.Fboarddata(uIForm, thor.ComId - 1, WayId + 1, "RFA", 13, 20);//读取副波幅度
+                        bok = Feelelec.Instance.Fboarddata(uIForm, thor.ComId - 1, WayId + 1, "RFN", 14, 20);//读取副波输出开始/停止
+
                         CalculationAo.HTRBCheck[WayId, 0] = 1;  //驱动板检测是否正常
                         CalculationAo.HTRBCheck[WayId, 1] = 0;   //是否插板
                         CalculationAo.HTRBCheck[WayId, 2] = 0;   //运行状态

GKHTRBC16P/RunLibrary/DriverBoardRefresh.cs

@@ -1755,7 +1755,7 @@ namespace GKHTRBC16P.RunLibrary
                 if (WayId == CalculationAo.BoardSS) ////刷新到当前通道时，该指示灯才指示
                 {
                     int tdm = CalculationAo.Thorous[WayId + 1].Snum;
-                    if (tdm.Equals(4) || tdm.Equals(40) || tdm.Equals(20))
+                    if (tdm.Equals(8) || tdm.Equals(40) || tdm.Equals(20))
                     {
                         Home_Status.home_Status.Invoke((EventHandler)(delegate
                         {
@@ -1768,6 +1768,17 @@ namespace GKHTRBC16P.RunLibrary
                             Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 3, 1, ConvertDataOpear.GetShowDouble(SI, CalculationAo.ThisDevConfig.DataLength));
                             SI = (double)Convert.ToInt32(ComRxdData[3]) / 10000;
                             Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 4, 1, ConvertDataOpear.GetShowDouble(SI, CalculationAo.ThisDevConfig.DataLength));
+
+                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 0, 2, "方波");
+                            SI2 = (double)Convert.ToInt32(ComRxdData[10]);
+                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 1, 2, ConvertDataOpear.GetShowDouble(SI, CalculationAo.ThisDevConfig.DataLength));
+                            SI2 = (double)Convert.ToInt32(ComRxdData[11]) / 1000;
+                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 2, 2, ConvertDataOpear.GetShowDouble(SI, CalculationAo.ThisDevConfig.DataLength));
+                            SI2 = (double)Convert.ToInt32(ComRxdData[12]) / 1000;
+                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 3, 2, ConvertDataOpear.GetShowDouble(SI, CalculationAo.ThisDevConfig.DataLength));
+                            SI2 = (double)Convert.ToInt32(ComRxdData[13]) / 10000;
+                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 4, 2, ConvertDataOpear.GetShowDouble(SI, CalculationAo.ThisDevConfig.DataLength));
+
                             var corr = Home_Status.home_Status.CorrList.FirstOrDefault(x => x.PassagewayId == WayId + 1);
                             Dictionary<int, Power_Data> power_Data = ConvertDataOpear.GetPowerDic(corr.PowerId, CalculationAo.PowerList);
                             if (power_Data != null && tes.PowerNo != null)
@@ -1778,17 +1789,25 @@ namespace GKHTRBC16P.RunLibrary
                                 Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 8, 1, power_Data[0].Current.ToString("0.0"));
                                 Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 9, 1, power_Data[1].Current.ToString("0.0"));
                                 Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 10, 1, power_Data[2].Current.ToString("0.0"));
-                            }
 
+                                //Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 5, 2, power_Data[0].Voltage.ToString("0.0"));
+                                //Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 6, 2, power_Data[1].Voltage.ToString("0.0"));
+                                //Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 7, 2, power_Data[2].Voltage.ToString("0.0"));
+                                //Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 8, 2, power_Data[0].Current.ToString("0.0"));
+                                //Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 9, 2, power_Data[1].Current.ToString("0.0"));
+                                //Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 10, 2, power_Data[2].Current.ToString("0.0"));
+                            }
 
-                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 11, 1, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss"));
+                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 11, 1, DateTime.Now.ToString("yyyy-MM-dd"));
+                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, 11, 2, DateTime.Now.ToString("HH:mm:ss"));
                         }));
                     }
                     else
                     {
-                        for (int r = 0; r < 5; r++)
+                        for (int r = 0; r <= 10; r++)
                         {
                             Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, r, 1, "888");
+                            Home_Status.home_Status.inGridviewValue(Home_Status.home_Status.uiDataGridView2, r, 2, "888");
                         }
                     }
                     //将数据显示在datagridview

GKHTRBC16P/ToolLibrary/Devicelibrary.cs

@@ -338,6 +338,10 @@ namespace GKHTRBC16P.ToolLibrary
                     sdev_device.F_WMD = Txt_WMD.Text.ToDecimal();
                     sdev_device.F_WMP = Txt_WMP.Text.ToDecimal();
                     sdev_device.F_WMA = Txt_WMA.Text.ToDecimal();
+                    sdev_device.F_WMF2 = Txt_WMF2.Text.ToDecimal();
+                    sdev_device.F_WMD2 = Txt_WMD2.Text.ToDecimal();
+                    sdev_device.F_WMP2 = Txt_WMP2.Text.ToDecimal();
+                    sdev_device.F_WMA2 = Txt_WMA2.Text.ToDecimal();
                     sdev_device.Vdd = Txt_Vdd.Text.Trim();
                     sdev_device.Vcc = Txt_Vcc.Text.Trim();
                     sdev_device.Vee = Txt_Vee.Text.Trim();
@@ -410,6 +414,10 @@ namespace GKHTRBC16P.ToolLibrary
                     sdev_device.F_WMD = Txt_WMD.Text.ToDecimal();
                     sdev_device.F_WMP = Txt_WMP.Text.ToDecimal();
                     sdev_device.F_WMA = Txt_WMA.Text.ToDecimal();
+                    sdev_device.F_WMF2 = Txt_WMF2.Text.ToDecimal();
+                    sdev_device.F_WMD2 = Txt_WMD2.Text.ToDecimal();
+                    sdev_device.F_WMP2 = Txt_WMP2.Text.ToDecimal();
+                    sdev_device.F_WMA2 = Txt_WMA2.Text.ToDecimal();
                     sdev_device.Vdd = Txt_Vdd.Text.Trim();
                     sdev_device.Vcc = Txt_Vcc.Text.Trim();
                     sdev_device.Vee = Txt_Vee.Text.Trim();
@@ -514,6 +522,10 @@ namespace GKHTRBC16P.ToolLibrary
                         Txt_WMD.Text = curenode.F_WMD.ToString();
                         Txt_WMP.Text = curenode.F_WMP.ToString();
                         Txt_WMA.Text = curenode.F_WMA.ToString();
+                        Txt_WMF2.Text = curenode.F_WMF2.ToString();
+                        Txt_WMD2.Text = curenode.F_WMD2.ToString();
+                        Txt_WMP2.Text = curenode.F_WMP2.ToString();
+                        Txt_WMA2.Text = curenode.F_WMA2.ToString();
 
                         Txt_Vdd.Text = curenode.Vdd;
                         Txt_Vcc.Text = curenode.Vcc;

GKHTRBC16P/bin/Debug/Languages/ChineseSimplified.xml

@@ -361,10 +361,10 @@
 			<Control name="uiLabel3" text="创建时间："/>
 			<Control name="uiLabel4" text="器件库："/>
 			<Control name="uiLabel2" text="器件名称："/>
-			<Control name="uiLabel7" text="主波频率(Hz)："/>
+			<Control name="uiLabel7" text="CH1波形频率(Hz)："/>
 			<Control name="uiLabel9" text="反偏电压值(V)："/>
 			<Control name="uiLabel6" text="老化时间(h)："/>
-			<Control name="uiLabel8" text="占空(%)："/>
+			<Control name="uiLabel8" text="CH1占空(%)："/>
 			<Control name="Com_Text_Type" text="0"/>
 			<Control name="uiLabel10" text="上电电压(上桥):"/>
 			<Control name="uiLabel11" text="下电电压(上桥):"/>

GKHTRBC16P/bin/Debug/Languages/English.xml

@@ -359,10 +359,10 @@
 			<Control name="uiLabel3" text="Create Time："/>
 			<Control name="uiLabel4" text="Device Library："/>
 			<Control name="uiLabel2" text="Device Name："/>
-			<Control name="uiLabel7" text="IR-min(uA)："/>
+			<Control name="uiLabel7" text="Main wave frequency："/>
 			<Control name="uiLabel9" text="VR(V)："/>
 			<Control name="uiLabel6" text="Burn-in Time(h)："/>
-			<Control name="uiLabel8" text="IR-max(uA)："/>
+			<Control name="uiLabel8" text="Duty cycle："/>
 			<Control name="Com_Text_Type" text="0"/>
 			<Control name="uiLabel10" text="Power on voltage:"/>
 			<Control name="uiLabel11" text="Power down voltage:"/>