Skip to content

李娜 / RC1271-DUOStore

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

1

1 个父辈 d01a881f
全部展开
内嵌 并排
正在显示 9 个修改的文件 包含 83 行增加 和 43 行删除
source/DUOStore/App.config
......@@ -6,7 +6,7 @@
<appSettings>
<!--是否开机自动启动料仓-->
<add key="App_AutoRun" value="0" />
<add key="App_Title" value="包装料料仓" />
<add key="App_Title" value="DUO料仓" />
<!-- 开始吹气的判断值（配置值=服务器发送的湿度值-开始吹气值）-->
<add key="StartBlowValue" value="4" />
<!-- 停止吹气的判断值（配置值=服务器发送的湿度值-停止吹气值）-->
......@@ -21,9 +21,9 @@
<add key="Store_Position_Config" value="\StoreConfig\linePositions.csv" />
<add key="BOX_ConfigPath" value="\StoreConfig\BoxConfig.csv" />
<add key="Store_Type" value="RC_AC_PA" />
<add key="Store_CID" value="packing-store" />
<add key="Store_CID_1" value="packing-19" />
<add key="Store_CID_2" value="packing-20" />
<add key="Store_CID" value="duo-store" />
<add key="Store_CID_1" value="duo-1" />
<add key="Store_CID_2" value="duo-2" />
<!--end one store config-->
<add key="ACBaudRate" value="115200" />
<add key="InOutDefaultPosition" value="52000" />
......
source/DUOStore/FrmAxisMove.Designer.cs
......@@ -76,12 +76,12 @@ namespace OnlineStore.DUOStore
this.groupInout.Controls.Add(this.txtMiddleP11);
this.groupInout.Controls.Add(this.btnMiddleP11);
this.groupInout.Enabled = false;
this.groupInout.Location = new System.Drawing.Point(12, 320);
this.groupInout.Location = new System.Drawing.Point(12, 377);
this.groupInout.Name = "groupInout";
this.groupInout.Size = new System.Drawing.Size(750, 287);
this.groupInout.Size = new System.Drawing.Size(734, 164);
this.groupInout.TabIndex = 100;
this.groupInout.TabStop = false;
this.groupInout.Text = "料仓操作";
this.groupInout.Text = "提升机构位置信息";
//
// txtInOutP2
//
......@@ -90,7 +90,7 @@ namespace OnlineStore.DUOStore
this.txtInOutP2.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP2.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP2.Location = new System.Drawing.Point(641, 30);
this.txtInOutP2.Location = new System.Drawing.Point(635, 30);
this.txtInOutP2.MaxLength = 20;
this.txtInOutP2.Name = "txtInOutP2";
this.txtInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -105,7 +105,7 @@ namespace OnlineStore.DUOStore
this.txtInOutP1.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInOutP1.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInOutP1.Location = new System.Drawing.Point(640, 69);
this.txtInOutP1.Location = new System.Drawing.Point(634, 69);
this.txtInOutP1.MaxLength = 20;
this.txtInOutP1.Name = "txtInOutP1";
this.txtInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
......@@ -182,7 +182,7 @@ namespace OnlineStore.DUOStore
this.btnInOutP2.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP2.ForeColor = System.Drawing.Color.Green;
this.btnInOutP2.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP2.Location = new System.Drawing.Point(497, 25);
this.btnInOutP2.Location = new System.Drawing.Point(491, 25);
this.btnInOutP2.Name = "btnInOutP2";
this.btnInOutP2.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP2.Size = new System.Drawing.Size(140, 33);
......@@ -200,7 +200,7 @@ namespace OnlineStore.DUOStore
this.btnInOutP1.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInOutP1.ForeColor = System.Drawing.Color.Green;
this.btnInOutP1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInOutP1.Location = new System.Drawing.Point(497, 64);
this.btnInOutP1.Location = new System.Drawing.Point(491, 64);
this.btnInOutP1.Name = "btnInOutP1";
this.btnInOutP1.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInOutP1.Size = new System.Drawing.Size(140, 33);
......@@ -287,11 +287,11 @@ namespace OnlineStore.DUOStore
this.txtInoutP11.Cursor = System.Windows.Forms.Cursors.IBeam;
this.txtInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.txtInoutP11.ForeColor = System.Drawing.SystemColors.WindowText;
this.txtInoutP11.Location = new System.Drawing.Point(640, 108);
this.txtInoutP11.Location = new System.Drawing.Point(634, 108);
this.txtInoutP11.MaxLength = 0;
this.txtInoutP11.Name = "txtInoutP11";
this.txtInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtInoutP11.Size = new System.Drawing.Size(77, 23);
this.txtInoutP11.Size = new System.Drawing.Size(89, 23);
this.txtInoutP11.TabIndex = 227;
this.txtInoutP11.Text = "999999";
//
......@@ -304,7 +304,7 @@ namespace OnlineStore.DUOStore
this.btnInoutP11.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
this.btnInoutP11.ForeColor = System.Drawing.Color.Green;
this.btnInoutP11.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft;
this.btnInoutP11.Location = new System.Drawing.Point(497, 103);
this.btnInoutP11.Location = new System.Drawing.Point(491, 103);
this.btnInoutP11.Name = "btnInoutP11";
this.btnInoutP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.btnInoutP11.Size = new System.Drawing.Size(140, 33);
......@@ -324,7 +324,7 @@ namespace OnlineStore.DUOStore
this.txtMiddleP11.MaxLength = 0;
this.txtMiddleP11.Name = "txtMiddleP11";
this.txtMiddleP11.RightToLeft = System.Windows.Forms.RightToLeft.No;
this.txtMiddleP11.Size = new System.Drawing.Size(77, 23);
this.txtMiddleP11.Size = new System.Drawing.Size(89, 23);
this.txtMiddleP11.TabIndex = 225;
this.txtMiddleP11.Text = "999999";
//
......@@ -349,7 +349,7 @@ namespace OnlineStore.DUOStore
// axisMoveControl1
//
this.axisMoveControl1.Enabled = false;
this.axisMoveControl1.Location = new System.Drawing.Point(11, 3);
this.axisMoveControl1.Location = new System.Drawing.Point(11, 1);
this.axisMoveControl1.Name = "axisMoveControl1";
this.axisMoveControl1.Size = new System.Drawing.Size(735, 316);
this.axisMoveControl1.TabIndex = 274;
......@@ -357,7 +357,7 @@ namespace OnlineStore.DUOStore
// btnAxisOff
//
this.btnAxisOff.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOff.Location = new System.Drawing.Point(898, 24);
this.btnAxisOff.Location = new System.Drawing.Point(148, 320);
this.btnAxisOff.Name = "btnAxisOff";
this.btnAxisOff.Size = new System.Drawing.Size(128, 39);
this.btnAxisOff.TabIndex = 276;
......@@ -367,7 +367,7 @@ namespace OnlineStore.DUOStore
// btnAxisOn
//
this.btnAxisOn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btnAxisOn.Location = new System.Drawing.Point(768, 24);
this.btnAxisOn.Location = new System.Drawing.Point(18, 320);
this.btnAxisOn.Name = "btnAxisOn";
this.btnAxisOn.Size = new System.Drawing.Size(128, 39);
this.btnAxisOn.TabIndex = 275;
......@@ -378,7 +378,7 @@ namespace OnlineStore.DUOStore
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
this.ClientSize = new System.Drawing.Size(1224, 626);
this.ClientSize = new System.Drawing.Size(964, 630);
this.Controls.Add(this.groupInout);
this.Controls.Add(this.axisMoveControl1);
this.Controls.Add(this.btnAxisOff);
......
source/DUOStore/FrmIOStatus.cs
......@@ -44,11 +44,14 @@ namespace OnlineStore.DUOStore
this.tableLayoutPanel1.RowCount = StoreManager.Config.DIList.Count;
foreach (ConfigIO ioValue in StoreManager.Config.DIList.Values)
{
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 26));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++;
DIControlList.Add(ioValue.ProName, control);
if (ioValue.SubType.Equals(0))
{
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 26));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel1.Controls.Add(control, 0, roleindex);
roleindex++;
DIControlList.Add(ioValue.ProName, control);
}
}
tableLayoutPanel2.RowStyles.Clear();
......@@ -56,11 +59,14 @@ namespace OnlineStore.DUOStore
roleindex = 0;
foreach (ConfigIO ioValue in StoreManager.Config.DOList.Values)
{
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++;
DOControlList.Add(ioValue.ProName, control);
if (ioValue.SubType.Equals(0))
{
this.tableLayoutPanel2.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
IOTextControl control = new IOTextControl(ioValue.ElectricalDefinition + "_" + ioValue.Explain, ioValue.ProName);
this.tableLayoutPanel2.Controls.Add(control, 0, roleindex);
roleindex++;
DOControlList.Add(ioValue.ProName, control);
}
}
this.SuspendLayout(); //此处为不闪屏，一定要有的！
......@@ -267,15 +273,14 @@ namespace OnlineStore.DUOStore
}
private void btnCloseCyDo_Click(object sender, EventArgs e)
{
//StoreManager.Store.IOMove(IO_Type.EntranceDoor_Open, IO_VALUE.LOW);
//StoreManager.Store.IOMove(IO_Type.EntranceDoor_Close, IO_VALUE.LOW);
//StoreManager.Store.IOMove(IO_Type.TopCylinder_Down, IO_VALUE.LOW);
//StoreManager.Store.IOMove(IO_Type.TopCylinder_Up, IO_VALUE.LOW);
//StoreManager.Store.IOMove(IO_Type.NGDoorCylinder_Down, IO_VALUE.LOW);
//StoreManager.Store.IOMove(IO_Type.NGDoowCylinder_Up, IO_VALUE.LOW);
// StoreManager.Store.IOMove(IO_Type.LocationCylinder_Down, IO_VALUE.LOW);
// StoreManager.Store.IOMove(IO_Type.LocationCylinder_Up, IO_VALUE.LOW);
{
foreach (ConfigIO io in StoreManager.Store.Config.DOList.Values)
{
if (io.SubType.Equals(0))
{
IOManager.instance.WriteSingleDO(io.IO_IP, (byte)0, (ushort)io.GetIOAddr(), IO_VALUE.LOW);
}
}
}
private void btnClamp_Click(object sender, EventArgs e)
......@@ -312,5 +317,16 @@ namespace OnlineStore.DUOStore
{
WriteDO(IO_VALUE.LOW);
}
private void btnLineRun_Click(object sender, EventArgs e)
{
StoreManager.Store.LineRun(null);
}
private void btnLineStop_Click(object sender, EventArgs e)
{
StoreManager.Store.LineStop(null);
}
}
}
source/DeviceLibrary/StoreConfig/StoreConfig.csv
......@@ -4,11 +4,11 @@ AXIS,,T2_取料机构旋转轴,T2_Middle_Axis,2,COM3,,1000,1000,1000,200,500,500,10,100
AXIS,,T3_取料机构上下轴,T3_Updown_Axis,3,COM3,,800,1000,1000,200,500,500,10,1000,0,0
,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
PRO,,IO模块对应的DI数量,IO_DILength,192.168.200.21#16;192.168.200.22#16;192.168.200.23#8,,,,,,,,,,,,
PRO,,IO模块对应的DO数量,IO_DOLength,192.168.200.21#16;192.168.200.22#16;192.168.200.23#8,,,,,,,,,,,,
PRO,,第一块IO模块IP,PRO_AIO_IP_1,192.168.200.21,,,,,,,,,,,,
PRO,,第二块IO模块IP,PRO_AIO_IP_2,192.168.200.22,,,,,,,,,,,,
PRO,,第三块IO模块IP,PRO_AIO_IP_3,192.168.200.23,,,,,,,,,,,,
PRO,,IO模块对应的DI数量,IO_DILength,192.168.201.21#16;192.168.201.22#16;192.168.201.23#8,,,,,,,,,,,,
PRO,,IO模块对应的DO数量,IO_DOLength,192.168.201.21#16;192.168.201.22#16;192.168.201.23#8,,,,,,,,,,,,
PRO,,第一块IO模块IP,PRO_AIO_IP_1,192.168.201.21,,,,,,,,,,,,
PRO,,第二块IO模块IP,PRO_AIO_IP_2,192.168.201.22,,,,,,,,,,,,
PRO,,第三块IO模块IP,PRO_AIO_IP_3,192.168.201.23,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
,,,,,,,,,,,,,,,,
DI,0,急停,SuddenStop_BTN,0,PRO_AIO_IP_1,X01,,,,,,,,,,
......
source/DeviceLibrary/duoStore/DUOStoreBean.cs
......@@ -388,6 +388,30 @@ namespace OnlineStore.DeviceLibrary
{
}
public void LineRun(StoreMoveInfo move)
{
if (move != null)
{
move.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Line_BackRun, IO_VALUE.LOW));
move.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Line_Run, IO_VALUE.HIGH));
}
IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW);
IOMove(IO_Type.Line_Run, IO_VALUE.HIGH);
}
public void LineStop(StoreMoveInfo move)
{
if (move != null)
{
move.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Line_BackRun, IO_VALUE.LOW));
move.WaitList.Add(WaitResultInfo.WaitIO(IO_Type.Line_Run, IO_VALUE.LOW));
}
IOMove(IO_Type.Line_BackRun, IO_VALUE.LOW);
IOMove(IO_Type.Line_Run, IO_VALUE.LOW);
}
#region 出库
public override bool StartOutStoreMove(InOutParam param)
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!