Bladeren bron

1、增加Device数据库读取
2、修改PDO,SDO读取方法

法 王 1 week geleden
bovenliggende
commit
4583830fdd

+ 6 - 0
SKMC.API/Common/DB/SqlSugarTool.cs

@@ -33,6 +33,12 @@ namespace SKMC.Api.Common.DB
         /// <returns></returns>
         public static SqlSugarClient GetRuntimeDB() => GetDB("DB_RUNDATA");
 
+        /// <summary>
+        /// 从硬件库文件获取数据库实例
+        /// </summary>
+        /// <returns></returns>
+        public static SqlSugarClient GetDeviceDB() => GetDB("DB_DEVICE");
+
         private static SqlSugarClient GetDB(string dbName)
         {
             SqlSugarClient db = new SqlSugarClient(new ConnectionConfig()

+ 14 - 0
SKMC.API/Machine/Config/MachineDeviceErrorStore.cs

@@ -0,0 +1,14 @@
+using Prism.Mvvm;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SKMC.Api.Machine.Config
+{
+    public abstract class MachineDeviceErrorStore : BindableBase
+    {
+        public abstract string GetAxisErrorInfo(short axisNo);
+    }
+}

+ 2 - 2
SKMC.API/Motion/Driver/IMotionDriver.cs

@@ -352,7 +352,7 @@ namespace SKMC.Api.Motion.Driver
         /// </summary>
         /// <param name="motionSdo">Sdo对象</param>
         /// <returns>读取的SDO数据长度</returns>
-        int ReadSdoData(MotionSdo motionSdo);
+        short ReadSdoData(MotionSdo motionSdo);
 
         /// <summary>
         /// 初始化Pdo配置
@@ -372,7 +372,7 @@ namespace SKMC.Api.Motion.Driver
         /// </summary>
         /// <param name="motionPdo">Pdo对象</param>
         /// <returns>读取的PDO数据长度</returns>
-        int ReadPdoData(MotionPdo motionPdo);
+        short ReadPdoData(MotionPdo motionPdo);
 
         /// <summary>
         /// 写入自定义数据码

+ 1 - 1
SKMC.API/Motion/Model/MotionSdo.cs

@@ -39,6 +39,6 @@ namespace SKMC.Api.Motion.Model
         /// <summary>
         /// 数值(10进制)
         /// </summary>
-        public int DataVal { get; set; }
+        public long DataVal { get; set; }
     }
 }

+ 1 - 0
SKMC.API/SKMC.API.csproj

@@ -131,6 +131,7 @@
     <Compile Include="Common\Tasks\Tasks.cs" />
     <Compile Include="Common\Tcp\TCPClient.cs" />
     <Compile Include="Common\Tcp\TcpClientBase.cs" />
+    <Compile Include="Machine\Config\MachineDeviceErrorStore.cs" />
     <Compile Include="Machine\Monitor\MachineLatchTask.cs" />
     <Compile Include="Machine\Monitor\MachineStateLatchMonitor.cs" />
     <Compile Include="Vision\SKV0\SKVisionClient.cs" />