Skip to content

G
GK-HTRB-GB
提交 55dd97ed authored 作者: yangbinjay's avatar yangbinjay
浏览文件
操作

vgs 优化

上级 470c8e44
全部展开 显示空白字符变更
内嵌 并排
正在显示 包含 450 行增加 和 106 行删除
GK-HTRB-C16P.Upgradation/FrmUpgradation.cs
浏览文件 @ 55dd97ed
......@@ -1007,31 +1007,31 @@ namespace GK_HTRB_C16P.Upgradation
switch(type)
{
case 0:
rbtl = 19200;
rbtl = 19200;//常规
break;
case 1:
rbtl = 19200;
rbtl = 19200;//快切
break;
case 2:
rbtl = 19200;
rbtl = 19200;//上下桥
break;
case 3:
rbtl = 115200;
rbtl = 115200;//H3trb
break;
case 4:
rbtl = 115200;
rbtl = 115200;//Gb80
break;
case 5:
rbtl = 115200;
rbtl = 115200;//Htgb
break;
case 6:
rbtl = 19200;
rbtl = 19200;//HighVol
break;
case 7:
rbtl = 19200;
rbtl = 19200;//80v6
break;
default:
rbtl = 19200;
rbtl = 19200;//Rb40D
break;
}
return rbtl;
......
GKHTRBC16P.Bll/StationTbridoDataBll.cs
浏览文件 @ 55dd97ed
......@@ -383,7 +383,22 @@ namespace GKHTRBC16P.Bll
station_Data.ParmId = test_Parameter.ParmId;
station_Data.RunTime = test_Parameter.TotalTime;
station_Data.VR = power_Data[0] == null ? 0 : power_Data[0].Voltage;
station_Data._VR = power_Data[1] == null ? 0 : power_Data[1].Voltage;
if (power_Data.Count == 1)
{
if (power_Data[0] == null)
{
station_Data._VR = power_Data[0].Voltage;
}
else
{
station_Data._VR = 0;
}
}
else
{
station_Data._VR = power_Data[1].Voltage;
}
//station_Data._VR = power_Data[1] == null ? 0 : power_Data[1].Voltage;
if (CalculationAo.VgsList.ContainsKey(test_Parameter.Id))
{
station_Data.VgsP = Math.Round(-1 * (CalculationAo.VgsList[test_Parameter.Id].VgsP), CalculationAo.ThisDevConfig.DataLength.Length - 2);
......
GKHTRBC16P.Model/obj/Debug/GKHTRBC16P.Model.csproj.FileListAbsolute.txt
浏览文件 @ 55dd97ed
......@@ -4,9 +4,9 @@ E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Mod
E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.CoreCompileInputs.cache
E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.dll
E:\Customer\GK-HTRB-C16P-gk\GKHTRBC16P\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.pdb
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\GKHTRBC16P.Model.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\bin\Debug\GKHTRBC16P.Model.pdb
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.AssemblyReference.cache
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.csproj.CoreCompileInputs.cache
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.dll
E:\CustomerRbGb\GK-HTRB-C16P-gaokun\GK-HTRB-GB\GKHTRBC16P.Model\obj\Debug\GKHTRBC16P.Model.pdb
GKHTRBC16P.Protocol/Boven/Ewgzks.cs 0 → 100644
浏览文件 @ 55dd97ed
using GKHTRBC16P.Toolbox;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Cryptography;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace GKHTRBC16P.Protocol.Boven
{
public class Ewgzks
{
private static readonly Ewgzks instance = new Ewgzks();
private readonly int MaxWatingTime = 300;
//private SuLock mLock = new SuLock();
private Ewgzks() { }
public static Ewgzks Instance
{
get
{
return instance;
}
}
public ushort ReadOven(Form from, int Com, int addr)
{
Monitor.Enter(SerialCom.ComWriteLock3[Com]);
ushort result = 1;
try
{
SerialCom.Oven_IsRreceiving = true;
uPublic.WriteOLog("ReadOven:Begin");
ushort cnum = 3;
while (result > 0 && cnum > 0)
{
result = FboarddataTestxwe(from, Com, addr);
if (result == 0)
{
uPublic.WriteOLog("ReadOven:End");
return result;
}
cnum--;
}
uPublic.WriteOLog("ReadOven:End No Data");
return result;
}
catch (Exception ex)
{
uPublic.WriteOLog(ex.Message);
return 6;
}
finally
{
SerialCom.Oven_IsRreceiving = false;
Monitor.Exit(SerialCom.ComWriteLock3[Com]);
}
}
public ushort FboarddataTestxwe(Form from, int Com, int Adr1)
{
try
{
SerialCom.OpenSerial_HighTem1_Hir(Com);
byte[] num = new byte[65];
byte[] senchr = new byte[512];
num[1] = (byte)ConvertDataOpear.HexToInt(Adr1.ToString("X2"));//目标地址
num[2] = (byte)0x03;
num[3] = (byte)0x1F;
num[4] = (byte)0x37;
num[5] = (byte)0x00;
num[6] = (byte)0x01;
List<byte> stu = new List<byte>();
for (int j = 1; j <= 6; j++)
{
stu.Add(Convert.ToByte(num[j].ToString("X2"), 16));
}
byte[] calcrc = ConvertDataOpear.CRCModelBus(stu);
num[7] = calcrc[0];
num[8] = calcrc[1];
LogisTrac.WriteLog(typeof(Hirayama), "-->" + ConvertDataOpear.GetBytesString(num, 1, 8, " "));
SerialCom.SerialPort_HighTem1[Com].Write(num, 1, 8);
DateTime dt = DateTime.Now;
while (SerialCom.SerialPort_HighTem1[Com].BytesToRead < 8)
{
Thread.Sleep(10);
if (DateTime.Now.Subtract(dt).TotalMilliseconds > MaxWatingTime) //如果2秒后仍然无数据返回，则视为超时
{
LogisTrac.WriteLog(from.GetType(), "设备未响应" + SerialCom.SerialPort_HighTem1[Com].PortName);
SerialCom.OpenSerial_HighTem1_Close(Com, false);//关闭
return 4;
}
}
senchr = new byte[50];
SerialCom.SerialPort_HighTem1[Com].Read(senchr, 0, 8);
LogisTrac.WriteLog(typeof(Hirayama), "<--" + ConvertDataOpear.GetBytesString(senchr, 0, 8, " "));
if (senchr.Length >= 8 && senchr[1] == 0X03)
{
string temp = Encoding.ASCII.GetString(new byte[] { senchr[3], senchr[4] });
int tem = Convert.ToInt32(temp, 16);
CalculationAo.OvenRead[0] = (double)tem / 10;
//string himi = Encoding.ASCII.GetString(new byte[] { senchr[9], senchr[10], senchr[11], senchr[23] });
//int him = Convert.ToInt32(himi, 16);
//CalculationAo.HumiRead[0] = (double)him / 100;
}
SerialCom.OpenSerial_HighTem1_Close(Com, true);//关闭
return 0;
}
catch (Exception ex)
{
SerialCom.OpenSerial_HighTem1_Close(Com, false);//关闭
//from.ShowErrorTip(ex.Message);
LogisTrac.WriteLog(from.GetType(), ex);
return 1;
}
}
}
}
GKHTRBC16P.Protocol/GKHTRBC16P.Protocol.csproj
浏览文件 @ 55dd97ed
......@@ -52,6 +52,7 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="Boven\Ewgzks.cs" />
<Compile Include="Boven\Gws.cs" />
<Compile Include="Boven\Hirayama.cs" />
<Compile Include="Driboard\BoardHtolmod.cs" />
......
GKHTRBC16P.Protocol/obj/Debug/GKHTRBC16P.Protocol.csproj.CoreCompileInputs.cache
浏览文件 @ 55dd97ed
30f2f25c981949957bd11c710537b2df434b52a7b8bf55b9d37097f1239e2b04
afc5450dcc6170cec6fd004cc4d0ed022bc5fa887ddf24ea00eda52a7fc375f7
GKHTRBC16P.Toolbox/ConvertDataOpear.cs
浏览文件 @ 55dd97ed
......@@ -681,9 +681,9 @@ namespace GKHTRBC16P.Toolbox
public static string StringRunState(string LangSign,int runflag,Test_Parameter tes)
{
string Result ="";
Paramter_Time mtine = tes.ParamterTimeList.FirstOrDefault(x => x.TolTime < 0);
if (mtine != null)
runflag = mtine.TolTime + 2;
//Paramter_Time mtine = tes.ParamterTimeList.FirstOrDefault(x => x.TolTime < 0 && tes.Id !=0);
//if (mtine != null)
// runflag = mtine.TolTime + 2;
if (LangSign == "ChineseSimplified")
{
switch (runflag)
......
GKHTRBC16P/FunMov/FrmPowerSet.cs
浏览文件 @ 55dd97ed
......@@ -465,9 +465,9 @@ namespace GKHTRBC16P.FunMov
LogisTrac.WriteLog(this.GetType(), "电压超过设置的反偏电压值!");
return;
}
Dev_Correspondence corr = Corrlist.FirstOrDefault(x => x.PowerId.Contains("PS" + powernum));
if (CalculationAo.ThisDevConfig.IsVgs == 0)
{
Dev_Correspondence corr = Corrlist.FirstOrDefault(x => x.PowerId.Contains("PS" + powernum));
if (corr != null)
{
if (CalculationAo.ThorouVgs.ContainsKey(corr.PassagewayId))
......@@ -485,12 +485,12 @@ namespace GKHTRBC16P.FunMov
double NULValue = vgsdata.VgsN[0] + thvgs.UpperLimit;
double NLLValue = vgsdata.VgsN[0] - thvgs.LowerLimit;
var tparm = CalculationAo.parametersList.FirstOrDefault(x => x.Id == corr.PassagewayId);
if (tparm != null)
if (tparm == null)
{
FrmMain.mainForm.Prompt("tdpower");
return;
}
if ((vgsdata.VgsP > PULValue || vgsdata.VgsP < PLLValue || vgsdata.VgsP == 0) && tparm.VgsP != 0)
if ((vgsdata.VgsP > PULValue || vgsdata.VgsP < PLLValue || vgsdata.VgsP == 0) && tparm.VgsP != 0)//&& tparm.VgsP != 0
{
//ShowErrorTip("正栅压没达标，请检查!");
FrmMain.mainForm.Prompt("positivegrid");
......@@ -499,7 +499,7 @@ namespace GKHTRBC16P.FunMov
}
for (int i = 0; i < vgsdata.VgsN.Length; i++)
{
if ((vgsdata.VgsN[i] > NULValue || vgsdata.VgsN[i] < NLLValue || vgsdata.VgsN[i] == 0) && tparm.VgsN != 0)
if ((vgsdata.VgsN[i] > NULValue || vgsdata.VgsN[i] < NLLValue || vgsdata.VgsN[i] == 0) && tparm.VgsN != 0)// && tparm.VgsN != 0
{
i = i + 1;
FrmMain.mainForm.Prompt("negativegate");
......@@ -572,6 +572,20 @@ namespace GKHTRBC16P.FunMov
LogisTrac.WriteLog(this.GetType(), "电压超过设置的反偏电压值......!");
return;
}
if (corr != null)
{
var tparm = CalculationAo.parametersList.FirstOrDefault(x => x.Id == corr.PassagewayId);
if (tparm != null)
{
var devicef = devlist.FirstOrDefault(x => x.Id == tparm.DeviceId);
if (Vx > (double)devicef.BackVol)
{
FrmMain.mainForm.Prompt("poption", devicef.BackVol.ToString());
LogisTrac.WriteLog(this.GetType(), "电压超过设置的反偏电压值......!");
return;
}
}
}
//EditVSet.Maximum = (double)VolMax;
string SV;
......
GKHTRBC16P/FunMov/FrmPowerTab.cs
浏览文件 @ 55dd97ed
......@@ -462,12 +462,12 @@ namespace GKHTRBC16P.FunMov
double NULValue = vgsdata.VgsN[0] + thvgs.UpperLimit;
double NLLValue = vgsdata.VgsN[0] - thvgs.LowerLimit;
var tparm = CalculationAo.parametersList.FirstOrDefault(x => x.Id == corr.PassagewayId);
if (tparm != null)
if (tparm == null)
{
FrmMain.mainForm.Prompt("tdpower");
return;
}
if ((vgsdata.VgsP > PULValue || vgsdata.VgsP < PLLValue || vgsdata.VgsP == 0) && tparm.VgsP != 0)
if ((vgsdata.VgsP > PULValue || vgsdata.VgsP < PLLValue || vgsdata.VgsP == 0) && tparm.VgsP != 0)//&& tparm.VgsP != 0
{
//ShowErrorTip("正栅压没达标，请检查!");
FrmMain.mainForm.Prompt("positivegrid");
......@@ -476,7 +476,7 @@ namespace GKHTRBC16P.FunMov
}
for (int i = 0; i < vgsdata.VgsN.Length; i++)
{
if ((vgsdata.VgsN[i] > NULValue || vgsdata.VgsN[i] < NLLValue || vgsdata.VgsN[i] == 0) && tparm.VgsN != 0)
if ((vgsdata.VgsN[i] > NULValue || vgsdata.VgsN[i] < NLLValue || vgsdata.VgsN[i] == 0) && tparm.VgsN != 0)// && tparm.VgsN != 0
{
i = i + 1;
FrmMain.mainForm.Prompt("negativegate");
......
GKHTRBC16P/FunMov/Home_Status.cs
浏览文件 @ 55dd97ed
......@@ -997,7 +997,7 @@ namespace GKHTRBC16P.FunMov
cellvalue = cellvalue + "_";
}
}
uiTabControl1.SelectedIndex = 1;
uiTabControl1.SelectedIndex = uiTabControl1.TabCount -1;
//StationPost.Text = cellvalue;
TreeNodeCollection treeNode = StationPost.Nodes;
string treetext = "";
......
GKHTRBC16P/Jurisdiction/FrmStagePress.cs
浏览文件 @ 55dd97ed
......@@ -633,7 +633,7 @@ namespace GKHTRBC16P.Jurisdiction
double NULValue = vgsdata.VgsN[0] + thvgs.UpperLimit;
double NLLValue = vgsdata.VgsN[0] - thvgs.LowerLimit;
var tparm = CalculationAo.parametersList.FirstOrDefault(x => x.Id == corr.PassagewayId);
if (tparm != null)
if (tparm == null)
{
FrmMain.mainForm.Prompt("tdpower");
return;
......
GKHTRBC16P/RunLibrary/AutoPowerCon.cs
浏览文件 @ 55dd97ed
......@@ -2,6 +2,7 @@
using GKHTRBC16P.FunMov;
using GKHTRBC16P.Model;
using GKHTRBC16P.Protocol.Boven;
using GKHTRBC16P.Protocol.Driboard;
using GKHTRBC16P.Protocol.Powers;
using GKHTRBC16P.Toolbox;
using GKHTRBC16P.ToolLibrary;
......@@ -55,52 +56,136 @@ namespace GKHTRBC16P.RunLibrary
// SetAutoParmOven(3, tparm, devm);
// }
//}
public void SetAutoParmPower(Test_Parameter tparm)
public bool SetVgsStdoy(Test_Parameter tparm, int td,int statused)
{
DeviceBll deviceBll = new DeviceBll();
List<Dev_Device> devicelist = deviceBll.GetList();
var devm = devicelist.FirstOrDefault(x => x.Id == tparm.DeviceId);
if (devm != null)
SetAutoParmOven(3, tparm, devm);
try
{
if (CalculationAo.ThisDevConfig.IsVgs == 1)
return true;
if (!CalculationAo.ThorouVgs.ContainsKey(td))
return true;
var th = CalculationAo.ThorouVgs[td];
float f_VgsP = ConvertDataOpear.StrToFloat(tparm.VgsP);
float f_VgsN = ConvertDataOpear.StrToFloat(tparm.VgsN);
if (statused == 2 || statused == 4)
{
f_VgsP = 0;
f_VgsN = 0;
}
public void SetAutoParmOven(int tdstatus, Test_Parameter tparm, Dev_Device device)
if (f_VgsP == 0 || f_VgsN == 0)
{
if (CalculationAo.ThisDevConfig.IsVgs == 0 && (tdstatus == 0 || tdstatus == 2))
var devCorrespondenceBll = new DevCorrespondenceBll();
var CorrList = devCorrespondenceBll.GetList();
var corr = CorrList.FirstOrDefault(x => x.PassagewayId == td);
if (corr != null)
{
if (CalculationAo.ThorouVgs.ContainsKey(tparm.Id))
string[] parsp = corr.PowerId.Replace("PS", "").Split(',');
int status = 0;
double PowerP = Lanyi.Instance.SendDataB(FrmMain.mainForm, 0, Convert.ToInt32(parsp[0]), 00, 00, out status);
double PowerN = Lanyi.Instance.SendDataB(FrmMain.mainForm, 0, Convert.ToInt32(parsp[1]), 00, 00, out status);
if (PowerP > 0.9 || PowerN > 0.9)
{
Dev_ThorouVgs thvgs = CalculationAo.ThorouVgs[tparm.Id];
int[] vgsData = null;
if (CalculationAo.VgsData.TryGetValue(tparm.Id, out vgsData))
FrmMain.mainForm.ShowErrorTip("vgs:请先降正负电压:" + td);
return false;
}
else
{
//DriverBoardRefresh.GetVgs(FrmMain.mainForm, corr.PassagewayId, vgsData);
if (CalculationAo.VgsList.ContainsKey(thvgs.Tid))
if (Vgs.Instance.VgsBoarddata(this.GetType(), th.ComId - 1, td, 1, 0, 71, f_VgsP, f_VgsN) == 0)
{
var vgsdata = CalculationAo.VgsList[thvgs.Tid];
double PULValue = vgsdata.VgsP + thvgs.UpperLimit;
double PLLValue = vgsdata.VgsP - thvgs.LowerLimit;
double NULValue = vgsdata.VgsN[0] + thvgs.UpperLimit;
double NLLValue = vgsdata.VgsN[0] - thvgs.LowerLimit;
if ((vgsdata.VgsP > PULValue || vgsdata.VgsP < PLLValue || vgsdata.VgsP == 0) && tparm.VgsP != 0)
FrmMain.mainForm.ShowSuccessTip("vgs:栅压降压命令发送成功:" + td);
LogisTrac.WriteLog(this.GetType(), "vgs:栅压降压命令发送成功,OK!");
Thread.Sleep(500);
return true;
}
else
{
FrmMain.mainForm.Prompt("positivegrid");
return;
FrmMain.mainForm.ShowErrorTip("vgs:通道" + td + "降栅压失败，请检查通讯");
return false;
}
}
for (int ii = 0; ii < vgsdata.VgsN.Length; ii++)
}
else
{
if ((vgsdata.VgsN[ii] > NULValue || vgsdata.VgsN[ii] < NLLValue || vgsdata.VgsN[ii] == 0) && tparm.VgsN != 0)
FrmMain.mainForm.ShowErrorTip("通道" + td + "请配置对应关系");
return false;
}
}
else
{
ii = ii + 1;
FrmMain.mainForm.Prompt("negativegate");
return;
if (Vgs.Instance.VgsBoarddata(this.GetType(), th.ComId - 1, td, 1, 0, 71, f_VgsP, f_VgsN) == 0)
{
if (CalculationAo.VgsData[td][10] != 0)
{
FrmMain.mainForm.ShowErrorTip("vgs:加栅压失败，请检查通讯:" + td);
return false;
}
}
else
{
FrmMain.mainForm.ShowErrorTip("通道" + td + "加栅压失败，请检查通讯!");
return false;
}
FrmMain.mainForm.ShowSuccessTip("vgs:栅压降压命令发送成功,,OK:" + td);
LogisTrac.WriteLog(this.GetType(), "vgs:栅压降压命令发送成功,,OK:" + td);
Thread.Sleep(500);
return true;
}
}
catch (Exception ex)
{
LogisTrac.WriteLog(this.GetType(), ex);
FrmMain.mainForm.ShowErrorTip("设置vgs失败！"+ td);
return false;
}
}
public void SetAutoParmPower(Test_Parameter tparm)
{
DeviceBll deviceBll = new DeviceBll();
List<Dev_Device> devicelist = deviceBll.GetList();
var devm = devicelist.FirstOrDefault(x => x.Id == tparm.DeviceId);
if (devm != null)
SetAutoParmOven(3, tparm, devm);
}
public void SetAutoParmOven(int tdstatus, Test_Parameter tparm, Dev_Device device)
{
#region 自动vgs处理
//if (CalculationAo.ThisDevConfig.IsVgs == 0 && (tdstatus == 0 || tdstatus == 2))
//{
// if (CalculationAo.ThorouVgs.ContainsKey(tparm.Id))
// {
// Dev_ThorouVgs thvgs = CalculationAo.ThorouVgs[tparm.Id];
// int[] vgsData = null;
// if (CalculationAo.VgsData.TryGetValue(tparm.Id, out vgsData))
// {
// //DriverBoardRefresh.GetVgs(FrmMain.mainForm, corr.PassagewayId, vgsData);
// if (CalculationAo.VgsList.ContainsKey(thvgs.Tid))
// {
// var vgsdata = CalculationAo.VgsList[thvgs.Tid];
// double PULValue = vgsdata.VgsP + thvgs.UpperLimit;
// double PLLValue = vgsdata.VgsP - thvgs.LowerLimit;
// double NULValue = vgsdata.VgsN[0] + thvgs.UpperLimit;
// double NLLValue = vgsdata.VgsN[0] - thvgs.LowerLimit;
// if ((vgsdata.VgsP > PULValue || vgsdata.VgsP < PLLValue || vgsdata.VgsP == 0) && tparm.VgsP != 0)
// {
// FrmMain.mainForm.Prompt("positivegrid");
// return;
// }
// for (int ii = 0; ii < vgsdata.VgsN.Length; ii++)
// {
// if ((vgsdata.VgsN[ii] > NULValue || vgsdata.VgsN[ii] < NLLValue || vgsdata.VgsN[ii] == 0) && tparm.VgsN != 0)
// {
// ii = ii + 1;
// FrmMain.mainForm.Prompt("negativegate");
// return;
// }
// }
// }
// }
// }
//}
#endregion
PowerOvenAutoBll powerOvenAutoBll = new PowerOvenAutoBll();
Power_Oven_Auto power_Oven_Auto = new Power_Oven_Auto();
if (CalculationAo.PowerKey.ContainsKey(tparm.PowerNo))
......
GKHTRBC16P/RunLibrary/CsvFileUtility.cs
浏览文件 @ 55dd97ed
......@@ -63,7 +63,8 @@ namespace GKHTRBC16P.RunLibrary
sb_Text.AppendLine("BoardInfo," + boardInfo);
sb_Text.AppendLine("FileName," + BatchFileName);
sb_Text.AppendLine("DeviceName," + DevName);
sb_Text.AppendLine("Oven#,HTRB_" + CalculationAo.ThisDevConfig.SerialNumber);
//sb_Text.AppendLine("Oven#,HTRB_" + CalculationAo.ThisDevConfig.SerialNumber);
sb_Text.AppendLine("0");
sb_Text.AppendLine("Slot#," + ParmId);
sb_Text.AppendLine(string.Format("IRMax({0}),",powernuint.Substring(3, 2)) + EleUpper);
sb_Text.AppendLine("VR(V)," + BackVol);
......
GKHTRBC16P/RunLibrary/DriverBoardRefresh.cs
浏览文件 @ 55dd97ed
......@@ -4,6 +4,7 @@ using GKHTRBC16P.Model;
using GKHTRBC16P.Properties;
using GKHTRBC16P.Protocol.Driboard;
using GKHTRBC16P.Toolbox;
using GKHTRBC16P.ToolLibrary;
using HTICOLClient;
using Sunny.UI;
using Sunny.UI.Win32;
......@@ -476,11 +477,20 @@ namespace GKHTRBC16P.RunLibrary
if (!string.IsNullOrEmpty(tes.PowerNo))
{
power_Data = ConvertDataOpear.GetPowerDic(tes.PowerNo, CalculationAo.PowerList);//
if (power_Data[0] != null && power_Data[1] != null)
power_Data = ConvertDataOpear.GetPowerDic(tes.PowerNo, CalculationAo.PowerList);//
if (power_Data[0] != null)
{
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EB_INVol, power_Data[0].Voltage.ToString("0.0"));
}
if (power_Data.Count == 1)
{
power_Data[1] = power_Data[0];
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EdZFConfig, power_Data[1].Voltage + "V");
}
else
{
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EdZFConfig, power_Data[0].Voltage + "V");
}
}
Home_Status.home_Status.inVokeText(Home_Status.home_Status.Txt_direction, "V-");
Home_Status.home_Status.inVokeText(Home_Status.home_Status.Lastatus, ConvertDataOpear.StringRunState(CalculationAo.ThisDevConfig.Language, CalculationAo.HTRBOT[WayId, 12], tes)); //运行状态
......@@ -540,8 +550,9 @@ namespace GKHTRBC16P.RunLibrary
{
CalculationAo.HTRBOT[WayId, 12] = 00; //表示停止运行
CalculationAo.HTRBCheck[WayId, 2] = 0;
AutoPowerCon.Instaion.SetAutoParmPower(tes);
}
if (AutoPowerCon.Instaion.SetVgsStdoy(tes, WayId + 1,4))
AutoPowerCon.Instaion.SetAutoParmPower(tes);
}
LightControl.ThreeColorLightControl(3, WayId);//表示有试验完成，绿灯闪烁提示
if (CalculationAo.ThisDevConfig.InterOpen == 1)
......@@ -740,11 +751,20 @@ namespace GKHTRBC16P.RunLibrary
else
{
power_Data = ConvertDataOpear.GetPowerDic(tes.PowerNo, CalculationAo.PowerList);//
if (power_Data[0] != null && power_Data[1] != null)
power_Data = ConvertDataOpear.GetPowerDic(tes.PowerNo, CalculationAo.PowerList);//
if (power_Data[0] != null)
{
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EB_INVol, power_Data[0].Voltage.ToString("0.0"));
}
if (power_Data.Count == 1)
{
power_Data[1] = power_Data[0];
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EdZFConfig, power_Data[1].Voltage + "V");
}
else
{
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EdZFConfig, power_Data[0].Voltage + "V");
}
}
Home_Status.home_Status.inVokeText(Home_Status.home_Status.Lastatus, ConvertDataOpear.StringRunState(CalculationAo.ThisDevConfig.Language, CalculationAo.HTRBOT[WayId, 12], tes)); //运行状态
Home_Status.home_Status.inVokeText(Home_Status.home_Status.LBRecCount, tes.Summary.RecordNum.ToString());
......@@ -800,6 +820,7 @@ namespace GKHTRBC16P.RunLibrary
CalculationAo.HTRBOT[WayId, 12] = 00; //表示停止运行
CalculationAo.HTRBCheck[WayId, 2] = 0;
}
if (AutoPowerCon.Instaion.SetVgsStdoy(tes, WayId + 1,4))
AutoPowerCon.Instaion.SetAutoParmPower(tes);
}
if (CalculationAo.LightControl.RedMove == "Y")
......@@ -1146,11 +1167,19 @@ namespace GKHTRBC16P.RunLibrary
else
{
power_Data = ConvertDataOpear.GetPowerDic(tes.PowerNo, CalculationAo.PowerList);//
if (power_Data[0] != null && power_Data[1] != null)
if (power_Data[0] != null)
{
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EB_INVol, power_Data[0].Voltage.ToString("0.0"));
}
if (power_Data.Count == 1)
{
power_Data[1] = power_Data[0];
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EdZFConfig, power_Data[1].Voltage + "V");
}
else
{
Home_Status.home_Status.inVokeText(Home_Status.home_Status.EdZFConfig, power_Data[0].Voltage + "V");
}
}
Home_Status.home_Status.inVokeText(Home_Status.home_Status.Lastatus, ConvertDataOpear.StringRunState(CalculationAo.ThisDevConfig.Language, CalculationAo.HTRBOT[WayId, 12], tes)); //运行状态
Home_Status.home_Status.inVokeText(Home_Status.home_Status.LBRecCount, tes.Summary.RecordNum.ToString());
......@@ -1206,6 +1235,7 @@ namespace GKHTRBC16P.RunLibrary
CalculationAo.HTRBOT[WayId, 12] = 00; //表示停止运行
CalculationAo.HTRBCheck[WayId, 2] = 0;
}
if (AutoPowerCon.Instaion.SetVgsStdoy(tes, WayId + 1, 4))
AutoPowerCon.Instaion.SetAutoParmPower(tes);
}
if (CalculationAo.LightControl.RedMove == "Y")
......@@ -1673,11 +1703,12 @@ namespace GKHTRBC16P.RunLibrary
if (CalculationAo.ThisDevConfig.AutoEndTest == 0)
{
var thor = CalculationAo.Thorous[WayId + 1];
if (Htgb80.Instance.FboarddataTestStatus(uIForm, thor.ComId - 1, WayId + 1, 0x04, 0xA5, 0x00, 20) == 0)
if(Rb40D.Instance.FboarddataTestStatus(uIForm, thor.ComId - 1, WayId + 1, 0x06, 0xA5, 0, 20) == 0)
{
CalculationAo.HTRBOT[WayId, 12] = 00; //表示停止运行
CalculationAo.HTRBCheck[WayId, 2] = 0;
}
if (AutoPowerCon.Instaion.SetVgsStdoy(tes, WayId + 1,4))
AutoPowerCon.Instaion.SetAutoParmPower(tes);
}
LightControl.ThreeColorLightControl(3);//表示有试验完成，绿灯闪烁提示
......@@ -1874,6 +1905,8 @@ namespace GKHTRBC16P.RunLibrary
Dictionary<int, Power_Data> power_Data = ConvertDataOpear.GetPowerDic(tes.PowerNo, CalculationAo.PowerList);//
Dev_Device Device = Home_Status.home_Status.devList.FirstOrDefault(x => x.Id == tes.DeviceId);
Oven_Data oven_Data = ConvertDataOpear.GetOven(tes.OvenNo, CalculationAo.OvenList);
if (power_Data.Count == 1)
power_Data[1] = power_Data[0];
if (Device != null && oven_Data.CreateTime != null)
{
Home_Status.home_Status.Invoke((EventHandler)delegate
......
GKHTRBC16P/RunLibrary/EntranceTempMain.cs
浏览文件 @ 55dd97ed
......@@ -99,6 +99,24 @@ namespace GKHTRBC16P.RunLibrary
CalculationAo.TemData[2] = 0;
}
}
else if (CalculationAo.ThisDevConfig.TestBoxId == 6)
{
if (Ewgzks.Instance.ReadOven(FrmMain.mainForm, 0, CalculationAo.ThisDevConfig.TestBoxNo) == 0)
{
CalculationAo.TemData[1] = Math.Round(CalculationAo.OvenRead[0] * 10, 1);
CalculationAo.TemData[3] = CalculationAo.TemData[1];
CalculationAo.TemData[4] = CalculationAo.TemData[1];
CalculationAo.TemData[5] = CalculationAo.TemData[1];
CalculationAo.RunLEDState = 0; //每次设置完成后，LED只进入读取状态
CalculationAo.TemData[2] = Math.Round(CalculationAo.HumiRead[0] * 10, 1);
OisovenCutoff[0] = DateTime.Now;
}
else
{
CalculationAo.TemData[1] = 0;
CalculationAo.TemData[2] = 0;
}
}
else
{
if (Gws.Instance.ReadOven(FrmMain.mainForm, 0, CalculationAo.ThisDevConfig.TestBoxNo) == 0)
......
GKHTRBC16P/ToolLibrary/AutoTemper.cs
浏览文件 @ 55dd97ed
......@@ -143,6 +143,24 @@ namespace GKHTRBC16P.ToolLibrary
CalculationAo.TemData[2] = 0;
}
}
if (CalculationAo.ThisDevConfig.TestBoxId == 6)
{
if (Ewgzks.Instance.ReadOven(FrmMain.mainForm, 0, CalculationAo.ThisDevConfig.TestBoxNo) == 0)
{
CalculationAo.TemData[1] = Math.Round(CalculationAo.OvenRead[0] * 10, 1);
CalculationAo.TemData[3] = CalculationAo.TemData[1];
CalculationAo.TemData[4] = CalculationAo.TemData[1];
CalculationAo.TemData[5] = CalculationAo.TemData[1];
CalculationAo.RunLEDState = 0; //每次设置完成后，LED只进入读取状态
CalculationAo.TemData[2] = Math.Round(CalculationAo.HumiRead[0] * 10, 1);
ShowHuiControl(true);
}
else
{
CalculationAo.TemData[1] = 0;
CalculationAo.TemData[2] = 0;
}
}
else
{
if (Gws.Instance.ReadOven(this, TemperaSign - 1, CalculationAo.ThisDevConfig.TestBoxNo) == 0)
......@@ -349,6 +367,24 @@ namespace GKHTRBC16P.ToolLibrary
CalculationAo.TemData[2] = 0;
}
}
if (CalculationAo.ThisDevConfig.TestBoxId == 6)
{
if (Ewgzks.Instance.ReadOven(FrmMain.mainForm, 0, CalculationAo.ThisDevConfig.TestBoxNo) == 0)
{
CalculationAo.TemData[1] = Math.Round(CalculationAo.OvenRead[0] * 10, 1);
CalculationAo.TemData[3] = CalculationAo.TemData[1];
CalculationAo.TemData[4] = CalculationAo.TemData[1];
CalculationAo.TemData[5] = CalculationAo.TemData[1];
CalculationAo.RunLEDState = 0; //每次设置完成后，LED只进入读取状态
CalculationAo.TemData[2] = Math.Round(CalculationAo.HumiRead[0] * 10, 1);
ShowHuiControl(true);
}
else
{
CalculationAo.TemData[1] = 0;
CalculationAo.TemData[2] = 0;
}
}
else
{
if (Gws.Instance.ReadOven(this, TemperaSign - 1, CalculationAo.ThisDevConfig.TestBoxNo) == 0)
......
GKHTRBC16P/ToolLibrary/Devicelibrary.Designer.cs
浏览文件 @ 55dd97ed
......@@ -43,6 +43,8 @@
this.uiSymbolButton1 = new Sunny.UI.UISymbolButton();
this.uiSymbolButton2 = new Sunny.UI.UISymbolButton();
this.uiGroupBox3 = new Sunny.UI.UIGroupBox();
this.Txt_Rqaw = new Sunny.UI.UITextBox();
this.Rqaw = new Sunny.UI.UILabel();
this.Txt_Vg = new Sunny.UI.UITextBox();
this.uiLabel23 = new Sunny.UI.UILabel();
this.Txt_Vgsn = new Sunny.UI.UITextBox();
......@@ -89,8 +91,6 @@
this.uiLabel4 = new Sunny.UI.UILabel();
this.Txt_Dev_Name = new Sunny.UI.UITextBox();
this.uiLabel2 = new Sunny.UI.UILabel();
this.Txt_Rqaw = new Sunny.UI.UITextBox();
this.Rqaw = new Sunny.UI.UILabel();
this.uiPanel1.SuspendLayout();
this.uiGroupBox1.SuspendLayout();
this.uiGroupBox3.SuspendLayout();
......@@ -381,6 +381,36 @@
this.uiGroupBox3.TextAlignment = System.Drawing.ContentAlignment.MiddleCenter;
this.uiGroupBox3.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// Txt_Rqaw
//
this.Txt_Rqaw.Cursor = System.Windows.Forms.Cursors.IBeam;
this.Txt_Rqaw.DecimalPlaces = 3;
this.Txt_Rqaw.DecLength = 3;
this.Txt_Rqaw.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Txt_Rqaw.Location = new System.Drawing.Point(147, 142);
this.Txt_Rqaw.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Txt_Rqaw.MinimumSize = new System.Drawing.Size(1, 16);
this.Txt_Rqaw.Name = "Txt_Rqaw";
this.Txt_Rqaw.ShowText = false;
this.Txt_Rqaw.Size = new System.Drawing.Size(114, 29);
this.Txt_Rqaw.TabIndex = 35;
this.Txt_Rqaw.Text = "0.000";
this.Txt_Rqaw.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.Txt_Rqaw.Type = Sunny.UI.UITextBox.UIEditType.Double;
this.Txt_Rqaw.Watermark = "";
this.Txt_Rqaw.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// Rqaw
//
this.Rqaw.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Rqaw.Location = new System.Drawing.Point(18, 148);
this.Rqaw.Name = "Rqaw";
this.Rqaw.Size = new System.Drawing.Size(143, 23);
this.Rqaw.TabIndex = 34;
this.Rqaw.Text = "RQj-a(℃/w)：";
this.Rqaw.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.Rqaw.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// Txt_Vg
//
this.Txt_Vg.Cursor = System.Windows.Forms.Cursors.IBeam;
......@@ -417,8 +447,14 @@
this.Txt_Vgsn.DecimalPlaces = 3;
this.Txt_Vgsn.DecLength = 3;
this.Txt_Vgsn.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Txt_Vgsn.HasMaximum = true;
this.Txt_Vgsn.HasMinimum = true;
this.Txt_Vgsn.Location = new System.Drawing.Point(591, 104);
this.Txt_Vgsn.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Txt_Vgsn.Maximum = 10000D;
this.Txt_Vgsn.MaximumEnabled = true;
this.Txt_Vgsn.Minimum = 0D;
this.Txt_Vgsn.MinimumEnabled = true;
this.Txt_Vgsn.MinimumSize = new System.Drawing.Size(1, 16);
this.Txt_Vgsn.Name = "Txt_Vgsn";
this.Txt_Vgsn.ShowText = false;
......@@ -436,8 +472,14 @@
this.Txt_Vgsp.DecimalPlaces = 3;
this.Txt_Vgsp.DecLength = 3;
this.Txt_Vgsp.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Txt_Vgsp.HasMaximum = true;
this.Txt_Vgsp.HasMinimum = true;
this.Txt_Vgsp.Location = new System.Drawing.Point(591, 65);
this.Txt_Vgsp.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Txt_Vgsp.Maximum = 10000D;
this.Txt_Vgsp.MaximumEnabled = true;
this.Txt_Vgsp.Minimum = 0D;
this.Txt_Vgsp.MinimumEnabled = true;
this.Txt_Vgsp.MinimumSize = new System.Drawing.Size(1, 16);
this.Txt_Vgsp.Name = "Txt_Vgsp";
this.Txt_Vgsp.ShowText = false;
......@@ -1068,36 +1110,6 @@
this.uiLabel2.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.uiLabel2.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// Txt_Rqaw
//
this.Txt_Rqaw.Cursor = System.Windows.Forms.Cursors.IBeam;
this.Txt_Rqaw.DecimalPlaces = 3;
this.Txt_Rqaw.DecLength = 3;
this.Txt_Rqaw.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Txt_Rqaw.Location = new System.Drawing.Point(147, 142);
this.Txt_Rqaw.Margin = new System.Windows.Forms.Padding(4, 5, 4, 5);
this.Txt_Rqaw.MinimumSize = new System.Drawing.Size(1, 16);
this.Txt_Rqaw.Name = "Txt_Rqaw";
this.Txt_Rqaw.ShowText = false;
this.Txt_Rqaw.Size = new System.Drawing.Size(114, 29);
this.Txt_Rqaw.TabIndex = 35;
this.Txt_Rqaw.Text = "0.000";
this.Txt_Rqaw.TextAlignment = System.Drawing.ContentAlignment.MiddleLeft;
this.Txt_Rqaw.Type = Sunny.UI.UITextBox.UIEditType.Double;
this.Txt_Rqaw.Watermark = "";
this.Txt_Rqaw.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// Rqaw
//
this.Rqaw.Font = new System.Drawing.Font("微软雅黑", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.Rqaw.Location = new System.Drawing.Point(18, 148);
this.Rqaw.Name = "Rqaw";
this.Rqaw.Size = new System.Drawing.Size(143, 23);
this.Rqaw.TabIndex = 34;
this.Rqaw.Text = "RQj-a(℃/w)：";
this.Rqaw.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.Rqaw.ZoomScaleRect = new System.Drawing.Rectangle(0, 0, 0, 0);
//
// Devicelibrary
//
this.AllowShowTitle = true;
......
GKHTRBC16P/ToolLibrary/RunSetting.cs
浏览文件 @ 55dd97ed
......@@ -33,8 +33,8 @@ namespace GKHTRBC16P.ToolLibrary
public static RunSetting p_RunSetting = null;
public List<Dev_Device> devicelist;
private PowerOvenAutoBll powerOvenAutoBll;
private DevCorrespondenceBll devCorrespondenceBll;
public List<Dev_Correspondence> CorrList;
//private DevCorrespondenceBll devCorrespondenceBll;
//public List<Dev_Correspondence> CorrList;
public RunSetting()
{
InitializeComponent();
......@@ -53,8 +53,8 @@ namespace GKHTRBC16P.ToolLibrary
testParmBll = new TestParmBll();
ParamterTimeBll = new ParamterTimeBll();
powerOvenAutoBll = new PowerOvenAutoBll();
devCorrespondenceBll = new DevCorrespondenceBll();
CorrList = devCorrespondenceBll.GetList();
//devCorrespondenceBll = new DevCorrespondenceBll();
//CorrList = devCorrespondenceBll.GetList();
//FunMov.Home_Status.home_Status.Home_Main();
//if (CalculationAo.ThisDevConfig.Isbridge == 0)
// FunMov.Home_Status.home_Status.Home_Main();
......@@ -186,17 +186,17 @@ namespace GKHTRBC16P.ToolLibrary
uiLabel7.Text = "nA";
}
}
if (CalculationAo.ThisDevConfig.IsVgs == 0)
{
if (!CalculationAo.ThorouVgs.ContainsKey(ChangeID + 1))
{
ShowBroadCtr();
}
else
{
ShowVgsAndBroad();
}
}
//if (CalculationAo.ThisDevConfig.IsVgs == 0)
//{
// if (!CalculationAo.ThorouVgs.ContainsKey(ChangeID + 1))
// {
// ShowBroadCtr();
// }
// else
// {
// ShowVgsAndBroad();
// }
//}
PolarityRGBoo = true;
}
}
......@@ -467,6 +467,8 @@ namespace GKHTRBC16P.ToolLibrary
var thor = CalculationAo.Thorous[iChangeID + 1];
decimal dBackVol = (decimal)6553.5;
var dev = devicelist.FirstOrDefault(x => x.Id == tparm.DeviceId);
if(!AutoPowerCon.Instaion.SetVgsStdoy(tparm, iChangeID+1,1))
continue;
if (tparm.Ishtrb == 0 || tparm.Ishtrb == 2)
{
if (bDialog)
......@@ -657,6 +659,8 @@ namespace GKHTRBC16P.ToolLibrary
CalculationAo.ZFConfig[iChangeID] = 1;
bool bResult = true;
var thor = CalculationAo.Thorous[iChangeID + 1];
if (!AutoPowerCon.Instaion.SetVgsStdoy(tparm, iChangeID + 1,2))
continue;
if (tparm.Ishtrb == 0 || tparm.Ishtrb == 2)
{
bResult = Routinedr.Instance.Fboardcontrolpb(this, thor.ComId - 1, iChangeID, 0X80 + iChangeID, 0X03, 0X01, 0X01, CalculationAo.ZFConfig[iChangeID], 0, CalculationAo.DevClickFlagSel, 2) == 0;
......@@ -797,6 +801,8 @@ namespace GKHTRBC16P.ToolLibrary
ushort result = 0;
var thor = CalculationAo.Thorous[iChangeID + 1];
var dev = devicelist.FirstOrDefault(x => x.Id == tparm.DeviceId);
if (!AutoPowerCon.Instaion.SetVgsStdoy(tparm, iChangeID + 1,3))
continue;
if (tparm.Ishtrb == 0 || tparm.Ishtrb == 2)
{
result = Routinedr.Instance.Fboardcontrolpb(this, thor.ComId - 1, iChangeID, 0X80 + iChangeID, 0X03, zffx, zffx, CalculationAo.ZFConfig[iChangeID], 0, CalculationAo.DevClickFlagSel, 2);
......@@ -957,6 +963,8 @@ namespace GKHTRBC16P.ToolLibrary
//for (int a = 0; a <= 255; a++)CalculationAo.ComRxdData[a] = 0;
var result = 0;
var thor = CalculationAo.Thorous[iChangeID + 1];
if (!AutoPowerCon.Instaion.SetVgsStdoy(tparm, iChangeID + 1,4))
continue;
if (tparm.Ishtrb == 0 || tparm.Ishtrb == 2)
{
//CalculationAo.ZFConfig[ChangeID] = Txt_PolarityRG.SelectedIndex + 1;//0X01
......@@ -1287,6 +1295,8 @@ namespace GKHTRBC16P.ToolLibrary
var tparm = CalculationAo.parametersList.FirstOrDefault(x => x.Id == ChangeID + 1);
if (f_VgsP == 0 || f_VgsN == 0)
{
var devCorrespondenceBll = new DevCorrespondenceBll();
var CorrList = devCorrespondenceBll.GetList();
var corr = CorrList.FirstOrDefault(x => x.PassagewayId == ChangeID + 1);
if (corr != null)
{
......
浏览文件 @ 55dd97ed
No preview for this file type
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论