Skip to content

孙克 / RC30-AutoInOutStore

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 0877157c 由 几米阳光
选项

蜂鸣器自动清除修改

1 个父辈 6b90ba1f
内嵌 并排
正在显示 3 个修改的文件 包含 25 行增加 和 16 行删除
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -87,7 +87,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -87,7 +87,8 @@ namespace OnlineStore.DeviceLibrary
//默认三个灯都亮 //默认三个灯都亮
IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW);
}); });
} }
} }
...@@ -279,6 +280,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -279,6 +280,7 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW);
storeRunStatus = StoreRunStatus.HomeMoving; storeRunStatus = StoreRunStatus.HomeMoving;
StoreMove.NewMove(StoreMoveType.ReturnHome); StoreMove.NewMove(StoreMoveType.ReturnHome);
...@@ -317,6 +319,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -317,6 +319,7 @@ namespace OnlineStore.DeviceLibrary
IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH); IOManager.IOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW); IOManager.IOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW);
//复位之前先停止运行 //复位之前先停止运行
if (isNeedClearAuto) if (isNeedClearAuto)
{ {
...@@ -1085,6 +1088,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1085,6 +1088,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info(StoreName + "当前空闲中，清理信号超时异常【" + StoreManager.Store.alarmType + "】" + WarnMsg); LogUtil.info(StoreName + "当前空闲中，清理信号超时异常【" + StoreManager.Store.alarmType + "】" + WarnMsg);
alarmType = StoreAlarmType.None; alarmType = StoreAlarmType.None;
IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW);
WarnMsg = ""; WarnMsg = "";
} }
else if (alarmType.Equals(StoreAlarmType.BatchAlarm) || alarmType.Equals(StoreAlarmType.BatchIoTimeOut)) else if (alarmType.Equals(StoreAlarmType.BatchAlarm) || alarmType.Equals(StoreAlarmType.BatchIoTimeOut))
...@@ -1093,6 +1097,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1093,6 +1097,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info("批量上下料模块空闲中，清理报警【" + StoreManager.Store.alarmType + "】" + AutomaticBaiting.WarnMsg); LogUtil.info("批量上下料模块空闲中，清理报警【" + StoreManager.Store.alarmType + "】" + AutomaticBaiting.WarnMsg);
alarmType = StoreAlarmType.None; alarmType = StoreAlarmType.None;
IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW);
AutomaticBaiting.WarnMsg = ""; AutomaticBaiting.WarnMsg = "";
} }
} }
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting.cs
...@@ -22,6 +22,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -22,6 +22,7 @@ namespace OnlineStore.DeviceLibrary
public static int DoorStatus = 2; public static int DoorStatus = 2;
private static int LastHeight = 0; private static int LastHeight = 0;
private static int LastWidth = 0; private static int LastWidth = 0;
private static List<string> LastCodeList = new List<string>();
private static string LastCode = ""; private static string LastCode = "";
private static string LastPosId = ""; private static string LastPosId = "";
public static int AxisChangeValue = ConfigAppSettings.GetIntValue(Setting_Init.AxisChangeValue); public static int AxisChangeValue = ConfigAppSettings.GetIntValue(Setting_Init.AxisChangeValue);
...@@ -103,6 +104,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -103,6 +104,7 @@ namespace OnlineStore.DeviceLibrary
private static void ClearInStoreInfo() private static void ClearInStoreInfo()
{ {
LastCode = ""; LastCode = "";
LastCodeList = new List<string>();
LastPosId = ""; LastPosId = "";
LastHeight = 0; LastHeight = 0;
LastWidth = 0; LastWidth = 0;
...@@ -144,7 +146,8 @@ namespace OnlineStore.DeviceLibrary ...@@ -144,7 +146,8 @@ namespace OnlineStore.DeviceLibrary
StoreManager.Store.alarmType.Equals(StoreAlarmType.BatchAxisAlarm) || StoreManager.Store.alarmType.Equals(StoreAlarmType.BatchIoTimeOut)) StoreManager.Store.alarmType.Equals(StoreAlarmType.BatchAxisAlarm) || StoreManager.Store.alarmType.Equals(StoreAlarmType.BatchIoTimeOut))
{ {
LogUtil.info(Name + " 复位前，清理报警【" + StoreManager.Store.alarmType + "】"); LogUtil.info(Name + " 复位前，清理报警【" + StoreManager.Store.alarmType + "】");
StoreManager.Store.alarmType = StoreAlarmType.None; StoreManager.Store.alarmType = StoreAlarmType.None;
IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW);
WarnMsg = ""; WarnMsg = "";
} }
AutomaticBaiting.IsNeedStartInout = isNeedInout; AutomaticBaiting.IsNeedStartInout = isNeedInout;
...@@ -562,6 +565,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -562,6 +565,7 @@ namespace OnlineStore.DeviceLibrary
private static void IsNeedScanCode() private static void IsNeedScanCode()
{ {
LastCode = ""; LastCode = "";
LastCodeList = new List<string>();
LastHeight = 0; LastHeight = 0;
LastWidth = 0; LastWidth = 0;
LastPosId = ""; LastPosId = "";
...@@ -571,6 +575,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -571,6 +575,7 @@ namespace OnlineStore.DeviceLibrary
{ {
LogUtil.info(Name + " 扫码前清理超时报警【" + StoreManager.Store.alarmType + "】"); LogUtil.info(Name + " 扫码前清理超时报警【" + StoreManager.Store.alarmType + "】");
StoreManager.Store.alarmType = StoreAlarmType.None; StoreManager.Store.alarmType = StoreAlarmType.None;
IOManager.IOMove(IO_Type.Buzzer_Sign, IO_VALUE.LOW);
ClearTimeOut(); ClearTimeOut();
} }
// if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(0)) // if (ACServerManager.GetLimitPositiveSingle(StoreManager.Config.Batch_Axis).Equals(0))
......
source/DeviceLibrary/acSingleStore/AutomaticBaiting_Partial.cs
...@@ -250,7 +250,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -250,7 +250,7 @@ namespace OnlineStore.DeviceLibrary
#region Halcon扫码枪代码 #region Halcon扫码枪代码
public bool IsTestCamera = false; public bool IsTestCamera = false;
private static char spiltStr = '#'; private static string spiltStr = "##";
public static void GetCameraCode() public static void GetCameraCode()
{ {
Task.Factory.StartNew(delegate () Task.Factory.StartNew(delegate ()
...@@ -273,6 +273,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -273,6 +273,7 @@ namespace OnlineStore.DeviceLibrary
message = message + spiltStr + str; message = message + spiltStr + str;
} }
} }
LastCodeList = hasList;
LastCode = message; LastCode = message;
if (LastCode.Equals("")&&StoreManager.Store.IsDebug) if (LastCode.Equals("")&&StoreManager.Store.IsDebug)
{ {
...@@ -308,23 +309,21 @@ namespace OnlineStore.DeviceLibrary ...@@ -308,23 +309,21 @@ namespace OnlineStore.DeviceLibrary
private static string ProcessMsg() private static string ProcessMsg()
{ {
string msg = ""; string msg = "";
string[] codeArray = LastCode.Split(spiltStr); //string[] codeArray = LastCode.Split(new string[] { spiltStr});
foreach (string code in codeArray) if (LastCodeList.Count > 0)
{ {
if (!code.Equals("")) foreach (string code in LastCodeList)
{ {
//msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + code + spiltStr + spiltStr; if (!code.Equals(""))
//演示机不需要发尺寸 {
//if (StoreManager.Config.Default_TrayWidth.Equals(0)) msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + code + spiltStr;
//{ }
// msg = msg + code + spiltStr + spiltStr;
//}
//else
//{
msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + code + spiltStr + spiltStr;
//}
} }
} }
else if (!LastCode.Equals(""))
{
msg = msg + "=1+0x0-" + LastWidth + "x" + LastHeight + "=" + LastCode + spiltStr;
}
return msg; return msg;
} }
//=1+0x0-13x24=201810220856;025;5N02018101;121;700012865;92498;1800;## //=1+0x0-13x24=201810220856;025;5N02018101;121;700012865;92498;1800;##
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!