Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
RC30-AutoInOutStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit b1c37f0f
由
几米阳光
编写于
2019-05-07 09:55:30 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
波特率改为115200,出入库优化
1 个父辈
16cf7bbc
隐藏空白字符变更
内嵌
并排
正在显示
5 个修改的文件
包含
13 行增加
和
12 行删除
source/ACSingleStore/App.config
source/DeviceLibrary/DeviceLibrary/PanasonicServo/ACServerManager.cs
source/DeviceLibrary/DeviceLibrary/PanasonicServo/ACServerManager_Partial.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
source/ACSingleStore/App.config
查看文件 @
b1c37f0
...
...
@@ -40,7 +40,7 @@
<
add
key
=
"DebugPosId"
value
=
"1#AC2_2_1_1"
/>
<!--是否有门禁屏蔽功能,=
1
表示有此功能-->
<
add
key
=
"HasDisableDoorControl"
value
=
"1"
/>
<
add
key
=
"ACBaudRate"
value
=
"
96
00"
/>
<
add
key
=
"ACBaudRate"
value
=
"
1152
00"
/>
<
add
key
=
"Default_Language"
value
=
"zh-CN"
/>
<
add
key
=
"UseAIOBOX"
value
=
"1"
/>
</
appSettings
>
...
...
source/DeviceLibrary/DeviceLibrary/PanasonicServo/ACServerManager.cs
查看文件 @
b1c37f0
...
...
@@ -15,7 +15,7 @@ namespace OnlineStore.DeviceLibrary
public
partial
class
ACServerManager
{
public
static
bool
IsShowMsg
=
false
;
private
static
int
SleepMSendons
=
10
0
;
private
static
int
SleepMSendons
=
2
0
;
private
static
Dictionary
<
string
,
Dictionary
<
string
,
int
>>
ComAddrValue
=
new
Dictionary
<
string
,
Dictionary
<
string
,
int
>>();
private
static
string
mapObj
=
""
;
...
...
@@ -352,7 +352,7 @@ namespace OnlineStore.DeviceLibrary
Thread
.
Sleep
(
time
);
LogUtil
.
info
(
"轴【"
+
portName
+
"_"
+
slvAddr
+
"】匀速 已等待"
+
time
+
",直接停止"
);
SuddenStop
(
portName
,
slvAddr
);
Thread
.
Sleep
(
100
);
Thread
.
Sleep
(
SleepMSendons
);
}
}
}
catch
(
Exception
ex
)
...
...
source/DeviceLibrary/DeviceLibrary/PanasonicServo/ACServerManager_Partial.cs
查看文件 @
b1c37f0
...
...
@@ -218,7 +218,7 @@ namespace OnlineStore.DeviceLibrary
OnlyOpenSTB
(
portName
,
slvAddr
);
System
.
Threading
.
Thread
.
Sleep
(
100
);
CloseSTB
(
portName
,
slvAddr
);
System
.
Threading
.
Thread
.
Sleep
(
100
);
System
.
Threading
.
Thread
.
Sleep
(
SleepMSendons
);
}
public
static
void
OnlyOpenSTB
(
string
portName
,
int
slvAddr
)
...
...
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @
b1c37f0
...
...
@@ -869,6 +869,7 @@ namespace OnlineStore.DeviceLibrary
{
AutomaticBaiting
.
TimerProcess
();
}
ShowTimeLog
(
"AutomaticBaiting.TimerProcess"
);
}
catch
(
Exception
ex
)
{
...
...
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean_Partial.cs
查看文件 @
b1c37f0
...
...
@@ -5,6 +5,7 @@ using System.Collections.Generic;
using
System.Diagnostics
;
using
System.Linq
;
using
System.Text
;
using
System.Threading.Tasks
;
namespace
OnlineStore.DeviceLibrary
{
...
...
@@ -410,7 +411,7 @@ namespace OnlineStore.DeviceLibrary
InStoreLog
(
"入库:SI_05 等待吸盘放下物品"
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SI_05_DoorWarToDevice
);
IOManager
.
IOMove
(
IO_Type
.
SuckingDisc_Work
,
IO_VALUE
.
LOW
);
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitTime
(
1000
));
//
StoreMove.WaitList.Add(WaitResultInfo.WaitTime(1000));
StoreMove
.
WaitList
.
Add
(
WaitResultInfo
.
WaitIO
(
IO_Type
.
SuckingDisc_Air
,
IO_VALUE
.
LOW
));
}
else
if
(
StoreMove
.
MoveStep
==
StoreMoveStep
.
SI_05_DoorWarToDevice
)
...
...
@@ -506,8 +507,8 @@ namespace OnlineStore.DeviceLibrary
lastPosId
=
posId
;
lastPosIdStatus
=
StoreStatus
.
InStoreEnd
;
storeStatus
=
StoreStatus
.
InStoreEnd
;
//手动发给服务器状态,防止没有手动
SendLineStatus
(
);
//手动发给服务器状态,防止没有手动
Task
.
Factory
.
StartNew
(
delegate
{
SendLineStatus
();
}
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SI_12_PutWareToBag
);
ComMoveToPosition
(
moveP
.
ComPress_P3
,
true
);
...
...
@@ -522,9 +523,9 @@ namespace OnlineStore.DeviceLibrary
}
else
if
(
StoreMove
.
MoveStep
==
StoreMoveStep
.
SI_13_InoutBack
)
{
InStoreLog
(
"入库:SI_14 返回待机点,轴2/轴1/轴4动作至P
1
(待机点))"
);
InStoreLog
(
"入库:SI_14 返回待机点,轴2/轴1/轴4动作至P
3
(待机点))"
);
StoreMove
.
NextMoveStep
(
StoreMoveStep
.
SI_14_GoBack
);
ComMoveToPosition
(
moveP
.
ComPress_P
1
);
ComMoveToPosition
(
moveP
.
ComPress_P
3
);
ACAxisMove
(
Config
.
Middle_Axis
,
moveP
.
Middle_P1
,
Config
.
MiddleAxis_P1_Speed
);
ACAxisMove
(
Config
.
UpDown_Axis
,
moveP
.
UpDown_P1
,
Config
.
UpDownAxis_P1_Speed
);
}
...
...
@@ -747,8 +748,7 @@ namespace OnlineStore.DeviceLibrary
lastPosIdStatus
=
StoreStatus
.
OutStoreBoxEnd
;
storeStatus
=
StoreStatus
.
OutStoreBoxEnd
;
//手动发给服务器状态,防止没有手动
SendLineStatus
();
Task
.
Factory
.
StartNew
(
delegate
{
SendLineStatus
();
});
}
else
if
(
StoreMove
.
MoveStep
==
StoreMoveStep
.
SO_06_BagDeviceBack
)
{
...
...
@@ -905,7 +905,7 @@ namespace OnlineStore.DeviceLibrary
ACAxisMove
(
Config
.
InOut_Axis
,
StoreMove
.
MoveParam
.
MoveP
.
InOut_P1
,
Config
.
InOutAxis_P1_Speed
);
if
(
IsHasCompress_Axis
)
{
ComMoveToPosition
(
StoreMove
.
MoveParam
.
MoveP
.
ComPress_P
1
);
ComMoveToPosition
(
StoreMove
.
MoveParam
.
MoveP
.
ComPress_P
3
);
}
}
/// <summary>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论