Skip to content

张东亮 / NS200

转到一个项目
切换导航栏
切换导航栏固定状态
Commit bd93dd1c 由 张东亮
选项

1

1 个父辈 d5d36c32
内嵌 并排
正在显示 12 个修改的文件 包含 184 行增加 和 360 行删除
AutoScanAndLabel/AxisControl.Designer.cs
......@@ -29,19 +29,12 @@ namespace AutoScanAndLabel
/// </summary>
private void InitializeComponent()
{
this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl();
this.panel1 = new System.Windows.Forms.Panel();
this.axisMoveControl1 = new DeviceLibrary.AxisMoveControl();
this.configControl1 = new AutoScanAndLabel.ConfigControl();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(3, 3);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(559, 400);
this.axisMoveControl1.TabIndex = 0;
//
// panel1
//
this.panel1.AutoScroll = true;
......@@ -53,13 +46,21 @@ namespace AutoScanAndLabel
this.panel1.Size = new System.Drawing.Size(1234, 924);
this.panel1.TabIndex = 2;
//
// axisMoveControl1
//
this.axisMoveControl1.Location = new System.Drawing.Point(24, 19);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(702, 400);
this.axisMoveControl1.TabIndex = 0;
this.axisMoveControl1.Tag = "not";
//
// configControl1
//
this.configControl1.Config = null;
this.configControl1.Location = new System.Drawing.Point(568, 3);
this.configControl1.Location = new System.Drawing.Point(24, 426);
this.configControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.configControl1.Name = "configControl1";
this.configControl1.Size = new System.Drawing.Size(663, 656);
this.configControl1.Size = new System.Drawing.Size(1134, 656);
this.configControl1.TabIndex = 1;
//
// AxisControl
......
AutoScanAndLabel/Form1.cs
......@@ -25,10 +25,10 @@ namespace AutoScanAndLabel
crc.OpenResourceLog = true;
InitializeComponent();
this.FormClosing += Form1_FormClosing;
this.Text = Config.Get(Setting_Init.App_Title);
crc.GetLanguageEvent += Crc_GetLanguageEvent;
crc.LanguageChangeEvent += Crc_LanguageChangeEvent;
crc.CurrLanguage = Crc_GetLanguageEvent();
this.Text = crc.GetString("App_Title", "自动贴标机");//Config.Get(Setting_Init.App_Title);
t1.Interval = 1000;
t1.Tick += T1_Tick;
t1.Start();
......@@ -56,7 +56,7 @@ namespace AutoScanAndLabel
{
crc.LanguageProcess(this, this.GetType().Name);
crc.ProcessListItem(menuStrip1.Items, "menuStrip1");
this.Text = crc.GetString("App_Title", "自动贴标机");//Config.Get(Setting_Init.App_Title);
listView1.Columns[1].Text = crc.GetString("Res0004", "时间");
listView1.Columns[2].Text = crc.GetString("Res0003", "信息");
......
AutoScanAndLabel/SettingControl.Designer.cs
......@@ -38,15 +38,15 @@ namespace AutoScanAndLabel
this.chbAutoRun = new System.Windows.Forms.CheckBox();
this.btn_labelDebug = new System.Windows.Forms.Button();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.listEdit_pn = new AutoScanAndLabel.UC.ListEditControl();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.listEditControl1 = new AutoScanAndLabel.UC.ListEditControl();
this.txt_code = new System.Windows.Forms.TextBox();
this.btn_codetest = new System.Windows.Forms.Button();
this.label_matchdebugstring = new System.Windows.Forms.Label();
this.groupBox4 = new System.Windows.Forms.GroupBox();
this.button1 = new System.Windows.Forms.Button();
this.uC_U11 = new AutoScanAndLabel.UC_U1();
this.listEditControl1 = new AutoScanAndLabel.UC.ListEditControl();
this.listEdit_pn = new AutoScanAndLabel.UC.ListEditControl();
this.groupBox1.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox3.SuspendLayout();
......@@ -100,7 +100,7 @@ namespace AutoScanAndLabel
this.cb_labelselect.FormattingEnabled = true;
this.cb_labelselect.Location = new System.Drawing.Point(134, 75);
this.cb_labelselect.Name = "cb_labelselect";
this.cb_labelselect.Size = new System.Drawing.Size(198, 20);
this.cb_labelselect.Size = new System.Drawing.Size(198, 23);
this.cb_labelselect.TabIndex = 0;
this.cb_labelselect.SelectedIndexChanged += new System.EventHandler(this.cb_labelselect_SelectedIndexChanged);
//
......@@ -109,7 +109,7 @@ namespace AutoScanAndLabel
this.cb_printerselect.FormattingEnabled = true;
this.cb_printerselect.Location = new System.Drawing.Point(134, 37);
this.cb_printerselect.Name = "cb_printerselect";
this.cb_printerselect.Size = new System.Drawing.Size(198, 20);
this.cb_printerselect.Size = new System.Drawing.Size(198, 23);
this.cb_printerselect.TabIndex = 0;
this.cb_printerselect.SelectedIndexChanged += new System.EventHandler(this.cb_printerselect_SelectedIndexChanged);
//
......@@ -118,7 +118,7 @@ namespace AutoScanAndLabel
this.chbAutoRun.AutoSize = true;
this.chbAutoRun.Location = new System.Drawing.Point(3, 185);
this.chbAutoRun.Name = "chbAutoRun";
this.chbAutoRun.Size = new System.Drawing.Size(84, 16);
this.chbAutoRun.Size = new System.Drawing.Size(104, 19);
this.chbAutoRun.TabIndex = 1;
this.chbAutoRun.Text = "开机自启动";
this.chbAutoRun.UseVisualStyleBackColor = true;
......@@ -145,18 +145,6 @@ namespace AutoScanAndLabel
this.groupBox2.Text = "PN匹配规则";
this.groupBox2.Visible = false;
//
// listEdit_pn
//
this.listEdit_pn.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEdit_pn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEdit_pn.ListFile = "config/pn.list";
this.listEdit_pn.Location = new System.Drawing.Point(3, 17);
this.listEdit_pn.Margin = new System.Windows.Forms.Padding(5);
this.listEdit_pn.Name = "listEdit_pn";
this.listEdit_pn.Size = new System.Drawing.Size(354, 158);
this.listEdit_pn.TabIndex = 3;
this.listEdit_pn.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// groupBox3
//
this.groupBox3.Controls.Add(this.listEditControl1);
......@@ -168,23 +156,11 @@ namespace AutoScanAndLabel
this.groupBox3.Text = "QTY匹配规则";
this.groupBox3.Visible = false;
//
// listEditControl1
//
this.listEditControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEditControl1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEditControl1.ListFile = "config/qty.list";
this.listEditControl1.Location = new System.Drawing.Point(3, 17);
this.listEditControl1.Margin = new System.Windows.Forms.Padding(5);
this.listEditControl1.Name = "listEditControl1";
this.listEditControl1.Size = new System.Drawing.Size(354, 208);
this.listEditControl1.TabIndex = 3;
this.listEditControl1.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// txt_code
//
this.txt_code.Location = new System.Drawing.Point(6, 24);
this.txt_code.Name = "txt_code";
this.txt_code.Size = new System.Drawing.Size(264, 21);
this.txt_code.Size = new System.Drawing.Size(264, 25);
this.txt_code.TabIndex = 5;
//
// btn_codetest
......@@ -225,15 +201,41 @@ namespace AutoScanAndLabel
this.button1.TabIndex = 10;
this.button1.Text = "button1";
this.button1.UseVisualStyleBackColor = true;
this.button1.Visible = false;
this.button1.Click += new System.EventHandler(this.button1_Click);
//
// uC_U11
//
this.uC_U11.Location = new System.Drawing.Point(3, 246);
this.uC_U11.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.uC_U11.Name = "uC_U11";
this.uC_U11.Size = new System.Drawing.Size(383, 167);
this.uC_U11.TabIndex = 9;
//
// listEditControl1
//
this.listEditControl1.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEditControl1.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEditControl1.ListFile = "config/qty.list";
this.listEditControl1.Location = new System.Drawing.Point(3, 21);
this.listEditControl1.Margin = new System.Windows.Forms.Padding(5);
this.listEditControl1.Name = "listEditControl1";
this.listEditControl1.Size = new System.Drawing.Size(354, 204);
this.listEditControl1.TabIndex = 3;
this.listEditControl1.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// listEdit_pn
//
this.listEdit_pn.Dock = System.Windows.Forms.DockStyle.Fill;
this.listEdit_pn.Font = new System.Drawing.Font("宋体", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.listEdit_pn.ListFile = "config/pn.list";
this.listEdit_pn.Location = new System.Drawing.Point(3, 21);
this.listEdit_pn.Margin = new System.Windows.Forms.Padding(5);
this.listEdit_pn.Name = "listEdit_pn";
this.listEdit_pn.Size = new System.Drawing.Size(354, 154);
this.listEdit_pn.TabIndex = 3;
this.listEdit_pn.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
// SettingControl
//
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
......
AutoScanAndLabel/resources/en-US.lngres
......@@ -158,6 +158,10 @@ Form1_tabControl1_Res0010__SettingControl_groupBox3_listEditControl1_btn_del_Tex
Form1_tabControl1_Res0010__SettingControl_groupBox3_Text QTY匹配规则 QTY Matching Test
Form1_tabControl1_Res0010__SettingControl_groupBox4_btn_codetest_Text 匹配 Matching
Form1_tabControl1_Res0010__SettingControl_groupBox4_Text 条码匹配测试 Barcode Matching Test
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_btn_selectdir_Text 浏览 Browse
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_cb_exportreephoto_Text 自动拍摄并保存料盘图像. 勾选后仅本次有效 Automatically capture and save reel images. If checked, it will only be valid this time
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_label_dir_Text 图像保存目录: Image saving directory:
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_Text 料盘图像导出 Tray image export
Form1_tabControl1_Res0070__AgvControl_checkBox1_Text 手动 By Manual
Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_Leftleavefull_Text 满料串取出 Take Away The Full Stacker
Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_leftneedempty_Text 空料串送入 Put In The Empty Stacker
......@@ -193,7 +197,6 @@ menuStrip1_关于ToolStripMenuItem_Text 关于 About
menuStrip1_设备操作ToolStripMenuItem_Text 设备操作 Operation
menuStrip1_语言toolStripMenuItem_Text 语言 Language
设备操作ToolStripMenuItem_二维码识别调试ToolStripMenuItem_Text 二维码识别调试 QR code recognition debugging
设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text 启用配置模式 Configuration Mode On
设备操作ToolStripMenuItem_退出ToolStripMenuItem_Text 退出 Exit
Airpressure_Check 气压检测 Pressure Detection
Alarm_Buzzer 报警蜂鸣器 Buzzer
......@@ -202,12 +205,6 @@ AutoRun_HddLed 自动指示灯 Auto Indicator
Cam_Pixel_X_Ratio 图像/X轴比值 Image/X Specific Value
Cam_Pixel_Y_Ratio 图像/Y轴比值 Image/Y Specific Value
Camera_Led 相机照明 Camera Light
crc.GetString("Res0101 设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text
crc.GetString("Res0101","设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text") 启用配置模式 Configuration Mode ON
crc.GetString("Res0102 Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text
crc.GetString("Res0102","Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text") 夹爪夹紧 Right Barrier Down
crc.GetString("Res0103 Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text
crc.GetString("Res0103","Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text") 夹爪放松 Right Electric Roller Exit
Device_Led 设备照明 Equipment Lighting
GratingSignal_Check 光栅信号 Light Curtain Signal
HasNgBox NG料箱检测 NG Box Detection
......@@ -388,7 +385,7 @@ Res0097 抓料失败请手动处理,请将料盘放入: 左侧料串,按右侧
Res0098 等待左侧允许放料
Res0099 等待料盘取走
Res0100 ,料串已清空.
Res0101 设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text
Res0101 启用配置模式 Configuration Mode On
Res0102 Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text
Res0103 Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text
Res0104 等待 Waiting
......@@ -411,3 +408,5 @@ Res0202 伺服尚未使能 Servo is disabled.
Res0203 伺服警报状态中 In servo alarm status
Res0204 无法操作 Unable to operate.
Res0216 打印机 Printer
Res0217 标签打印机打开失败 The label printer failed to open
App_Title 自动贴标机 Automatic labeling machine
\ No newline at end of file
AutoScanAndLabel/resources/ja-JP.lngres
......@@ -418,3 +418,5 @@ Res0216 打印机 プリンター
Res0101 启用配置模式 設定モードを開ける
Res0102 夹爪夹紧 グリッパー圧着
Res0103 夹爪放松 グリッパー解除
Res0217 标签打印机打开失败 ラベルプリンターを開けませんでした
App_Title 自动贴标机 自動ラベル貼付機
\ No newline at end of file
AutoScanAndLabel/resources/zh-CN.lngres
......@@ -86,9 +86,9 @@ Form1_tabControl1___IOControl_groupBox1_btn打开设备光源_Text 打开设备
Form1_tabControl1___IOControl_groupBox1_btn打开相机光源_Text 打开相机光源 打开相机光源
Form1_tabControl1___IOControl_groupBox1_btn关闭设备光源_Text 关闭设备光源 关闭设备光源
Form1_tabControl1___IOControl_groupBox1_btn关闭相机光源_Text 关闭相机光源 关闭相机光源
Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text 夹爪放松 夹爪放松
Form1_tabControl1___IOControl_groupBox1_btn夹爪回原_Text 夹爪回原 夹爪回原
Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text 夹爪夹紧 夹爪夹紧
Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text 夹取机构放料 夹取机构放料
Form1_tabControl1___IOControl_groupBox1_btn夹爪回原_Text 夹取机构回原 夹取机构回原
Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text 夹取机构取料 夹取机构取料
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒进入_Text 入口电滚筒进入 入口电滚筒进入
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒停止_Text 入口电滚筒停止 入口电滚筒停止
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒退出_Text 入口电滚筒退出 入口电滚筒退出
......@@ -158,6 +158,10 @@ Form1_tabControl1_Res0010__SettingControl_groupBox3_listEditControl1_btn_del_Tex
Form1_tabControl1_Res0010__SettingControl_groupBox3_Text QTY匹配规则 QTY匹配规则
Form1_tabControl1_Res0010__SettingControl_groupBox4_btn_codetest_Text 匹配 匹配
Form1_tabControl1_Res0010__SettingControl_groupBox4_Text 条码匹配测试 条码匹配测试
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_btn_selectdir_Text 浏览 浏览
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_cb_exportreephoto_Text 自动拍摄并保存料盘图像. 勾选后仅本次有效 自动拍摄并保存料盘图像. 勾选后仅本次有效
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_label_dir_Text 图像保存目录: 图像保存目录:
Form1_tabControl1_Res0010__SettingControl_uC_U11_gb_Text 料盘图像导出 料盘图像导出
Form1_tabControl1_Res0070__AgvControl_checkBox1_Text 手动 手动
Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_Leftleavefull_Text 满料串取出 满料串取出
Form1_tabControl1_Res0070__AgvControl_groupBox_left_button_leftneedempty_Text 空料串送入 空料串送入
......@@ -380,3 +384,5 @@ Res0202 伺服尚未使能 伺服尚未使能
Res0203 伺服警报状态中 伺服警报状态中
Res0204 无法操作 无法操作
Res0216 打印机 打印机
Res0217 标签打印机打开失败 标签打印机打开失败
App_Title 自动贴标机 自动贴标机
\ No newline at end of file
DeviceLibrary/AutoScanAndLabel/Common.cs
......@@ -2,6 +2,7 @@
using OnlineStore.Common;
using System;
using System.Collections.Generic;
using System.Configuration;
using System.Drawing;
using System.Drawing.Imaging;
using System.IO;
......@@ -235,6 +236,7 @@ namespace DeviceLibrary
SolidBrush tmpPlace = new SolidBrush(Color.BlueViolet);
//贴标位置
SolidBrush yeelow = new SolidBrush(Color.Yellow);
SolidBrush white = new SolidBrush(Color.White);
Font font = new Font(FontFamily.GenericSansSerif, 60);
Pen Greenpen = new Pen(Color.Green, 10);
......@@ -268,6 +270,7 @@ namespace DeviceLibrary
{
Point op = new Point(c.X, c.Y);
g.FillEllipse(blue, new Rectangle(op, pointsize));
g.DrawString($"{angles.Count + 1}", font, white, c.X+5, c.Y);
var a = (int)getAngle(Right_Batch_Point, op);
a = a < 0 ? 360 + a : a;
angles.Add(a);
......@@ -294,7 +297,13 @@ namespace DeviceLibrary
LogUtil.info($"labelAngle{i}:{labelAngle}");
}
}
widthOffset = widthOffsets.Min();
int tmp= angles[angles.Count - 1] - angles[0];
if (tmp/2>labelAngle)
{
labelAngle = tmp;
LogUtil.info($"use 首尾labelAngle:{labelAngle}");
}
widthOffset = (widthOffsets.Min()+widthOffsets.Max())/2;
LogUtil.info($"use widthOffset:{widthOffset},angle:{labelAngle}");
labelAngle = labelAngle > 360 ? labelAngle - 360 : labelAngle;
labelAngle = labelAngle > 360 ? labelAngle - 360 : labelAngle;
......
DeviceLibrary/AutoScanAndLabel/MainMachine _LeftProcess.cs
......@@ -37,16 +37,9 @@ namespace DeviceLibrary
LeftMoveInfo.log($"批量轴上升到P2位置,二次提升,LeftStartMovePosition={LeftStartMovePosition}");
break;
case MoveStep.L03:
//if (IOValue(IO_Type.LeftOverHead_Check).Equals(IO_VALUE.HIGH))
//{
// LeftMoveInfo.NextMoveStep(MoveStep.L02);
// Left_Batch_Axis.AbsMove(LeftMoveInfo, LeftStartMovePosition, Config.Left_Batch_P2_speed);
// LeftMoveInfo.log($"批量轴上升过头,下降到:LeftStartMovePosition={LeftStartMovePosition}");
//}
//else
{
LeftMoveInfo.NextMoveStep(MoveStep.L04);
}
LeftMoveInfo.NextMoveStep(MoveStep.L04);
LeftBatchAxisDown();
LeftMoveInfo.log($"批量轴下降固定值");
break;
case MoveStep.L04:
var currpos = Left_Batch_Axis.GetAclPosition();
......@@ -69,23 +62,20 @@ namespace DeviceLibrary
case MoveStep.L11_ReelPutted:
LeftCount++;
LeftMoveInfo.NextMoveStep(MoveStep.L12);
LeftBatchAxisToP1();
//LeftBatchAxisToP1();
LeftBatchAxisDown();
//LeftMoveInfo.log($"料盘已放入,批量轴上升,LeftStartMovePosition={LeftStartMovePosition}");
LeftMoveInfo.log($"左侧料盘已放入,批量轴下降");
LeftMoveInfo.log($"左侧料盘已放入,批量轴下降固定值");
break;
case MoveStep.L12:
//if (IOValue(IO_Type.LeftOverHead_Check).Equals(IO_VALUE.HIGH))
//{
// LeftMoveInfo.NextMoveStep(MoveStep.L11_ReelPutted);
// Left_Batch_Axis.AbsMove(LeftMoveInfo, LeftStartMovePosition, Config.Left_Batch_P2_speed);
// LeftMoveInfo.log($"批量轴上升过头,下降到:LeftStartMovePosition={LeftStartMovePosition}");
//}
//else
{
LabelMoveInfo.MoveParam = LeftMoveInfo.MoveParam.clone();
LeftMoveInfo.NextMoveStep(MoveStep.L20_WaitLabel);
LeftMoveInfo.log($"批量轴完成上升,等待贴标");
}
LeftMoveInfo.NextMoveStep(MoveStep.L13);
LeftBatchAxisToP2(false);
LeftMoveInfo.log($"批量轴上升到P2位置,LeftStartMovePosition={LeftStartMovePosition}");
break;
case MoveStep.L13:
LabelMoveInfo.MoveParam = LeftMoveInfo.MoveParam.clone();
LeftMoveInfo.NextMoveStep(MoveStep.L20_WaitLabel);
LeftMoveInfo.log($"批量轴完成上升,等待贴标");
break;
case MoveStep.L20_WaitLabel:
break;
......@@ -100,8 +90,8 @@ namespace DeviceLibrary
else
{
LeftMoveInfo.NextMoveStep(MoveStep.L04);
LeftBatchAxisToP2(false);
LeftMoveInfo.log($"贴标完成,准备下一盘料,批量轴上升到P2位置,二次提升,LeftStartMovePosition={LeftStartMovePosition}");
LeftBatchAxisDown();
LeftMoveInfo.log($"贴标完成,批量轴下降固定值");
}
break;
case MoveStep.L40_ShelfFull:
......@@ -241,7 +231,7 @@ namespace DeviceLibrary
}
LeftMoveInfo.log("BatchAxisToP2 目标P2: " + targetP2 + "(" + currPosition + ")");
}
targetSpeed = Config.Left_Batch_P2_speed / 10;
targetSpeed = Config.Left_Batch_P2_speed;
}
LeftMoveInfo.TimeOutSeconds = 200;
LeftMoveInfo.CanWhileCount = 0;
......@@ -259,7 +249,7 @@ namespace DeviceLibrary
void LeftBatchAxisToP1()
{
int targetP1 = Config.Left_Batch_P1;
int targetSpeed = Config.Left_Batch_P2_speed / 10;
int targetSpeed = Config.Left_Batch_P2_speed;
LeftMoveInfo.TimeOutSeconds = 200;
LeftMoveInfo.CanWhileCount = 0;
......@@ -271,5 +261,14 @@ namespace DeviceLibrary
//开始检测信号
Left_Batch_Axis.BatchAxisStartCheck(IO_Type.LeftTop_Check, IO_VALUE.LOW);
}
/// <summary>
/// 下降固定值
/// </summary>
void LeftBatchAxisDown()
{
int targetP1 = Left_Batch_Axis.GetAclPosition() - ConfigHelper.Config.Get("LeftAxisDownValue", 50) * Config.Left_Batch_ChangeValue;
int targetSpeed = Config.Left_Batch_P1_speed;
Left_Batch_Axis.AbsMove(LeftMoveInfo, targetP1, targetSpeed);
}
}
}
\ No newline at end of file
DeviceLibrary/AutoScanAndLabel/RobotManage.cs
......@@ -56,7 +56,7 @@ namespace DeviceLibrary
}
if (!printerHelper.Connection(""))
{
msg += "标签打印机打开失败" + "\n";
msg += crc.GetString("Res0217", "标签打印机打开失败") + "\n";
IsLoadOk = false;
}
else
......
DeviceLibrary/userControl/AxisMoveControl.Designer.cs
......@@ -28,7 +28,6 @@
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.groupAxis = new System.Windows.Forms.GroupBox();
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.lblAlarmcode = new System.Windows.Forms.Label();
......@@ -55,22 +54,6 @@
this.lblAxPrfPos = new System.Windows.Forms.Label();
this.lblAxisPrfMode = new System.Windows.Forms.Label();
this.label50 = new System.Windows.Forms.Label();
this.groupBox1 = new System.Windows.Forms.GroupBox();
this.txtBusyStatus = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
this.txtHomeStatus = new System.Windows.Forms.TextBox();
this.label10 = new System.Windows.Forms.Label();
this.label3 = new System.Windows.Forms.Label();
this.label24 = new System.Windows.Forms.Label();
this.label5 = new System.Windows.Forms.Label();
this.btnGetAlarm = new System.Windows.Forms.Button();
this.txtAlarmStatus = new System.Windows.Forms.TextBox();
this.txtLimit2 = new System.Windows.Forms.TextBox();
this.txtServoStatue = new System.Windows.Forms.TextBox();
this.label22 = new System.Windows.Forms.Label();
this.txtLimit1 = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.txtHomeSingle = new System.Windows.Forms.TextBox();
this.panel1 = new System.Windows.Forms.Panel();
this.linkLabel1 = new System.Windows.Forms.LinkLabel();
this.comjSpeed = new System.Windows.Forms.ComboBox();
......@@ -99,10 +82,9 @@
this.txtAxisValue = new System.Windows.Forms.TextBox();
this.txtAxisDeviceName = new System.Windows.Forms.TextBox();
this.lblServerOn = new System.Windows.Forms.Label();
this.timer1 = new System.Windows.Forms.Timer(this.components);
this.timer1 = new System.Windows.Forms.Timer();
this.groupAxis.SuspendLayout();
this.groupBox2.SuspendLayout();
this.groupBox1.SuspendLayout();
this.panel1.SuspendLayout();
this.SuspendLayout();
//
......@@ -113,7 +95,6 @@
| System.Windows.Forms.AnchorStyles.Right)));
this.groupAxis.BackColor = System.Drawing.Color.White;
this.groupAxis.Controls.Add(this.groupBox2);
this.groupAxis.Controls.Add(this.groupBox1);
this.groupAxis.Controls.Add(this.panel1);
this.groupAxis.Controls.Add(this.lblServerOn);
this.groupAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
......@@ -154,7 +135,7 @@
this.groupBox2.Margin = new System.Windows.Forms.Padding(2);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Padding = new System.Windows.Forms.Padding(2);
this.groupBox2.Size = new System.Drawing.Size(540, 118);
this.groupBox2.Size = new System.Drawing.Size(679, 118);
this.groupBox2.TabIndex = 303;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "轴状态监控";
......@@ -165,7 +146,7 @@
this.lblAlarmcode.Location = new System.Drawing.Point(433, 65);
this.lblAlarmcode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAlarmcode.Name = "lblAlarmcode";
this.lblAlarmcode.Size = new System.Drawing.Size(68, 17);
this.lblAlarmcode.Size = new System.Drawing.Size(85, 20);
this.lblAlarmcode.TabIndex = 19;
this.lblAlarmcode.Text = "错误码:160";
this.lblAlarmcode.Visible = false;
......@@ -176,7 +157,7 @@
this.label4.Location = new System.Drawing.Point(267, 90);
this.label4.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label4.Name = "label4";
this.label4.Size = new System.Drawing.Size(59, 17);
this.label4.Size = new System.Drawing.Size(73, 20);
this.label4.TabIndex = 18;
this.label4.Text = "回原状态:";
//
......@@ -186,7 +167,7 @@
this.lblhomeSts.Location = new System.Drawing.Point(332, 90);
this.lblhomeSts.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblhomeSts.Name = "lblhomeSts";
this.lblhomeSts.Size = new System.Drawing.Size(17, 17);
this.lblhomeSts.Size = new System.Drawing.Size(21, 20);
this.lblhomeSts.TabIndex = 17;
this.lblhomeSts.Text = "...";
//
......@@ -196,7 +177,7 @@
this.label2.Location = new System.Drawing.Point(433, 90);
this.label2.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(71, 17);
this.label2.Size = new System.Drawing.Size(88, 20);
this.label2.TabIndex = 11;
this.label2.Text = "实际加速度:";
this.label2.Visible = false;
......@@ -207,7 +188,7 @@
this.lblAxEncAcc.Location = new System.Drawing.Point(510, 90);
this.lblAxEncAcc.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncAcc.Name = "lblAxEncAcc";
this.lblAxEncAcc.Size = new System.Drawing.Size(17, 17);
this.lblAxEncAcc.Size = new System.Drawing.Size(21, 20);
this.lblAxEncAcc.TabIndex = 12;
this.lblAxEncAcc.Text = "...";
this.lblAxEncAcc.Visible = false;
......@@ -308,7 +289,7 @@
this.label53.Location = new System.Drawing.Point(134, 90);
this.label53.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label53.Name = "label53";
this.label53.Size = new System.Drawing.Size(59, 17);
this.label53.Size = new System.Drawing.Size(73, 20);
this.label53.TabIndex = 1;
this.label53.Text = "规划速度:";
//
......@@ -318,7 +299,7 @@
this.label56.Location = new System.Drawing.Point(10, 90);
this.label56.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label56.Name = "label56";
this.label56.Size = new System.Drawing.Size(59, 17);
this.label56.Size = new System.Drawing.Size(73, 20);
this.label56.TabIndex = 1;
this.label56.Text = "实际速度:";
//
......@@ -328,7 +309,7 @@
this.label55.Location = new System.Drawing.Point(10, 65);
this.label55.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label55.Name = "label55";
this.label55.Size = new System.Drawing.Size(59, 17);
this.label55.Size = new System.Drawing.Size(73, 20);
this.label55.TabIndex = 1;
this.label55.Text = "实际位置:";
//
......@@ -338,7 +319,7 @@
this.label52.Location = new System.Drawing.Point(134, 65);
this.label52.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label52.Name = "label52";
this.label52.Size = new System.Drawing.Size(59, 17);
this.label52.Size = new System.Drawing.Size(73, 20);
this.label52.TabIndex = 1;
this.label52.Text = "规划位置:";
//
......@@ -348,7 +329,7 @@
this.lblAxEncVel.Location = new System.Drawing.Point(73, 90);
this.lblAxEncVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncVel.Name = "lblAxEncVel";
this.lblAxEncVel.Size = new System.Drawing.Size(17, 17);
this.lblAxEncVel.Size = new System.Drawing.Size(21, 20);
this.lblAxEncVel.TabIndex = 1;
this.lblAxEncVel.Text = "...";
//
......@@ -358,7 +339,7 @@
this.lblAxPrfVel.Location = new System.Drawing.Point(199, 90);
this.lblAxPrfVel.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfVel.Name = "lblAxPrfVel";
this.lblAxPrfVel.Size = new System.Drawing.Size(17, 17);
this.lblAxPrfVel.Size = new System.Drawing.Size(21, 20);
this.lblAxPrfVel.TabIndex = 1;
this.lblAxPrfVel.Text = "...";
//
......@@ -368,7 +349,7 @@
this.lblAxEncPos.Location = new System.Drawing.Point(73, 65);
this.lblAxEncPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxEncPos.Name = "lblAxEncPos";
this.lblAxEncPos.Size = new System.Drawing.Size(17, 17);
this.lblAxEncPos.Size = new System.Drawing.Size(21, 20);
this.lblAxEncPos.TabIndex = 1;
this.lblAxEncPos.Text = "...";
//
......@@ -378,7 +359,7 @@
this.lblAxPrfPos.Location = new System.Drawing.Point(199, 65);
this.lblAxPrfPos.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxPrfPos.Name = "lblAxPrfPos";
this.lblAxPrfPos.Size = new System.Drawing.Size(17, 17);
this.lblAxPrfPos.Size = new System.Drawing.Size(21, 20);
this.lblAxPrfPos.TabIndex = 1;
this.lblAxPrfPos.Text = "...";
//
......@@ -388,7 +369,7 @@
this.lblAxisPrfMode.Location = new System.Drawing.Point(332, 65);
this.lblAxisPrfMode.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.lblAxisPrfMode.Name = "lblAxisPrfMode";
this.lblAxisPrfMode.Size = new System.Drawing.Size(17, 17);
this.lblAxisPrfMode.Size = new System.Drawing.Size(21, 20);
this.lblAxisPrfMode.TabIndex = 1;
this.lblAxisPrfMode.Text = "...";
//
......@@ -398,167 +379,10 @@
this.label50.Location = new System.Drawing.Point(267, 65);
this.label50.Margin = new System.Windows.Forms.Padding(2, 0, 2, 0);
this.label50.Name = "label50";
this.label50.Size = new System.Drawing.Size(59, 17);
this.label50.Size = new System.Drawing.Size(73, 20);
this.label50.TabIndex = 1;
this.label50.Text = "规划模式:";
//
// groupBox1
//
this.groupBox1.Controls.Add(this.txtBusyStatus);
this.groupBox1.Controls.Add(this.label11);
this.groupBox1.Controls.Add(this.txtHomeStatus);
this.groupBox1.Controls.Add(this.label10);
this.groupBox1.Controls.Add(this.label3);
this.groupBox1.Controls.Add(this.label24);
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.btnGetAlarm);
this.groupBox1.Controls.Add(this.txtAlarmStatus);
this.groupBox1.Controls.Add(this.txtLimit2);
this.groupBox1.Controls.Add(this.txtServoStatue);
this.groupBox1.Controls.Add(this.label22);
this.groupBox1.Controls.Add(this.txtLimit1);
this.groupBox1.Controls.Add(this.label6);
this.groupBox1.Controls.Add(this.txtHomeSingle);
this.groupBox1.Location = new System.Drawing.Point(553, 12);
this.groupBox1.Name = "groupBox1";
this.groupBox1.Size = new System.Drawing.Size(135, 260);
this.groupBox1.TabIndex = 302;
this.groupBox1.TabStop = false;
this.groupBox1.Text = "状态";
//
// txtBusyStatus
//
this.txtBusyStatus.Enabled = false;
this.txtBusyStatus.Location = new System.Drawing.Point(99, 76);
this.txtBusyStatus.Name = "txtBusyStatus";
this.txtBusyStatus.Size = new System.Drawing.Size(25, 23);
this.txtBusyStatus.TabIndex = 288;
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(31, 107);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(59, 17);
this.label11.TabIndex = 292;
this.label11.Text = "回零状态:";
//
// txtHomeStatus
//
this.txtHomeStatus.Enabled = false;
this.txtHomeStatus.Location = new System.Drawing.Point(99, 104);
this.txtHomeStatus.Name = "txtHomeStatus";
this.txtHomeStatus.Size = new System.Drawing.Size(25, 23);
this.txtHomeStatus.TabIndex = 291;
//
// label10
//
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(24, 79);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(66, 17);
this.label10.TabIndex = 289;
this.label10.Text = "BUSY状态:";
//
// label3
//
this.label3.AutoSize = true;
this.label3.Location = new System.Drawing.Point(31, 51);
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(59, 17);
this.label3.TabIndex = 286;
this.label3.Text = "报警状态:";
//
// label24
//
this.label24.AutoSize = true;
this.label24.Location = new System.Drawing.Point(19, 191);
this.label24.Name = "label24";
this.label24.Size = new System.Drawing.Size(71, 17);
this.label24.TabIndex = 316;
this.label24.Text = "负极限信号:";
this.label24.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// label5
//
this.label5.AutoSize = true;
this.label5.Location = new System.Drawing.Point(31, 23);
this.label5.Name = "label5";
this.label5.Size = new System.Drawing.Size(59, 17);
this.label5.TabIndex = 328;
this.label5.Text = "伺服状态:";
//
// btnGetAlarm
//
this.btnGetAlarm.BackColor = System.Drawing.Color.White;
this.btnGetAlarm.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnGetAlarm.Location = new System.Drawing.Point(14, 218);
this.btnGetAlarm.Name = "btnGetAlarm";
this.btnGetAlarm.Size = new System.Drawing.Size(110, 34);
this.btnGetAlarm.TabIndex = 284;
this.btnGetAlarm.Text = "读报状态";
this.btnGetAlarm.UseVisualStyleBackColor = false;
this.btnGetAlarm.Click += new System.EventHandler(this.btnGetAlarm_Click);
//
// txtAlarmStatus
//
this.txtAlarmStatus.Enabled = false;
this.txtAlarmStatus.Location = new System.Drawing.Point(99, 48);
this.txtAlarmStatus.Name = "txtAlarmStatus";
this.txtAlarmStatus.Size = new System.Drawing.Size(25, 23);
this.txtAlarmStatus.TabIndex = 285;
//
// txtLimit2
//
this.txtLimit2.Enabled = false;
this.txtLimit2.Location = new System.Drawing.Point(99, 188);
this.txtLimit2.Name = "txtLimit2";
this.txtLimit2.Size = new System.Drawing.Size(25, 23);
this.txtLimit2.TabIndex = 313;
//
// txtServoStatue
//
this.txtServoStatue.Enabled = false;
this.txtServoStatue.Location = new System.Drawing.Point(99, 20);
this.txtServoStatue.Name = "txtServoStatue";
this.txtServoStatue.Size = new System.Drawing.Size(25, 23);
this.txtServoStatue.TabIndex = 327;
//
// label22
//
this.label22.AutoSize = true;
this.label22.Location = new System.Drawing.Point(19, 163);
this.label22.Name = "label22";
this.label22.Size = new System.Drawing.Size(71, 17);
this.label22.TabIndex = 312;
this.label22.Text = "正极限信号:";
this.label22.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
//
// txtLimit1
//
this.txtLimit1.Enabled = false;
this.txtLimit1.Location = new System.Drawing.Point(99, 160);
this.txtLimit1.Name = "txtLimit1";
this.txtLimit1.Size = new System.Drawing.Size(25, 23);
this.txtLimit1.TabIndex = 309;
//
// label6
//
this.label6.AutoSize = true;
this.label6.Location = new System.Drawing.Point(31, 135);
this.label6.Name = "label6";
this.label6.Size = new System.Drawing.Size(59, 17);
this.label6.TabIndex = 300;
this.label6.Text = "原点信号:";
//
// txtHomeSingle
//
this.txtHomeSingle.Enabled = false;
this.txtHomeSingle.Location = new System.Drawing.Point(99, 132);
this.txtHomeSingle.Name = "txtHomeSingle";
this.txtHomeSingle.Size = new System.Drawing.Size(25, 23);
this.txtHomeSingle.TabIndex = 297;
//
// panel1
//
this.panel1.Controls.Add(this.linkLabel1);
......@@ -590,15 +414,15 @@
this.panel1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.panel1.Location = new System.Drawing.Point(7, 17);
this.panel1.Name = "panel1";
this.panel1.Size = new System.Drawing.Size(540, 250);
this.panel1.Size = new System.Drawing.Size(679, 250);
this.panel1.TabIndex = 219;
//
// linkLabel1
//
this.linkLabel1.AutoSize = true;
this.linkLabel1.Location = new System.Drawing.Point(169, 165);
this.linkLabel1.Location = new System.Drawing.Point(284, 169);
this.linkLabel1.Name = "linkLabel1";
this.linkLabel1.Size = new System.Drawing.Size(32, 17);
this.linkLabel1.Size = new System.Drawing.Size(39, 20);
this.linkLabel1.TabIndex = 336;
this.linkLabel1.TabStop = true;
this.linkLabel1.Text = "复制";
......@@ -609,16 +433,16 @@
this.comjSpeed.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.comjSpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.comjSpeed.FormattingEnabled = true;
this.comjSpeed.Location = new System.Drawing.Point(71, 207);
this.comjSpeed.Location = new System.Drawing.Point(161, 207);
this.comjSpeed.Name = "comjSpeed";
this.comjSpeed.Size = new System.Drawing.Size(95, 28);
this.comjSpeed.Size = new System.Drawing.Size(95, 31);
this.comjSpeed.TabIndex = 335;
//
// btnComAlarmClear
//
this.btnComAlarmClear.BackColor = System.Drawing.Color.White;
this.btnComAlarmClear.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnComAlarmClear.Location = new System.Drawing.Point(307, 154);
this.btnComAlarmClear.Location = new System.Drawing.Point(396, 160);
this.btnComAlarmClear.Name = "btnComAlarmClear";
this.btnComAlarmClear.Size = new System.Drawing.Size(110, 34);
this.btnComAlarmClear.TabIndex = 50;
......@@ -633,7 +457,7 @@
this.btnAxisStop.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisStop.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisStop.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisStop.Location = new System.Drawing.Point(427, 78);
this.btnAxisStop.Location = new System.Drawing.Point(520, 83);
this.btnAxisStop.Name = "btnAxisStop";
this.btnAxisStop.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisStop.Size = new System.Drawing.Size(110, 110);
......@@ -649,7 +473,7 @@
this.btnAxisReturnHome.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisReturnHome.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisReturnHome.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisReturnHome.Location = new System.Drawing.Point(307, 116);
this.btnAxisReturnHome.Location = new System.Drawing.Point(396, 122);
this.btnAxisReturnHome.Name = "btnAxisReturnHome";
this.btnAxisReturnHome.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisReturnHome.Size = new System.Drawing.Size(110, 34);
......@@ -663,9 +487,9 @@
this.cmbAxis.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbAxis.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.cmbAxis.FormattingEnabled = true;
this.cmbAxis.Location = new System.Drawing.Point(71, 6);
this.cmbAxis.Location = new System.Drawing.Point(141, 11);
this.cmbAxis.Name = "cmbAxis";
this.cmbAxis.Size = new System.Drawing.Size(227, 28);
this.cmbAxis.Size = new System.Drawing.Size(213, 31);
this.cmbAxis.TabIndex = 301;
this.cmbAxis.SelectedIndexChanged += new System.EventHandler(this.comboBox1_SelectedIndexChanged);
//
......@@ -674,7 +498,7 @@
this.btnDelMove.BackColor = System.Drawing.Color.White;
this.btnDelMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnDelMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnDelMove.Location = new System.Drawing.Point(321, 199);
this.btnDelMove.Location = new System.Drawing.Point(486, 199);
this.btnDelMove.Name = "btnDelMove";
this.btnDelMove.Size = new System.Drawing.Size(140, 45);
this.btnDelMove.TabIndex = 332;
......@@ -690,7 +514,7 @@
this.btnOpenAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnOpenAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnOpenAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnOpenAxis.Location = new System.Drawing.Point(307, 2);
this.btnOpenAxis.Location = new System.Drawing.Point(396, 8);
this.btnOpenAxis.Name = "btnOpenAxis";
this.btnOpenAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnOpenAxis.Size = new System.Drawing.Size(110, 34);
......@@ -706,7 +530,7 @@
this.btnCloseAxis.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnCloseAxis.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnCloseAxis.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnCloseAxis.Location = new System.Drawing.Point(427, 2);
this.btnCloseAxis.Location = new System.Drawing.Point(520, 7);
this.btnCloseAxis.Name = "btnCloseAxis";
this.btnCloseAxis.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnCloseAxis.Size = new System.Drawing.Size(110, 34);
......@@ -720,7 +544,7 @@
this.btnAddMove.BackColor = System.Drawing.Color.White;
this.btnAddMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAddMove.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAddMove.Location = new System.Drawing.Point(172, 199);
this.btnAddMove.Location = new System.Drawing.Point(291, 199);
this.btnAddMove.Name = "btnAddMove";
this.btnAddMove.Size = new System.Drawing.Size(140, 45);
this.btnAddMove.TabIndex = 330;
......@@ -736,20 +560,20 @@
this.txtASpeed.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtASpeed.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtASpeed.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtASpeed.Location = new System.Drawing.Point(207, 88);
this.txtASpeed.Location = new System.Drawing.Point(278, 88);
this.txtASpeed.MaxLength = 12;
this.txtASpeed.Name = "txtASpeed";
this.txtASpeed.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtASpeed.Size = new System.Drawing.Size(91, 26);
this.txtASpeed.Size = new System.Drawing.Size(91, 31);
this.txtASpeed.TabIndex = 251;
this.txtASpeed.Text = "200";
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(9, 213);
this.label1.Location = new System.Drawing.Point(38, 213);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(68, 17);
this.label1.Size = new System.Drawing.Size(84, 20);
this.label1.TabIndex = 329;
this.label1.Text = "点动速度：";
//
......@@ -759,10 +583,10 @@
this.label47.Cursor = System.Windows.Forms.Cursors.Default;
this.label47.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label47.ForeColor = System.Drawing.SystemColors.ControlText;
this.label47.Location = new System.Drawing.Point(142, 93);
this.label47.Location = new System.Drawing.Point(178, 93);
this.label47.Name = "label47";
this.label47.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label47.Size = new System.Drawing.Size(59, 17);
this.label47.Size = new System.Drawing.Size(73, 20);
this.label47.TabIndex = 250;
this.label47.Text = "目标速度:";
this.label47.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -774,7 +598,7 @@
this.btnReadPosition.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnReadPosition.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnReadPosition.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnReadPosition.Location = new System.Drawing.Point(207, 127);
this.btnReadPosition.Location = new System.Drawing.Point(271, 130);
this.btnReadPosition.Name = "btnReadPosition";
this.btnReadPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnReadPosition.Size = new System.Drawing.Size(91, 34);
......@@ -790,7 +614,7 @@
this.btnAxisVMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisVMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisVMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisVMove.Location = new System.Drawing.Point(307, 78);
this.btnAxisVMove.Location = new System.Drawing.Point(396, 84);
this.btnAxisVMove.Name = "btnAxisVMove";
this.btnAxisVMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisVMove.Size = new System.Drawing.Size(110, 34);
......@@ -803,9 +627,9 @@
//
this.label8.AutoSize = true;
this.label8.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label8.Location = new System.Drawing.Point(18, 136);
this.label8.Location = new System.Drawing.Point(10, 131);
this.label8.Name = "label8";
this.label8.Size = new System.Drawing.Size(59, 17);
this.label8.Size = new System.Drawing.Size(73, 20);
this.label8.TabIndex = 255;
this.label8.Text = "实时位置:";
//
......@@ -816,7 +640,7 @@
this.btnAxisRMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisRMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisRMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisRMove.Location = new System.Drawing.Point(427, 39);
this.btnAxisRMove.Location = new System.Drawing.Point(520, 44);
this.btnAxisRMove.Name = "btnAxisRMove";
this.btnAxisRMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisRMove.Size = new System.Drawing.Size(110, 34);
......@@ -828,10 +652,10 @@
// lblCountPulse
//
this.lblCountPulse.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.lblCountPulse.Location = new System.Drawing.Point(83, 131);
this.lblCountPulse.Location = new System.Drawing.Point(138, 133);
this.lblCountPulse.Name = "lblCountPulse";
this.lblCountPulse.ReadOnly = true;
this.lblCountPulse.Size = new System.Drawing.Size(118, 26);
this.lblCountPulse.Size = new System.Drawing.Size(118, 31);
this.lblCountPulse.TabIndex = 38;
//
// btnAxisAMove
......@@ -841,7 +665,7 @@
this.btnAxisAMove.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisAMove.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnAxisAMove.ForeColor = System.Drawing.SystemColors.ControlText;
this.btnAxisAMove.Location = new System.Drawing.Point(307, 40);
this.btnAxisAMove.Location = new System.Drawing.Point(396, 46);
this.btnAxisAMove.Name = "btnAxisAMove";
this.btnAxisAMove.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnAxisAMove.Size = new System.Drawing.Size(110, 34);
......@@ -855,9 +679,9 @@
this.label49.AutoSize = true;
this.label49.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label49.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label49.Location = new System.Drawing.Point(10, 11);
this.label49.Location = new System.Drawing.Point(62, 16);
this.label49.Name = "label49";
this.label49.Size = new System.Drawing.Size(51, 17);
this.label49.Size = new System.Drawing.Size(64, 20);
this.label49.TabIndex = 233;
this.label49.Text = "AC伺服:";
this.label49.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -868,11 +692,11 @@
this.txtAPosition.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtAPosition.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAPosition.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtAPosition.Location = new System.Drawing.Point(207, 48);
this.txtAPosition.Location = new System.Drawing.Point(281, 51);
this.txtAPosition.MaxLength = 12;
this.txtAPosition.Name = "txtAPosition";
this.txtAPosition.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtAPosition.Size = new System.Drawing.Size(91, 26);
this.txtAPosition.Size = new System.Drawing.Size(91, 31);
this.txtAPosition.TabIndex = 244;
this.txtAPosition.Text = "3000";
//
......@@ -881,9 +705,9 @@
this.label46.AutoSize = true;
this.label46.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label46.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label46.Location = new System.Drawing.Point(26, 93);
this.label46.Location = new System.Drawing.Point(10, 93);
this.label46.Name = "label46";
this.label46.Size = new System.Drawing.Size(35, 17);
this.label46.Size = new System.Drawing.Size(43, 20);
this.label46.TabIndex = 239;
this.label46.Text = "地址:";
this.label46.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -894,10 +718,10 @@
this.label48.Cursor = System.Windows.Forms.Cursors.Default;
this.label48.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label48.ForeColor = System.Drawing.SystemColors.ControlText;
this.label48.Location = new System.Drawing.Point(142, 53);
this.label48.Location = new System.Drawing.Point(178, 56);
this.label48.Name = "label48";
this.label48.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.label48.Size = new System.Drawing.Size(59, 17);
this.label48.Size = new System.Drawing.Size(73, 20);
this.label48.TabIndex = 243;
this.label48.Text = "目标位置:";
this.label48.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -907,9 +731,9 @@
this.label45.AutoSize = true;
this.label45.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.label45.ImageAlign = System.Drawing.ContentAlignment.MiddleRight;
this.label45.Location = new System.Drawing.Point(14, 53);
this.label45.Location = new System.Drawing.Point(8, 53);
this.label45.Name = "label45";
this.label45.Size = new System.Drawing.Size(47, 17);
this.label45.Size = new System.Drawing.Size(58, 20);
this.label45.TabIndex = 240;
this.label45.Text = "端口号:";
this.label45.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
......@@ -917,22 +741,22 @@
// txtAxisValue
//
this.txtAxisValue.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisValue.Location = new System.Drawing.Point(71, 88);
this.txtAxisValue.Location = new System.Drawing.Point(89, 92);
this.txtAxisValue.MaxLength = 10;
this.txtAxisValue.Name = "txtAxisValue";
this.txtAxisValue.ReadOnly = true;
this.txtAxisValue.Size = new System.Drawing.Size(50, 26);
this.txtAxisValue.Size = new System.Drawing.Size(50, 31);
this.txtAxisValue.TabIndex = 242;
this.txtAxisValue.Text = "0";
//
// txtAxisDeviceName
//
this.txtAxisDeviceName.Font = new System.Drawing.Font("微软雅黑", 10.5F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtAxisDeviceName.Location = new System.Drawing.Point(71, 48);
this.txtAxisDeviceName.Location = new System.Drawing.Point(89, 51);
this.txtAxisDeviceName.MaxLength = 10;
this.txtAxisDeviceName.Name = "txtAxisDeviceName";
this.txtAxisDeviceName.ReadOnly = true;
this.txtAxisDeviceName.Size = new System.Drawing.Size(50, 26);
this.txtAxisDeviceName.Size = new System.Drawing.Size(50, 31);
this.txtAxisDeviceName.TabIndex = 241;
this.txtAxisDeviceName.Text = "0";
//
......@@ -944,7 +768,7 @@
this.lblServerOn.ForeColor = System.Drawing.Color.Red;
this.lblServerOn.Location = new System.Drawing.Point(32, 115);
this.lblServerOn.Name = "lblServerOn";
this.lblServerOn.Size = new System.Drawing.Size(0, 19);
this.lblServerOn.Size = new System.Drawing.Size(0, 25);
this.lblServerOn.TabIndex = 268;
//
// timer1
......@@ -963,8 +787,6 @@
this.groupAxis.PerformLayout();
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.groupBox1.ResumeLayout(false);
this.groupBox1.PerformLayout();
this.panel1.ResumeLayout(false);
this.panel1.PerformLayout();
this.ResumeLayout(false);
......@@ -975,15 +797,6 @@
private System.Windows.Forms.GroupBox groupAxis;
private System.Windows.Forms.ComboBox cmbAxis;
private System.Windows.Forms.Label label6;
private System.Windows.Forms.TextBox txtHomeSingle;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox txtHomeStatus;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox txtBusyStatus;
private System.Windows.Forms.Label label3;
private System.Windows.Forms.TextBox txtAlarmStatus;
private System.Windows.Forms.Button btnGetAlarm;
internal System.Windows.Forms.Button btnReadPosition;
private System.Windows.Forms.Label lblServerOn;
private System.Windows.Forms.Label label8;
......@@ -1005,17 +818,10 @@
private System.Windows.Forms.Label label45;
private System.Windows.Forms.Label label46;
private System.Windows.Forms.Label label49;
private System.Windows.Forms.Label label24;
private System.Windows.Forms.TextBox txtLimit2;
private System.Windows.Forms.Label label22;
private System.Windows.Forms.TextBox txtLimit1;
private System.Windows.Forms.Panel panel1;
private System.Windows.Forms.Label label5;
private System.Windows.Forms.TextBox txtServoStatue;
private System.Windows.Forms.Button btnDelMove;
private System.Windows.Forms.Button btnAddMove;
private System.Windows.Forms.Label label1;
private System.Windows.Forms.GroupBox groupBox1;
private System.Windows.Forms.ComboBox comjSpeed;
private System.Windows.Forms.LinkLabel linkLabel1;
private System.Windows.Forms.GroupBox groupBox2;
......
DeviceLibrary/userControl/AxisMoveControl.cs
......@@ -63,14 +63,14 @@ namespace DeviceLibrary
this.IsHuiChuan = isHc;
if (IsHuiChuan)
{
groupBox1.Visible = false;
groupBox2.Visible = true;
//groupBox1.Visible = false;
//groupBox2.Visible = true;
timer1.Start();
}
else
{
groupBox1.Visible = true;
groupBox2.Visible = false;
//groupBox1.Visible = true;
//groupBox2.Visible = false;
}
}
......@@ -183,17 +183,17 @@ namespace DeviceLibrary
}
}
private void btnGetAlarm_Click(object sender, EventArgs e)
{
this.txtAlarmStatus.Text = AxisManager.GetAlarmStatus(PortName, SlvAddr).ToString();
this.txtBusyStatus.Text = AxisManager.GetBusyStatus(PortName, SlvAddr).ToString();
//this.txtStb.Text = AxisManager.instance.GetSTBState(PortName, SlvAddr).ToString();
this.txtHomeStatus.Text = AxisManager.GetHomeEndStatus(PortName, SlvAddr).ToString();
this.txtHomeSingle.Text = AxisManager.GetHomeSingle(PortName, SlvAddr).ToString();
this.txtLimit1.Text = AxisManager.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
this.txtLimit2.Text = AxisManager.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
txtServoStatue.Text = AxisManager.IsServeoOn(PortName, SlvAddr) ? "✔" : "✘";
}
//private void btnGetAlarm_Click(object sender, EventArgs e)
//{
// this.txtAlarmStatus.Text = AxisManager.GetAlarmStatus(PortName, SlvAddr).ToString();
// this.txtBusyStatus.Text = AxisManager.GetBusyStatus(PortName, SlvAddr).ToString();
// //this.txtStb.Text = AxisManager.instance.GetSTBState(PortName, SlvAddr).ToString();
// this.txtHomeStatus.Text = AxisManager.GetHomeEndStatus(PortName, SlvAddr).ToString();
// this.txtHomeSingle.Text = AxisManager.GetHomeSingle(PortName, SlvAddr).ToString();
// this.txtLimit1.Text = AxisManager.GetLimitPositiveSingle(PortName, SlvAddr).ToString();
// this.txtLimit2.Text = AxisManager.GetLimitNegativeSingle(PortName, SlvAddr).ToString();
// txtServoStatue.Text = AxisManager.IsServeoOn(PortName, SlvAddr) ? "✔" : "✘";
//}
private void btnReadPosition_Click(object sender, EventArgs e)
......@@ -248,17 +248,17 @@ namespace DeviceLibrary
btnAxisStop.ForeColor = color;
btnComAlarmClear.ForeColor = color;
btnReadPosition.ForeColor = color;
btnGetAlarm.ForeColor = color;
// btnGetAlarm.ForeColor = color;
btnAddMove.ForeColor = color;
btnDelMove.ForeColor = color;
this.txtAlarmStatus.Text = "";
this.txtBusyStatus.Text = "";
this.txtHomeStatus.Text = "";
this.txtHomeSingle.Text = "";
this.txtLimit1.Text = "";
this.txtLimit2.Text = "";
txtServoStatue.Text = "";
//this.txtAlarmStatus.Text = "";
//this.txtBusyStatus.Text = "";
//this.txtHomeStatus.Text = "";
//this.txtHomeSingle.Text = "";
//this.txtLimit1.Text = "";
//this.txtLimit2.Text = "";
//txtServoStatue.Text = "";
}
}
private void AxisMove(int speed)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!