Skip to content

孙克 / ACSingleStore

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

旋转轴进出轴正方向回原点，升降轴反方向回原点

1 个父辈 d8649f39
内嵌 并排
正在显示 9 个修改的文件 包含 32 行增加 和 10 行删除
doc/二维码.xlsx 0 → 100644
此文件类型无法预览
doc/新建 DOC 文档.doc 0 → 100644
此文件类型无法预览
doc/设备IP地址分配.xlsx 0 → 100644
此文件类型无法预览
source/ACSingleStore/ACSingleStore.csproj
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>OnlineStore.ACSingleStore</RootNamespace> <RootNamespace>OnlineStore.ACSingleStore</RootNamespace>
<AssemblyName>ACSingleStore</AssemblyName> <AssemblyName>BJACSingleStore</AssemblyName>
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion> <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<TargetFrameworkProfile /> <TargetFrameworkProfile />
......
source/ACSingleStore/App.config
...@@ -38,7 +38,8 @@ ...@@ -38,7 +38,8 @@
<!--摄像机名称列表配置，用#分割--> <!--摄像机名称列表配置，用#分割-->
<add key="CameraName" value="codeCamera"/> <add key="CameraName" value="codeCamera"/>
<!--二维码类型列表配置，用#分割--> <!--二维码类型列表配置，用#分割-->
<add key="CodeType" value="Data Matrix ECC 200"/> <add key="CodeType" value="QR Code"/>
<!--<add key="CodeType" value="Data Matrix ECC 200"/>-->
<!--二维码参数文件所在路径，文件名与二维码类型名一样--> <!--二维码参数文件所在路径，文件名与二维码类型名一样-->
<add key="CodeParamPath" value="\StoreConfig\AC\"/> <add key="CodeParamPath" value="\StoreConfig\AC\"/>
</appSettings> </appSettings>
......
source/ACSingleStore/FrmAxisDebug.Designer.cs
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
this.btnMiddleMove.Name = "btnMiddleMove"; this.btnMiddleMove.Name = "btnMiddleMove";
this.btnMiddleMove.Size = new System.Drawing.Size(131, 36); this.btnMiddleMove.Size = new System.Drawing.Size(131, 36);
this.btnMiddleMove.TabIndex = 4; this.btnMiddleMove.TabIndex = 4;
this.btnMiddleMove.Text = "旋转轴+(顺时针)"; this.btnMiddleMove.Text = "旋转轴+(逆时针)";
this.btnMiddleMove.UseVisualStyleBackColor = true; this.btnMiddleMove.UseVisualStyleBackColor = true;
this.btnMiddleMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseDown); this.btnMiddleMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseDown);
this.btnMiddleMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseUp); this.btnMiddleMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMove_MouseUp);
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
this.btnInOutMove.Name = "btnInOutMove"; this.btnInOutMove.Name = "btnInOutMove";
this.btnInOutMove.Size = new System.Drawing.Size(131, 36); this.btnInOutMove.Size = new System.Drawing.Size(131, 36);
this.btnInOutMove.TabIndex = 10; this.btnInOutMove.TabIndex = 10;
this.btnInOutMove.Text = "进出轴+(前进)"; this.btnInOutMove.Text = "进出轴+(后退)";
this.btnInOutMove.UseVisualStyleBackColor = true; this.btnInOutMove.UseVisualStyleBackColor = true;
this.btnInOutMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnInOutMove_MouseDown); this.btnInOutMove.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnInOutMove_MouseDown);
this.btnInOutMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnInOutMove_MouseUp); this.btnInOutMove.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnInOutMove_MouseUp);
...@@ -138,7 +138,7 @@ ...@@ -138,7 +138,7 @@
this.btnInOutMovej.Name = "btnInOutMovej"; this.btnInOutMovej.Name = "btnInOutMovej";
this.btnInOutMovej.Size = new System.Drawing.Size(131, 36); this.btnInOutMovej.Size = new System.Drawing.Size(131, 36);
this.btnInOutMovej.TabIndex = 14; this.btnInOutMovej.TabIndex = 14;
this.btnInOutMovej.Text = "进出轴-(后退)"; this.btnInOutMovej.Text = "进出轴-(前进)";
this.btnInOutMovej.UseVisualStyleBackColor = true; this.btnInOutMovej.UseVisualStyleBackColor = true;
this.btnInOutMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnInOutMovej_MouseDown); this.btnInOutMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnInOutMovej_MouseDown);
this.btnInOutMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnInOutMovej_MouseUp); this.btnInOutMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnInOutMovej_MouseUp);
...@@ -160,7 +160,7 @@ ...@@ -160,7 +160,7 @@
this.btnMiddleMovej.Name = "btnMiddleMovej"; this.btnMiddleMovej.Name = "btnMiddleMovej";
this.btnMiddleMovej.Size = new System.Drawing.Size(131, 36); this.btnMiddleMovej.Size = new System.Drawing.Size(131, 36);
this.btnMiddleMovej.TabIndex = 12; this.btnMiddleMovej.TabIndex = 12;
this.btnMiddleMovej.Text = "旋转轴-(逆时针)"; this.btnMiddleMovej.Text = "旋转轴-(顺时针)";
this.btnMiddleMovej.UseVisualStyleBackColor = true; this.btnMiddleMovej.UseVisualStyleBackColor = true;
this.btnMiddleMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMovej_MouseDown); this.btnMiddleMovej.MouseDown += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMovej_MouseDown);
this.btnMiddleMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMovej_MouseUp); this.btnMiddleMovej.MouseUp += new System.Windows.Forms.MouseEventHandler(this.btnMiddleMovej_MouseUp);
......
source/ACSingleStore/记录.txt
...@@ -4,3 +4,6 @@ ...@@ -4,3 +4,6 @@
已修改：定位气缸有两组 已修改：定位气缸有两组
二维码学习功能增加 二维码学习功能增加
左右侧门增加开关 左右侧门增加开关
旋转轴原点返回正方向，其他的原点返回负方向
source/DeviceLibrary/PanasonicServo/ACServerManager.cs
...@@ -297,7 +297,22 @@ namespace OnlineStore.DeviceLibrary ...@@ -297,7 +297,22 @@ namespace OnlineStore.DeviceLibrary
//默认负方向原点返回 //默认负方向原点返回
//byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, ACCMDManager.Block_HomeMove1, 2); //byte[] data = ACCMDManager.GetWriteData(slvAddr, ACCMDManager.CMD_WriteRegisters, ACCMDManager.BlockNo, ACCMDManager.Block_HomeMove1, 2);
//SendData(portName, data); //SendData(portName, data);
//旋转轴回正方向，其他轴回负方向
if (portName.Equals(ACStoreManager.store.Config.Middle_Axis.DeviceName))
{
UpdateBlock(portName, slvAddr, ACCMDManager.Block_HomeMove0);
LogUtil.info("旋转轴原点返回方向：正方向");
}
else if (portName.Equals(ACStoreManager.store.Config.InOut_Axis.DeviceName))
{
UpdateBlock(portName, slvAddr, ACCMDManager.Block_HomeMove0);
LogUtil.info("进出轴原点返回方向：正方向");
}
else
{
UpdateBlock(portName, slvAddr, ACCMDManager.Block_HomeMove1); UpdateBlock(portName, slvAddr, ACCMDManager.Block_HomeMove1);
LogUtil.info("升降轴原点返回方向：反方向");
}
Thread.Sleep(SleepMSendons); Thread.Sleep(SleepMSendons);
OpenAndCloseSTB(portName, slvAddr); OpenAndCloseSTB(portName, slvAddr);
} }
......
source/DeviceLibrary/acSingleStore/AC_SA_BoxBean.cs
...@@ -6,6 +6,7 @@ using System.Collections.Generic; ...@@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
namespace OnlineStore.DeviceLibrary namespace OnlineStore.DeviceLibrary
{ {
...@@ -281,9 +282,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -281,9 +282,9 @@ namespace OnlineStore.DeviceLibrary
storeRunStatus = StoreRunStatus.HomeMoving; storeRunStatus = StoreRunStatus.HomeMoving;
//启动温湿度服务器 //启动温湿度服务器
HumitureServer.StartTemperateServer(Config.TemperateServer_Port); HumitureServer.StartTemperateServer(Config.TemperateServer_Port);
//Task.Factory.StartNew( delegate () {
HDevelopExport.OpenAllCamera(); // HDevelopExport.OpenAllCamera();
//scanSocket.ConnectScanner(Config.Scanner_Ip, Config.Scanner_Port); //});
ReturnHome(); ReturnHome();
StartTime = DateTime.Now; StartTime = DateTime.Now;
timersTimer.Enabled = true; timersTimer.Enabled = true;
...@@ -365,7 +366,9 @@ namespace OnlineStore.DeviceLibrary ...@@ -365,7 +366,9 @@ namespace OnlineStore.DeviceLibrary
autoNext = false; autoNext = false;
} }
HDevelopExport.OpenAllCamera(); //Task.Factory.StartNew( delegate () {
// HDevelopExport.OpenAllCamera();
//});
ACServerManager.SuddenStop(Config.Middle_Axis.DeviceName, Config.Middle_Axis.GetAxisValue()); ACServerManager.SuddenStop(Config.Middle_Axis.DeviceName, Config.Middle_Axis.GetAxisValue());
ACServerManager.SuddenStop(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue()); ACServerManager.SuddenStop(Config.UpDown_Axis.DeviceName, Config.UpDown_Axis.GetAxisValue());
ACServerManager.SuddenStop(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue()); ACServerManager.SuddenStop(Config.InOut_Axis.DeviceName, Config.InOut_Axis.GetAxisValue());
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!