dohertj2/lmxopcua
1
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Joseph Doherty
2026-05-17 01:55:28 -04:00
parent 69f02fed7f
commit a25593a9c6
1044 changed files with 365 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCatProject/PLC/GVLs/GVL_Arrays.TcGVL Normal file
View File

@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<GVL Name="GVL_Arrays" Id="{6d45cf94-641a-40eb-a780-4fb3a1f8984f}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// 1-D arrays of primitives.
aBool1D : ARRAY[0..9] OF BOOL;
aInt1D : ARRAY[0..9] OF INT := [10(0)];
aDInt1D : ARRAY[1..16] OF DINT;
aReal1D : ARRAY[0..31] OF REAL;
aLReal1D : ARRAY[0..7] OF LREAL;
aString1D : ARRAY[1..4] OF STRING(32);
// 2-D and 3-D arrays.
aReal2D : ARRAY[1..4, 1..4] OF REAL;
aDInt3D : ARRAY[0..2, 0..2, 0..2] OF DINT;
// Array-of-UDT (exercises per-element browse of nested structs).
aAxisSnapshots : ARRAY[1..4] OF ST_Axis;
END_VAR
]]></Declaration>
</GVL>
</TcPlcObject>

17
tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCatProject/PLC/GVLs/GVL_Enums.TcGVL Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<GVL Name="GVL_Enums" Id="{a0e45f27-3675-4b6f-bc09-ded0723b7029}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// Enum + alias coverage — standalone globals so OPC UA browse can assert
// on EnumStrings / DataTypeDefinition rendering without walking into the
// plant hierarchy.
currentAxisState : E_AxisState := E_AxisState.Idle;
currentSeverity : E_Severity := E_Severity.Info;
severityLog : ARRAY[1..8] OF E_Severity;
cabinetTemperature : T_Temperature := 22.5;
conveyorSpeed : T_MeterPerSec := 1.5;
END_VAR
]]></Declaration>
</GVL>
</TcPlcObject>

18
tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCatProject/PLC/GVLs/GVL_Fixture.TcGVL Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<GVL Name="GVL_Fixture" Id="{cdbd99aa-f3c6-48ad-a068-d31a9e1a3b21}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// Monotonic counter — MAIN increments every cycle. Seed 1234 is the
// floor the smoke tests assert against.
nCounter : DINT := 1234;
// Scratch REAL for write-then-read round-trip.
rSetpoint : REAL := 0.0;
// Reserved for discovery / browse tests.
bFlag : BOOL := TRUE;
END_VAR
]]></Declaration>
</GVL>
</TcPlcObject>

19
tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCatProject/PLC/GVLs/GVL_Plant.TcGVL Normal file
View File

@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<GVL Name="GVL_Plant" Id="{00c8ed35-95d3-494a-92d8-db5f2c8ab6d9}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// Top-level plant hierarchy exposed to OPC UA browse:
// GVL_Plant.Line1.Stations[1..3].Axes[1..4].Motor/Encoder/Commands
// .IO
// .Alarms[1..16]
// .Recipe.Steps[1..10]
// .Stats
Line1 : ST_Line := (
Name := 'Assembly-01',
Running := TRUE
);
END_VAR
]]></Declaration>
</GVL>
</TcPlcObject>

32
tests/Drivers/ZB.MOM.WW.OtOpcUa.Driver.TwinCAT.IntegrationTests/TwinCatProject/PLC/GVLs/GVL_Primitives.TcGVL Normal file
View File

@@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
<GVL Name="GVL_Primitives" Id="{2f721507-9717-45cf-bf40-02a9691bb5b4}">
<Declaration><![CDATA[{attribute 'qualified_only'}
VAR_GLOBAL
// One of every primitive ADS type. Exercises the full
// TwinCATDataType → OPC UA NodeId mapping.
vBool : BOOL := TRUE;
vByte : BYTE := 16#A5;
vWord : WORD := 16#BEEF;
vDWord : DWORD := 16#DEADBEEF;
vLWord : LWORD := 16#0123456789ABCDEF;
vSInt : SINT := -42;
vUSInt : USINT := 250;
vInt : INT := -12345;
vUInt : UINT := 54321;
vDInt : DINT := -1234567;
vUDInt : UDINT := 4000000000;
vLInt : LINT := -1234567890123;
vULInt : ULINT := 12345678901234567;
vReal : REAL := 3.14159;
vLReal : LREAL := 2.7182818284590452;
vString : STRING(80) := 'Hello from TC3';
vWString : WSTRING(80) := "unicode ✓";
vTime : TIME := T#2h34m17s500ms;
vTimeOfDay : TOD := TOD#08:30:00;
vDate : DATE := D#2026-04-22;
vDateTime : DT := DT#2026-04-22-08:30:00;
END_VAR
]]></Declaration>
</GVL>
</TcPlcObject>