Skip to content
切换导航条
切换导航条
当前项目
正在载入...
登录
孙克
/
ACSingleStore
转到一个项目
切换导航栏
切换导航栏固定状态
项目
群组
代码片段
帮助
项目
活动
版本库
流水线
图表
问题
0
合并请求
0
维基
网络
创建新的问题
作业
提交
问题看板
文件
提交
网络
比较
分支
标签
Commit a1225610
由
几米阳光
编写于
2018-10-23 09:38:35 +0800
浏览文件
选项
浏览文件
标签
下载
电子邮件补丁
差异文件
添加康奈德AI模块代码
1 个父辈
d7299a86
全部展开
隐藏空白字符变更
内嵌
并排
正在显示
9 个修改的文件
包含
22 行增加
和
15 行删除
doc/设备IP地址分配.xlsx
source/ACSingleStore/FrmStoreBox.cs
source/DeviceLibrary/DeviceLibrary.csproj
source/DeviceLibrary/KangNaiDe/AITcpClient.cs
source/DeviceLibrary/KangNaiDe/KNDAIManager.cs
source/DeviceLibrary/KangNaiDe/KNDManager.cs
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
doc/设备IP地址分配.xlsx
查看文件 @
a122561
此文件类型无法预览
source/ACSingleStore/FrmStoreBox.cs
查看文件 @
a122561
...
@@ -1178,6 +1178,7 @@ namespace OnlineStore.ACSingleStore
...
@@ -1178,6 +1178,7 @@ namespace OnlineStore.ACSingleStore
KNDManager
.
CloseAllDO
();
KNDManager
.
CloseAllDO
();
StoreOpenStatus
(
false
);
StoreOpenStatus
(
false
);
KNDManager
.
CloseAllConnection
();
KNDManager
.
CloseAllConnection
();
KNDAIManager
.
CloseAllConnection
();
//WCFControl.CloseWCF();
//WCFControl.CloseWCF();
System
.
Environment
.
Exit
(
System
.
Environment
.
ExitCode
);
System
.
Environment
.
Exit
(
System
.
Environment
.
ExitCode
);
}
}
...
...
source/DeviceLibrary/DeviceLibrary.csproj
查看文件 @
a122561
...
@@ -60,6 +60,8 @@
...
@@ -60,6 +60,8 @@
<Compile Include="acSingleStore\AC_SA_BoxBean_Partial.cs" />
<Compile Include="acSingleStore\AC_SA_BoxBean_Partial.cs" />
<Compile Include="acSingleStore\ACStoreManager.cs" />
<Compile Include="acSingleStore\ACStoreManager.cs" />
<Compile Include="halcon\HDevelopExport.cs" />
<Compile Include="halcon\HDevelopExport.cs" />
<Compile Include="KangNaiDe\AITcpClient.cs" />
<Compile Include="KangNaiDe\KNDAIManager.cs" />
<Compile Include="KangNaiDe\KNDManager.cs" />
<Compile Include="KangNaiDe\KNDManager.cs" />
<Compile Include="KangNaiDe\MasterTcpClient.cs" />
<Compile Include="KangNaiDe\MasterTcpClient.cs" />
<Compile Include="PanasonicServo\ACCMDManager.cs" />
<Compile Include="PanasonicServo\ACCMDManager.cs" />
...
...
source/DeviceLibrary/KangNaiDe/AITcpClient.cs
0 → 100644
查看文件 @
a122561
此文件的差异被折叠,
点击展开。
source/DeviceLibrary/KangNaiDe/KNDAIManager.cs
0 → 100644
查看文件 @
a122561
此文件的差异被折叠,
点击展开。
source/DeviceLibrary/KangNaiDe/KNDManager.cs
查看文件 @
a122561
...
@@ -145,11 +145,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -145,11 +145,7 @@ namespace OnlineStore.DeviceLibrary
//端口号暂时使用固定的502;
//端口号暂时使用固定的502;
ushort
port
=
502
;
ushort
port
=
502
;
foreach
(
string
ip
in
DIONameList
)
foreach
(
string
ip
in
DIONameList
)
{
{
//if (ip.Equals("192.168.10.10"))
//{
// continue;
//}
ConnectionIP
(
ip
,
port
);
ConnectionIP
(
ip
,
port
);
}
}
}
}
...
...
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
查看文件 @
a122561
...
@@ -34,9 +34,10 @@ DO,相机照明开,CameraLight_Power,110,192.168.200.10,0,相机照明开,Y11,DO-11,0,
...
@@ -34,9 +34,10 @@ DO,相机照明开,CameraLight_Power,110,192.168.200.10,0,相机照明开,Y11,DO-11,0,
AXIS,(轴一)旋转轴,Middle_Axis,1,COM3,0,,,,,
AXIS,(轴一)旋转轴,Middle_Axis,1,COM3,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,1,COM4,0,,,,,
AXIS,(轴二)升降轴轴,UpDown_Axis,1,COM4,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,1,COM5,0,,,,,
AXIS,(轴三)进出轴,InOut_Axis,1,COM5,0,,,,,
PRO,温湿度传感器地址,Temperate_ServerAddress,192.168.200.14,,,,,,,
PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.11,,,,,,,
PRO,扫码枪IP,Scanner_Ip,192.168.200.13,,,,,,,
,温湿度传感器地址,Temperate_ServerAddress,192.168.200.14,,,,,,,
PRO,扫码枪端口号,Scanner_Port,51236,,,,,,,
,扫码枪IP,Scanner_Ip,192.168.200.13,,,,,,,
,扫码枪端口号,Scanner_Port,51236,,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,423300,,,,,,,
PRO,升降轴 进料口取料点 P1,UpDownAxis_DoorOPosition_P1,423300,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,450000,,,,,,,
PRO,升降轴 进料口出料前点 P2,UpDownAxis_DoorIPosition_P2,450000,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,450000,,,,,,,
PRO,升降轴 进料口取料缓冲点 P7,UpDownAxis_DoorOBPosition_P7,450000,,,,,,,
...
@@ -45,11 +46,11 @@ PRO,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1_Position,-200400,,,,,,,
...
@@ -45,11 +46,11 @@ PRO,旋转轴(轴1)P1 待机原位点,MiddleAxis_P1_Position,-200400,,,,,,,
PRO,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,500,,,,,,,
PRO,进出轴(轴3)P1待机原位点,InOutAxis_P1_Position,500,,,,,,,
PRO,押金轴(轴4)P1待机原位点,CompressAxis_P1_Position,0,,,,,,,
PRO,押金轴(轴4)P1待机原位点,CompressAxis_P1_Position,0,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否使用定位气缸,IsHasLocationCylinder,0,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,
0
,,,,,,,
PRO,是否有左右侧门,IsHasDoorLimit,
1
,,,,,,,
PRO,是否使用压紧轴(1=使用),IsHasCompress_Axis,1,,,,, ,,
PRO,是否使用压紧轴(1=使用),IsHasCompress_Axis,1,,,,, ,,
PRO,设备是否处于调试状态(1=调试,0=正常),IsInDebug,0,,,,,,,
PRO,设备是否处于调试状态(1=调试,0=正常),IsInDebug,0,,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,
PRO,气压检测IO关闭需要持续的时间,AirCheckSeconds,3,,,,,,,
PRO
,温湿度传感器地址,TemperateServer_Port,9001,,,,,,,
,温湿度传感器地址,TemperateServer_Port,9001,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,,
PRO,预警温度,WarnTemperate,80,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,,
PRO,预警湿度,WarnHumidity,80,,,,,,,
PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,40,,,,,,,
PRO,(轴一)旋转轴目标速度,MiddleAxis_TargetSpeed,40,,,,,,,
...
...
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
查看文件 @
a122561
...
@@ -89,7 +89,7 @@ namespace OnlineStore.DeviceLibrary
...
@@ -89,7 +89,7 @@ namespace OnlineStore.DeviceLibrary
//初始化 //连接设备
//初始化 //连接设备
KNDManager
.
ConnectionKND
(
Config
.
DIODeviceNameList
);
KNDManager
.
ConnectionKND
(
Config
.
DIODeviceNameList
);
KNDAIManager
.
ConnectionIP
(
Config
.
AIDevice_IP
);
//scanSocket.OnScanRevice += onCodeReceived;
//scanSocket.OnScanRevice += onCodeReceived;
timersTimer
.
Enabled
=
false
;
timersTimer
.
Enabled
=
false
;
...
...
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
查看文件 @
a122561
...
@@ -60,12 +60,12 @@ namespace OnlineStore.LoadCSVLibrary
...
@@ -60,12 +60,12 @@ namespace OnlineStore.LoadCSVLibrary
/// <summary>
/// <summary>
/// PRO 扫码枪IP Scanner_Ip 192.168.200.13
/// PRO 扫码枪IP Scanner_Ip 192.168.200.13
/// </summary>
/// </summary>
[
ConfigProAttribute
(
"Scanner_Ip"
)]
[
ConfigProAttribute
(
"Scanner_Ip"
,
false
)]
public
string
Scanner_Ip
{
get
;
set
;
}
public
string
Scanner_Ip
{
get
;
set
;
}
/// <summary>
/// <summary>
/// PRO 扫码枪端口号 Scanner_Port 51236
/// PRO 扫码枪端口号 Scanner_Port 51236
/// </summary>
/// </summary>
[
ConfigProAttribute
(
"Scanner_Port"
)]
[
ConfigProAttribute
(
"Scanner_Port"
,
false
)]
public
int
Scanner_Port
{
get
;
set
;
}
public
int
Scanner_Port
{
get
;
set
;
}
/// <summary>
/// <summary>
/// PRO (轴一)旋转轴原点目标速度 MiddleAxis_TargetSpeed 30000
/// PRO (轴一)旋转轴原点目标速度 MiddleAxis_TargetSpeed 30000
...
@@ -475,13 +475,20 @@ namespace OnlineStore.LoadCSVLibrary
...
@@ -475,13 +475,20 @@ namespace OnlineStore.LoadCSVLibrary
[
ConfigProAttribute
(
"BlowAir_Interval"
,
false
)]
[
ConfigProAttribute
(
"BlowAir_Interval"
,
false
)]
public
int
BlowAir_Interval
{
get
;
set
;
}
public
int
BlowAir_Interval
{
get
;
set
;
}
public
int
InoutAxis_PositionMax
{
get
;
set
;
}
/// <summary>
/// <summary>
/// PRO,温湿度端口号,Humiture_Port,COM1,,,,,,,
/// PRO,温湿度端口号,Humiture_Port,COM1,,,,,,,
/// </summary>
/// </summary>
[
ConfigProAttribute
(
"Humiture_Port"
,
true
)]
[
ConfigProAttribute
(
"Humiture_Port"
,
true
)]
public
string
Humiture_Port
{
get
;
set
;
}
public
string
Humiture_Port
{
get
;
set
;
}
public
int
InoutAxis_PositionMax
{
get
;
set
;
}
/// <summary>
/// PRO 模拟量IO模块的IP地址 AIDevice_IP 192.168.200.11
/// </summary>
[
ConfigProAttribute
(
"AIDevice_IP"
,
true
)]
public
string
AIDevice_IP
{
get
;
set
;
}
//private List<string> TempAddrList = null;
//private List<string> TempAddrList = null;
//public static char TempAddrSpilt = '#';
//public static char TempAddrSpilt = '#';
///// <summary>
///// <summary>
...
...
编写
预览
支持
Markdown
格式
附加文件
你添加了
0
人
到此讨论。请谨慎行事。
Finish editing this message first!
Cancel
请
注册
或
登录
后发表评论