NewLife/SmartA2

使用新的继电器控制板接口
智能大石头 authored at 2025-05-28 12:45:59
26ee8a3
Tree
1 Parent(s) 566e0f5
Summary: 15 changed files with 44 additions and 43 deletions.
Modified +2 -2
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +27 -27
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +1 -1
Modified +2 -2
Modified +1 -1
Modified +2 -1
Modified +2 -2
diff --git a/A2Flower/A2Flower.csproj b/A2Flower/A2Flower.csproj
index 7558d0e..5dfef78 100644
--- a/A2Flower/A2Flower.csproj
+++ b/A2Flower/A2Flower.csproj
@@ -20,8 +20,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.5.2025.519-beta1544" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.516-beta1457" />
+    <PackageReference Include="NewLife.Core" Version="11.5.2025.527-beta1718" />
+    <PackageReference Include="NewLife.Stardust" Version="3.4.2025.527-beta1719" />
   </ItemGroup>
 
   <ItemGroup>
Modified +1 -1
diff --git a/Samples/BuzzerTest/BuzzerTest.csproj b/Samples/BuzzerTest/BuzzerTest.csproj
index 9cc5bc1..bd3313b 100644
--- a/Samples/BuzzerTest/BuzzerTest.csproj
+++ b/Samples/BuzzerTest/BuzzerTest.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.5.2025.522-beta1610" />
+    <PackageReference Include="NewLife.IoT" Version="2.5.2025.528-beta0425" />
   </ItemGroup>
 
 </Project>
Modified +1 -1
diff --git a/Samples/DatabaseTest/DatabaseTest.csproj b/Samples/DatabaseTest/DatabaseTest.csproj
index 445b07e..fbadc51 100644
--- a/Samples/DatabaseTest/DatabaseTest.csproj
+++ b/Samples/DatabaseTest/DatabaseTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.XCode" Version="11.19.2025.501" />
+    <PackageReference Include="NewLife.XCode" Version="11.19.2025.527-beta1546" />
   </ItemGroup>
 
 </Project>
Modified +1 -1
diff --git a/Samples/FullTest/FullTest.csproj b/Samples/FullTest/FullTest.csproj
index 8e7b39e..4a03961 100644
--- a/Samples/FullTest/FullTest.csproj
+++ b/Samples/FullTest/FullTest.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="NewLife.MQTT" Version="2.1.2025.519-beta1637" />
-    <PackageReference Include="NewLife.Stardust" Version="3.3.2025.516-beta1457" />
+    <PackageReference Include="NewLife.Stardust" Version="3.4.2025.527-beta1719" />
   </ItemGroup>
 
   <ItemGroup>
Modified +27 -27
diff --git a/Samples/FullTest/Sensors/ZhiShengRelayControl.cs b/Samples/FullTest/Sensors/ZhiShengRelayControl.cs
index d332466..202b5b2 100644
--- a/Samples/FullTest/Sensors/ZhiShengRelayControl.cs
+++ b/Samples/FullTest/Sensors/ZhiShengRelayControl.cs
@@ -9,42 +9,42 @@ namespace FullTest.Sensors;
 /// 购买于2019~2020年,https://item.taobao.com/item.htm?id=549504261336
 /// 默认波特率9600,8N1,Modbus地址1。
 /// </remarks>
-public class ZhiShengRelayControl
+public class ZhiShengRelayControl : RelayController
 {
-    /// <summary>Modbus对象</summary>
-    public IModbus Modbus { get; set; }
+    ///// <summary>Modbus对象</summary>
+    //public IModbus Modbus { get; set; }
 
-    /// <summary>主机地址</summary>
-    public Byte Host { get; set; } = 1;
+    ///// <summary>主机地址</summary>
+    //public Byte Host { get; set; } = 1;
 
-    /// <summary>控制指定点位</summary>
-    /// <param name="address"></param>
-    /// <param name="flag"></param>
-    public void Write(Int32 address, Boolean flag) => Modbus.WriteCoil(Host, (UInt16)address, (UInt16)(flag ? 0xFF00 : 0x0000));
+    ///// <summary>控制指定点位</summary>
+    ///// <param name="address"></param>
+    ///// <param name="flag"></param>
+    //public void Write(Int32 address, Boolean flag) => Modbus.WriteCoil(Host, (UInt16)address, (UInt16)(flag ? 0xFF00 : 0x0000));
 
-    /// <summary>翻转指定点位</summary>
-    /// <param name="address"></param>
-    public void Invert(Int32 address) => Modbus.WriteCoil(Host, (UInt16)address, 0x5500);
+    ///// <summary>翻转指定点位</summary>
+    ///// <param name="address"></param>
+    //public void Invert(Int32 address) => Modbus.WriteCoil(Host, (UInt16)address, 0x5500);
 
-    /// <summary>控制指定点位</summary>
-    /// <param name="flag"></param>
-    public void WriteAll(Boolean flag) => Modbus.WriteCoil(Host, 0x00FF, (UInt16)(flag ? 0xFFFF : 0x0000));
+    ///// <summary>控制指定点位</summary>
+    ///// <param name="flag"></param>
+    //public void WriteAll(Boolean flag) => Modbus.WriteCoil(Host, 0x00FF, (UInt16)(flag ? 0xFFFF : 0x0000));
 
-    /// <summary>翻转指定点位</summary>
-    public void InvertAll() => Modbus.WriteCoil(Host, 0x00FF, 0x5a00);
+    ///// <summary>翻转指定点位</summary>
+    //public void InvertAll() => Modbus.WriteCoil(Host, 0x00FF, 0x5a00);
 
-    /// <summary>读取指定点位</summary>
-    /// <param name="address"></param>
-    /// <returns></returns>
-    public Boolean Read(Int32 address) => Modbus.ReadCoil(Host, (UInt16)address, 1)[0];
+    ///// <summary>读取指定点位</summary>
+    ///// <param name="address"></param>
+    ///// <returns></returns>
+    //public Boolean Read(Int32 address) => Modbus.ReadCoil(Host, (UInt16)address, 1)[0];
 
-    /// <summary>读取所有点位</summary>
-    /// <returns></returns>
-    public Boolean[] ReadAll(UInt16 count = 8) => Modbus.ReadCoil(Host, 0, count);
+    ///// <summary>读取所有点位</summary>
+    ///// <returns></returns>
+    //public Boolean[] ReadAll(UInt16 count = 8) => Modbus.ReadCoil(Host, 0, count);
 
-    /// <summary>读取从机地址</summary>
-    /// <returns></returns>
-    public UInt16 ReadAddress() => Modbus.ReadRegister(0x00, 0x4000, 1)[0];
+    ///// <summary>读取从机地址</summary>
+    ///// <returns></returns>
+    //public UInt16 ReadAddress() => Modbus.ReadRegister(0x00, 0x4000, 1)[0];
 
     /// <summary>写入从机地址</summary>
     public Int32 WriteAddress(UInt16 address) => Modbus.WriteRegister(0x00, 0x4000, address);
Modified +1 -1
diff --git a/Samples/FullTest/TestWorker.cs b/Samples/FullTest/TestWorker.cs
index 9423402..0f52c92 100644
--- a/Samples/FullTest/TestWorker.cs
+++ b/Samples/FullTest/TestWorker.cs
@@ -119,7 +119,7 @@ internal class TestWorker(IBoard board) : IHostedService
             }
 
             // 翻转
-            for (var i = 0; i < 400; i++)
+            for (var i = 0; i < 10; i++)
             {
                 for (var j = 0; j < 4; j++)
                 {
Modified +1 -1
diff --git a/Samples/KeyTest/KeyTest.csproj b/Samples/KeyTest/KeyTest.csproj
index 21fa6e2..9cb8439 100644
--- a/Samples/KeyTest/KeyTest.csproj
+++ b/Samples/KeyTest/KeyTest.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.5.2025.522-beta1610" />
+    <PackageReference Include="NewLife.IoT" Version="2.5.2025.528-beta0425" />
   </ItemGroup>
 
 </Project>
Modified +1 -1
diff --git a/Samples/LedTest/LedTest.csproj b/Samples/LedTest/LedTest.csproj
index 53ff76b..fd70f9b 100644
--- a/Samples/LedTest/LedTest.csproj
+++ b/Samples/LedTest/LedTest.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.5.2025.522-beta1610" />
+    <PackageReference Include="NewLife.IoT" Version="2.5.2025.528-beta0425" />
   </ItemGroup>
 
 </Project>
Modified +1 -1
diff --git a/Samples/NetClientTest/NetClientTest.csproj b/Samples/NetClientTest/NetClientTest.csproj
index a5f2987..3ab98b1 100644
--- a/Samples/NetClientTest/NetClientTest.csproj
+++ b/Samples/NetClientTest/NetClientTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.5.2025.519-beta1544" />
+    <PackageReference Include="NewLife.Core" Version="11.5.2025.527-beta1718" />
   </ItemGroup>
 
 </Project>
Modified +1 -1
diff --git a/Samples/NetServerTest/NetServerTest.csproj b/Samples/NetServerTest/NetServerTest.csproj
index 279991e..fbf50b3 100644
--- a/Samples/NetServerTest/NetServerTest.csproj
+++ b/Samples/NetServerTest/NetServerTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.5.2025.519-beta1544" />
+    <PackageReference Include="NewLife.Core" Version="11.5.2025.527-beta1718" />
   </ItemGroup>
 
 </Project>
Modified +1 -1
diff --git a/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj b/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj
index 9c8f8dc..8027afb 100644
--- a/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj
+++ b/Samples/Serial2NetClientTest/Serial2NetClientTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.5.2025.519-beta1544" />
+    <PackageReference Include="NewLife.Core" Version="11.5.2025.527-beta1718" />
   </ItemGroup>
 
   <ItemGroup>
Modified +1 -1
diff --git a/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj b/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj
index 681b028..f416c0a 100644
--- a/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj
+++ b/Samples/Serial2NetServerTest/Serial2NetServerTest.csproj
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.5.2025.519-beta1544" />
+    <PackageReference Include="NewLife.Core" Version="11.5.2025.527-beta1718" />
   </ItemGroup>
 
 </Project>
Modified +2 -2
diff --git a/Samples/SerialTest/SerialTest.csproj b/Samples/SerialTest/SerialTest.csproj
index 23eaa23..c30f652 100644
--- a/Samples/SerialTest/SerialTest.csproj
+++ b/Samples/SerialTest/SerialTest.csproj
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.Core" Version="11.5.2025.519-beta1544" />
-    <PackageReference Include="NewLife.IoT" Version="2.5.2025.522-beta1610" />
+    <PackageReference Include="NewLife.Core" Version="11.5.2025.527-beta1718" />
+    <PackageReference Include="NewLife.IoT" Version="2.5.2025.528-beta0425" />
   </ItemGroup>
 
   <ItemGroup>
Modified +1 -1
diff --git a/Samples/UsbPowerTest/UsbPowerTest.csproj b/Samples/UsbPowerTest/UsbPowerTest.csproj
index 3c531eb..d9c3d9b 100644
--- a/Samples/UsbPowerTest/UsbPowerTest.csproj
+++ b/Samples/UsbPowerTest/UsbPowerTest.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.5.2025.522-beta1610" />
+    <PackageReference Include="NewLife.IoT" Version="2.5.2025.528-beta0425" />
   </ItemGroup>
 
 </Project>
Modified +2 -1
diff --git a/SmartA2/SmartA2.csproj b/SmartA2/SmartA2.csproj
index ba78a0b..235129e 100644
--- a/SmartA2/SmartA2.csproj
+++ b/SmartA2/SmartA2.csproj
@@ -39,6 +39,7 @@
   <ItemGroup>
     <Compile Remove="InputPort.cs" />
     <Compile Remove="OutputPort.cs" />
+    <Compile Remove="RelayControl.cs" />
   </ItemGroup>
 
   <ItemGroup>
@@ -49,7 +50,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="NewLife.IoT" Version="2.5.2025.522-beta1610" />
+    <PackageReference Include="NewLife.IoT" Version="2.5.2025.528-beta0425" />
     <PackageReference Include="NewLife.ModbusRTU" Version="2.0.2025.522-beta1626" />
   </ItemGroup>