Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC1250-AssemblyLine
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit f1de5b9b
由
LN
编写于
2020-02-14 17:57:34 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
1
1 个父辈
01c8f861
隐藏空白字符变更
内嵌
并排
正在显示
4 个修改的文件
包含
315 行增加
和
20 行删除
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
source/DeviceLibrary/deviceLibrary/RFID/RFIDReader(1).cs
source/DeviceLibrary/deviceLibrary/RFID/RFIDReader.cs
source/DeviceLibrary/assemblyLine/FeedingEquip.cs
查看文件 @
f1de5b9
...
@@ -377,6 +377,29 @@ namespace OnlineStore.DeviceLibrary
...
@@ -377,6 +377,29 @@ namespace OnlineStore.DeviceLibrary
StartCheckFixture
();
StartCheckFixture
();
}
}
}
}
if
(
NoErrorAlarm
())
{
if
(
IOValue
(
IO_Type
.
SL_Out_Check
).
Equals
(
IO_VALUE
.
HIGH
))
{
//线体出口检测到料架,需要通知AGV小车
AgvClient
.
NeedLeave
(
Config
.
AgvOutName
);
// SendShelfToAGV();
}
else
{
AgvClient
.
SetToNone
(
Config
.
AgvOutName
);
}
//入口无料架,mayEnter
if
(
IOValue
(
IO_Type
.
SL_Entry_Check
).
Equals
(
IO_VALUE
.
LOW
))
{
AgvClient
.
NeedEnter
(
Config
.
AgvInName
);
}
else
{
AgvClient
.
SetToNone
(
Config
.
AgvInName
);
}
}
IOTimeOutProcess
();
IOTimeOutProcess
();
}
}
...
...
source/DeviceLibrary/assemblyLine/FeedingEquip_InStore.cs
查看文件 @
f1de5b9
...
@@ -400,26 +400,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -400,26 +400,7 @@ namespace OnlineStore.DeviceLibrary
ShelfEnterProcess
();
ShelfEnterProcess
();
}
}
}
}
if
(
IOValue
(
IO_Type
.
SL_Out_Check
).
Equals
(
IO_VALUE
.
HIGH
))
{
//线体出口检测到料架,需要通知AGV小车
AgvClient
.
NeedLeave
(
Config
.
AgvOutName
);
// SendShelfToAGV();
}
else
{
AgvClient
.
SetToNone
(
Config
.
AgvOutName
);
}
//入口无料架,mayEnter
if
(
IOValue
(
IO_Type
.
SL_Entry_Check
).
Equals
(
IO_VALUE
.
LOW
))
{
AgvClient
.
NeedEnter
(
Config
.
AgvInName
);
}
else
{
AgvClient
.
SetToNone
(
Config
.
AgvInName
);
}
return
false
;
return
false
;
}
}
public
override
bool
StartInStoreMove
(
InOutParam
param
)
public
override
bool
StartInStoreMove
(
InOutParam
param
)
...
...
source/DeviceLibrary/deviceLibrary/RFID/RFIDReader(1).cs
0 → 100644
查看文件 @
f1de5b9
using
log4net
;
using
System
;
using
System.Collections.Generic
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
using
static
Asa
.
RFID
.
RFIDAuto
;
namespace
Asa.RFID
{
public
class
RFID
{
public
static
readonly
ILog
LOGGER
=
LogManager
.
GetLogger
(
"TheRFID"
);
private
System
.
Threading
.
Thread
tScan
;
private
bool
loop
;
private
string
IP
=
""
;
private
byte
addr
;
private
int
portIndex
;
private
bool
IsConnect
=
false
;
private
byte
[]
lastData
=
new
byte
[
8
];
internal
byte
[]
_buff
;
//8字节缓存
private
byte
[]
_uid
;
//卡片ID
public
bool
IsExist
=
false
;
public
int
ErrCode
=
0
;
/// <summary>
/// 接收事件
/// </summary>
/// <param name="ip"></param>
/// <param name="buff"></param>
public
delegate
void
Received_Event
(
string
ip
,
byte
[]
buff
);
/// <summary>
/// 接收数据
/// </summary>
public
event
Received_Event
Received
;
public
RFID
(
string
ip
)
{
this
.
IP
=
ip
;
}
public
int
Close
()
{
try
{
loop
=
false
;
IsConnect
=
false
;
int
ErrCode
=
ReaderA
.
StaticClassReaderA
.
CloseNetPort
(
portIndex
);
LOGGER
.
Info
(
"Close RFID ["
+
IP
+
"]:"
+
ErrCode
);
return
ErrCode
;
}
catch
(
Exception
e
)
{
LOGGER
.
Error
(
"Close RFID["
+
IP
+
"] has error"
,
e
);
}
return
-
1
;
}
public
int
Open
()
{
if
(
IsConnect
)
{
LOGGER
.
Warn
(
" RFID ["
+
IP
+
"] is already connected, no need to start again"
);
return
0
;
}
//IP合法
string
pattern
=
@"^((2[0-4]\d|25[0-5]|[01]?\d\d?)\.){3}(2[0-4]\d|25[0-5]|[01]?\d\d?)$"
;
bool
rtn
=
System
.
Text
.
RegularExpressions
.
Regex
.
IsMatch
(
IP
,
pattern
);
if
(!
rtn
)
{
LOGGER
.
Error
(
IP
+
" is error"
);
return
-
1
;
}
string
[]
arr
=
IP
.
Split
(
'.'
);
if
(
arr
.
Length
!=
4
)
{
LOGGER
.
Error
(
IP
+
" length is not 4"
);
return
-
1
;
}
addr
=
Convert
.
ToByte
(
arr
[
3
]);
int
port
=
6000
+
Convert
.
ToInt32
(
arr
[
3
]);
portIndex
=
0
;
int
ErrCode
=
ReaderA
.
StaticClassReaderA
.
OpenNetPort
(
port
,
IP
,
ref
addr
,
ref
portIndex
);
LOGGER
.
Info
(
"Connect ["
+
IP
+
"] :"
+
ErrCode
);
// 在 OpenNetPort 后面使用
System
.
Threading
.
Thread
.
Sleep
(
100
);
OpenCloseRF
(
false
);
System
.
Threading
.
Thread
.
Sleep
(
100
);
OpenCloseRF
(
true
);
return
ErrCode
;
}
public
void
FindMode
()
{
loop
=
true
;
tScan
=
new
System
.
Threading
.
Thread
(
new
System
.
Threading
.
ThreadStart
(
Scan
));
tScan
.
Start
();
}
private
void
Scan
()
{
while
(
loop
)
{
bool
rtn
=
FindRFID
();
if
(
rtn
)
{
ReadRFID
();
byte
[]
bb
=
new
byte
[]
{
_buff
[
1
],
_buff
[
2
]
};
Received
?.
Invoke
(
IP
,
bb
);
}
System
.
Threading
.
Thread
.
Sleep
(
100
);
}
}
private
void
OpenCloseRF
(
bool
rtn
)
{
if
(
rtn
)
ErrCode
=
ReaderA
.
StaticClassReaderA
.
OpenRf
(
ref
addr
,
portIndex
);
else
ErrCode
=
ReaderA
.
StaticClassReaderA
.
CloseRf
(
ref
addr
,
portIndex
);
}
/// <summary>
/// 查找电子标签,扫描模式不能使用
/// </summary>
/// <returns></returns>
public
bool
FindRFID
()
{
//0 不带AFI
//1 带AFI
//2 不带AFI,继续查询
//3 带AFI,继续查询
//6 不带AFI,新的查询
//7 带AFI,新的查询
byte
state
=
0
;
//Select模式需要AFI
byte
AFI
=
0
;
//输出,1字节DSFID,8字节UID
byte
[]
DSFIDAndUID
=
new
byte
[
9
];
//输出,标签数量
byte
cardNumber
=
0
;
ErrCode
=
ReaderA
.
StaticClassReaderA
.
Inventory
(
ref
addr
,
ref
state
,
ref
AFI
,
DSFIDAndUID
,
ref
cardNumber
,
portIndex
);
if
(
ErrCode
==
0
)
{
//查询时间
//fCmdRet = StaticClassReaderA.GetInventoryTime(ref n_time, portIndex);
Array
.
Copy
(
DSFIDAndUID
,
1
,
_uid
,
0
,
8
);
IsExist
=
true
;
return
true
;
}
else
{
for
(
int
i
=
0
;
i
<
_uid
.
Length
;
i
++)
_uid
[
i
]
=
0
;
IsExist
=
false
;
return
false
;
}
}
public
byte
[]
Read
(
bool
isNeedFind
=
false
)
{
if
(
isNeedFind
)
{
FindRFID
();
}
if
(
IsExist
)
{
ReadRFID
();
return
_buff
;
}
else
{
LOGGER
.
Info
(
IP
+
" Read: IsExist=false "
);
}
return
null
;
}
private
void
ReadRFID
()
{
//0 不带AFI
//1 带AFI
//2 不带AFI,继续查询
//3 带AFI,继续查询
//6 不带AFI,新的查询
//7 带AFI,新的查询
byte
state
=
0
;
//起始块号
byte
blockNum
=
0
;
//块数量
byte
blockCount
=
2
;
//输出,块内安全信息,长度为BlockCount个字节
byte
[]
blockSecStatus
=
new
byte
[
blockCount
];
//输出,块内数据信息,长度为块的大小(4或8字节)乘以BlockCount个字节
byte
[]
data
=
new
byte
[
4
*
blockCount
];
//错误代码
byte
errorCode
=
0
;
ErrCode
=
ReaderA
.
StaticClassReaderA
.
ReadMultipleBlock
(
ref
addr
,
ref
state
,
_uid
,
blockNum
,
blockCount
,
blockSecStatus
,
data
,
ref
errorCode
,
portIndex
);
if
(
ErrCode
==
0
)
{
Array
.
Copy
(
data
,
0
,
_buff
,
0
,
data
.
Length
);
string
dataStr
=
byteToStr
(
data
,
data
.
Length
);
LOGGER
.
Info
(
IP
+
" ReadMultipleBlock: Length: "
+
data
.
Length
+
" Data:"
+
dataStr
);
}
else
{
LOGGER
.
Info
(
IP
+
" ReadMultipleBlock: ErrCode: "
+
ErrCode
);
}
}
private
string
byteToStr
(
byte
[]
data
,
int
len
)
{
string
s
=
""
;
for
(
int
i
=
0
;
i
<
len
;
i
++)
{
s
+=
data
[
i
].
ToString
(
"X2"
)
+
" "
;
}
return
s
;
}
}
public
class
RFIDReader
{
public
static
readonly
ILog
LOGGER
=
LogManager
.
GetLogger
(
"TheRFID"
);
private
static
Dictionary
<
string
,
RFID
>
rfidMap
=
new
Dictionary
<
string
,
RFID
>();
public
static
void
Open
(
params
string
[]
ipArr
)
{
foreach
(
var
ip
in
ipArr
)
{
if
(
rfidMap
.
ContainsKey
(
ip
))
{
rfidMap
[
ip
].
Open
();
}
else
{
RFID
rfid
=
new
RFID
(
ip
);
rfid
.
Open
();
rfidMap
.
Add
(
ip
,
rfid
);
}
}
}
public
static
bool
FindRFID
(
string
ip
)
{
if
(
rfidMap
.
ContainsKey
(
ip
))
{
return
rfidMap
[
ip
].
FindRFID
();
}
return
false
;
}
public
static
byte
[]
Read
(
string
ip
,
bool
isNeedFind
)
{
if
(
rfidMap
.
ContainsKey
(
ip
))
{
return
rfidMap
[
ip
].
Read
(
isNeedFind
);
}
return
null
;
}
public
static
void
CloseAll
()
{
foreach
(
var
rfid
in
rfidMap
.
Values
)
{
rfid
.
Close
();
}
}
}
}
source/DeviceLibrary/deviceLibrary/RFID/RFIDReader.cs
查看文件 @
f1de5b9
...
@@ -141,6 +141,10 @@ namespace Asa.RFID
...
@@ -141,6 +141,10 @@ namespace Asa.RFID
ReadRFID
();
ReadRFID
();
return
_buff
;
return
_buff
;
}
}
else
{
LOGGER
.
Info
(
IP
+
" Read: IsExist=false "
);
}
return
null
;
return
null
;
}
}
private
void
ReadRFID
()
private
void
ReadRFID
()
...
@@ -168,6 +172,13 @@ namespace Asa.RFID
...
@@ -168,6 +172,13 @@ namespace Asa.RFID
if
(
ErrCode
==
0
)
if
(
ErrCode
==
0
)
{
{
Array
.
Copy
(
data
,
0
,
_buff
,
0
,
data
.
Length
);
Array
.
Copy
(
data
,
0
,
_buff
,
0
,
data
.
Length
);
string
dataStr
=
byteToStr
(
data
,
data
.
Length
);
LOGGER
.
Info
(
IP
+
" ReadMultipleBlock: Length: "
+
data
.
Length
+
" Data:"
+
dataStr
);
}
else
{
LOGGER
.
Info
(
IP
+
" ReadMultipleBlock: ErrCode: "
+
ErrCode
);
}
}
}
}
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论