Merge branch 'master' of http://localhost:8000/FullAutoWaterCheck
This commit is contained in:
@@ -85,8 +85,8 @@ namespace 全自动水压检测仪
|
||||
{
|
||||
CreateRegisterConfig(2394, uiTextBox1, "F2",false), // 控制压力系数
|
||||
CreateRegisterConfig(3134, uiTextBox3, "F2",false), // 压力保护输入
|
||||
CreateRegisterConfig(2376, uiTextBox2, "F2",false), // 压力上限
|
||||
CreateRegisterConfig(2374, uiTextBox4, "F2",false), // 压力下限
|
||||
//CreateRegisterConfig(2376, uiTextBox2, "F2",false), // 压力上限
|
||||
//CreateRegisterConfig(2374, uiTextBox4, "F2",false), // 压力下限
|
||||
CreateRegisterConfig(3482, uiTextBox8, "F2",false), // 温度系数
|
||||
CreateRegisterConfig(3176, uiTextBox6, "F2",false), // 出口温度系数
|
||||
CreateRegisterConfig(3076, uiTextBox7, "F2",false), // 常温液位系数
|
||||
@@ -101,6 +101,7 @@ namespace 全自动水压检测仪
|
||||
CreateRegisterConfig(2408, uiTextBox14, "0",true), // 稳压时间
|
||||
CreateRegisterConfig(2406, uiTextBox15, "0",true), // 通水时间
|
||||
CreateRegisterConfig(2410, uiTextBox13, "0",true), // 排空时间
|
||||
CreateRegisterConfig(2414, uiTextBox2, "0",true), // 延迟记录初始值时间
|
||||
|
||||
CreateRegisterConfig(2402, uiTextBox16, "0",true) // 温度
|
||||
|
||||
@@ -199,8 +200,8 @@ namespace 全自动水压检测仪
|
||||
|
||||
private void Coeffiicientsetting_Load(object sender, EventArgs e)
|
||||
{
|
||||
string plcIp = "192.168.1.10";
|
||||
//string plcIp = "127.0.0.1";
|
||||
//string plcIp = "192.168.1.10";
|
||||
string plcIp = "127.0.0.1";
|
||||
bool initSuccess = Data.ModbusResourceManager.Instance.Init(plcIp, 502);
|
||||
if (!initSuccess)
|
||||
{
|
||||
@@ -322,21 +323,26 @@ namespace 全自动水压检测仪
|
||||
{
|
||||
ma?.WriteToPLCForNew(uiTextBox3.Text.Trim(), 3134, Function.DataType.浮点型);
|
||||
}
|
||||
|
||||
|
||||
//压力上限
|
||||
private void uiTextBox2_Click(object sender, EventArgs e)
|
||||
{
|
||||
ma?.WriteToPLCForNew(uiTextBox2.Text.Trim(), 2376, Function.DataType.浮点型);
|
||||
}
|
||||
//private void uiTextBox2_Click(object sender, EventArgs e)
|
||||
//{
|
||||
// ma?.WriteToPLCForNew(uiTextBox2.Text.Trim(), 2376, Function.DataType.浮点型);
|
||||
//}
|
||||
|
||||
//压力下限
|
||||
private void uiTextBox4_Click(object sender, EventArgs e)
|
||||
{
|
||||
ma?.WriteToPLCForNew(uiTextBox4.Text.Trim(), 2374, Function.DataType.浮点型);
|
||||
}
|
||||
//private void uiTextBox4_Click(object sender, EventArgs e)
|
||||
//{
|
||||
// ma?.WriteToPLCForNew(uiTextBox4.Text.Trim(), 2374, Function.DataType.浮点型);
|
||||
//}
|
||||
|
||||
//温度系数
|
||||
private void uiTextBox8_Click(object sender, EventArgs e)
|
||||
{
|
||||
ma?.WriteToPLCForNew(uiTextBox8.Text.Trim(), 3482, Function.DataType.浮点型);
|
||||
}
|
||||
|
||||
//出口温度系数
|
||||
private void uiTextBox6_Click(object sender, EventArgs e)
|
||||
{
|
||||
@@ -418,5 +424,11 @@ namespace 全自动水压检测仪
|
||||
|
||||
ma?.BtnClickFunctionForNew(Function.ButtonType.切换型, 10110);
|
||||
}
|
||||
|
||||
//延迟记录初始值时间
|
||||
private void uiTextBox2_Click(object sender, EventArgs e)
|
||||
{
|
||||
ma?.WriteToPLCForNew(uiTextBox2.Text.Trim(), 2414, Function.DataType.整形);
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user