Skip to content

孙克 / ACSingleStore

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

wait方法修改。光栅代码增加。部分代码调整。

1 个父辈 a1225610
全部展开
内嵌 并排
正在显示 14 个修改的文件 包含 164 行增加 和 49 行删除
source/ACSingleStore/FrmIOStatus.cs
...@@ -86,13 +86,10 @@ namespace OnlineStore.ACSingleStore ...@@ -86,13 +86,10 @@ namespace OnlineStore.ACSingleStore
cmbWriteIO.ValueMember = "ProName"; cmbWriteIO.ValueMember = "ProName";
cmbWriteIO.DisplayMember = "DisplayStr"; cmbWriteIO.DisplayMember = "DisplayStr";
cmbWriteValue.SelectedIndex = 0; cmbWriteValue.SelectedIndex = 0;
} }
private void timer1_Tick(object sender, EventArgs e) private void timer1_Tick(object sender, EventArgs e)
{ {
ReadIOList(); ReadIOList();
} }
...@@ -269,7 +266,6 @@ namespace OnlineStore.ACSingleStore ...@@ -269,7 +266,6 @@ namespace OnlineStore.ACSingleStore
private void btnCloseAxisBreak_Click(object sender, EventArgs e) private void btnCloseAxisBreak_Click(object sender, EventArgs e)
{ {
boxBean.KNDIOMove(IO_Type.Axis_Brake, IO_VALUE.LOW); boxBean.KNDIOMove(IO_Type.Axis_Brake, IO_VALUE.LOW);
} }
...@@ -280,13 +276,11 @@ namespace OnlineStore.ACSingleStore ...@@ -280,13 +276,11 @@ namespace OnlineStore.ACSingleStore
private void btnOpenLed_Click(object sender, EventArgs e) private void btnOpenLed_Click(object sender, EventArgs e)
{ {
boxBean.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH); boxBean.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.HIGH);
} }
private void btnCloseLed_Click(object sender, EventArgs e) private void btnCloseLed_Click(object sender, EventArgs e)
{ {
boxBean.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW); boxBean.KNDIOMove(IO_Type.CameraLight_Power, IO_VALUE.LOW);
} }
} }
......
source/ACSingleStore/FrmStoreBox.cs
...@@ -1301,5 +1301,9 @@ namespace OnlineStore.ACSingleStore ...@@ -1301,5 +1301,9 @@ namespace OnlineStore.ACSingleStore
// Bt_ClearCounter.Enabled = isOpen; // Bt_ClearCounter.Enabled = isOpen;
} }
private void groupBox2_Enter(object sender, EventArgs e)
{
}
} }
} }
source/DeviceLibrary/StoreConfig/AC/StoreConfig.csv
...@@ -34,7 +34,6 @@ DO,相机照明开,CameraLight_Power,110,192.168.200.10,0,相机照明开,Y11,DO-11,0, ...@@ -34,7 +34,6 @@ 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,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.11,,,,,,,
,温湿度传感器地址,Temperate_ServerAddress,192.168.200.14,,,,,,, ,温湿度传感器地址,Temperate_ServerAddress,192.168.200.14,,,,,,,
,扫码枪IP,Scanner_Ip,192.168.200.13,,,,,,, ,扫码枪IP,Scanner_Ip,192.168.200.13,,,,,,,
,扫码枪端口号,Scanner_Port,51236,,,,,,, ,扫码枪端口号,Scanner_Port,51236,,,,,,,
...@@ -117,3 +116,9 @@ PRO,硕科步进电机（压紧轴）控制加速度,CompressAxis_AddSpeed,15000,,,,,,, ...@@ -117,3 +116,9 @@ PRO,硕科步进电机（压紧轴）控制加速度,CompressAxis_AddSpeed,15000,,,,,,,
PRO,硕科步进电机（压紧轴）控制减速度,CompressAxis_DelSpeed,15000,,,,,,, PRO,硕科步进电机（压紧轴）控制减速度,CompressAxis_DelSpeed,15000,,,,,,,
PRO,硕科步进电机（压紧轴）控制归零速度（原点返回速度）,CompressAxis_HomeSpeed,15000,,,,,,, PRO,硕科步进电机（压紧轴）控制归零速度（原点返回速度）,CompressAxis_HomeSpeed,15000,,,,,,,
PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,, PRO,硕科步进电机轴地址（压紧轴),CompressAxis_Slv,1,,,,,,,
,,,,,,,,, ,
PRO,模拟量IO模块的IP地址,AIDevice_IP,192.168.200.11,,,,,,,
PRO,模拟信号1默认高度,AIDI1_DefaultPosition,1,,,,,,,
PRO,模拟信号2默认高度,AIDI2_DefaultPosition,1,,,,,,,
PRO,模拟信号3默认高度,AIDI3_DefaultPosition,1,,,,,,,
,,,,,,,,, ,
source/DeviceLibrary/store/KTK_DeviceBase.cs
...@@ -43,7 +43,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -43,7 +43,7 @@ namespace OnlineStore.DeviceLibrary
/// <summary> /// <summary>
/// 定时器 /// 定时器
/// </summary> /// </summary>
protected System.Timers.Timer timersTimer; protected System.Timers.Timer mainTimer;
private bool isInit = false; private bool isInit = false;
/// <summary> /// <summary>
...@@ -55,11 +55,11 @@ namespace OnlineStore.DeviceLibrary ...@@ -55,11 +55,11 @@ namespace OnlineStore.DeviceLibrary
{ {
StoreMove = new StoreMoveInfo(StoreID); StoreMove = new StoreMoveInfo(StoreID);
timersTimer = new System.Timers.Timer(); mainTimer = new System.Timers.Timer();
timersTimer.Enabled = false; mainTimer.Enabled = false;
timersTimer.Interval = 300; mainTimer.Interval = 300;
timersTimer.Elapsed += timersTimer_Elapsed; mainTimer.Elapsed += timersTimer_Elapsed;
timersTimer.AutoReset = true; mainTimer.AutoReset = true;
isInit = true; isInit = true;
} }
} }
......
source/DeviceLibrary/store/KTK_Store.cs
...@@ -292,6 +292,7 @@ namespace OnlineStore.DeviceLibrary ...@@ -292,6 +292,7 @@ namespace OnlineStore.DeviceLibrary
//LogUtil.error(LOGGER, StoreName + " storeMoveStep=" + StoreMove.MoveStep + moveAxis.DisplayStr + "目标位置[" + targetPosition + "]重新开始运动"); //LogUtil.error(LOGGER, StoreName + " storeMoveStep=" + StoreMove.MoveStep + moveAxis.DisplayStr + "目标位置[" + targetPosition + "]重新开始运动");
ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed); ACServerManager.AbsMove(moveAxis.DeviceName, moveAxis.GetAxisValue(), targetPosition, targetSpeed);
StoreMove.CanWhileCount--; StoreMove.CanWhileCount--;
return false;
} }
else else
{ {
......
source/DeviceLibrary/store/model/StoreMoveInfo.cs
...@@ -14,6 +14,10 @@ namespace OnlineStore.DeviceLibrary ...@@ -14,6 +14,10 @@ namespace OnlineStore.DeviceLibrary
/// </summary> /// </summary>
public class StoreMoveInfo public class StoreMoveInfo
{ {
/// <summary>
/// 超时时间
/// </summary>
public int TimeOutSeconds = 300;
public StoreMoveInfo(int storeId) public StoreMoveInfo(int storeId)
{ {
moveType = StoreMoveType.None; moveType = StoreMoveType.None;
...@@ -333,13 +337,13 @@ namespace OnlineStore.DeviceLibrary ...@@ -333,13 +337,13 @@ namespace OnlineStore.DeviceLibrary
/// 重置 /// 重置
/// </summary> /// </summary>
StoreReset = 4, StoreReset = 4,
/// <summary> ///// <summary>
/// 移栽装置的停止，需要先远点返回，然后停止 ///// 移栽装置的停止，需要先远点返回，然后停止
/// </summary> ///// </summary>
StopMove=5, //StopMove=5,
/// <summary> ///// <summary>
/// 移栽检测托盘 ///// 移栽检测托盘
/// </summary> ///// </summary>
CheckFixture=6, //CheckFixture=6,
} }
} }
source/LoadCVSLibrary/LoadCSVLibrary.csproj
...@@ -61,6 +61,12 @@ ...@@ -61,6 +61,12 @@
<Compile Include="storeConfig\config\StoreConfig.cs" /> <Compile Include="storeConfig\config\StoreConfig.cs" />
<Compile Include="position\StorePostionBase.cs" /> <Compile Include="position\StorePostionBase.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.csproj">
<Project>{43cdd09e-fcf3-4960-a01d-3bbfe9933122}</Project>
<Name>Common</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
......
source/LoadCVSLibrary/position/ACSAStorePosition.cs
using System; using OnlineStore.Common;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Text; using System.Text;
...@@ -65,6 +66,69 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -65,6 +66,69 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[CSVAttribute("进出轴进料口取料点P2")] [CSVAttribute("进出轴进料口取料点P2")]
public int InOutAxis_DoorPosition_P2 { get; set; } public int InOutAxis_DoorPosition_P2 { get; set; }
public static bool CheckPosition(ACStorePosition position, AC_SA_Config Config)
{
try
{
if (Config.Middle_Axis.PositionIsHasLimit())
{
int mMin = Config.Middle_Axis.PositionMin;
int mMax = Config.Middle_Axis.PositionMax;
if (mMin > position.MiddleAxis_Position_P2 || mMax < position.MiddleAxis_Position_P2)
{
LogUtil.error(position.PositionNum + " MiddleAxis_Position_P2位置超出" + Config.Middle_Axis.Explain + "上下限（" + mMin + "-" + mMax + "）");
return false;
}
}
if (Config.InOut_Axis.PositionIsHasLimit())
{
int iMin = Config.InOut_Axis.PositionMin;
int iMax = Config.InOut_Axis.PositionMax;
if (iMin > position.InOutAxis_DoorPosition_P2 || iMax < position.InOutAxis_DoorPosition_P2)
{
LogUtil.error(position.PositionNum + " InOutAxis_DoorPosition_P2位置超出" + Config.InOut_Axis.Explain + "上下限（" + iMin + "-" + iMax + "）");
return false;
}
if (iMin > position.InOutAxis_Position_P3 || iMax < position.InOutAxis_Position_P3)
{
LogUtil.error(position.PositionNum + " InOutAxis_Position_P3位置超出" + Config.InOut_Axis.Explain + "上下限（" + iMin + "-" + iMax + "）");
return false;
}
}
if (Config.UpDown_Axis.PositionIsHasLimit())
{
int uMin = Config.UpDown_Axis.PositionMin;
int uMax = Config.UpDown_Axis.PositionMax;
if (uMin > position.UpDownAxis_IHPosition_P3 || uMax < position.UpDownAxis_IHPosition_P3)
{
LogUtil.error(position.PositionNum + " UpDownAxis_IHPosition_P3位置超出" + Config.UpDown_Axis.Explain + "上下限（" + uMin + "-" + uMax + "）");
return false;
}
if (uMin > position.UpDownAxis_ILPosition_P4 || uMax < position.UpDownAxis_ILPosition_P4)
{
LogUtil.error(position.PositionNum + " UpDownAxis_ILPosition_P4位置超出" + Config.UpDown_Axis.Explain + "上下限（" + uMin + "-" + uMax + "）");
return false;
}
if (uMin > position.UpDownAxis_OHPosition_P5 || uMax < position.UpDownAxis_OHPosition_P5)
{
LogUtil.error(position.PositionNum + " UpDownAxis_OHPosition_P5位置超出" + Config.UpDown_Axis.Explain + "上下限（" + uMin + "-" + uMax + "）");
return false;
}
if (uMin > position.UpDownAxis_OLPosition_P6 || uMax < position.UpDownAxis_OLPosition_P6)
{
LogUtil.error(position.PositionNum + " UpDownAxis_OLPosition_P6位置超出" + Config.UpDown_Axis.Explain + "上下限（" + uMin + "-" + uMax + "）");
return false;
}
}
}
catch (Exception ex)
{
LogUtil.error("验证" + position.PositionNum + "的位置范围出错：" + ex.ToString());
}
return true;
}
///// <summary> ///// <summary>
///// 升降轴进料口出料前点P2 ///// 升降轴进料口出料前点P2
///// </summary> ///// </summary>
......
source/LoadCVSLibrary/storeConfig/config/AC_SA_Config.cs
...@@ -140,6 +140,8 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -140,6 +140,8 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary> /// </summary>
[ConfigProAttribute("UpdownAxis_HomeLowSpeed")] [ConfigProAttribute("UpdownAxis_HomeLowSpeed")]
public short UpdownAxis_HomeLowSpeed { get; set; } public short UpdownAxis_HomeLowSpeed { get; set; }
/// <summary> /// <summary>
/// PRO （轴二）升降轴轴原点高速 UpdownAxis_HomeHighSpeed 100 /// PRO （轴二）升降轴轴原点高速 UpdownAxis_HomeHighSpeed 100
/// </summary> /// </summary>
...@@ -489,6 +491,22 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -489,6 +491,22 @@ namespace OnlineStore.LoadCSVLibrary
[ConfigProAttribute("AIDevice_IP", true)] [ConfigProAttribute("AIDevice_IP", true)]
public string AIDevice_IP { get; set; } public string AIDevice_IP { get; set; }
/// <summary>
/// PRO,模拟信号1默认高度,AIDI1_DefaultPosition,1,,,,,,,
/// </summary>
[ConfigProAttribute("AIDI1_DefaultPosition", true)]
public string AIDI1_DefaultPosition { get; set; }
/// <summary>
/// PRO,模拟信号2默认高度,AIDI2_DefaultPosition,1,,,,,,,
/// </summary>
[ConfigProAttribute("AIDI2_DefaultPosition", true)]
public string AIDI2_DefaultPosition { get; set; }
/// <summary>
/// PRO,模拟信号3默认高度,AIDI3_DefaultPosition,1,,,,,,,
/// </summary>
[ConfigProAttribute("AIDI3_DefaultPosition", true)]
public string AIDI3_DefaultPosition { get; set; }
//private List<string> TempAddrList = null; //private List<string> TempAddrList = null;
//public static char TempAddrSpilt = '#'; //public static char TempAddrSpilt = '#';
///// <summary> ///// <summary>
...@@ -553,5 +571,51 @@ namespace OnlineStore.LoadCSVLibrary ...@@ -553,5 +571,51 @@ namespace OnlineStore.LoadCSVLibrary
MustHaveDOList.Add(IO_Type.Axis_Brake); MustHaveDOList.Add(IO_Type.Axis_Brake);
MustHaveDOList.Add(IO_Type.CameraLight_Power); MustHaveDOList.Add(IO_Type.CameraLight_Power);
} }
public static void ConfigAxis(AC_SA_Config Config)
{
Config.Middle_Axis.TargetSpeed = Config.MiddleAxis_TargetSpeed;
Config.Middle_Axis.AddSpeed = Config.MiddleAxis_AddSpeed;
Config.Middle_Axis.DelSpeed = Config.MiddleAxis_DelSpeed;
Config.Middle_Axis.HomeAddSpeed = Config.MiddleAxis_HomeAddSpeed;
Config.Middle_Axis.HomeHighSpeed = Config.MiddleAxis_HomeHighSpeed;
Config.Middle_Axis.HomeLowSpeed = Config.MiddleAxis_HomeLowSpeed;
Config.InOut_Axis.TargetSpeed = Config.InoutAxis_TargetSpeed;
Config.InOut_Axis.DelSpeed = Config.InoutAxis_AddSpeed;
Config.InOut_Axis.AddSpeed = Config.InoutAxis_DelSpeed;
Config.InOut_Axis.HomeAddSpeed = Config.InoutAxis_HomeAddSpeed;
Config.InOut_Axis.HomeHighSpeed = Config.InoutAxis_HomeHighSpeed;
Config.InOut_Axis.HomeLowSpeed = Config.InoutAxis_HomeLowSpeed;
Config.UpDown_Axis.TargetSpeed = Config.UpdownAxis_TargetSpeed;
Config.UpDown_Axis.AddSpeed = Config.UpdownAxis_AddSpeed;
Config.UpDown_Axis.DelSpeed = Config.UpdownAxis_DelSpeed;
Config.UpDown_Axis.HomeAddSpeed = Config.UpdownAxis_HomeAddSpeed;
Config.UpDown_Axis.HomeHighSpeed = Config.UpdownAxis_HomeHighSpeed;
Config.UpDown_Axis.HomeLowSpeed = Config.UpdownAxis_HomeLowSpeed;
Config.Middle_Axis.CanErrorCountMin = Config.MiddleAxis_ErrorCountMin;
Config.InOut_Axis.CanErrorCountMin = Config.InoutAxis_ErrorCountMin;
Config.UpDown_Axis.CanErrorCountMin = Config.UpdownAxis_ErrorCountMin;
Config.Middle_Axis.CanErrorCountMax = Config.MiddleAxis_ErrorCountMax;
Config.InOut_Axis.CanErrorCountMax = Config.InoutAxis_ErrorCountMax;
Config.UpDown_Axis.CanErrorCountMax = Config.UpdownAxis_ErrorCountMax;
Config.Middle_Axis.PositionMin = Config.MiddleAxis_PositionMin;
Config.Middle_Axis.PositionMax = Config.MiddleAxis_PositionMax;
Config.InOut_Axis.PositionMin = Config.InoutAxis_PositionMin;
Config.InOut_Axis.PositionMax = Config.InoutAxis_PositionMax;
Config.UpDown_Axis.PositionMin = Config.UpdownAxis_PositionMin;
Config.UpDown_Axis.PositionMax = Config.UpdownAxis_PositionMax;
//Config.InOut_Axis.ResolveSpeed = Config.InoutAxis_ResolveSpeed;
//Config.UpDown_Axis.ResolveSpeed = Config.UpdownAxis_ResolveSpeed;
//Config.Middle_Axis.ResolveSpeed = Config.MiddleAxis_ResolveSpeed;
Config.Middle_Axis.DefaultPosition = Config.MiddleAxis_P1_Position;
Config.InOut_Axis.DefaultPosition = Config.InOutAxis_P1_Position;
Config.UpDown_Axis.DefaultPosition = Config.UpDownAxis_DoorOPosition_P1;
}
} }
} }
source/UserFromControl/UserFromControl.csproj
...@@ -44,12 +44,6 @@ ...@@ -44,12 +44,6 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="AxisShowControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="AxisShowControl.Designer.cs">
<DependentUpon>AxisShowControl.cs</DependentUpon>
</Compile>
<Compile Include="ImageManager.cs" /> <Compile Include="ImageManager.cs" />
<Compile Include="IOStatusControl.cs"> <Compile Include="IOStatusControl.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
...@@ -57,24 +51,12 @@ ...@@ -57,24 +51,12 @@
<Compile Include="IOStatusControl.Designer.cs"> <Compile Include="IOStatusControl.Designer.cs">
<DependentUpon>IOStatusControl.cs</DependentUpon> <DependentUpon>IOStatusControl.cs</DependentUpon>
</Compile> </Compile>
<Compile Include="ModbusStatusControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="ModbusStatusControl.Designer.cs">
<DependentUpon>ModbusStatusControl.cs</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\Resources.Designer.cs"> <Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DesignTime>True</DesignTime> <DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<Compile Include="AxisShowSControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="AxisShowSControl.Designer.cs">
<DependentUpon>AxisShowSControl.cs</DependentUpon>
</Compile>
<Compile Include="IOTextControl.cs"> <Compile Include="IOTextControl.cs">
<SubType>UserControl</SubType> <SubType>UserControl</SubType>
</Compile> </Compile>
...@@ -84,22 +66,13 @@ ...@@ -84,22 +66,13 @@
<Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" /> <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="AxisShowControl.resx">
<DependentUpon>AxisShowControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="IOStatusControl.resx"> <EmbeddedResource Include="IOStatusControl.resx">
<DependentUpon>IOStatusControl.cs</DependentUpon> <DependentUpon>IOStatusControl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="ModbusStatusControl.resx">
<DependentUpon>ModbusStatusControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx"> <EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator> <Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput> <LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource> </EmbeddedResource>
<EmbeddedResource Include="AxisShowSControl.resx">
<DependentUpon>AxisShowSControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="IOTextControl.resx"> <EmbeddedResource Include="IOTextControl.resx">
<DependentUpon>IOTextControl.cs</DependentUpon> <DependentUpon>IOTextControl.cs</DependentUpon>
</EmbeddedResource> </EmbeddedResource>
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!