Mirrors the v1 otopcua-cli value prop (ad-hoc shell-level PLC validation) for
the Modbus-TCP driver, and lays down the shared scaffolding that AB CIP, AB
Legacy, S7, and TwinCAT CLIs will build on.
New projects:
- src/ZB.MOM.WW.OtOpcUa.Driver.Cli.Common/ — DriverCommandBase (verbose
flag + Serilog config) + SnapshotFormatter (single-tag + table +
write-result renders with invariant-culture value formatting + OPC UA
status-code shortnames + UTC-normalised timestamps).
- src/ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli/ — otopcua-modbus-cli executable.
Commands: probe, read, write, subscribe. ModbusCommandBase carries the
host/port/unit-id flags + builds ModbusDriverOptions with Probe.Enabled
=false (CLI runs are one-shot; driver-internal keep-alive would race).
Commands + coverage:
- probe single FC03 + GetHealth() + pretty-print
- read region × address × type synth into one driver tag
- write same shape + --value parsed per --type
- subscribe polled-subscription stream until Ctrl+C
Tests (38 total):
- 16 SnapshotFormatterTests covering: status-code shortnames, unknown
codes fall back to hex, null value + timestamp placeholders, bool
lowercase, float invariant culture, string quoting, write-result shape,
aligned table columns, mismatched-length rejection, UTC normalisation.
- 22 Modbus CLI tests:
· ReadCommandTests.SynthesiseTagName (5 theory cases)
· WriteCommandParseValueTests (17 cases: bool aliases, unknown rejected,
Int16 bounds, UInt16/Bcd16 type, Float32/64 invariant culture,
String passthrough, BitInRegister, Int32 MinValue, non-numeric reject)
Wiring:
- ZB.MOM.WW.OtOpcUa.slnx grew 4 entries (2 src + 2 tests).
- docs/Driver.Modbus.Cli.md — operator-facing runbook with examples per
command + output format + typical workflows.
Regression: full-solution build clean; shared-lib tests 16/0, Modbus CLI tests
22/0.
Next up: repeat the pattern for AB CIP (shares ~40% more with Modbus via
libplctag), then AB Legacy, S7, TwinCAT. The shared base stays as-is unless
one of those exposes a gap the Modbus-first pass missed.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
93 lines
3.7 KiB
C#
93 lines
3.7 KiB
C#
using CliFx.Attributes;
|
|
using CliFx.Infrastructure;
|
|
using ZB.MOM.WW.OtOpcUa.Core.Abstractions;
|
|
using ZB.MOM.WW.OtOpcUa.Driver.Cli.Common;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Driver.Modbus.Cli.Commands;
|
|
|
|
/// <summary>
|
|
/// Long-running poll of one Modbus register via the driver's <c>ISubscribable</c> surface
|
|
/// (under the hood: <c>PollGroupEngine</c>). Prints each data-change event until the
|
|
/// operator Ctrl+C's the CLI. Useful for watching a changing PLC signal during
|
|
/// commissioning or while reproducing a customer bug.
|
|
/// </summary>
|
|
[Command("subscribe", Description = "Watch a Modbus register via polled subscription until Ctrl+C.")]
|
|
public sealed class SubscribeCommand : 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("interval-ms", 'i', Description =
|
|
"Publishing interval in milliseconds (default 1000). The PollGroupEngine enforces " +
|
|
"a floor of ~250ms; values below it get rounded up.")]
|
|
public int IntervalMs { get; init; } = 1000;
|
|
|
|
[CommandOption("byte-order", Description =
|
|
"BigEndian (default) or WordSwap.")]
|
|
public ModbusByteOrder ByteOrder { get; init; } = ModbusByteOrder.BigEndian;
|
|
|
|
public override async ValueTask ExecuteAsync(IConsole console)
|
|
{
|
|
ConfigureLogging();
|
|
var ct = console.RegisterCancellationHandler();
|
|
|
|
var tagName = ReadCommand.SynthesiseTagName(Region, Address, DataType);
|
|
var tag = new ModbusTagDefinition(
|
|
Name: tagName,
|
|
Region: Region,
|
|
Address: Address,
|
|
DataType: DataType,
|
|
Writable: false,
|
|
ByteOrder: ByteOrder);
|
|
var options = BuildOptions([tag]);
|
|
|
|
await using var driver = new ModbusDriver(options, DriverInstanceId);
|
|
ISubscriptionHandle? handle = null;
|
|
try
|
|
{
|
|
await driver.InitializeAsync("{}", ct);
|
|
|
|
// Route every data-change event to the CliFx console (not System.Console — the
|
|
// analyzer flags it + IConsole is the testable abstraction).
|
|
driver.OnDataChange += (_, e) =>
|
|
{
|
|
var line = $"[{DateTime.UtcNow:HH:mm:ss.fff}] " +
|
|
$"{e.FullReference} = {SnapshotFormatter.FormatValue(e.Snapshot.Value)} " +
|
|
$"({SnapshotFormatter.FormatStatus(e.Snapshot.StatusCode)})";
|
|
console.Output.WriteLine(line);
|
|
};
|
|
|
|
handle = await driver.SubscribeAsync([tagName], TimeSpan.FromMilliseconds(IntervalMs), ct);
|
|
|
|
await console.Output.WriteLineAsync(
|
|
$"Subscribed to {tagName} @ {IntervalMs}ms. Ctrl+C to stop.");
|
|
try
|
|
{
|
|
await Task.Delay(System.Threading.Timeout.InfiniteTimeSpan, ct);
|
|
}
|
|
catch (OperationCanceledException)
|
|
{
|
|
// Expected on Ctrl+C — fall through to the unsubscribe in finally.
|
|
}
|
|
}
|
|
finally
|
|
{
|
|
if (handle is not null)
|
|
{
|
|
try { await driver.UnsubscribeAsync(handle, CancellationToken.None); }
|
|
catch { /* teardown best-effort */ }
|
|
}
|
|
await driver.ShutdownAsync(CancellationToken.None);
|
|
}
|
|
}
|
|
}
|