细节调整

SKMC.API/Machine/Config/MachineConfigStore.cs

@@ -1,6 +1,7 @@
 using SKMC.Api.Common.Exceptions;
 using System;
 using System.Collections.Generic;
+using System.Collections.ObjectModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -9,6 +10,22 @@ namespace SKMC.Api.Machine.Config
 {
     public abstract class MachineConfigStore
     {
+        /// <summary>
+        /// 查询机台参数集合
+        /// </summary>
+        /// <returns></returns>
+        public abstract ObservableCollection<MachineParamConfig> QueryParams();
 
+        /// <summary>
+        /// 查询机台分类集合
+        /// </summary>
+        /// <returns></returns>
+        public abstract ObservableCollection<MachineCatalogConfig> QueryCatalogs();
+
+        /// <summary>
+        /// 保存机台参数
+        /// </summary>
+        /// <param name="machineParamModel"></param>
+        public abstract void SaveMachineParam(MachineParamConfig machineParamModel);
     }
 }

SKMC.API/Machine/MachineCacher.cs

@@ -1,5 +1,6 @@
 using SKMC.Api.Common.Exceptions;
 using SKMC.Api.Machine.Config;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 
 namespace SKMC.Api.Machine
@@ -9,12 +10,21 @@ namespace SKMC.Api.Machine
     /// </summary>
     public abstract class MachineCacher
     {
-        // Catalog数据
+        /// <summary>
+        /// Catalog数据
+        /// </summary>
         public ObservableCollection<MachineCatalogConfig> MachineCatalogs { get; set; }
 
-        // Param数据
+        /// <summary>
+        /// Param数据
+        /// </summary>
         public ObservableCollection<MachineParamConfig> MachineParams { get; set; }
 
+        /// <summary>
+        /// 异常配置集
+        /// </summary>
+        public List<ExceptionConfig> MachineExceptions { get; set; }
+
         /// <summary>
         /// 获取设备参数
         /// </summary>

SKMC.API/Motion/Control/IMotionControl.cs

@@ -136,11 +136,11 @@ namespace SKMC.Api.Motion.Control
         /// <para>3.剩下返回true</para>
         /// </summary>
         /// <param name="pointCode">点位码</param>
-        /// <param name="axisIndex">绑定点位的电机序号, 0开头, 默认-1表示该点位的所有电机</param>
+        /// <param name="index">绑定点位的电机序号, 0开头, 默认-1表示该点位的所有电机</param>
         /// <param name="negativeOffset">大于该点位的负方向距离</param>
         /// <param name="positiveOffset">小于该点位的正方向距离</param>
         /// <returns>是否满足位置条件</returns>
-        bool CheckNear(string pointCode, short axisIndex = -1, double negativeOffset = 0.1, double positiveOffset = 0.1);
+        bool CheckNear(string pointCode, short index = -1, double negativeOffset = 0.1, double positiveOffset = 0.1);
 
         /// <summary>
         /// 通过点位码驱动对应的Axis运动, speedRadio表示每秒旋转圈数
@@ -208,13 +208,13 @@ namespace SKMC.Api.Motion.Control
         /// 让绑定点位码的指定单个电机以指定速度运动到点位码
         /// </summary>
         /// <param name="pointCode">点位码</param>
-        /// <param name="index">该点位绑定的轴序号, 例如绑定了x1,y1，需要x1移动时传0，需要y1移动时传1</param>
+        /// <param name="axisCode">指定电机的电机码</param>
         /// <param name="speedCode">速度码, null表示使用该点配置的默认速度码</param>
         /// <param name="waiting">是否等待到位, 默认为true</param>
         /// <param name="inRange">整定范围, 单位毫米或者步距</param>
         /// <param name="onSuccess">运动完成后的回调动作</param>
         /// <param name="onTimeout">超时未完成的回调动作</param>
-        void MovePointOne(string pointCode, short index = 0, string speedCode = null,
+        void MovePointOne(string pointCode, string axisCode, string speedCode = null,
             bool waiting = true, double inRange = -1,
             Action onSuccess = null, Action onTimeout = null);
 
@@ -222,13 +222,13 @@ namespace SKMC.Api.Motion.Control
         /// 让绑定点位码的指定单个电机以指定速度运动到点位码
         /// </summary>
         /// <param name="recipePoint">点位对象</param>
-        /// <param name="index">该点位绑定的轴序号, 例如绑定了x1,y1，需要x1移动时传0，需要y1移动时传1</param>
+        /// <param name="axisCode">指定电机的电机码</param>
         /// <param name="recipeSpeed">速度对象, null表示使用该点配置的默认速度</param>
         /// <param name="waiting">是否等待到位, 默认为true</param>
         /// <param name="inRange">整定范围, 单位毫米或者步距</param>
         /// <param name="onSuccess">运动完成后的回调动作</param>
         /// <param name="onTimeout">超时未完成的回调动作</param>
-        void MovePointOne(RecipePoint recipePoint, short index = 0, RecipeSpeed recipeSpeed = null,
+        void MovePointOne(RecipePoint recipePoint, string axisCode, RecipeSpeed recipeSpeed = null,
             bool waiting = true, double inRange = -1,
             Action onSuccess = null, Action onTimeout = null);
 
@@ -237,13 +237,13 @@ namespace SKMC.Api.Motion.Control
         /// </summary>
         /// <param name="pointCode">点位码</param>
         /// <param name="fixset">基于点位的偏移量(mm)</param>
-        /// <param name="index">该点位绑定的轴序号, 例如绑定了x1,y1，需要x1移动时传0，需要y1移动时传1</param>
+        /// <param name="axisCode">指定电机的电机码</param>
         /// <param name="speedCode">速度码, null表示使用该点配置的默认速度码</param>
         /// <param name="waiting">是否等待到位, 默认为true</param>
         /// <param name="inRange">整定范围, 单位毫米或者步距</param>
         /// <param name="onSuccess">运动完成后的回调动作</param>
         /// <param name="onTimeout">超时未完成的回调动作</param>
-        void MovePointOneFix(string pointCode, double fixset, short index = 0, string speedCode = null,
+        void MovePointOneFix(string pointCode, double fixset, string axisCode, string speedCode = null,
             bool waiting = true, double inRange = -1,
             Action onSuccess = null, Action onTimeout = null);
 
@@ -252,13 +252,13 @@ namespace SKMC.Api.Motion.Control
         /// </summary>
         /// <param name="recipePoint">点位对象</param>
         /// <param name="fixset">基于点位的偏移量(mm)</param>
-        /// <param name="index">该点位绑定的轴序号, 例如绑定了x1,y1，需要x1移动时传0，需要y1移动时传1</param>
+        /// <param name="axisCode">指定电机的电机码</param>
         /// <param name="recipeSpeed">速度对象, null表示使用该点配置的默认速度</param>
         /// <param name="waiting">是否等待到位, 默认为true</param>
         /// <param name="inRange">整定范围, 单位毫米或者步距</param>
         /// <param name="onSuccess">运动完成后的回调动作</param>
         /// <param name="onTimeout">超时未完成的回调动作</param>
-        void MovePointOneFix(RecipePoint recipePoint, double fixset, short index = 0, RecipeSpeed recipeSpeed = null,
+        void MovePointOneFix(RecipePoint recipePoint, double fixset, string axisCode, RecipeSpeed recipeSpeed = null,
             bool waiting = true, double inRange = -1,
             Action onSuccess = null, Action onTimeout = null);
 
@@ -332,8 +332,7 @@ namespace SKMC.Api.Motion.Control
         /// <param name="onSuccess">运动完成后的回调动作</param>
         /// <param name="onTimeout">超时未完成的回调动作</param>
         void WaitPoint(RecipePoint recipePoint, int timeout = 10000, double inRange = -1,
-            Func<bool> safeCnd = null, Action onSuccess = null, Action onTimeout = null,
-            Func<bool> checkCnd = null, Action onChecked = null);
+            Action onSuccess = null, Action onTimeout = null);
 
         /// <summary>
         /// 等待电机组所有电机到位

SKMC.API/SKMC.API.csproj

@@ -208,7 +208,9 @@
     <Compile Include="Common\Vision\IResultParser.cs" />
     <Compile Include="Common\Vision\VisionException.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="Device\Config\" />
+  </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="packages.config" />