Skip to content

刘韬 / 1069_MIMO_PlUS

转到一个项目
切换导航栏
切换导航栏固定状态
Commit 5f3b917f 由 刘韬
选项

1

2 个父辈 cda6d9ad c9ccd6ff
全部展开
内嵌 并排
正在显示 16 个修改的文件 包含 181 行增加 和 21 行删除
Common/Common.csproj
......@@ -36,9 +36,8 @@
<Reference Include="ConfigHelper">
<HintPath>..\..\ConfigHelper\ConfigHelper\bin\Debug\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
<Reference Include="log4net">
<HintPath>..\DLL\log4net.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.13.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
......
DLL/Asa.PrintLabel.dll 0 → 100644
此文件类型无法预览
DLL/MvCameraControl.Net.dll 0 → 100644
此文件类型无法预览
DLL/Neotel.Rmaxis.dll 0 → 100644
此文件类型无法预览
DLL/Neotel.Rmaxis.xml 0 → 100644
<?xml version="1.0"?>
<doc>
<assembly>
<name>Neotel.Rmaxis</name>
</assembly>
<members>
<member name="T:Neotel.Rmaxis">
<summary>
增广智能电动夹爪（RM-C控制器）
</summary>
</member>
<member name="M:Neotel.Rmaxis.#ctor(System.String)">
<summary>
增广智能电动夹爪（RM-C控制器）
</summary>
<param name="logName">日志名</param>
</member>
<member name="P:Neotel.Rmaxis.IsPortOpen">
<summary>
串口是否连接
</summary>
</member>
<member name="P:Neotel.Rmaxis.IsMoving">
<summary>
轴是否在运动
</summary>
</member>
<member name="P:Neotel.Rmaxis.IsReached">
<summary>
轴是否到达运动目标
</summary>
</member>
<member name="P:Neotel.Rmaxis.IsPushEmpty">
<summary>
轴是否推空（可以在Push完成后检测是否推压/夹持为空）
</summary>
</member>
<member name="P:Neotel.Rmaxis.ErrorCode">
<summary>
错误代码
</summary>
</member>
<member name="M:Neotel.Rmaxis.OpenPort(System.String,System.UInt16)">
<summary>
打开串口
</summary>
<param name="portName">串口名</param>
<param name="axisNo">轴号</param>
<returns></returns>
</member>
<member name="M:Neotel.Rmaxis.ClosePort">
<summary>
关闭串口
</summary>
</member>
<member name="M:Neotel.Rmaxis.ResetError">
<summary>
重置控制器错误
</summary>
</member>
<member name="M:Neotel.Rmaxis.StopAxis">
<summary>
停止轴运动
</summary>
</member>
<member name="M:Neotel.Rmaxis.GetVersion">
<summary>
控制器版本号
</summary>
<returns></returns>
</member>
<member name="M:Neotel.Rmaxis.GetTorque">
<summary>
获取当前设置的出力值
</summary>
<returns>出力，%</returns>
</member>
<member name="M:Neotel.Rmaxis.GetVelocity">
<summary>
获取当前电机速度
</summary>
<returns>速度，mm/s</returns>
</member>
<member name="M:Neotel.Rmaxis.GetPosition">
<summary>
获取当前位置
</summary>
<returns>位置，mm</returns>
</member>
<member name="M:Neotel.Rmaxis.GoHome">
<summary>
回原点
</summary>
</member>
<member name="M:Neotel.Rmaxis.Push(System.Single,System.Single,System.Single)">
<summary>
推压运动
</summary>
<param name="force">出力，%</param>
<param name="distance">距离，mm</param>
<param name="velocity">速度，mm/s</param>
</member>
<member name="M:Neotel.Rmaxis.MoveAbsolute(System.Single,System.Single,System.Single,System.Single,System.Single)">
<summary>
绝对运动
</summary>
<param name="position">位置，mm</param>
<param name="velocity">速度，mm/s</param>
<param name="acceleration">加速度，mm/s^2</param>
<param name="deacceleration">减速度，mm/s^2</param>
<param name="band">定位范围，mm</param>
</member>
<member name="M:Neotel.Rmaxis.MoveTo(System.Single)">
<summary>
直接运动到指定位置
</summary>
<param name="position">位置，mm</param>
</member>
<member name="M:Neotel.Rmaxis.MoveConfig(System.Single,System.Single,System.Single)">
<summary>
直接运动的参数
</summary>
<param name="velocity">速度，mm/s</param>
<param name="acceleration">加速度，mm/s^2</param>
<param name="deacceleration">减速度，mm/s^2</param>
</member>
<member name="M:Neotel.Rmaxis.GoHomeWait(System.Int32)">
<summary>
回原点，并等到到位
</summary>
<param name="timeout">超时时间，ms</param>
<returns></returns>
</member>
<member name="M:Neotel.Rmaxis.PushWait(System.Single,System.Single,System.Single,System.Int32)">
<summary>
推压运动，并等到到位
</summary>
<param name="force">出力，%</param>
<param name="distance">距离，mm</param>
<param name="velocity">速度，mm/s</param>
<param name="timeout">超时时间，ms</param>
<returns></returns>
</member>
<member name="M:Neotel.Rmaxis.MoveAbsoluteWait(System.Single,System.Single,System.Single,System.Single,System.Single,System.Int32)">
<summary>
绝对运动，并等到到位
</summary>
<param name="position">位置，mm</param>
<param name="velocity">速度，mm/s</param>
<param name="acceleration">加速度，mm/s^2</param>
<param name="deacceleration">减速度，mm/s^2</param>
<param name="band">定位范围，mm</param>
<param name="timeout">超时时间，ms</param>
<returns></returns>
</member>
<member name="M:Neotel.Rmaxis.MoveToWait(System.Single,System.Int32)">
<summary>
直接运动到指定位置，并等到到位
</summary>
<param name="position">位置，mm</param>
<param name="timeout">超时时间，ms</param>
<returns></returns>
</member>
</members>
</doc>
DLL/halcon.dll 0 → 100644
此文件太大，无法显示。
DLL/halcondotnet.dll 0 → 100644
此文件类型无法预览
DLL/log4net.dll 0 → 100644
此文件类型无法预览
DLL/log4net.xml 0 → 100644
此文件的差异太大，无法显示。
DeviceLibrary/DeviceLibrary.csproj
......@@ -45,14 +45,14 @@
<HintPath>..\DLL\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="halcondotnet">
<HintPath>..\..\RC1271-DUOStore\dll\halcondotnet.dll</HintPath>
<HintPath>..\DLL\halcondotnet.dll</HintPath>
</Reference>
<Reference Include="HuichuanLibrary, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\HuichuanLibrary.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
<HintPath>..\DLL\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......
DeviceLibrary/theMachine/MainMachine.cs
......@@ -151,11 +151,7 @@ namespace DeviceLibrary
RobotManage.Config.DIList.Remove(IO_Type.LeftDoorClose_Check);
RobotManage.Config.DIList.Remove(IO_Type.RightDoorClose_Check);
RobotManage.Config.DIList.Remove(IO_Type.BackDoorClose_Check);
try
{
RobotManage.Config.DIList.Remove(IO_Type.AGV_OnPosition);
}
catch { }
RobotManage.Config.DIList.Remove(IO_Type.AGV_OnPosition);
RobotManage.Config.DOList.Remove(IO_Type.DoorSafe_Disable);
}
......
LoadCVSLibrary/Config/Config.csv
......@@ -55,11 +55,11 @@ DI,0,急停,SuddenStop_BTN,0,HC,X00,,,,,,,,,,
DI,0,复位,Reset_BTN,1,HC,X01,,,,,,,,,,
DI,0,自动启动,AutoRun_Single,2,HC,X02,,,,,,,,,,
DI,0,气压检测,Airpressure_Check,3,HC,X03,,,,,,,,,,
DI,0,安全光栅,SafetyLightCurtains,4,HC,X04,,,,,,,,,,
DI,0,仓门口安全光栅,SafetyLightCurtains,4,HC,X04,,,,,,,,,,
DI,0,左侧防护门关闭,LeftDoorClose_Check,5,HC,X05,,,,,,,,,,
DI,0,右侧防护门关闭,RightDoorClose_Check,6,HC,X06,,,,,,,,,,
DI,0,后侧防护门关闭,BackDoorClose_Check,7,HC,X07,,,,,,,,,,
DI,0,AGV到位检测（预留）,AGV_OnPosition,8,HC,X08,,,,,,,,,,
DI,0,折叠门光栅,StringDoor_SafetyLightCurtains,8,HC,X08,,,,,,,,,,
DI,0,进料线体前端料串检测,StringFront_Check,9,HC,X09,,,,,,,,,,
DI,0,进料线体末端料串检测,StringBack_Check,10,HC,X10,,,,,,,,,,
DI,0,进料线体料串固定上升端,StringFix_Top,11,HC,X11,,,,,,,,,,
......
LoadCVSLibrary/LoadCSVLibrary.csproj
......@@ -37,9 +37,8 @@
</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
<Reference Include="log4net">
<HintPath>..\DLL\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......
LoadCVSLibrary/storeConfig/config/IO_Type.cs
......@@ -61,9 +61,9 @@ namespace OnlineStore.LoadCSVLibrary
/// </summary>
public static string BackDoorClose_Check = "BackDoorClose_Check";
/// <summary>
/// DI,0,AGV到位检测（预留）,AGV_OnPosition,8,HC,X08,,,,,,,,,,
/// DI,0,折叠门光栅,StringDoor_SafetyLightCurtains,8,HC,X08,,,,,,,,,,
/// </summary>
public static string AGV_OnPosition = "AGV_OnPosition";
public static string StringDoor_SafetyLightCurtains = "StringDoor_SafetyLightCurtains";
/// <summary>
/// DI,0,进料线体前端料串检测,StringFront_Check,9,HC,X09,,,,,,,,,,
/// </summary>
......
TheMachine/TheMachine.csproj
......@@ -49,10 +49,11 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\DLL\ConfigHelper.dll</HintPath>
</Reference>
<Reference Include="halcondotnet, Version=12.0.0.0, Culture=neutral, PublicKeyToken=4973bed59ddbf2b8" />
<Reference Include="log4net, Version=2.0.12.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\增广夹爪\Rmaxis\bin\Debug\log4net.dll</HintPath>
<Reference Include="halcondotnet">
<HintPath>..\DLL\halcondotnet.dll</HintPath>
</Reference>
<Reference Include="log4net">
<HintPath>..\DLL\log4net.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!