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>
This commit is contained in:
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="E_AxisState" Id="{ff675b51-fdf4-4a20-9755-d3a962aa226c}">
|
||||
<Declaration><![CDATA[TYPE E_AxisState :
|
||||
(
|
||||
Idle := 0,
|
||||
Homing := 1,
|
||||
Moving := 2,
|
||||
Stopped := 3,
|
||||
Faulted := 99
|
||||
) DINT;
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="E_Severity" Id="{00ec5016-5d26-4d67-bac9-3fc28b1c92ce}">
|
||||
<Declaration><![CDATA[TYPE E_Severity :
|
||||
(
|
||||
Info := 0,
|
||||
Warning := 1,
|
||||
Critical := 2,
|
||||
Fatal := 3
|
||||
) INT;
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,18 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_Alarm" Id="{d6459f8b-1fda-4bad-b787-c0e7e49fd8ec}">
|
||||
<Declaration><![CDATA[TYPE ST_Alarm :
|
||||
STRUCT
|
||||
Active : BOOL;
|
||||
Acknowledged : BOOL;
|
||||
Code : DINT;
|
||||
Severity : E_Severity;
|
||||
RaisedAt : DT;
|
||||
ClearedAt : DT;
|
||||
Message : STRING(80);
|
||||
Source : STRING(40);
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,19 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_Axis" Id="{2e150fb3-4694-4853-bb73-754d225c082a}">
|
||||
<Declaration><![CDATA[TYPE ST_Axis :
|
||||
STRUCT
|
||||
Name : STRING(32);
|
||||
State : E_AxisState;
|
||||
PositionMm : LREAL;
|
||||
VelocityMps : T_MeterPerSec;
|
||||
Accel : REAL;
|
||||
Motor : ST_Motor;
|
||||
Encoder : ST_Encoder;
|
||||
Commands : ST_AxisCommands;
|
||||
TravelLog : ARRAY[1..8] OF LREAL;
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_AxisCommands" Id="{0aaff3fd-5525-495b-9759-4de792f6e615}">
|
||||
<Declaration><![CDATA[TYPE ST_AxisCommands :
|
||||
STRUCT
|
||||
Enable : BOOL;
|
||||
Home : BOOL;
|
||||
Jog : BOOL;
|
||||
Stop : BOOL;
|
||||
TargetPos : LREAL;
|
||||
TargetVel : T_MeterPerSec;
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_Encoder" Id="{87f1e7c2-2359-4db5-acf3-46a1dd518acb}">
|
||||
<Declaration><![CDATA[TYPE ST_Encoder :
|
||||
STRUCT
|
||||
RawCounts : DINT;
|
||||
PositionMm : LREAL;
|
||||
VelocityMmPerS : T_MeterPerSec;
|
||||
Homed : BOOL;
|
||||
LastHomedAt : DT;
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_Line" Id="{3eaaae0a-31e2-43d6-b77c-5065a55c7d07}">
|
||||
<Declaration><![CDATA[TYPE ST_Line :
|
||||
STRUCT
|
||||
Name : STRING(32);
|
||||
Running : BOOL;
|
||||
Stations : ARRAY[1..3] OF ST_Station;
|
||||
Recipe : ST_Recipe;
|
||||
Stats : ST_Stats;
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_Motor" Id="{9354c15d-7882-42bb-8bce-017f74e49cca}">
|
||||
<Declaration><![CDATA[TYPE ST_Motor :
|
||||
STRUCT
|
||||
Current : REAL;
|
||||
Voltage : REAL;
|
||||
Temperature : T_Temperature;
|
||||
Rpm : DINT;
|
||||
Running : BOOL;
|
||||
Faulted : BOOL;
|
||||
SerialNo : STRING(24);
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_Recipe" Id="{723636a8-1265-46a5-88b3-fa1a3d77e594}">
|
||||
<Declaration><![CDATA[TYPE ST_Recipe :
|
||||
STRUCT
|
||||
Name : STRING(40);
|
||||
Description : WSTRING(120);
|
||||
Version : UINT;
|
||||
LoadedAt : DT;
|
||||
Steps : ARRAY[1..10] OF ST_RecipeStep;
|
||||
SupportedSkus: ARRAY[1..4] OF STRING(16);
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_RecipeStep" Id="{64d61cc8-2aba-4adb-9cf1-9345fc6f95b8}">
|
||||
<Declaration><![CDATA[TYPE ST_RecipeStep :
|
||||
STRUCT
|
||||
Enabled : BOOL;
|
||||
StepName : STRING(32);
|
||||
Duration : TIME;
|
||||
Setpoint : LREAL;
|
||||
Tolerance : REAL;
|
||||
Retries : USINT;
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_Station" Id="{ab0c22da-aee2-42de-be7f-05b8a8c27083}">
|
||||
<Declaration><![CDATA[TYPE ST_Station :
|
||||
STRUCT
|
||||
Name : STRING(32);
|
||||
Online : BOOL;
|
||||
Axes : ARRAY[1..4] OF ST_Axis;
|
||||
IO : ST_StationIO;
|
||||
Alarms : ARRAY[1..16] OF ST_Alarm;
|
||||
Heartbeat: UDINT;
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,17 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_StationIO" Id="{f71903d5-b9ea-4b75-9ca7-977b8374c11a}">
|
||||
<Declaration><![CDATA[TYPE ST_StationIO :
|
||||
STRUCT
|
||||
DigitalInputs : ARRAY[0..31] OF BOOL;
|
||||
DigitalOutputs : ARRAY[0..31] OF BOOL;
|
||||
AnalogInputs : ARRAY[0..7] OF REAL;
|
||||
AnalogOutputs : ARRAY[0..7] OF REAL;
|
||||
CycleCounter : UDINT;
|
||||
LastInputMask : DWORD;
|
||||
LastOutputMask : DWORD;
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,16 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="ST_Stats" Id="{23dffb59-ae06-4ac7-8c98-cba78dddf81d}">
|
||||
<Declaration><![CDATA[TYPE ST_Stats :
|
||||
STRUCT
|
||||
UnitsProduced : UDINT;
|
||||
UnitsRejected : UDINT;
|
||||
UpTimeSeconds : UDINT;
|
||||
LastRejectAt : DT;
|
||||
LastProducedAt : DT;
|
||||
RejectReasons : ARRAY[1..5] OF UDINT;
|
||||
END_STRUCT
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="T_MeterPerSec" Id="{bddf08a2-da6c-4076-9719-13806a9e2438}">
|
||||
<Declaration><![CDATA[TYPE T_MeterPerSec : LREAL;
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<TcPlcObject Version="1.1.0.1" ProductVersion="3.1.4024.0">
|
||||
<DUT Name="T_Temperature" Id="{5e81fac6-ab58-4311-b798-907495f9ead9}">
|
||||
<Declaration><![CDATA[TYPE T_Temperature : LREAL;
|
||||
END_TYPE
|
||||
]]></Declaration>
|
||||
</DUT>
|
||||
</TcPlcObject>
|
||||
Reference in New Issue
Block a user