Skip to content

孙克 / RC1250-AssemblyLine

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

agv更新

1 个父辈 e45fc0ce
内嵌 并排
正在显示 7 个修改的文件 包含 16 行增加 和 28 行删除
dll/Client.dll
此文件类型无法预览
dll/Client.xml
...@@ -60,11 +60,6 @@ ...@@ -60,11 +60,6 @@
日志 日志
</summary> </summary>
</member> </member>
<member name="P:Asa.Client.ErrInfo">
<summary>
错误信息
</summary>
</member>
<member name="P:Asa.Client.IsConn"> <member name="P:Asa.Client.IsConn">
<summary> <summary>
是否连接服务器 是否连接服务器
...@@ -81,24 +76,17 @@ ...@@ -81,24 +76,17 @@
</summary> </summary>
<param name="serverIP">服务器IP地址</param> <param name="serverIP">服务器IP地址</param>
</member> </member>
<member name="M:Asa.Client.Connect"> <member name="M:Asa.Client.Connect(System.String[])">
<summary> <summary>
连接 连接
</summary> </summary>
<returns></returns> <param name="id"></param>
</member> </member>
<member name="M:Asa.Client.Close"> <member name="M:Asa.Client.Close">
<summary> <summary>
关闭 关闭
</summary> </summary>
</member> </member>
<member name="M:Asa.Client.SetNodeID(System.String[])">
<summary>
连接后设置节点ID
</summary>
<param name="id"></param>
<returns></returns>
</member>
<member name="M:Asa.Client.SendRFID(System.String,System.String)"> <member name="M:Asa.Client.SendRFID(System.String,System.String)">
<summary> <summary>
发送RFID信息 发送RFID信息
...@@ -107,11 +95,12 @@ ...@@ -107,11 +95,12 @@
<param name="s"></param> <param name="s"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.NeedEnter(System.String)"> <member name="M:Asa.Client.NeedEnter(System.String,System.String)">
<summary> <summary>
需要进入料架 需要进入料架（包装料仓）
</summary> </summary>
<param name="id"></param> <param name="id"></param>
<param name="mark"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.NeedLeave(System.String)"> <member name="M:Asa.Client.NeedLeave(System.String)">
...@@ -149,12 +138,11 @@ ...@@ -149,12 +138,11 @@
<param name="id"></param> <param name="id"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.IsEnter(System.String,System.Boolean)"> <member name="M:Asa.Client.IsEnter(System.String)">
<summary> <summary>
是否可以进入，仅用于CanEnter事件 是否可以进入，仅用于CanEnter事件
</summary> </summary>
<param name="id"></param> <param name="id">节点，可以多个</param>
<param name="val"></param>
<returns></returns> <returns></returns>
</member> </member>
<member name="M:Asa.Client.Send(System.Byte[])"> <member name="M:Asa.Client.Send(System.Byte[])">
......
source/AssemblyLineClient/App.config
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
</layout> </layout>
</appender> </appender>
<appender name="TheRFID" type="log4net.Appender.RollingFileAppender"> <appender name="TheRFID" type="log4net.Appender.RollingFileAppender">
<file value="logs/TheRFID.log"/> <file value="logs/TheRFID-line.log"/>
<param name="Encoding" value="UTF-8" /> <param name="Encoding" value="UTF-8" />
<appendToFile value="true"/> <appendToFile value="true"/>
<rollingStyle value="Date"/> <rollingStyle value="Date"/>
...@@ -87,6 +87,8 @@ ...@@ -87,6 +87,8 @@
<level value="Debug" /> <level value="Debug" />
<appender-ref ref="TheRFID" /> <appender-ref ref="TheRFID" />
</logger> </logger>
<!--<root> <!--<root>
<level value="Info" /> <level value="Info" />
<appender-ref ref="RollingLogFileAppender" /> <appender-ref ref="RollingLogFileAppender" />
......
source/DeviceLibrary/agvClient/AgvClient.cs
...@@ -33,8 +33,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -33,8 +33,7 @@ namespace OnlineStore.DeviceLibrary
agvClient.CanEnter += AgvClient_CanEnter; agvClient.CanEnter += AgvClient_CanEnter;
agvClient.Ready += AgvClient_Ready; agvClient.Ready += AgvClient_Ready;
agvClient.Connect(); agvClient.Connect(NodeList.ToArray());
agvClient.SetNodeID(NodeList.ToArray());
} }
catch (Exception ex) catch (Exception ex)
{ {
......
source/DeviceLibrary/assemblyLine/LineBean.cs
...@@ -886,8 +886,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -886,8 +886,7 @@ namespace OnlineStore.DeviceLibrary
msg += "runS： "+ runStatus + "\n"; msg += "runS： "+ runStatus + "\n";
msg += "lineS： "+ lineStatus + "\n"; msg += "lineS： "+ lineStatus + "\n";
msg += "alarm： " + alarmType + "\n"; msg += "alarm： " + alarmType + "\n";
msg += "MoveT：" + MoveInfo.MoveType + "\n"; msg += "Move：" + MoveInfo.MoveType + " " + MoveInfo.SLog + "\n";
msg += "MoveS： " + MoveInfo.SLog + "\n";
msg += "SW41： "+ SW41_MoveInfo.MoveType + " "+ SW41_MoveInfo.MoveStep + "\n"; msg += "SW41： "+ SW41_MoveInfo.MoveType + " "+ SW41_MoveInfo.MoveStep + "\n";
msg += "SW23： " + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n"; msg += "SW23： " + SW23_MoveInfo.MoveType + " " + SW23_MoveInfo.MoveStep + "\n";
return msg; return msg;
......
source/DeviceLibrary/assemblymanager/RFIDManagercs.cs
...@@ -112,7 +112,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -112,7 +112,7 @@ namespace OnlineStore.DeviceLibrary
{ {
//LogUtil.error("ReadRFID["+ip+"]出错：",ex); //LogUtil.error("ReadRFID["+ip+"]出错：",ex);
} }
return new RFIDData(-1, -1); return new RFIDData( );
} }
public static string GetRFIP(int subType, int rtType = 0) public static string GetRFIP(int subType, int rtType = 0)
...@@ -147,14 +147,14 @@ namespace OnlineStore.DeviceLibrary ...@@ -147,14 +147,14 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// RFID类型，区分是料架还是托盘，托盘E=69,包装料料架A=65，料串=B /// RFID类型，区分是料架还是托盘，托盘E=69,包装料料架A=65，料串=B
/// </summary> /// </summary>
public char RFType = 'E'; public char RFType = '0';
/// <summary> /// <summary>
/// 托盘编号，从1-32 /// 托盘编号，从1-32
/// </summary> /// </summary>
public int Num = 0; public int Num = 0;
public RFIDData(int num, int t) public RFIDData(int num=0, int t=0)
{ {
if (t < 65) if (t < 65)
{ {
......
source/DeviceLibrary/deviceLibrary/RFID/RFID.cs
...@@ -268,7 +268,7 @@ namespace Asa.RFID ...@@ -268,7 +268,7 @@ namespace Asa.RFID
{ {
byte[] data = lastData; byte[] data = lastData;
lastData = new byte[8]; lastData = new byte[8];
LOGGER.Info("Read and clear RFID[" + IP + "] data:" + byteToStr(data, data.Length)); LOGGER.Debug("Read and clear RFID[" + IP + "] data:" + byteToStr(data, data.Length));
return data; return data;
} }
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!