Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 69cbddcc 由 LN
选项

1

1 个父辈 4eaa20d8
内嵌 并排
正在显示 2 个修改的文件 包含 52 行增加 和 34 行删除
TheMachine/AxisControl.Designer.cs
...@@ -61,26 +61,29 @@ namespace TheMachine ...@@ -61,26 +61,29 @@ namespace TheMachine
// lblLed // lblLed
// //
this.lblLed.AutoSize = true; this.lblLed.AutoSize = true;
this.lblLed.Location = new System.Drawing.Point(38, 621); this.lblLed.Location = new System.Drawing.Point(256, 487);
this.lblLed.Name = "lblLed"; this.lblLed.Name = "lblLed";
this.lblLed.Size = new System.Drawing.Size(0, 12); this.lblLed.Size = new System.Drawing.Size(41, 12);
this.lblLed.TabIndex = 16; this.lblLed.TabIndex = 16;
this.lblLed.Text = "氛围灯";
// //
// lblOkValue // lblOkValue
// //
this.lblOkValue.AutoSize = true; this.lblOkValue.AutoSize = true;
this.lblOkValue.Location = new System.Drawing.Point(38, 578); this.lblOkValue.Location = new System.Drawing.Point(256, 454);
this.lblOkValue.Name = "lblOkValue"; this.lblOkValue.Name = "lblOkValue";
this.lblOkValue.Size = new System.Drawing.Size(0, 12); this.lblOkValue.Size = new System.Drawing.Size(65, 12);
this.lblOkValue.TabIndex = 15; this.lblOkValue.TabIndex = 15;
this.lblOkValue.Text = "压力传感器";
// //
// lblSensor // lblSensor
// //
this.lblSensor.AutoSize = true; this.lblSensor.AutoSize = true;
this.lblSensor.Location = new System.Drawing.Point(38, 539); this.lblSensor.Location = new System.Drawing.Point(256, 421);
this.lblSensor.Name = "lblSensor"; this.lblSensor.Name = "lblSensor";
this.lblSensor.Size = new System.Drawing.Size(0, 12); this.lblSensor.Size = new System.Drawing.Size(65, 12);
this.lblSensor.TabIndex = 14; this.lblSensor.TabIndex = 14;
this.lblSensor.Text = "声波传感器";
// //
// button3 // button3
// //
......
TheMachine/AxisControl.cs
...@@ -24,6 +24,9 @@ namespace TheMachine ...@@ -24,6 +24,9 @@ namespace TheMachine
if (DesignMode) if (DesignMode)
return; return;
crc.LanguageChangeEvent += Crc_LanguageChangeEvent; crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
lblLed.Text = "";
lblOkValue.Text = "";
lblSensor.Text = "";
} }
private void Crc_LanguageChangeEvent(object sender, EventArgs e) private void Crc_LanguageChangeEvent(object sender, EventArgs e)
...@@ -121,47 +124,59 @@ namespace TheMachine ...@@ -121,47 +124,59 @@ namespace TheMachine
{ {
roateloop = false; roateloop = false;
} }
private bool isPro = false;
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
if (!this.Visible) if (!this.Visible)
{ {
return; return;
} }
try if (isPro)
{ {
if (Setting_Init.Device_LedLight_PortName != "") return;
{ }
lblLed.Text ="LED"+ Setting_Init.Device_LedLight_PortName+":"+ RobotManage.mainMachine.lastColor.ToString(); isPro = true;
} Task.Run(() =>
else {
try
{ {
lblLed.Text = ""; if (Setting_Init.Device_LedLight_PortName != "")
} {
lblLed.Text = "LED" + Setting_Init.Device_LedLight_PortName + ":" + RobotManage.mainMachine.lastColor.ToString();
}
else
{
lblLed.Text = "";
}
if (Setting_Init.Device_DauxiKS107_PortName != "")
{
RobotManage.dauxiKS107Controller.Quary(out int currValue, out string msg);
lblSensor.Text = $"红外传感器{Setting_Init.Device_DauxiKS107_PortName}：" + currValue + ", /" + Setting_Init.Device_DauxiKS107_BaseValue + "/" + Setting_Init.Device_DauxiKS107_ErrorValue;
}
else
{
lblSensor.Text = "";
}
if (Setting_Init.Device_WeightSensor_PortName != "")
{
lblOkValue.Text = $"压力传感器{Setting_Init.Device_WeightSensor_PortName}: {Setting_Init.Device_WeightSensor_MaxValue}";
}
else
{
lblOkValue.Text = "";
}
if (Setting_Init.Device_DauxiKS107_PortName != "")
{
RobotManage.dauxiKS107Controller.Quary(out int currValue, out string msg);
lblSensor.Text = $"红外传感器{Setting_Init.Device_DauxiKS107_PortName}：" + currValue + ", /" + Setting_Init.Device_DauxiKS107_BaseValue + "/" + Setting_Init.Device_DauxiKS107_ErrorValue;
}
else
{
lblSensor.Text = "";
} }
if (Setting_Init.Device_WeightSensor_PortName != "") catch (Exception ex)
{ {
lblOkValue.Text = $"压力传感器{Setting_Init.Device_WeightSensor_PortName}: {Setting_Init.Device_WeightSensor_MaxValue}"; LogUtil.error("出错：" + ex.ToString());
} }
else finally
{ {
lblOkValue.Text = ""; isPro = false;
} }
});
}
catch(Exception ex)
{
LogUtil.error("出错：" + ex.ToString());
}
} }
} }
} }
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!