a25593a9c6
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>
62 lines
2.3 KiB
C#
62 lines
2.3 KiB
C#
using CliFx.Attributes;
|
|
using ZB.MOM.WW.OtOpcUa.Driver.Cli.Common;
|
|
using S7NetCpuType = global::S7.Net.CpuType;
|
|
|
|
namespace ZB.MOM.WW.OtOpcUa.Driver.S7.Cli;
|
|
|
|
/// <summary>
|
|
/// Base for every S7 CLI command. Carries the ISO-on-TCP endpoint options
|
|
/// (host / port / CPU type / rack / slot) that S7.Net needs for its handshake +
|
|
/// exposes <see cref="BuildOptions"/> so each command can synthesise an
|
|
/// <see cref="S7DriverOptions"/> on demand.
|
|
/// </summary>
|
|
public abstract class S7CommandBase : DriverCommandBase
|
|
{
|
|
[CommandOption("host", 'h', Description = "PLC IP address or hostname.", IsRequired = true)]
|
|
public string Host { get; init; } = default!;
|
|
|
|
[CommandOption("port", 'p', Description = "ISO-on-TCP port (default 102).")]
|
|
public int Port { get; init; } = 102;
|
|
|
|
[CommandOption("cpu", 'c', Description =
|
|
"S7 CPU family: S7200 / S7200Smart / S7300 / S7400 / S71200 / S71500 " +
|
|
"(default S71500). Determines the ISO-TSAP slot byte.")]
|
|
public S7NetCpuType CpuType { get; init; } = S7NetCpuType.S71500;
|
|
|
|
[CommandOption("rack", Description = "Rack number (default 0 — single-rack).")]
|
|
public short Rack { get; init; } = 0;
|
|
|
|
[CommandOption("slot", Description =
|
|
"CPU slot. S7-300 = 2, S7-400 = 2 or 3, S7-1200 / S7-1500 = 0 (default 0).")]
|
|
public short Slot { get; init; } = 0;
|
|
|
|
[CommandOption("timeout-ms", Description = "Per-operation timeout in ms (default 5000).")]
|
|
public int TimeoutMs { get; init; } = 5000;
|
|
|
|
/// <inheritdoc />
|
|
public override TimeSpan Timeout
|
|
{
|
|
get => TimeSpan.FromMilliseconds(TimeoutMs);
|
|
init { /* driven by TimeoutMs */ }
|
|
}
|
|
|
|
/// <summary>
|
|
/// Build an <see cref="S7DriverOptions"/> with the endpoint fields this base
|
|
/// collected + whatever <paramref name="tags"/> the subclass declares. Probe
|
|
/// disabled — CLI runs are one-shot.
|
|
/// </summary>
|
|
protected S7DriverOptions BuildOptions(IReadOnlyList<S7TagDefinition> tags) => new()
|
|
{
|
|
Host = Host,
|
|
Port = Port,
|
|
CpuType = CpuType,
|
|
Rack = Rack,
|
|
Slot = Slot,
|
|
Timeout = Timeout,
|
|
Tags = tags,
|
|
Probe = new S7ProbeOptions { Enabled = false },
|
|
};
|
|
|
|
protected string DriverInstanceId => $"s7-cli-{Host}:{Port}";
|
|
}
|