Skip to content

孙克 / ACSingleStore

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

修改配置

1 个父辈 1cc651a5
内嵌 并排
正在显示 9 个修改的文件 包含 73 行增加 和 124 行删除
dll/CodeLibrary.dll
此文件类型无法预览
source/ACSingleStore/FrmIOStatus.cs
...@@ -213,17 +213,17 @@ namespace OnlineStore.ACSingleStore ...@@ -213,17 +213,17 @@ namespace OnlineStore.ACSingleStore
} }
} }
double ai1Value = KNDAIManager.GetAIValue(boxBean.Config.AIDevice_IP, 1); double ai1Value = KNDAIManager.GetAIValue(boxBean.Config.AIDevice_IP, StoreManager.Config.AIDI1_Addr);
double ai2Value = KNDAIManager.GetAIValue(boxBean.Config.AIDevice_IP, 2); double ai2Value = KNDAIManager.GetAIValue(boxBean.Config.AIDevice_IP, StoreManager.Config.AIDI2_Addr);
double ai3Value = KNDAIManager.GetAIValue(boxBean.Config.AIDevice_IP, 3); //double ai3Value = KNDAIManager.GetAIValue(boxBean.Config.AIDevice_IP, 3);
txtAI1.Text = ai1Value.ToString(); txtAI1.Text = ai1Value.ToString();
txtAI2.Text = ai2Value.ToString(); txtAI2.Text = ai2Value.ToString();
txtAI3.Text = ai3Value.ToString(); //txtAI3.Text = ai3Value.ToString();
txtAIResult1.Text = KNDAIManager.ConvertAI(ai1Value,boxBean.Config.AIDI1_DefaultPosition).ToString(); txtAIResult1.Text = KNDAIManager.ConvertAI(ai1Value,boxBean.Config.AIDI1_DefaultPosition).ToString();
txtAIResult2.Text = KNDAIManager.ConvertAI(ai2Value, boxBean.Config.AIDI2_DefaultPosition).ToString(); txtAIResult2.Text = KNDAIManager.ConvertAI(ai2Value, boxBean.Config.AIDI2_DefaultPosition).ToString();
txtAIResult3.Text = KNDAIManager.ConvertAI(ai3Value, boxBean.Config.AIDI3_DefaultPosition).ToString(); //txtAIResult3.Text = KNDAIManager.ConvertAI(ai3Value, boxBean.Config.AIDI3_DefaultPosition).ToString();
txtHeight.Text = boxBean.GetHeight().ToString(); txtHeight.Text = boxBean.GetHeight().ToString();
txtSize.Text = boxBean.GetSize().ToString(); txtSize.Text = boxBean.GetSize().ToString();
......
source/DeviceLibrary/KangNaiDe/KNDAIManager.cs
...@@ -284,23 +284,23 @@ namespace OnlineStore.DeviceLibrary ...@@ -284,23 +284,23 @@ namespace OnlineStore.DeviceLibrary
} }
AIValueMap.Add(ioIp, kndList); AIValueMap.Add(ioIp, kndList);
} }
//try try
//{ {
// //每次上传后验证下 //每次上传后验证下
// int v1 = (int)GetAIValue(ioIp, 1); int v1 = (int)GetAIValue(ioIp, StoreManager.Config.AIDI1_Addr);
// int v2 = (int)GetAIValue(ioIp, 2); int v2 = (int)GetAIValue(ioIp, StoreManager.Config.AIDI2_Addr);
// int v3 = (int)GetAIValue(ioIp, 3); //int v3 = (int)GetAIValue(ioIp, 3);
// if (v1.Equals(0) && v2.Equals(0) && v3.Equals(0)) if (v1.Equals(0) && v2.Equals(0) )
// { {
// string value = AcSerialBean.ByteToString(values); string value = AcSerialBean.ByteToString(values);
// LogUtil.error("收到【" + ioIp + "】的数据【" + value + "】，三个高度都为0，断开重新连接"); LogUtil.error("收到【" + ioIp + "】的数据【" + value + "】，二个高度都为0");
// ConnectionIP(ioIp); // ConnectionIP(ioIp);
// } }
//} }
//catch (Exception ex) catch (Exception ex)
//{ {
// LogUtil.error("验证数据出错：" + ex.StackTrace); LogUtil.error("验证数据出错：" + ex.StackTrace);
//} }
} }
} }
catch (Exception ex) catch (Exception ex)
......
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID, 类型,说明,名称,属性值,设备名称,默认值,描述,电器定义,代码定义,SlaveID,
DI,急停,SuddenStop_BTN,200,192.168.200.10,0,急停,X01,DI-01,0, DI,急停,SuddenStop_BTN,200,192.168.200.11,0,急停,X01,DI-01,0,
DI,复位,Reset_BTN,201,192.168.200.10,0,复位,X02,DI-02,0, DI,复位,Reset_BTN,201,192.168.200.11,0,复位,X02,DI-02,0,
DI,自动,AutoRun_Signal,202,192.168.200.10,0,自动,X03,DI-03,0, DI,自动,AutoRun_Signal,202,192.168.200.11,0,自动,X03,DI-03,0,
DI,气压检测,Airpressure_Check,203,192.168.200.10,0,气压检测,X04,DI-04,0, DI,气压检测,Airpressure_Check,203,192.168.200.11,0,气压检测,X04,DI-04,0,
DI,料盘检测1（进料口）,TrayCheck_Door,204,192.168.200.10,0,料盘检测1（进料口）,X05,DI-05,0, DI,料盘检测1（进料口）,TrayCheck_Door,204,192.168.200.11,0,料盘检测1（进料口）,X05,DI-05,0,
DI,料盘检测2（料叉）,TrayCheck_Fixture,205,192.168.200.10,0,料盘检测2（料叉）,X06,DI-06,0, DI,料盘检测2（料叉）,TrayCheck_Fixture,205,192.168.200.11,0,料盘检测2（料叉）,X06,DI-06,0,
DI,进料口门上升端,Door_Up,206,192.168.200.10,0,进料口门上升端,X07,DI-07,0, DI,进料口门上升端,Door_Up,206,192.168.200.11,0,进料口门上升端,X07,DI-07,0,
DI,进料口门下降端,Door_Down,207,192.168.200.10,0,进料口门下降端,X08,DI-08,0, DI,进料口门下降端,Door_Down,207,192.168.200.11,0,进料口门下降端,X08,DI-08,0,
,,,208,192.168.200.10,0,,X09,DI-09,0, ,,,208,192.168.200.11,0,,X09,DI-09,0,
,,,209,192.168.200.10,0,,X10,DI-10,0, ,,,209,192.168.200.11,0,,X10,DI-10,0,
DI,前门限位,Door_LimitSingle,210,192.168.200.10,0,前门限位,X11,DI-11,0, DI,前门限位,Door_LimitSingle,210,192.168.200.11,0,前门限位,X11,DI-11,0,
,,,211,192.168.200.10,0,,X12,DI-12,0, ,,,211,192.168.200.11,0,,X12,DI-12,0,
DI,安全光栅,SafetyLightCurtains,212,192.168.200.10,0,安全光栅,X13,DI-13,0, DI,安全光栅,SafetyLightCurtains,212,192.168.200.11,0,安全光栅,X13,DI-13,0,
,,,213,192.168.200.10,0,,X14,DI-14,0, ,,,213,192.168.200.11,0,,X14,DI-14,0,
,,,214,192.168.200.10,0,,X15,DI-15,0, ,,,214,192.168.200.11,0,,X15,DI-15,0,
,,,215,192.168.200.10,0,,X16,DI-16,0, DI,压紧机构计量检测,CompressAxis_Check,215,192.168.200.11,0,压紧机构计量检测,X16,DI-16,0,
DO,自动指示灯,AutoRun_HddLed,100,192.168.200.10,0,自动指示灯,Y01,DO-01,0, DO,自动指示灯,AutoRun_HddLed,100,192.168.200.11,0,自动指示灯,Y01,DO-01,0,
DO,故障指示灯,Alarm_HddLed,101,192.168.200.10,0,故障指示灯,Y02,DO-02,0, DO,故障指示灯,Alarm_HddLed,101,192.168.200.11,0,故障指示灯,Y02,DO-02,0,
DO,待机指示灯,RunSign_HddLed,102,192.168.200.10,0,待机指示灯,Y03,DO-03,0, DO,待机指示灯,RunSign_HddLed,102,192.168.200.11,0,待机指示灯,Y03,DO-03,0,
DO,吹气SOL ON,StartOrStopBlow,103,192.168.200.10,0,吹气SOL ON,Y04,DO-04,0, DO,吹气SOL ON,StartOrStopBlow,103,192.168.200.11,0,吹气SOL ON,Y04,DO-04,0,
DO,料仓运转ON,Run_Signal,104,192.168.200.10,0,料仓运转ON,Y05,DO-05,0, DO,料仓运转ON,Run_Signal,104,192.168.200.11,0,料仓运转ON,Y05,DO-05,0,
DO,轴2刹车电源ON,Axis_Brake,105,192.168.200.10,0,轴2刹车电源ON,Y06,DO-06,0, DO,轴2刹车电源ON,Axis_Brake,105,192.168.200.11,0,轴2刹车电源ON,Y06,DO-06,0,
DO,进料口门上升SOL,Door_Up,106,192.168.200.10,0,进料口门上升SOL,Y07,DO-07,0, DO,进料口门上升SOL,Door_Up,106,192.168.200.11,0,进料口门上升SOL,Y07,DO-07,0,
DO,进料口门下降SOL,Door_Down,107,192.168.200.10,0,进料口门下降SOL,Y08,DO-08,0, DO,进料口门下降SOL,Door_Down,107,192.168.200.11,0,进料口门下降SOL,Y08,DO-08,0,
,,,108,192.168.200.10,0,,Y09,DO-09,0, ,,,108,192.168.200.11,0,,Y09,DO-09,0,
,,,109,192.168.200.10,0,,Y10,DO-10,0, ,,,109,192.168.200.11,0,,Y10,DO-10,0,
DO,相机照明开,CameraLight_Power,110,192.168.200.10,0,相机照明开,Y11,DO-11,0, DO,相机照明开,CameraLight_Power,110,192.168.200.11,0,相机照明开,Y11,DO-11,0,
,,,111,192.168.200.10,0,,Y12,DO-12,0, ,,,111,192.168.200.11,0,,Y12,DO-12,0,
,,,112,192.168.200.10,0,,Y13,DO-13,0, ,,,112,192.168.200.11,0,,Y13,DO-13,0,
,,,113,192.168.200.10,0,,Y14,DO-14,0, ,,,113,192.168.200.11,0,,Y14,DO-14,0,
,,,114,192.168.200.10,0,,Y15,DO-15,0, ,,,114,192.168.200.11,0,,Y15,DO-15,0,
,,,115,192.168.200.10,0,,Y16,DO-16,0, ,,,115,192.168.200.11,0,,Y16,DO-16,0,
AXIS,（轴一）旋转轴,Middle_Axis,1,COM4,0,,,,, AXIS,（轴一）旋转轴,Middle_Axis,1,COM4,0,,,,,
AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM5,0,,,,, AXIS,（轴二）升降轴轴,UpDown_Axis,1,COM5,0,,,,,
AXIS,（轴三）进出轴,InOut_Axis,1,COM6,0,,,,, AXIS,（轴三）进出轴,InOut_Axis,1,COM6,0,,,,,
...@@ -117,8 +117,10 @@ PRO,硕科步进电机（压紧轴）控制减速度,CompressAxis_DelSpeed,15000,,,,,,, ...@@ -117,8 +117,10 @@ PRO,硕科步进电机（压紧轴）控制减速度,CompressAxis_DelSpeed,15000,,,,,,,
PRO,硕科步进电机（压紧轴）控制归零速度（原点返回速度）,CompressAxis_HomeSpeed,15000,,,,,,, PRO,硕科步进电机（压紧轴）控制归零速度（原点返回速度）,CompressAxis_HomeSpeed,15000,,,,,,,
PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,, PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.11,,,,,,, PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.12,,,,,,,
PRO,模拟信号1默认高度,AIDI1_DefaultPosition,2500,,,,,,, PRO,模拟信号1默认高度,AIDI1_DefaultPosition,2500,,,,,,,
PRO,模拟信号2默认高度,AIDI2_DefaultPosition,2500,,,,,,, PRO,模拟信号2默认高度,AIDI2_DefaultPosition,2500,,,,,,,
PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,, PRO,模拟信号3默认高度,AIDI3_DefaultPosition,2500,,,,,,,
,,,,,,,,, , ,,,,,,,,, ,
PRO,模拟信号1的地址,AIDI1_Addr,7,,,,,,,
PRO,模拟信号2的地址,AIDI2_Addr,8,,,,,,,
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -781,71 +781,6 @@ namespace OnlineStore.DeviceLibrary ...@@ -781,71 +781,6 @@ namespace OnlineStore.DeviceLibrary
LogUtil.info("【" + info + "】 处理完成，耗时：" + stopwatch.Elapsed.ToString()); LogUtil.info("【" + info + "】 处理完成，耗时：" + stopwatch.Elapsed.ToString());
} }
} }
//private void LedProcess()
//{
//try
//{
// DateTime time = DateTime.Now;
// //黄灯
// if (IsNotScanCode || storeRunStatus.Equals(StoreRunStatus.HomeMoving) || storeRunStatus.Equals(StoreRunStatus.Reset))
// {
// //开机执行中时黄灯闪烁
// if (KNDIOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
// {
// KNDIOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
// }
// else
// {
// KNDIOMove(IO_Type.RunSign_HddLed, IO_VALUE.HIGH);
// }
// }
// else
// {
// if (KNDIOValue(IO_Type.RunSign_HddLed).Equals(IO_VALUE.HIGH))
// {
// KNDIOMove(IO_Type.RunSign_HddLed, IO_VALUE.LOW);
// }
// }
// //路灯亮
// //出入库执行中，绿灯闪烁
// if ((StoreMove.MoveType.Equals(StoreMoveType.InStore) || StoreMove.MoveType.Equals(StoreMoveType.OutStore)) && KNDIOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.HIGH))
// {
// KNDIOMove(IO_Type.AutoRun_HddLed, IO_VALUE.LOW);
// }
// else
// {
// if (KNDIOValue(IO_Type.AutoRun_HddLed).Equals(IO_VALUE.LOW))
// {
// KNDIOMove(IO_Type.AutoRun_HddLed, IO_VALUE.HIGH);
// }
// }
// bool isNeedAlarmLed = false;
// //报警灯
// if (!alarmType.Equals(StoreAlarmType.None) || isNoAirCheck || isInSuddenDown)
// {
// isNeedAlarmLed = true;
// }
// if (isNeedAlarmLed)
// {
// if (KNDIOValue(IO_Type.Alarm_HddLed).Equals(IO_VALUE.LOW))
// {
// KNDIOMove(IO_Type.Alarm_HddLed, IO_VALUE.HIGH);
// }
// }
// else
// {
// if (KNDIOValue(IO_Type.Alarm_HddLed).Equals(IO_VALUE.HIGH))
// {
// KNDIOMove(IO_Type.Alarm_HddLed, IO_VALUE.LOW);
// }
// }
//}
//catch (Exception ex)
//{
// LOGGER.Error(StoreName + "灯处理定时器出错：", ex);
//}
//}
private void LedProcess() private void LedProcess()
{ {
try try
...@@ -1542,10 +1477,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -1542,10 +1477,9 @@ namespace OnlineStore.DeviceLibrary
{ {
int result = 0; int result = 0;
double ai1Value = KNDAIManager.ConvertAI(KNDAIManager.GetAIValue(Config.AIDevice_IP, 1), Config.AIDI1_DefaultPosition); double ai1Value = KNDAIManager.ConvertAI(KNDAIManager.GetAIValue(Config.AIDevice_IP, Config.AIDI1_Addr), Config.AIDI1_DefaultPosition);
double ai2Value = KNDAIManager.ConvertAI(KNDAIManager.GetAIValue(Config.AIDevice_IP, 2), Config.AIDI2_DefaultPosition); double ai2Value = KNDAIManager.ConvertAI(KNDAIManager.GetAIValue(Config.AIDevice_IP, Config.AIDI2_Addr), Config.AIDI2_DefaultPosition);
double ai3Value = KNDAIManager.ConvertAI(KNDAIManager.GetAIValue(Config.AIDevice_IP, 3), Config.AIDI3_DefaultPosition); double Value = Math.Round((ai1Value + ai2Value ) / 2, 1);
double Value = Math.Round((ai1Value + ai2Value + ai3Value) / 3, 1);
if (Value > 14) if (Value > 14)
{ {
result = 16; result = 16;
...@@ -1556,7 +1490,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -1556,7 +1490,7 @@ namespace OnlineStore.DeviceLibrary
} }
else if (Value >= 4) else if (Value >= 4)
{ {
if (ai1Value >= 9 || ai2Value >= 9 || ai3Value >= 9) if (ai1Value >= 9 || ai2Value >= 9 )
{ {
result = 12; result = 12;
} }
......
source/DeviceLibrary/halcon/CodeManager.cs
...@@ -30,6 +30,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -30,6 +30,7 @@ namespace OnlineStore.DeviceLibrary
{ {
cameraNameList = new List<string>(); cameraNameList = new List<string>();
codeTypeList = new List<string>(); codeTypeList = new List<string>();
HDLogUtil.LogName = "RollingLogFileAppender";
try try
{ {
string[] nameArray = nameStr.Split(spiltChar); string[] nameArray = nameStr.Split(spiltChar);
......
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
...@@ -508,6 +508,17 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -508,6 +508,17 @@ namespace OnlineStore.LoadCSVLibrary
public double AIDI3_DefaultPosition { get; set; } public double AIDI3_DefaultPosition { get; set; }
/// <summary>
/// PRO 模拟信号1的地址 AIDI1_Addr 7
/// </summary>
[ConfigProAttribute("AIDI1_Addr", true)]
public int AIDI1_Addr { get; set; }
/// <summary>
/// PRO 模拟信号2的地址 AIDI2_Addr 8
/// </summary>
[ConfigProAttribute("AIDI2_Addr", true)]
public int AIDI2_Addr { get; set; }
//private List<string> TempAddrList = null; //private List<string> TempAddrList = null;
//public static char TempAddrSpilt = '#'; //public static char TempAddrSpilt = '#';
///// <summary> ///// <summary>
...@@ -548,6 +559,7 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -548,6 +559,7 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDIList.Add(IO_Type.Door_Down); MustHaveDIList.Add(IO_Type.Door_Down);
MustHaveDIList.Add(IO_Type.Door_LimitSingle); MustHaveDIList.Add(IO_Type.Door_LimitSingle);
MustHaveDIList.Add(IO_Type.SafetyLightCurtains); MustHaveDIList.Add(IO_Type.SafetyLightCurtains);
MustHaveDIList.Add(IO_Type.CompressAxis_Check);
//MustHaveDIList.Add(IO_Type.LocationCylinder_Down); //MustHaveDIList.Add(IO_Type.LocationCylinder_Down);
//MustHaveDIList.Add(IO_Type.LocationCylinder_Up); //MustHaveDIList.Add(IO_Type.LocationCylinder_Up);
//MustHaveDIList.Add(IO_Type.LocationCylinder2_Down); //MustHaveDIList.Add(IO_Type.LocationCylinder2_Down);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!