chore: organize solution into module folders (Core/Server/Drivers/Client/Tooling)

Group all 69 projects into category subfolders under src/ and tests/ so the Rider Solution Explorer mirrors the module structure. Folders: Core, Server, Drivers (with a nested Driver CLIs subfolder), Client, Tooling. - Move every project folder on disk with git mv (history preserved as renames). - Recompute relative paths in 57 .csproj files: cross-category ProjectReferences, the lib/ HintPath+None refs in Driver.Historian.Wonderware, and the external mxaccessgw refs in Driver.Galaxy and its test project. - Rebuild ZB.MOM.WW.OtOpcUa.slnx with nested solution folders. - Re-prefix project paths in functional scripts (e2e, compliance, smoke SQL, integration, install). Build green (0 errors); unit tests pass. Docs left for a separate pass. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-05-17 01:55:28 -04:00
parent 69f02fed7f
commit a25593a9c6
1044 changed files with 365 additions and 343 deletions
@@ -0,0 +1,95 @@
+using CliFx.Attributes;
+using CliFx.Infrastructure;
+using ZB.MOM.WW.OtOpcUa.Driver.Cli.Common;
+
+namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Commands;
+
+/// <summary>
+///     Read one Modbus register / coil. Operator specifies the address via
+///     <c>--region</c> + <c>--address</c> + <c>--type</c>; the CLI synthesises a single
+///     <see cref="ModbusTagDefinition"/>, spins up the driver, reads once, prints the snapshot,
+///     and shuts down. Multi-register types (Int32 / Float32 / String / BCD32) respect
+///     <c>--byte-order</c> the same way real driver configs do.
+/// </summary>
+[Command("read", Description = "Read a single Modbus register or coil.")]
+public sealed class ReadCommand : ModbusCommandBase
+{
+    [CommandOption("region", 'r', Description =
+        "Coils / DiscreteInputs / InputRegisters / HoldingRegisters", IsRequired = true)]
+    public ModbusRegion Region { get; init; }
+
+    [CommandOption("address", 'a', Description =
+        "Zero-based address within the region.", IsRequired = true)]
+    public ushort Address { get; init; }
+
+    [CommandOption("type", 't', Description =
+        "Bool / Int16 / UInt16 / Int32 / UInt32 / Int64 / UInt64 / Float32 / Float64 / " +
+        "BitInRegister / String / Bcd16 / Bcd32", IsRequired = true)]
+    public ModbusDataType DataType { get; init; }
+
+    [CommandOption("byte-order", Description =
+        "BigEndian (default, spec ABCD) or WordSwap (CDAB). Ignored for single-register types.")]
+    public ModbusByteOrder ByteOrder { get; init; } = ModbusByteOrder.BigEndian;
+
+    [CommandOption("bit-index", Description =
+        "For type=BitInRegister: bit 0-15 LSB-first.")]
+    public byte BitIndex { get; init; }
+
+    [CommandOption("string-length", Description =
+        "For type=String: character count (2 per register, rounded up).")]
+    public ushort StringLength { get; init; }
+
+    [CommandOption("string-byte-order", Description =
+        "For type=String: HighByteFirst (standard) or LowByteFirst (DirectLOGIC et al).")]
+    public ModbusStringByteOrder StringByteOrder { get; init; } = ModbusStringByteOrder.HighByteFirst;
+
+    public override async ValueTask ExecuteAsync(IConsole console)
+    {
+        ConfigureLogging();
+        var ct = console.RegisterCancellationHandler();
+
+        var tagName = SynthesiseTagName(Region, Address, DataType);
+        var tag = new ModbusTagDefinition(
+            Name: tagName,
+            Region: Region,
+            Address: Address,
+            DataType: DataType,
+            Writable: false,
+            ByteOrder: ByteOrder,
+            BitIndex: BitIndex,
+            StringLength: StringLength,
+            StringByteOrder: StringByteOrder);
+        var options = BuildOptions([tag]);
+
+        await using var driver = new ModbusDriver(options, DriverInstanceId);
+        try
+        {
+            await driver.InitializeAsync("{}", ct);
+            var snapshot = await driver.ReadAsync([tagName], ct);
+            await console.Output.WriteLineAsync(SnapshotFormatter.Format(tagName, snapshot[0]));
+        }
+        finally
+        {
+            await driver.ShutdownAsync(CancellationToken.None);
+        }
+    }
+
+    /// <summary>
+    ///     Builds a human-readable tag name matching the operator's conceptual model
+    ///     (<c>HR[100]</c>, <c>Coil[5]</c>, <c>IR[42]</c>) — the driver treats the name
+    ///     purely as a lookup key, so any stable string works.
+    /// </summary>
+    internal static string SynthesiseTagName(
+        ModbusRegion region, ushort address, ModbusDataType type)
+    {
+        var prefix = region switch
+        {
+            ModbusRegion.Coils => "Coil",
+            ModbusRegion.DiscreteInputs => "DI",
+            ModbusRegion.InputRegisters => "IR",
+            ModbusRegion.HoldingRegisters => "HR",
+            _ => "Reg",
+        };
+        return $"{prefix}[{address}]:{type}";
+    }
+}