Skip to content

孙克 / ACSingleStore

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

1

1 个父辈 f6098eca
内嵌 并排
正在显示 13 个修改的文件 包含 47 行增加 和 46 行删除
source/ACSingleStore/ACSingleStore.csproj
......@@ -50,7 +50,7 @@
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>box.ico</ApplicationIcon>
<ApplicationIcon>SBSH.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest>
......@@ -266,6 +266,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="box.ico" />
<Content Include="SBSH.ico" />
<Content Include="记录.txt" />
</ItemGroup>
<ItemGroup>
......
source/ACSingleStore/FrmIOStatus.cs
......@@ -58,7 +58,7 @@ namespace OnlineStore.ACSingleStore
if (dilist.Contains(ioValue.ElectricalDefinition))
continue;
dilist.Add(ioValue.ElectricalDefinition);
this.tableLayoutPanel1.RowStyles.Add(new RowStyle(SizeType.Absolute, 28));
......
source/ACSingleStore/FrmStoreBox.Designer.cs
......@@ -59,6 +59,7 @@ namespace OnlineStore.ACSingleStore
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.btnHul = new System.Windows.Forms.Button();
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.label_currentinfo = new System.Windows.Forms.Label();
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.chbTH = new System.Windows.Forms.CheckBox();
this.lblWarnMsg = new System.Windows.Forms.Label();
......@@ -151,7 +152,6 @@ namespace OnlineStore.ACSingleStore
this.开启DEBUGToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator12 = new System.Windows.Forms.ToolStripSeparator();
this.清理日志ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
this.label_currentinfo = new System.Windows.Forms.Label();
this.contextMenuStrip1.SuspendLayout();
this.tabControl2.SuspendLayout();
this.tabPage4.SuspendLayout();
......@@ -574,6 +574,15 @@ namespace OnlineStore.ACSingleStore
this.groupBox3.TabStop = false;
this.groupBox3.Text = "设备状态";
//
// label_currentinfo
//
this.label_currentinfo.AutoSize = true;
this.label_currentinfo.Location = new System.Drawing.Point(411, 35);
this.label_currentinfo.Name = "label_currentinfo";
this.label_currentinfo.Size = new System.Drawing.Size(36, 20);
this.label_currentinfo.TabIndex = 274;
this.label_currentinfo.Text = "info";
//
// flowLayoutPanel1
//
this.flowLayoutPanel1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
......@@ -1612,15 +1621,6 @@ namespace OnlineStore.ACSingleStore
this.清理日志ToolStripMenuItem.Text = "清理日志";
this.清理日志ToolStripMenuItem.Click += new System.EventHandler(this.清理日志ToolStripMenuItem_Click);
//
// label_currentinfo
//
this.label_currentinfo.AutoSize = true;
this.label_currentinfo.Location = new System.Drawing.Point(411, 35);
this.label_currentinfo.Name = "label_currentinfo";
this.label_currentinfo.Size = new System.Drawing.Size(36, 20);
this.label_currentinfo.TabIndex = 274;
this.label_currentinfo.Text = "info";
//
// FrmStoreBox
//
this.AutoScaleDimensions = new System.Drawing.SizeF(96F, 96F);
......
source/ACSingleStore/FrmStoreBox.resx
此文件的差异太大，无法显示。
source/ACSingleStore/Properties/AssemblyInfo.cs
......@@ -9,7 +9,7 @@ using System.Runtime.InteropServices;
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore 478d0803e8601b903834b5718f1ac5d657635495")]
[assembly: AssemblyProduct("SO951-HC-ACSingleStore f6098eca023647b0fd493696a0451b04773a3ac3")]
[assembly: AssemblyCopyright("Copyright ? 2017")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
......
source/ACSingleStore/SBSH.ico 0 → 100644
此文件类型无法预览
source/ACSingleStore/resources/SISO.xlsx 0 → 100644
此文件类型无法预览
source/ACSingleStore/resources/en-US.lngres
......@@ -230,8 +230,8 @@ WaitSingleTimeOut 等待信号{0}={1}超时 Wait signal {0}={1} timeout
startFailAir 启动失败:没有气压信号 Startup failure: no air pressure signal
AxisHomeMoveAlarm 运动{0}轴{1}收到原点完成信号，当前位置[{2}]，误差过大，需要报警 The movement {0} axis {1} receives the origin completion signal& the current position [{2}]& the error is too large& it needs to alarm
AxisMoveAlarm 运动{0}轴{1}目标位置[{2}]当前位置{3}误差过大，需要报警 Movement {0} axis {1} target position [{2}] current position {3} error is too large& need to alarm
MoveTimeOut {0}]超时{1}[{2}] {0}]Time out {1}[{2}]
WaitInstoreTimeOut [{0}]超时[等待可以入库][{1}秒] [{0}] timeout [wait to store][{1} seconds]
MoveTimeOut {0}]超时{1}[{2}] {0}]Time out {1}
WaitInstoreTimeOut [{0}]超时[等待可以入库][{1}秒] [{0}] timeout [wait to store]
HasWare 叉子料盘检测有料，请检查 Fork tray full& please check
NoCodeMsg 未扫到二维码，请重新放入料盘 If the qr code is not scanned& please put it back into the material tray
InStoreNoCode 未扫到二维码，需要将料盘送出 The qr code is not scanned& the material plate needs to be sent out
......
source/ACSingleStore/resources/ja-JP.lngres
......@@ -231,8 +231,8 @@ WaitSingleTimeOut 等待信号{0}={1}超时 信号を待つ、タイムオーバ
startFailAir 启动失败:没有气压信号 起動失敗し、気圧信号がない
AxisHomeMoveAlarm 运动{0}轴{1}收到原点完成信号，当前位置[{2}]，误差过大，需要报警 運転軸は原点に戻って信号を獲得、現在位置、誤差過大、緊急通報が必要だ{0} axis {1}[{2}]
AxisMoveAlarm 运动{0}轴{1}目标位置[{2}]当前位置{3}误差过大，需要报警 運転軸　目標位置、現在位置、誤差過大、緊急通報が必要だ{0} axis {1} target position [{2}]
MoveTimeOut {0}]超时{1}[{2}] タイムオーバー{0}]超时{1}[{2}] {0}]Time out {1}[{2}]
WaitInstoreTimeOut [{0}]超时[等待可以入库][{1}秒] タイムオーバー　入庫するのを待つ[{0}] timeout [wait to store][{1} seconds]
MoveTimeOut {0}]超时{1}[{2}] タイムオーバー{0}]超时{1} {0}]Time out {1}
WaitInstoreTimeOut [{0}]超时[等待可以入库][{1}秒] タイムオーバー　入庫するのを待つ timeout [wait to store]
HasWare 叉子料盘检测有料，请检查 フォークリールには材料があって、確認
NoCodeMsg 未扫到二维码，请重新放入料盘 QRコードはまだスキャンしていませんので、改めてフォークリールにいれてください
InStoreNoCode 未扫到二维码，需要将料盘送出 QRコードはまだスキャンしていませんので、リールを取り出してください。
......
source/ACSingleStore/resources/zh-CN.lngres
......@@ -230,8 +230,8 @@ WaitSingleTimeOut 等待信号{0}={1}超时 等待信号{0}={1}超时
startFailAir 启动失败:没有气压信号 启动失败:没有气压信号
AxisHomeMoveAlarm 运动{0}轴{1}收到原点完成信号，当前位置[{2}]，误差过大，需要报警 运动{0}轴{1}收到原点完成信号，当前位置[{2}]，误差过大，需要报警
AxisMoveAlarm 运动{0}轴{1}目标位置[{2}]当前位置{3}误差过大，需要报警 运动{0}轴{1}目标位置[{2}]当前位置{3}误差过大，需要报警
MoveTimeOut {0}]超时{1}[{2}] {0}]超时{1}[{2}]
WaitInstoreTimeOut [{0}]超时[等待可以入库][{1}秒] [{0}]超时[等待可以入库][{1}秒]
MoveTimeOut {0}]超时{1} {0}]超时{1}
WaitInstoreTimeOut [{0}]超时[等待可以入库] [{0}]超时[等待可以入库]
HasWare 叉子料盘检测有料，请检查 叉子料盘检测有料，请检查
NoCodeMsg 未扫到二维码，请重新放入料盘 未扫到二维码，请重新放入料盘
InStoreNoCode 未扫到二维码，需要将料盘送出 未扫到二维码，需要将料盘送出
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
......@@ -7,19 +7,19 @@ AXIS,（轴五）出料门,Door_Axis,4,HC,0,,,,
,,,,,,,,,
DI,急停,SuddenStop_BTN,0,HC,0,急停,X00,X00,0
DI,复位,Reset_BTN,1,HC,0,复位,X01,X01,0
DI,启动,AutoRun_Signal,29,HC,0,hide,X029,X02,0
DI,氮气气压检测,Airpressure_Check,0,HC,0,hide,X039,X03,0
DI,料盘检测1（进料口）,TrayCheck_Door,2,HC,0,料盘检测1（进料口）,X02,X04,0
DI,料盘检测2（料叉）,TrayCheck_Fixture,3,HC,0,料盘检测2（料叉）,X03,X05,0
DI,进料口门上升端,Door_Up,4,HC,0,进料口门上升端,X04,X06,0
DI,进料口门下降端,Door_Down,5,HC,0,进料口门下降端,X05,X07,0
DI,安全光栅,SafetyLightCurtains,0,HC,0,hide,X00,X08,0
DI,激光对点检测,Laser_detection,6,HC,0,激光对点检测,X06,X12,0
DI,后门门禁,Door_Limit,7,HC,0,后门门禁,X07,X09,0
DI,后门门禁,Door_LeftLimit,7,HC,0,后门门禁,X07,X10,0
DI,后门门禁,Door_RightLimit,7,HC,0,后门门禁,X07,X11,0
DI,进料口电机异常,Motor_Error,29,HC,0,hide,X139,X13,0
DI,料盘检测3（进料口）,TrayCheck_Door_13,29,HC,0,hide,X149,X14,0
DI,启动,AutoRun_Signal,29,HC,0,hide,X029,X029,0
DI,氮气气压检测,Airpressure_Check,0,HC,0,hide,X039,X039,0
DI,料盘检测1（进料口）,TrayCheck_Door,2,HC,0,料盘检测1（进料口）,X02,X02,0
DI,料盘检测2（料叉）,TrayCheck_Fixture,3,HC,0,料盘检测2（料叉）,X03,X03,0
DI,进料口门上升端,Door_Up,4,HC,0,进料口门上升端,X04,X04,0
DI,进料口门下降端,Door_Down,5,HC,0,进料口门下降端,X05,X05,0
DI,安全光栅,SafetyLightCurtains,0,HC,0,hide,X00,X00,0
DI,激光对点检测,Laser_detection,6,HC,0,激光对点检测,X06,X06,0
DI,后门门禁,Door_Limit,7,HC,0,后门门禁,X07,X07,0
DI,后门门禁,Door_LeftLimit,7,HC,0,后门门禁,X07,X07,0
DI,后门门禁,Door_RightLimit,7,HC,0,后门门禁,X07,X07,0
DI,进料口电机异常,Motor_Error,29,HC,0,hide,X139,X139,0
DI,料盘检测3（进料口）,TrayCheck_Door_13,29,HC,0,hide,X149,X149,0
,,,,,,,,,
DO,自动指示灯,AutoRun_HddLed,0,HC,0,自动指示灯,Y00,Y01,0
DO,故障指示灯,Alarm_HddLed,1,HC,0,故障指示灯,Y01,Y02,0
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
......@@ -241,7 +241,7 @@ namespace OnlineStore.DeviceLibrary
{
// WarnMsg = StoreName + "【" + StoreMove.MoveType + "】【" + StoreMove.MoveStep + "】等待超时 [" + NotOkMsg
// + "]已等待[" + Math.Round(span.TotalSeconds, 1) + "]秒";
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", NotOkMsg, Math.Round(span.TotalSeconds, 1) + ""); //1085
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep.ToString(), NotOkMsg, Math.Round(span.TotalSeconds, 1) + ""); //1085
LogUtil.error(LOGGER, WarnObj.WarnMsg, 100);
Alarm(StoreAlarmType.IoSingleTimeOut, "", StoreMove.MoveType);
}
......@@ -933,15 +933,15 @@ namespace OnlineStore.DeviceLibrary
StoreMove.WaitList.Add(WaitResultInfo.WaitHeight(0));
OpenDoor();
}
else if (StoreMove.TimeOutSeconds > 30) {
else if (StoreMove.TimeOutSeconds > 60*10) {
if (IOManager.IOValue(IO_Type.TrayCheck_Door).Equals(IO_VALUE.HIGH))
{
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.TrayCheck_Door.ToString() + "=LOW", StoreMove.TimeOutSeconds.ToString()); //1085
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.TrayCheck_Door.ToString() + "=LOW", ""); //1085
LogUtil.error(LOGGER, WarnObj.WarnMsg, 100);
}
else if(IOManager.IOValue(IO_Type.SafetyLightCurtains).Equals(IO_VALUE.LOW))
{
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.SafetyLightCurtains.ToString()+"=HIGH", StoreMove.TimeOutSeconds.ToString()); //1085
SetWarnMsg(ResourceControl.MoveTimeOut, StoreMove.MoveStep + "", IO_Type.SafetyLightCurtains.ToString()+"=HIGH", ""); //1085
LogUtil.error(LOGGER, WarnObj.WarnMsg, 100);
}
}
......
source/DeviceLibrary/acSingleStore/DoorControl.cs
......@@ -32,16 +32,15 @@ namespace OnlineStore.DeviceLibrary
if (Config.Door_Axis != null)
{
CheckDoorState();
ACServerManager.RelMove(Config.Door_Axis.DeviceName, Config.Door_Axis.GetAxisValue(),500000, Config.DoorAxis_Run_Speed, DoorAccSpeed, DoorAccSpeed);
ACServerManager.RelMove(Config.Door_Axis.DeviceName, Config.Door_Axis.GetAxisValue(),600000, Config.DoorAxis_Run_Speed, DoorAccSpeed, DoorAccSpeed);
LogUtil.info(StoreName + "出料门开门,速度: " + Config.DoorAxis_Run_Speed.ToString());
_doorRunState = 1;
}
else
{
IOManager.IOMove(IO_Type.Door_Moto_Rev, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Door_Moto_Run, IO_VALUE.HIGH);
}
_doorRunState = 1;
DoorRunMonitorEnable = true;
if (needwait)
......@@ -62,16 +61,16 @@ namespace OnlineStore.DeviceLibrary
{
CheckDoorState();
//ACServerManager.SpeedMove(Config.Door_Axis.DeviceName,Config.Door_Axis.GetAxisValue(),-Config.DoorAxis_Run_Speed, DoorAccSpeed, DoorAccSpeed);
ACServerManager.RelMove(Config.Door_Axis.DeviceName, Config.Door_Axis.GetAxisValue(), -500000, Config.DoorAxis_Run_Speed, DoorAccSpeed, DoorAccSpeed);
ACServerManager.RelMove(Config.Door_Axis.DeviceName, Config.Door_Axis.GetAxisValue(), -600000, Config.DoorAxis_Run_Speed, DoorAccSpeed, DoorAccSpeed);
LogUtil.info(StoreName + "出料门关门,速度: -"+Config.DoorAxis_Run_Speed.ToString());
_doorRunState = -1;
}
else
{
IOManager.IOMove(IO_Type.Door_Moto_Rev, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.Door_Moto_Run, IO_VALUE.HIGH);
}
_doorRunState = -1;
DoorRunMonitorEnable = true;
if (needwait)
{
......@@ -110,14 +109,15 @@ namespace OnlineStore.DeviceLibrary
ACServerManager.SuddenStop(Config.Door_Axis);
LogUtil.info(StoreName + "出料门停止");
DoorRunMonitorEnable = false;
if (ResetState)
_doorRunState = 0;
}
else
{
IOManager.IOMove(IO_Type.Door_Moto_Run, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Door_Moto_Rev, IO_VALUE.LOW);
}
if (ResetState)
_doorRunState = 0;
}
int _doorRunState = 0;
/// <summary>
......@@ -125,9 +125,9 @@ namespace OnlineStore.DeviceLibrary
/// </summary>
/// <returns>1:开门,-1:关门,0:不在运动</returns>
int DoorRunState() {
return _doorRunState;
if (Config.Door_Axis != null)
{
return _doorRunState;
{
var b = HuichuanLibrary.HCBoardManager.GetAxisSts(Config.Door_Axis.GetAxisValue()).BUSY == 0;
if (b)
return 0;
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!