Skip to content

张东亮 / NS200

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

合并冲突

2 个父辈 ec0496d2 4d2c68da
全部展开
内嵌 并排
正在显示 16 个修改的文件 包含 287 行增加 和 139 行删除
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
......@@ -15,6 +15,7 @@ using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
using AutoScanAndLabel.UC;
using PrintLabel;
namespace AutoScanAndLabel
{
......@@ -25,10 +26,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 +57,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", "信息");
......@@ -139,7 +140,7 @@ namespace AutoScanAndLabel
AddForm("Res0007", crc.GetString("Res0007", "日志"), lc);
RobotManage.Init();
RobotManage.UserPauseSet += RobotManage_UserPauseSet;
Common.LabelResult += Common_LabelResult;
DeviceLibrary.Common.LabelResult += Common_LabelResult;
OnlineStore.CodeResourceControl.RefreshLanguageEvent += CodeResourceControl_RefreshLanguageEvent;
}
......@@ -431,10 +432,16 @@ namespace AutoScanAndLabel
{
Camera._cam.CloseAll();
}
CodeLibrary.CodeResourceControl.GetLanguageEvent += Crc_GetLanguageEvent;
CodeLibrary.FrmCodeDecode frm = new CodeLibrary.FrmCodeDecode();
frm.CurrLanguage = Crc_GetLanguageEvent();
frm.chbZxing.Checked = false;
try
{
frm.ShowDialog();
frm.Dispose();
}
catch { }
//IOManager.IOMove(IO_Type.Camera_Led, IO_VALUE.LOW);
}
......
AutoScanAndLabel/SettingControl.Designer.cs
......@@ -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;
......@@ -150,10 +150,10 @@ namespace AutoScanAndLabel
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.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, 158);
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);
//
......@@ -173,10 +173,10 @@ namespace AutoScanAndLabel
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.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, 208);
this.listEditControl1.Size = new System.Drawing.Size(354, 204);
this.listEditControl1.TabIndex = 3;
this.listEditControl1.DataRefresh += new System.EventHandler(this.listEdit_pn_DataRefresh);
//
......@@ -184,7 +184,7 @@ namespace AutoScanAndLabel
//
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,13 +225,17 @@ 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.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
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.Size = new System.Drawing.Size(591, 167);
this.uC_U11.TabIndex = 9;
//
// SettingControl
......
AutoScanAndLabel/SettingControl.cs
......@@ -80,8 +80,9 @@ namespace AutoScanAndLabel
//RobotManage.PrintBean.EditLabel();
PrintLabel.FrmLabel frmLabel = new PrintLabel.FrmLabel();
//crc.CurrLanguage = "";
frmLabel.Text = crc.GetString("FrmLabel_Text", "标签编辑");
crc.LanguageProcess(frmLabel, "FrmLabel");
frmLabel.KeyWord.AddRange(keys);
//frmLabel.KeyWord.AddRange(keys);
frmLabel.ShowDialog();
RobotManage_LoadFinishEvent(true, "");
RobotManage.LoadPrintSetting();
......
AutoScanAndLabel/UC_U1.Designer.cs
......@@ -42,18 +42,20 @@ namespace AutoScanAndLabel
this.label_dir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.label_dir.AutoSize = true;
this.label_dir.Location = new System.Drawing.Point(3, 53);
this.label_dir.Location = new System.Drawing.Point(4, 66);
this.label_dir.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
this.label_dir.Name = "label_dir";
this.label_dir.Size = new System.Drawing.Size(83, 12);
this.label_dir.Size = new System.Drawing.Size(105, 15);
this.label_dir.TabIndex = 16;
this.label_dir.Text = "图像保存目录:";
//
// btn_selectdir
//
this.btn_selectdir.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btn_selectdir.Location = new System.Drawing.Point(355, 71);
this.btn_selectdir.Location = new System.Drawing.Point(480, 92);
this.btn_selectdir.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.btn_selectdir.Name = "btn_selectdir";
this.btn_selectdir.Size = new System.Drawing.Size(65, 23);
this.btn_selectdir.Size = new System.Drawing.Size(87, 29);
this.btn_selectdir.TabIndex = 15;
this.btn_selectdir.Text = "浏览";
this.btn_selectdir.UseVisualStyleBackColor = true;
......@@ -61,12 +63,11 @@ namespace AutoScanAndLabel
//
// txt_reelphotodir
//
this.txt_reelphotodir.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.txt_reelphotodir.Location = new System.Drawing.Point(3, 74);
this.txt_reelphotodir.Location = new System.Drawing.Point(4, 92);
this.txt_reelphotodir.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.txt_reelphotodir.Name = "txt_reelphotodir";
this.txt_reelphotodir.ReadOnly = true;
this.txt_reelphotodir.Size = new System.Drawing.Size(346, 21);
this.txt_reelphotodir.Size = new System.Drawing.Size(460, 25);
this.txt_reelphotodir.TabIndex = 14;
//
// cb_exportreephoto
......@@ -74,9 +75,10 @@ namespace AutoScanAndLabel
this.cb_exportreephoto.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.cb_exportreephoto.AutoSize = true;
this.cb_exportreephoto.Location = new System.Drawing.Point(6, 20);
this.cb_exportreephoto.Location = new System.Drawing.Point(8, 25);
this.cb_exportreephoto.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.cb_exportreephoto.Name = "cb_exportreephoto";
this.cb_exportreephoto.Size = new System.Drawing.Size(264, 16);
this.cb_exportreephoto.Size = new System.Drawing.Size(330, 19);
this.cb_exportreephoto.TabIndex = 13;
this.cb_exportreephoto.Text = "自动拍摄并保存料盘图像. 勾选后仅本次有效";
this.cb_exportreephoto.UseVisualStyleBackColor = true;
......@@ -89,19 +91,22 @@ namespace AutoScanAndLabel
this.gb.Controls.Add(this.txt_reelphotodir);
this.gb.Dock = System.Windows.Forms.DockStyle.Fill;
this.gb.Location = new System.Drawing.Point(0, 0);
this.gb.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gb.Name = "gb";
this.gb.Size = new System.Drawing.Size(431, 148);
this.gb.Padding = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.gb.Size = new System.Drawing.Size(575, 185);
this.gb.TabIndex = 17;
this.gb.TabStop = false;
this.gb.Text = "料盘图像导出";
//
// UC_U1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 15F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.gb);
this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
this.Name = "UC_U1";
this.Size = new System.Drawing.Size(431, 148);
this.Size = new System.Drawing.Size(575, 185);
this.Load += new System.EventHandler(this.UC_U1_Load);
this.gb.ResumeLayout(false);
this.gb.PerformLayout();
......
AutoScanAndLabel/resources/en-US.lngres
......@@ -86,9 +86,9 @@ Form1_tabControl1___IOControl_groupBox1_btn打开设备光源_Text 打开设备
Form1_tabControl1___IOControl_groupBox1_btn打开相机光源_Text 打开相机光源 Gripper Compression
Form1_tabControl1___IOControl_groupBox1_btn关闭设备光源_Text 关闭设备光源 Right Electric Roller Enter
Form1_tabControl1___IOControl_groupBox1_btn关闭相机光源_Text 关闭相机光源 Right Electric Roller Stop
Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text 夹爪放松 Right Electric Roller Exit
Form1_tabControl1___IOControl_groupBox1_btn夹爪回原_Text 夹爪回原 Right Barrier Up
Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text 夹爪夹紧 Right Barrier Down
Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text 夹取机构放料 Put down
Form1_tabControl1___IOControl_groupBox1_btn夹爪回原_Text 夹取机构回原 Home
Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text 夹取机构取料 Pick up
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒进入_Text 入口电滚筒进入 Left Electric Roller Enter
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒停止_Text 入口电滚筒停止 Left Electric Roller Stop
Form1_tabControl1___IOControl_groupBox1_btn入口电滚筒退出_Text 入口电滚筒退出 Left Electric Roller Exit
......@@ -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
......@@ -189,11 +193,20 @@ Form1_tabControl1_tabPage1_cb_IgnoreGratingSignal_Text 忽略安全光栅 Skip s
Form1_tabControl1_tabPage1_cb_IgnoreSafecheck_Text 忽略安全检查(含安全光栅) Skip safety check including safety light curtain.
Form1_tabControl1_tabPage1_groupBox1_Text 运行状态 Running Status
Form1_tabControl1_tabPage1_Text 信息 Info.
FrmLabel_Text 标签编辑 Label editing
FrmLabel_BtnFieldAdd_Text 字段添加 Field addition
FrmLabel_BtnFieldDel_Text 字段删除 Field deletion
FrmLabel_BtnFieldFont_Text 字段字体 Field font
FrmLabel_BtnLabelDel_Text 删除 Delete
FrmLabel_BtnLabelNew_Text 新建 Add
FrmLabel_BtnPrintTest_Text 打印测试 Print test
FrmLabel_BtnRename_Text 重命名 Rename
FrmLabel_BtnSave_Text 保存 Save
FrmLabel_grpDsc_Text 字段说明 Field description
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 +215,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
......@@ -362,33 +369,33 @@ Res0071 任务状态
Res0072 标签已打印,当前ReelID: Label is printed. Current Reel ID:
Res0073 等待标签打印 Waiting label printing…
Res0074 等待中 Waiting…
Res0075 任务编号: 任務番号:
Res0076 运行编号: 実行番号:
Res0077 任务状态: 任務状態:
Res0078 运行结果: 実行結果:
Res0075 任务编号: MissionId:
Res0076 运行编号: RunningId:
Res0077 任务状态: MissionStatus:
Res0078 运行结果: RunningResult:
Res0079 机器尚未启动不能呼叫Agv AGV cannot be called when the equipment is OFF.
Res0080 当前有料串不能请求进入料串 AGV cannot be called when the stacker exists.
Res0081 当前没有料串不能请求取料串 AGV cannot be called when there is no stacker.
Res0082 机器尚在运行,不能退出,请先停止运行. Please stop operation before exit.
Res0083 左侧料串正在提升或下降, 不能释放
Res0084 左侧料串等待释放中({0})
Res0085 安全释放左侧料串
Res0086 右侧料串当前没有就位, 不能释放
Res0087 右侧料串等待释放中({0})
Res0088 安全释放右侧料串
Res0089 右侧料串正在运行,不能手动上料
Res0090 左侧料串正在运行,不能手动上料
Res0091 请确认是否运动到该位置
Res0092 确定要删除:\"{0}\"?
Res0093 右侧料串已空,等待取走料串
Res0094 左侧料串已满,等待取走料串
Res0095 左侧空闲中
Res0096 抓料失败请手动处理,请将料盘放入:NG箱,按右侧按钮继续
Res0097 抓料失败请手动处理,请将料盘放入: 左侧料串,按右侧按钮继续
Res0098 等待左侧允许放料
Res0099 等待料盘取走
Res0100 ,料串已清空.
Res0101 设备操作ToolStripMenuItem_启用调试模式ToolStripMenuItem_Text
Res0083 左侧料串正在提升或下降,不能释放 The left string is lifting or descending and cannot be released
Res0084 左侧料串等待释放中({0}) Left string waiting to be released ({0})
Res0085 安全释放左侧料串 Safe release of the left string
Res0086 右侧料串当前没有就位, 不能释放 The right string is not currently in place and cannot be released
Res0087 右侧料串等待释放中({0}) Right string waiting to be released ({0})
Res0088 安全释放右侧料串 Safely release the right string
Res0089 右侧料串正在运行,不能手动上料 The right string is running and cannot be loaded manually
Res0090 左侧料串正在运行,不能手动上料 The left string is running and cannot be loaded manually
Res0091 请确认是否运动到该位置 Please confirm that you are moving to this position
Res0092 确定要删除:\"{0}\"? Are you sure you want to delete: "{0}"?
Res0093 右侧料串已空,等待取走料串 The right string is empty, waiting to be removed
Res0094 左侧料串已满,等待取走料串 The left bunch is full, wait to remove the bunch
Res0095 左侧空闲中 Left side idle
Res0096 抓料失败请手动处理,请将料盘放入:NG箱,按右侧按钮继续 Please handle the failure of the material picking manually, please put the material tray in: NG box, press the right button to continue
Res0097 抓料失败请手动处理,请将料盘放入: 左侧料串,按右侧按钮继续 Please handle the failure of the material picking manually, please put the material tray in: left string, press the right button to continue
Res0098 等待左侧允许放料 Wait for the left side to allow the material to be released
Res0099 等待料盘取走 Wait for the reel to be removed
Res0100 ,料串已清空. The string has been emptied
Res0101 启用配置模式 Configuration Mode On
Res0102 Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text
Res0103 Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text
Res0104 等待 Waiting
......@@ -411,3 +418,26 @@ 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
Res0218 有料串,已提取{0}张料盘 The stacker is ready. {0} reels has been extracted.
FrmCodeDecode_btnAn_Text 变暗 darken
FrmCodeDecode_btnbarCode_Text 一维码识别 One dimensional code recognition
FrmCodeDecode_btnCameraImage_Text 相机获取图片 camera image
FrmCodeDecode_btnClearLog_Text 清理日志 Clear log
FrmCodeDecode_btnCopyN_Text 复制名称 Copy Name
FrmCodeDecode_btnDCode_Text 二维码识别 Qr code recognition
FrmCodeDecode_btnErZhi_Text 二值化 binaryzation 
FrmCodeDecode_btnExit_Text 退出 Exit
FrmCodeDecode_btnGray_Text 图像转灰 Turning grey
FrmCodeDecode_btnLearn_Text 学习 learn
FrmCodeDecode_btnLight_Text 提亮 brighten
FrmCodeDecode_btnScanTest_Text 新算法解码 New algorithm decoding
FrmCodeDecode_btnSelImage_Text 打开本地图片 Open local image
FrmCodeDecode_chbUseParam_Text 使用参数 operation parameter
FrmCodeDecode_label1_Text 图片路径 Image path
FrmCodeDecode_label2_Text 相机列表： Camera list:
FrmCodeDecode_label3_Text 条码类型： Bar code type:
FrmCodeDecode_label4_Text 参数路径 Parameters of the path
FrmCodeDecode_lblCount_Text 条码数量： Barcode number:
FrmCodeDecode_Text 二维码识别 Qr code recognition
\ No newline at end of file
AutoScanAndLabel/resources/ja-JP.lngres
......@@ -122,9 +122,9 @@ Form1_tabControl1_Res0008__IOControl_groupBox1_btn打开设备光源_Text 打开
Form1_tabControl1_Res0008__IOControl_groupBox1_btn打开相机光源_Text 打开相机光源 カメラの光源を点灯させます。
Form1_tabControl1_Res0008__IOControl_groupBox1_btn关闭设备光源_Text 关闭设备光源 設備の光源を消します。
Form1_tabControl1_Res0008__IOControl_groupBox1_btn关闭相机光源_Text 关闭相机光源 カメラの光源を消します。
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪放松_Text 夹爪放松 グリッパー解除
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪回原_Text 夹爪回原 グリッパー戻り
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪夹紧_Text 夹爪夹紧 グリッパー圧着
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪放松_Text 夹取机构放料 クランプ機構排出
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪回原_Text 夹取机构回原 クランプ機構は元に戻ります
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪夹紧_Text 夹取机构取料 抽出のためのクランプ機構
Form1_tabControl1_Res0008__IOControl_groupBox1_btn右侧电滚筒进入_Text 入口电滚筒进入 入り口ローラー進入
Form1_tabControl1_Res0008__IOControl_groupBox1_btn右侧电滚筒停止_Text 入口电滚筒停止 入り口ローラー停止
Form1_tabControl1_Res0008__IOControl_groupBox1_btn右侧电滚筒退出_Text 入口电滚筒退出 入り口ローラー脱退
......@@ -193,15 +193,16 @@ Form1_tabControl1_tabPage1_cb_IgnoreGratingSignal_Text 忽略安全光栅 ライ
Form1_tabControl1_tabPage1_cb_IgnoreSafecheck_Text 忽略安全检查(含安全光栅) セーフティチックを無視する（ライトカーテン含み）
Form1_tabControl1_tabPage1_groupBox1_Text 运行状态 実行状況
Form1_tabControl1_tabPage1_Text 信息 情報
FrmLabel_BtnFieldAdd_Text 字段添加 フィールド追加
FrmLabel_BtnFieldDel_Text 字段删除 フィールド削除
FrmLabel_BtnFieldFont_Text 字段字体 フィールド字体
FrmLabel_BtnLabelDel_Text 删除 削減
FrmLabel_BtnLabelNew_Text 新建 新規
FrmLabel_Text 标签编辑 ラベル編集
FrmLabel_BtnFieldAdd_Text 字段添加 フィールドの追加
FrmLabel_BtnFieldDel_Text 字段删除 フィールドの削除
FrmLabel_BtnFieldFont_Text 字段字体 フィールドフォント
FrmLabel_BtnLabelDel_Text 删除 削除
FrmLabel_BtnLabelNew_Text 新建 新築
FrmLabel_BtnPrintTest_Text 打印测试 印刷テスト
FrmLabel_BtnRename_Text 新建 新規
FrmLabel_BtnSave_Text 保存 保存
FrmLabel_groupBox1_Text 字段说明 フィールド説明
FrmLabel_BtnRename_Text 重命名 改名する
FrmLabel_BtnSave_Text 保存 セーブ
FrmLabel_grpDsc_Text 字段说明 フィールドの説明
menuStrip1_关于ToolStripMenuItem_Text 关于 情報
menuStrip1_设备操作ToolStripMenuItem_Text 设备操作 操作
menuStrip1_语言toolStripMenuItem_Text 语言 言語
......@@ -401,8 +402,8 @@ Res0106 秒 秒
Res0188 电夹爪通讯失败:{0} グリッパー通信エラー
Res0189 IO板卡初始化失败 IO初期化失敗
Res0190 打开配置模式 設定モード起動
Res0192 夹爪夹紧 グリッパー圧着
Res0193 夹爪放松 グリッパー解除
Res0192 夹取机构取料 グリッパー圧着
Res0193 夹取机构放料 クランプ機構排出
Res0194 请先选择运动轴 軸を選んでください。
Res0195 警告 注意！
Res0196 点动+ 逆転
......@@ -416,5 +417,28 @@ Res0203 伺服警报状态中 サーボアラーム状態
Res0204 无法操作 動作不能
Res0216 打印机 プリンター
Res0101 启用配置模式 設定モードを開ける
Res0102 夹爪夹紧 グリッパー圧着
Res0103 夹爪放松 グリッパー解除
Res0102 夹取机构取料 グリッパー圧着
Res0103 夹取机构放料 クランプ機構排出
Res0217 标签打印机打开失败 ラベルプリンターを開けませんでした
App_Title 自动贴标机 自動ラベル貼付機
Res0218 有料串,已提取{0}张料盘 ストリングがあり、トレイ{0}抽出されています
FrmCodeDecode_btnAn_Text 变暗 暗く
FrmCodeDecode_btnbarCode_Text 一维码识别 バーコード識別
FrmCodeDecode_btnCameraImage_Text 相机获取图片 カメラから画像
FrmCodeDecode_btnClearLog_Text 清理日志 クリア日誌
FrmCodeDecode_btnCopyN_Text 复制名称 コピー
FrmCodeDecode_btnDCode_Text 二维码识别 QRコード識別
FrmCodeDecode_btnErZhi_Text 二值化 二値化
FrmCodeDecode_btnExit_Text 退出 やめる
FrmCodeDecode_btnGray_Text 图像转灰 灰色に
FrmCodeDecode_btnLearn_Text 学习 勉強
FrmCodeDecode_btnLight_Text 提亮 明るく
FrmCodeDecode_btnScanTest_Text 新算法解码 新アルゴリズムデコード
FrmCodeDecode_btnSelImage_Text 打开本地图片 ローカル画像
FrmCodeDecode_chbUseParam_Text 使用参数 パラメータ演算
FrmCodeDecode_label1_Text 图片路径 画像パス
FrmCodeDecode_label2_Text 相机列表： カメラリスト：
FrmCodeDecode_label3_Text 条码类型： バーコードタイプ：
FrmCodeDecode_label4_Text 参数路径 パスパラメータ
FrmCodeDecode_lblCount_Text 条码数量： バーコード数：
FrmCodeDecode_Text 二维码识别 QRコード識別
\ 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 入口电滚筒退出 入口电滚筒退出
......@@ -122,9 +122,9 @@ Form1_tabControl1_Res0008__IOControl_groupBox1_btn打开设备光源_Text 打开
Form1_tabControl1_Res0008__IOControl_groupBox1_btn打开相机光源_Text 打开相机光源 打开相机光源
Form1_tabControl1_Res0008__IOControl_groupBox1_btn关闭设备光源_Text 关闭设备光源 关闭设备光源
Form1_tabControl1_Res0008__IOControl_groupBox1_btn关闭相机光源_Text 关闭相机光源 关闭相机光源
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪放松_Text 夹爪放松 夹爪放松
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪回原_Text 夹爪回原 夹爪回原
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪夹紧_Text 夹爪夹紧 夹爪夹紧
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪放松_Text 夹取机构放料 夹取机构放料
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪回原_Text 夹取机构回原 夹取机构回原
Form1_tabControl1_Res0008__IOControl_groupBox1_btn夹爪夹紧_Text 夹取机构取料 夹取机构取料
Form1_tabControl1_Res0008__IOControl_groupBox1_btn右侧电滚筒进入_Text 入口电滚筒进入 入口电滚筒进入
Form1_tabControl1_Res0008__IOControl_groupBox1_btn右侧电滚筒停止_Text 入口电滚筒停止 入口电滚筒停止
Form1_tabControl1_Res0008__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 空料串送入 空料串送入
......@@ -189,6 +193,16 @@ Form1_tabControl1_tabPage1_cb_IgnoreGratingSignal_Text 忽略安全光栅 忽略
Form1_tabControl1_tabPage1_cb_IgnoreSafecheck_Text 忽略安全检查(含安全光栅) 忽略安全检查(含安全光栅)
Form1_tabControl1_tabPage1_groupBox1_Text 运行状态 运行状态
Form1_tabControl1_tabPage1_Text 信息 信息
FrmLabel_Text 标签编辑 标签编辑
FrmLabel_BtnFieldAdd_Text 字段添加 字段添加
FrmLabel_BtnFieldDel_Text 字段删除 字段删除
FrmLabel_BtnFieldFont_Text 字段字体 字段字体
FrmLabel_BtnLabelDel_Text 删除 删除
FrmLabel_BtnLabelNew_Text 新建 新建
FrmLabel_BtnPrintTest_Text 打印测试 打印测试
FrmLabel_BtnRename_Text 重命名 重命名
FrmLabel_BtnSave_Text 保存 保存
FrmLabel_grpDsc_Text 字段说明 字段说明
menuStrip1_关于ToolStripMenuItem_Text 关于 关于
menuStrip1_设备操作ToolStripMenuItem_Text 设备操作 设备操作
menuStrip1_语言toolStripMenuItem_Text 语言 语言
......@@ -363,6 +377,31 @@ Res0078 运行结果: 运行结果:
Res0079 机器尚未启动不能呼叫Agv 机器尚未启动不能呼叫Agv
Res0080 当前有料串不能请求进入料串 当前有料串不能请求进入料串
Res0081 当前没有料串不能请求取料串 当前没有料串不能请求取料串
Res0082 机器尚在运行,不能退出,请先停止运行. 机器尚在运行,不能退出,请先停止运行.
Res0083 左侧料串正在提升或下降, 不能释放
Res0084 左侧料串等待释放中({0})
Res0085 安全释放左侧料串
Res0086 右侧料串当前没有就位, 不能释放
Res0087 右侧料串等待释放中({0})
Res0088 安全释放右侧料串
Res0089 右侧料串正在运行,不能手动上料
Res0090 左侧料串正在运行,不能手动上料
Res0091 请确认是否运动到该位置
Res0092 确定要删除:\"{0}\"?
Res0093 右侧料串已空,等待取走料串
Res0094 左侧料串已满,等待取走料串
Res0095 左侧空闲中
Res0096 抓料失败请手动处理,请将料盘放入:NG箱,按右侧按钮继续
Res0097 抓料失败请手动处理,请将料盘放入: 左侧料串,按右侧按钮继续
Res0098 等待左侧允许放料
Res0099 等待料盘取走
Res0100 ,料串已清空.
Res0101 启用配置模式 Configuration Mode On
Res0102 Form1_tabControl1___IOControl_groupBox1_btn夹爪夹紧_Text
Res0103 Form1_tabControl1___IOControl_groupBox1_btn夹爪放松_Text
Res0104 等待 Waiting
Res0105 超时 Time Out
Res0106 秒
Res0188 电夹爪通讯失败:{0} 电夹爪通讯失败:{0}
Res0189 IO板卡初始化失败 IO板卡初始化失败
Res0190 打开配置模式 打开配置模式
......@@ -380,3 +419,25 @@ Res0202 伺服尚未使能 伺服尚未使能
Res0203 伺服警报状态中 伺服警报状态中
Res0204 无法操作 无法操作
Res0216 打印机 打印机
Res0217 标签打印机打开失败 标签打印机打开失败
App_Title 自动贴标机 自动贴标机
Res0218 有料串,已提取{0}张料盘 有料串,已提取{0}张料盘
FrmCodeDecode_Text 二维码识别 二维码识别
FrmCodeDecode_label4_Text 参数路径 参数路径
FrmCodeDecode_chbUseParam_Text 使用参数 使用参数
FrmCodeDecode_btnAn_Text 变暗 变暗
FrmCodeDecode_btnLight_Text 提亮 提亮
FrmCodeDecode_btnCopyN_Text 复制名称 复制名称
FrmCodeDecode_label3_Text 条码类型： 条码类型：
FrmCodeDecode_label2_Text 相机列表： 相机列表：
FrmCodeDecode_btnExit_Text 退出 退出
FrmCodeDecode_btnCameraImage_Text 相机获取图片 相机获取图片
FrmCodeDecode_lblCount_Text 条码数量： 条码数量：
FrmCodeDecode_btnClearLog_Text 清理日志 清理日志
FrmCodeDecode_btnDCode_Text 二维码识别 二维码识别
FrmCodeDecode_btnLearn_Text 学习 学习
FrmCodeDecode_btnbarCode_Text 一维码识别 一维码识别
FrmCodeDecode_btnGray_Text 图像转灰 图像转灰
FrmCodeDecode_btnErZhi_Text 二值化 二值化
FrmCodeDecode_btnSelImage_Text 打开本地图片 打开本地图片
FrmCodeDecode_label1_Text 图片路径 图片路径
\ No newline at end of file
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);
}
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
{
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,15 +90,23 @@ namespace DeviceLibrary
else
{
LeftMoveInfo.NextMoveStep(MoveStep.L04);
LeftBatchAxisToP2(false);
LeftMoveInfo.log($"贴标完成,准备下一盘料,批量轴上升到P2位置,二次提升,LeftStartMovePosition={LeftStartMovePosition}");
LeftBatchAxisDown();
LeftMoveInfo.log($"贴标完成,批量轴下降固定值");
}
break;
case MoveStep.L40_ShelfFull:
LeftShelfNoTray = true;
LeftMoveInfo.NextMoveStep(MoveStep.LEND);
Left_Batch_Axis.AbsMove(LeftMoveInfo, Config.Left_Batch_P1, Config.Left_Batch_P1_speed);
if (ConfigHelper.Config.Get("UseAGVTransferShelf",false))//是否用AGV运输料串
{
LeftMoveInfo.log($"料串已满,批量轴下降到P1位置");
}
else
{
CylinderMove(LeftMoveInfo, IO_Type.LeftStopUP, IO_Type.LeftStopDown);
LeftMoveInfo.log($"料串已满,批量轴下降到P1位置,阻挡下降");
}
break;
case MoveStep.LEND:
LeftMoveInfo.EndMove();
......@@ -241,7 +239,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 +257,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 +269,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/MainMachine _RightProcess.cs
......@@ -145,7 +145,15 @@ namespace DeviceLibrary
ConfigHelper.Config.Set(Setting_Init.SaveReelPhoto, false);
RightMoveInfo.NextMoveStep(MoveStep.REND);
Right_Batch_Axis.AbsMove(RightMoveInfo, Config.Right_Batch_P1, Config.Right_Batch_P1_speed);
if (ConfigHelper.Config.Get("UseAGVTransferShelf", false))//是否用AGV运输料串
{
RightMoveInfo.log($"料串已取完, 批量轴下降到P1");
}
else
{
CylinderMove(LeftMoveInfo, IO_Type.RightStopUP, IO_Type.RightStopDown);
RightMoveInfo.log($"料串已取完, 批量轴下降到P1,阻挡下降");
}
break;
case MoveStep.REND:
RightMoveInfo.log($"结束运动");
......
DeviceLibrary/DeviceLibrary/PrinterHelper.cs
......@@ -15,7 +15,7 @@ namespace DeviceLibrary
string Port;
public PrinterHelper()
{
print = new Asa.PrintLabel(Application.StartupPath + "\\Label", 300);
print = new Asa.PrintLabel(Application.StartupPath + "\\Label");
}
public static CustPrinterStatus LastPrintStatus = CustPrinterStatus.Unknown;
public bool Connection(string port)
......@@ -30,7 +30,7 @@ namespace DeviceLibrary
}
else
{
print = new Asa.PrintLabel(Application.StartupPath + "\\Label", zebraManger.PrinterDPI);
print = new Asa.PrintLabel(Application.StartupPath + "\\Label");
return true;
}
}
......
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!