Skip to content

刘韬 / 1053_CycleLine

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 3a7fdcec 由 刘韬
选项

1

1 个父辈 61f4e58c
内嵌 并排
正在显示 5 个修改的文件 包含 8 行增加 和 48 行删除
Common/Setting_Init.cs
...@@ -65,7 +65,7 @@ namespace OnlineStore.Common ...@@ -65,7 +65,7 @@ namespace OnlineStore.Common
[MyConfigComment("VJ点料机串口端口号")] [MyConfigComment("VJ点料机串口端口号")]
public static MyConfig<string> VJCounter_COMPORT = "COM5"; public static MyConfig<string> VJCounter_COMPORT = "COM5";
[MyConfigComment("VJ点料机串口比特率")] [MyConfigComment("VJ点料机串口比特率")]
public static MyConfig<int> VJCounter_BaudRate = 115200; public static MyConfig<int> VJCounter_BaudRate = 9600;
......
DeviceLibrary/VirtuallyStore/VStore.cs
...@@ -254,7 +254,7 @@ namespace DeviceLibrary ...@@ -254,7 +254,7 @@ namespace DeviceLibrary
Msg.add($"StatusCode:{ti.StatusCode},StatusText:{ti.StatusText},OnlineStatus:{ti.OnlineStatus}", MsgLevel.warning); Msg.add($"StatusCode:{ti.StatusCode},StatusText:{ti.StatusText},OnlineStatus:{ti.OnlineStatus}", MsgLevel.warning);
RTStoreStatus = RTStoreStatus.Offline; RTStoreStatus = RTStoreStatus.Offline;
TerminalError = false; TerminalError = false;
//ServerCM.storeStatus = StoreStatus.None; ServerCM.storeStatus = StoreStatus.None;
} }
else if (ti.StatusCode < 10000) else if (ti.StatusCode < 10000)
......
DeviceLibrary/theMachine/sub/CI.cs
...@@ -263,7 +263,7 @@ namespace DeviceLibrary ...@@ -263,7 +263,7 @@ namespace DeviceLibrary
case MoveStep.MI_17: case MoveStep.MI_17:
MoveInfo.NextMoveStep(MoveStep.MI_50); MoveInfo.NextMoveStep(MoveStep.MI_50);
MoveInfo.MoveParam = TheLine.Regetposid(MoveInfo.MoveParam, TrayTypeE.MTP1.ToString(), out string msg); MoveInfo.MoveParam = TheLine.Regetposid(MoveInfo.MoveParam, TrayTypeE.MTP1.ToString(), out string msg);
MoveInfo.log($"步骤7: 重新获取库位 msg:{msg},\t {MoveInfo.MoveParam.ToStr()}"); MoveInfo.log($"步骤8: 重新获取库位 msg:{msg},\t {MoveInfo.MoveParam.ToStr()}");
break; break;
case MoveStep.MI_50: case MoveStep.MI_50:
MoveInfo.NextMoveStep(MoveStep.MI_53); MoveInfo.NextMoveStep(MoveStep.MI_53);
......
TheMachine/device/CIDebugControl.Designer.cs
...@@ -42,8 +42,6 @@ ...@@ -42,8 +42,6 @@
this.cb_bitrate = new System.Windows.Forms.ComboBox(); this.cb_bitrate = new System.Windows.Forms.ComboBox();
this.btn_reopen = new System.Windows.Forms.Button(); this.btn_reopen = new System.Windows.Forms.Button();
this.button_start = new System.Windows.Forms.Button(); this.button_start = new System.Windows.Forms.Button();
this.cb_enter = new System.Windows.Forms.CheckBox();
this.cb_newline = new System.Windows.Forms.CheckBox();
this.SuspendLayout(); this.SuspendLayout();
// //
// label_status // label_status
...@@ -150,6 +148,7 @@ ...@@ -150,6 +148,7 @@
this.cb_com.Name = "cb_com"; this.cb_com.Name = "cb_com";
this.cb_com.Size = new System.Drawing.Size(101, 20); this.cb_com.Size = new System.Drawing.Size(101, 20);
this.cb_com.TabIndex = 6; this.cb_com.TabIndex = 6;
this.cb_com.Visible = false;
// //
// cb_bitrate // cb_bitrate
// //
...@@ -162,6 +161,7 @@ ...@@ -162,6 +161,7 @@
this.cb_bitrate.Name = "cb_bitrate"; this.cb_bitrate.Name = "cb_bitrate";
this.cb_bitrate.Size = new System.Drawing.Size(121, 20); this.cb_bitrate.Size = new System.Drawing.Size(121, 20);
this.cb_bitrate.TabIndex = 6; this.cb_bitrate.TabIndex = 6;
this.cb_bitrate.Visible = false;
// //
// btn_reopen // btn_reopen
// //
...@@ -171,6 +171,7 @@ ...@@ -171,6 +171,7 @@
this.btn_reopen.TabIndex = 7; this.btn_reopen.TabIndex = 7;
this.btn_reopen.Text = "Apply"; this.btn_reopen.Text = "Apply";
this.btn_reopen.UseVisualStyleBackColor = true; this.btn_reopen.UseVisualStyleBackColor = true;
this.btn_reopen.Visible = false;
this.btn_reopen.Click += new System.EventHandler(this.btn_reopen_Click); this.btn_reopen.Click += new System.EventHandler(this.btn_reopen_Click);
// //
// button_start // button_start
...@@ -183,38 +184,10 @@ ...@@ -183,38 +184,10 @@
this.button_start.UseVisualStyleBackColor = true; this.button_start.UseVisualStyleBackColor = true;
this.button_start.Click += new System.EventHandler(this.button_start_Click); this.button_start.Click += new System.EventHandler(this.button_start_Click);
// //
// cb_enter
//
this.cb_enter.AutoSize = true;
this.cb_enter.Location = new System.Drawing.Point(360, 54);
this.cb_enter.Name = "cb_enter";
this.cb_enter.Size = new System.Drawing.Size(36, 16);
this.cb_enter.TabIndex = 9;
this.cb_enter.Tag = "not";
this.cb_enter.Text = "\\r";
this.cb_enter.UseVisualStyleBackColor = true;
this.cb_enter.CheckedChanged += new System.EventHandler(this.cb_enter_CheckedChanged);
//
// cb_newline
//
this.cb_newline.AutoSize = true;
this.cb_newline.Checked = true;
this.cb_newline.CheckState = System.Windows.Forms.CheckState.Checked;
this.cb_newline.Location = new System.Drawing.Point(424, 54);
this.cb_newline.Name = "cb_newline";
this.cb_newline.Size = new System.Drawing.Size(36, 16);
this.cb_newline.TabIndex = 9;
this.cb_newline.Tag = "not";
this.cb_newline.Text = "\\n";
this.cb_newline.UseVisualStyleBackColor = true;
this.cb_newline.CheckedChanged += new System.EventHandler(this.cb_enter_CheckedChanged);
//
// CIDebugControl // CIDebugControl
// //
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F); this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.cb_newline);
this.Controls.Add(this.cb_enter);
this.Controls.Add(this.button_start); this.Controls.Add(this.button_start);
this.Controls.Add(this.btn_reopen); this.Controls.Add(this.btn_reopen);
this.Controls.Add(this.cb_bitrate); this.Controls.Add(this.cb_bitrate);
...@@ -249,7 +222,5 @@ ...@@ -249,7 +222,5 @@
private System.Windows.Forms.ComboBox cb_bitrate; private System.Windows.Forms.ComboBox cb_bitrate;
private System.Windows.Forms.Button btn_reopen; private System.Windows.Forms.Button btn_reopen;
private System.Windows.Forms.Button button_start; private System.Windows.Forms.Button button_start;
private System.Windows.Forms.CheckBox cb_enter;
private System.Windows.Forms.CheckBox cb_newline;
} }
} }
TheMachine/device/CIDebugControl.cs
...@@ -22,8 +22,8 @@ namespace TheMachine.device ...@@ -22,8 +22,8 @@ namespace TheMachine.device
{ {
InitializeComponent(); InitializeComponent();
RobotManage.LoadFinishEvent += RobotManage_LoadFinishEvent; RobotManage.LoadFinishEvent += RobotManage_LoadFinishEvent;
Config.PropertyBind(Setting_Init.VJCounter_COMPORT.Key, cb_com, "SelectedItem", "SelectedIndexChanged"); //Config.PropertyBind(Setting_Init.VJCounter_COMPORT.Key, cb_com, "SelectedItem", "SelectedIndexChanged");
Config.PropertyBind(Setting_Init.VJCounter_BaudRate.Key, cb_bitrate, "SelectedItem", "SelectedIndexChanged"); //Config.PropertyBind(Setting_Init.VJCounter_BaudRate.Key, cb_bitrate, "SelectedItem", "SelectedIndexChanged");
} }
private void RobotManage_LoadFinishEvent(bool state, string msg) private void RobotManage_LoadFinishEvent(bool state, string msg)
...@@ -147,16 +147,5 @@ namespace TheMachine.device ...@@ -147,16 +147,5 @@ namespace TheMachine.device
LogUtil.info("CID:手动点击startbtn"); LogUtil.info("CID:手动点击startbtn");
TrayStop.DeviceList["CI"].IOMove(IO_Type.CI_Start, IO_VALUE.HIGH, 500); TrayStop.DeviceList["CI"].IOMove(IO_Type.CI_Start, IO_VALUE.HIGH, 500);
} }
private void cb_enter_CheckedChanged(object sender, EventArgs e)
{
string newline = "";
if (cb_enter.Checked)
newline += "\r";
if (cb_newline.Checked)
newline += "\n";
VJCounter.newline=newline;
}
} }
} }
\ No newline at end of file \ No newline at end of file
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!