升级IoT架构

NewLifeX · Jul 12, 2023 · 07b3449 · 07b3449
1 parent 9b1973d
commit 07b3449
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/NewLife.Panasonic/Drivers/PanasonicDriver.cs b/NewLife.Panasonic/Drivers/PanasonicDriver.cs
@@ -1,7 +1,5 @@
 using System.ComponentModel;
 using NewLife.IoT.Protocols;
-using NewLife.Panasonic.Drivers;
-using NewLife.Serialization;
 
 namespace NewLife.IoT.Drivers;
 
@@ -18,12 +16,12 @@ public class PanasonicDriver : ModbusDriver, IDriver
     /// </summary>
     /// <param name="device">逻辑设备</param>
     /// <param name="node">设备节点</param>
-    /// <param name="parameters">参数</param>
+    /// <param name="parameter">参数</param>
     /// <returns></returns>
-    protected override Modbus CreateModbus(IDevice device, ModbusNode node, IDictionary<String, Object> parameters)
+    protected override Modbus CreateModbus(IDevice device, ModbusNode node, ModbusParameter parameter)
     {
-        var p = JsonHelper.Convert<ModbusTcpParameter>(parameters);
-        if (p.Server.IsNullOrEmpty()) throw new ArgumentException("参数中未指定地址Server");
+        var p = parameter as ModbusTcpParameter;
+        if (p == null || p.Server.IsNullOrEmpty()) throw new ArgumentException("参数中未指定地址Server");
 
         node.Parameter = p;
 

diff --git a/NewLife.Panasonic/NewLife.Panasonic.csproj b/NewLife.Panasonic/NewLife.Panasonic.csproj
@@ -44,9 +44,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="10.3.2023.503" />
-    <PackageReference Include="NewLife.IoT" Version="1.8.2023.511" />
-    <PackageReference Include="NewLife.Modbus" Version="1.6.2023.511" />
+    <PackageReference Include="NewLife.Core" Version="10.4.2023.707" />
+    <PackageReference Include="NewLife.IoT" Version="1.8.2023.711" />
+    <PackageReference Include="NewLife.Modbus" Version="1.6.2023.711-beta1735" />
   </ItemGroup>
 
   <ItemGroup>