From 14258bdd0865874dbe0b836b86db4fe48d92a27f Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 19:48:12 +0200 Subject: [PATCH 01/33] Create draft PR for #1124 From 86987001a7b545f91fd0ae844d5570b2272e198b Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 19:57:24 +0200 Subject: [PATCH 02/33] chore: update code structure for better readability and maintainability --- .../components.abb.robotics.code-workspace | 4 ---- .../ctrl/src/{ => AxoIrc5_v_1_x_x}/AxoIrc5_v_1_x_x.st | 0 .../ctrl/src/{ => AxoOmnicore_v_1_x_x}/AxoOmnicore_v_1_x_x.st | 0 src/template.axolibrary/template.axolibrary.code-workspace | 3 --- 4 files changed, 7 deletions(-) rename src/components.abb.robotics/ctrl/src/{ => AxoIrc5_v_1_x_x}/AxoIrc5_v_1_x_x.st (100%) rename src/components.abb.robotics/ctrl/src/{ => AxoOmnicore_v_1_x_x}/AxoOmnicore_v_1_x_x.st (100%) diff --git a/src/components.abb.robotics/components.abb.robotics.code-workspace b/src/components.abb.robotics/components.abb.robotics.code-workspace index 0cae3806d..8c32f6273 100644 --- a/src/components.abb.robotics/components.abb.robotics.code-workspace +++ b/src/components.abb.robotics/components.abb.robotics.code-workspace @@ -3,10 +3,6 @@ { "name": "ctrl", "path": "ctrl" - }, - { - "name": "app", - "path": "app" } ], "settings": {} diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st similarity index 100% rename from src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.st similarity index 100% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.st diff --git a/src/template.axolibrary/template.axolibrary.code-workspace b/src/template.axolibrary/template.axolibrary.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/template.axolibrary/template.axolibrary.code-workspace +++ b/src/template.axolibrary/template.axolibrary.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} From 2b444c15e27c314de65f9189c9e2d2f1aed2556b Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:19:16 +0200 Subject: [PATCH 03/33] feat: unify AxoIrc5 and AxoOmnicore component structures for consistency --- .../src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st | 8 +- .../AxoIrc5_v_1_x_x_Component_Status.st} | 2 +- .../AxoIrc5_v_1_x_x_Config.st} | 4 +- .../AxoIrc5_v_1_x_x_Control.st} | 2 +- .../AxoIrc5_v_1_x_x_HWIDs.st} | 2 +- .../AxoIrc5_v_1_x_x_State.st} | 2 +- .../AxoOmnicore_v_1_x_x.st | 8 +- .../AxoOmnicore_v_1_x_x_Component_Status.st | 13 ++ .../AxoOmnicore_v_1_x_x_Config.st | 16 +++ .../AxoOmnicore_v_1_x_x_Control.st | 96 +++++++++++++ .../AxoOmnicore_v_1_x_x_HWIDs.st | 13 ++ .../AxoOmnicore_v_1_x_x_State.st | 134 ++++++++++++++++++ 12 files changed, 286 insertions(+), 14 deletions(-) rename src/components.abb.robotics/ctrl/src/{AxoAbbRobotics_Component_Status_v_1_x_x.st => AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Component_Status.st} (62%) rename src/components.abb.robotics/ctrl/src/{AxoAbbRobotics_Config_v_1_x_x.st => AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Config.st} (85%) rename src/components.abb.robotics/ctrl/src/{AxoAbbRobotics_Control_v_1_x_x.st => AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Control.st} (99%) rename src/components.abb.robotics/ctrl/src/{AxoAbbRobotics_HWIDs.st => AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_HWIDs.st} (93%) rename src/components.abb.robotics/ctrl/src/{AxoAbbRobotics_State_v_1_x_x.st => AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_State.st} (99%) create mode 100644 src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st create mode 100644 src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st create mode 100644 src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st create mode 100644 src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st create mode 100644 src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st index cba9e9687..5da3eba72 100644 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st @@ -73,14 +73,14 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Config")]} {#ix-attr:[ReadOnly()]} - Config : AxoAbbRobotics_Config_v_1_x_x; + Config : AxoIrc5_v_1_x_x_Config; END_VAR VAR PUBLIC //STATUS {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} - Status : AxoAbbRobotics_Component_Status_v_1_x_x; + Status : AxoIrc5_v_1_x_x_Component_Status; Messenger : AXOpen.Messaging.Static.AxoMessenger; TaskMessenger : AXOpen.Messaging.Static.AxoMessenger; _progress : INT := 0; @@ -92,13 +92,13 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Inputs#>"} {#ix-attr:[ReadOnly()]} - Inputs : AxoAbbRobotics_State_v_1_x_x; + Inputs : AxoIrc5_v_1_x_x_State; {#ix-attr:[ComponentDetails("Hardware signals")]} {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Outputs#>"} {#ix-attr:[ReadOnly()]} - Outputs : AxoAbbRobotics_Control_v_1_x_x; + Outputs : AxoIrc5_v_1_x_x_Control; END_VAR VAR PUBLIC //HardwareDiagnostics diff --git a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Component_Status_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Component_Status.st similarity index 62% rename from src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Component_Status_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Component_Status.st index f1c90ef15..49a5b87db 100644 --- a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Component_Status_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Component_Status.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoAbbRobotics_Component_Status_v_1_x_x EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + CLASS PUBLIC AxoIrc5_v_1_x_x_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status VAR PUBLIC END_VAR END_CLASS diff --git a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Config_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Config.st similarity index 85% rename from src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Config_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Config.st index bdc87abf1..094f00416 100644 --- a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Config_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Config.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoAbbRobotics_Config_v_1_x_x + CLASS PUBLIC AxoIrc5_v_1_x_x_Config VAR PUBLIC {#ix-set:AttributeName = "<#Info time#>"} InfoTime : LTIME := LT#2S; @@ -10,7 +10,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-set:AttributeName = "<#Task timeout#>"} TaskTimeout : LTIME := LT#0S; {#ix-set:AttributeName = "<#Hardware IDs#>"} - HWIDs : AxoAbbRobotics_HWIDs; + HWIDs : AxoIrc5_v_1_x_x_HWIDs; END_VAR END_CLASS END_NAMESPACE \ No newline at end of file diff --git a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Control_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Control.st similarity index 99% rename from src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Control_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Control.st index cd84c2e70..b69e8256d 100644 --- a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Control_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Control.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoAbbRobotics_Control_v_1_x_x + CLASS AxoIrc5_v_1_x_x_Control VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_HWIDs.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_HWIDs.st similarity index 93% rename from src/components.abb.robotics/ctrl/src/AxoAbbRobotics_HWIDs.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_HWIDs.st index 7a5992de3..f94441433 100644 --- a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_HWIDs.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_HWIDs.st @@ -1,6 +1,6 @@ NAMESPACE AXOpen.Components.Abb.Robotics {S7.extern=ReadWrite} -CLASS AxoAbbRobotics_HWIDs +CLASS AxoIrc5_v_1_x_x_HWIDs VAR PUBLIC {#ix-set:AttributeName = "<#Hardware ID of the device#>"} HW_Device : UINT; diff --git a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_State_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_State.st similarity index 99% rename from src/components.abb.robotics/ctrl/src/AxoAbbRobotics_State_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_State.st index b1f0a3bae..46d3e1ca4 100644 --- a/src/components.abb.robotics/ctrl/src/AxoAbbRobotics_State_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_State.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoAbbRobotics_State_v_1_x_x + CLASS AxoIrc5_v_1_x_x_State VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.st index 52a938bf1..aa399459b 100644 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.st @@ -68,14 +68,14 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Config")]} {#ix-attr:[ReadOnly()]} - Config : AxoAbbRobotics_Config_v_1_x_x; + Config : AxoOmnicore_v_1_x_x_Config; END_VAR VAR PUBLIC //STATUS {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} - Status : AxoAbbRobotics_Component_Status_v_1_x_x; + Status : AxoOmnicore_v_1_x_x_Component_Status; {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} {#ix-set:AttributeName = "<#Power progress#>"} @@ -94,13 +94,13 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Inputs#>"} {#ix-attr:[ReadOnly()]} - Inputs : AxoAbbRobotics_State_v_1_x_x; + Inputs : AxoOmnicore_v_1_x_x_State; {#ix-attr:[ComponentDetails("Hardware signals")]} {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Outputs#>"} {#ix-attr:[ReadOnly()]} - Outputs : AxoAbbRobotics_Control_v_1_x_x; + Outputs : AxoOmnicore_v_1_x_x_Control; END_VAR VAR PUBLIC //HardwareDiagnostics diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st new file mode 100644 index 000000000..b73abab27 --- /dev/null +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st @@ -0,0 +1,13 @@ +NAMESPACE AXOpen.Components.Abb.Robotics + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Stack)]} + CLASS PUBLIC AxoOmnicore_v_1_x_x_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + VAR PUBLIC + END_VAR + END_CLASS +END_NAMESPACE + + + + + diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st new file mode 100644 index 000000000..290112665 --- /dev/null +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st @@ -0,0 +1,16 @@ +NAMESPACE AXOpen.Components.Abb.Robotics + {#ix-attr:[Container(Layout.Stack)]} + {S7.extern=ReadWrite} + CLASS PUBLIC AxoOmnicore_v_1_x_x_Config + VAR PUBLIC + {#ix-set:AttributeName = "<#Info time#>"} + InfoTime : LTIME := LT#2S; + {#ix-set:AttributeName = "<#Error time#>"} + ErrorTime : LTIME := LT#0S; + {#ix-set:AttributeName = "<#Task timeout#>"} + TaskTimeout : LTIME := LT#0S; + {#ix-set:AttributeName = "<#Hardware IDs#>"} + HWIDs : AxoOmnicore_v_1_x_x_HWIDs; + END_VAR + END_CLASS +END_NAMESPACE \ No newline at end of file diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st new file mode 100644 index 000000000..9d5f6d299 --- /dev/null +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st @@ -0,0 +1,96 @@ +NAMESPACE AXOpen.Components.Abb.Robotics + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Wrap)]} + CLASS AxoOmnicore_v_1_x_x_Control + VAR PUBLIC + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Interuption actually running instruction#>"} + Interupt : BOOL; + {#ix-set:AttributeName = "<#Load program#>"} + LoadProg : BOOL; + {#ix-set:AttributeName = "<#Load and run program#>"} + LoadAndStartProg : BOOL; + {#ix-set:AttributeName = "<#Switch off the motors#>"} + MotorOff : BOOL; + {#ix-set:AttributeName = "<#Switch on the motors#>"} + MotorOn : BOOL; + {#ix-set:AttributeName = "<#Switch on the motors and start program#>"} + MotorOnAndStart : BOOL; + {#ix-set:AttributeName = "<#Emergency stop acknowledge#>"} + ResetEmgStop : BOOL; + {#ix-set:AttributeName = "<#Error acknowledge#>"} + ResetError : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Program start#>"} + StartProgram : BOOL; + {#ix-set:AttributeName = "<#Program start at main#>"} + StartAtMain : BOOL; + {#ix-set:AttributeName = "<#Program stop#>"} + StopProgram : BOOL; + {#ix-set:AttributeName = "<#Stop movement-quick#>"} + QuickStop : BOOL; + {#ix-set:AttributeName = "<#Stop movement-soft#>"} + SoftStop : BOOL; + {#ix-set:AttributeName = "<#Stop program at the end of the cycle#>"} + StopCycle : BOOL; + {#ix-set:AttributeName = "<#Stop program at the end of the instruction#>"} + StopInstruction : BOOL; + {#ix-set:AttributeName = "<#Speed limitation#>"} + LimitSpeed : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Master mode#>"} + MasterMode : BYTE; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Tool 1 retract#>"} + Tool_1_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 1 extend#>"} + Tool_1_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 2 retract#>"} + Tool_2_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 2 extend#>"} + Tool_2_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 3 retract#>"} + Tool_3_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 3 extend#>"} + Tool_3_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 4 retract#>"} + Tool_4_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 4 extend#>"} + Tool_4_Extend : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Zones#>"} + Zone : BYTE; + {#ix-set:AttributeName = "<#In position#>"} + InPosition : BYTE; + {#ix-set:AttributeName = "<#Action number#>"} + ActionNo : BYTE; + {#ix-set:AttributeName = "<#Global robot speed#>"} + GlobalSpeed : BYTE; + {#ix-set:AttributeName = "<#Tool number#>"} + ToolNo : BYTE; + {#ix-set:AttributeName = "<#Workobject number#>"} + WorkobjectNo : BYTE; + {#ix-set:AttributeName = "<#Point number#>"} + PointNo : BYTE; + {#ix-set:AttributeName = "<#User specific speed 1#>"} + UserSpecSpeed1 : REAL; + {#ix-set:AttributeName = "<#User specific speed 2#>"} + UserSpecSpeed2 : REAL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Coordinates#>"} + Coordinates : AXOpen.Components.Abstractions.Robotics.AxoRoboticsCoordinates; + END_VAR + END_CLASS +END_NAMESPACE + \ No newline at end of file diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st new file mode 100644 index 000000000..6d9d94306 --- /dev/null +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st @@ -0,0 +1,13 @@ +NAMESPACE AXOpen.Components.Abb.Robotics +{S7.extern=ReadWrite} +CLASS AxoOmnicore_v_1_x_x_HWIDs + VAR PUBLIC + {#ix-set:AttributeName = "<#Hardware ID of the device#>"} + HW_Device : UINT; + {#ix-set:AttributeName = "<#Hardware ID of the 'DI_64_bytes' submodule#>"} + HwID_DI_64_bytes : UINT; + {#ix-set:AttributeName = "<#Hardware ID of the 'DO_64_bytes' submodule#>"} + HwID_DO_64_bytes : UINT; + END_VAR +END_CLASS +END_NAMESPACE diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st new file mode 100644 index 000000000..a3b45b147 --- /dev/null +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st @@ -0,0 +1,134 @@ +NAMESPACE AXOpen.Components.Abb.Robotics + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Wrap)]} + CLASS AxoOmnicore_v_1_x_x_State + VAR PUBLIC + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#AutoOn#>"} + AutoOn : BOOL; + {#ix-set:AttributeName = "<#CycleOn#>"} + CycleOn : BOOL; + {#ix-set:AttributeName = "<#Emergency stop#>"} + EmgStop : BOOL; + {#ix-set:AttributeName = "<#Error#>"} + Error : BOOL; + {#ix-set:AttributeName = "<#Event ID#>"} + EventId : UDINT; + {#ix-set:AttributeName = "<#Move active#>"} + MoveActive : BOOL; + {#ix-set:AttributeName = "<#Move inactive#>"} + MoveInactive : BOOL; + {#ix-set:AttributeName = "<#Motor off#>"} + MotorOff : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Motor on#>"} + MotorOn : BOOL; + {#ix-set:AttributeName = "<#Motor off state#>"} + MotorOffState : BOOL; + {#ix-set:AttributeName = "<#Motor on state#>"} + MotorOnState : BOOL; + {#ix-set:AttributeName = "<#Program execution error#>"} + ProgExecError : BOOL; + {#ix-set:AttributeName = "<#Safety OK#>"} + SafetyOk : BOOL; + {#ix-set:AttributeName = "<#System input busy#>"} + SystemInputBusy : BOOL; + {#ix-set:AttributeName = "<#Program pointer moved#>"} + PpMoved : BOOL; + {#ix-set:AttributeName = "<#Motion supervision#>"} + MotionSupervision : BOOL; + {#ix-set:AttributeName = "<#Battery Low#>"} + BatteryLow : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#In area 1#>"} + InArea_1 : BOOL; + {#ix-set:AttributeName = "<#In area 2#>"} + InArea_2 : BOOL; + {#ix-set:AttributeName = "<#In area 3#>"} + InArea_3 : BOOL; + {#ix-set:AttributeName = "<#In area 4#>"} + InArea_4 : BOOL; + {#ix-set:AttributeName = "<#In position 1#>"} + InPosition_1 : BOOL; + {#ix-set:AttributeName = "<#In position 2#>"} + InPosition_2 : BOOL; + {#ix-set:AttributeName = "<#In position 3#>"} + InPosition_3 : BOOL; + {#ix-set:AttributeName = "<#In position 4#>"} + InPosition_4 : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Zones#>"} + Zone : BYTE; + {#ix-set:AttributeName = "<#In position#>"} + InPosition : BYTE; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Tool 1 retract#>"} + Tool_1_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 1 extend#>"} + Tool_1_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 2 retract#>"} + Tool_2_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 2 extend#>"} + Tool_2_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 3 retract#>"} + Tool_3_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 3 extend#>"} + Tool_3_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 4 retract#>"} + Tool_4_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 4 extend#>"} + Tool_4_Extend : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Auto stop 1#>"} + AutoStop_1 : BOOL; + {#ix-set:AttributeName = "<#Auto stop 2#>"} + AutoStop_2 : BOOL; + {#ix-set:AttributeName = "<#Emergency stop 1#>"} + EmergencyStop_1 : BOOL; + {#ix-set:AttributeName = "<#Emergency stop 2#>"} + EmergencyStop_2 : BOOL; + {#ix-set:AttributeName = "<#General stop 1#>"} + GeneralStop_1 : BOOL; + {#ix-set:AttributeName = "<#General stop 2#>"} + GeneralStop_2 : BOOL; + {#ix-set:AttributeName = "<#Enable 1#>"} + Enable_1 : BOOL; + {#ix-set:AttributeName = "<#Enable 2#>"} + Enable_2 : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Action number#>"} + ActionNo : BYTE; + {#ix-set:AttributeName = "<#Global speed#>"} + GlobalSpeed : BYTE; + {#ix-set:AttributeName = "<#Tool number#>"} + ToolNo : BYTE; + {#ix-set:AttributeName = "<#Workobject number#>"} + WorkobjectNo : BYTE; + {#ix-set:AttributeName = "<#PointNumber#>"} + PointNo : BYTE; + {#ix-set:AttributeName = "<#User specific speed 1#>"} + UserSpecSpeed1 : DINT; + {#ix-set:AttributeName = "<#User specific speed 2#>"} + UserSpecSpeed2 : DINT; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {attribute addProperty Name "<#Coordinates#>"} + Coordinates : AXOpen.Components.Abstractions.Robotics.AxoRoboticsCoordinates; + END_VAR + END_CLASS +END_NAMESPACE + \ No newline at end of file From b66624b92a53d55e9863120c37edfe877c7247d3 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:34:32 +0200 Subject: [PATCH 04/33] Refactor solution structure: remove obsolete projects and add new robotics components - Removed projects: AXOpen.Logging.Serilog, AXOpen.Components.Abb.Robotics.blazorapp, app_axopen_components_abb_robotics, AXOpen.Data.Json, AXOpen.Security.Blazor, AXOpen.Security, inxton_axopen_simatic1500 - Added new project: AXOpen.Components.Robotics.blazor - Updated project references and configurations to reflect the changes in the solution structure. --- .../components.abb.robotics.sln | 107 ++----- ...AxoAbbRobotics_Component_Status_v_1_x_x.cs | 280 ------------------ .../AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs | 272 ++++++++++++++++- .../AxoOmnicore_v_1_x_x.cs | 271 ++++++++++++++++- src/components.abb.robotics/this.sln | 107 ++----- 5 files changed, 579 insertions(+), 458 deletions(-) delete mode 100644 src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoAbbRobotics_Component_Status_v_1_x_x/AxoAbbRobotics_Component_Status_v_1_x_x.cs diff --git a/src/components.abb.robotics/components.abb.robotics.sln b/src/components.abb.robotics/components.abb.robotics.sln index 0470836eb..b38fed543 100644 --- a/src/components.abb.robotics/components.abb.robotics.sln +++ b/src/components.abb.robotics/components.abb.robotics.sln @@ -5,14 +5,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{0F6074CE-5D38-4A98-A7AA-E656CF4D8B60}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{D3783687-F7F5-4418-A893-1905C1D6D528}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Abb.Robotics.blazorapp", "app\ix-blazor\AXOpen.Components.Abb.Robotics.blazorapp.csproj", "{C9AE09D3-28EF-4ECD-A401-EEE5F7568331}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_abb_robotics", "app\ix\app_axopen_components_abb_robotics.csproj", "{0299E990-7CEE-4217-90ED-3F15F39FDECC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Abb.Robotics.blazor", "src\AXOpen.Components.Abb.Robotics.blazor\AXOpen.Components.Abb.Robotics.blazor.csproj", "{03763B1D-F6A9-4A92-94F3-594D2C7A2952}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abb_robotics", "src\AXOpen.Components.Abb.Robotics\inxton_axopen_components_abb_robotics.csproj", "{080F1CAA-EE1F-4CE0-8807-EAC2F0976B40}" @@ -21,25 +15,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Abb.Robot EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{58ECB392-DF76-4497-BFDE-9C5F389D31C9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor\AXOpen.Components.Robotics.blazor.csproj", "{0DEAC314-938D-4E60-ADC4-9D5CE73152C0}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{A15BFAF5-BA77-48E7-8B89-96E0FA354DC7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\core\src\AXOpen.Core.Blazor\axopen_core_blazor.csproj", "{3D7718C3-8EF4-4D01-BC3D-361ABDDF7635}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{09014B87-0239-4561-AF86-1671A98A95C9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{D65B0597-116A-444C-BEC4-AFED775CCE56}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{0F21248F-877C-4189-8222-C790E28E9E14}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{C9642EAC-1A53-436D-8FA7-499BB0A6858B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{A462DD97-989F-4635-AF74-6D08574F0316}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{73EF84EA-C582-4DAC-96BF-01307176F9DD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{552D0FAF-57D4-422E-9E91-49EF4521E4BE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{5F83D89E-D142-435E-BE8F-E89D3FA80425}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{55181ECB-848C-4FCB-AFFA-A66266836D05}" EndProject @@ -53,20 +43,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{08186FCD-AF06-4ACD-849F-781C0BD9CFCA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{F868DBD5-78D2-4FE6-BB84-DA8F4D4ED6FB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{FC76ADC2-CDD9-4D6C-93CA-5C3802F7BCDA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{1A788435-BAF9-4974-9458-09BC713D6A53}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "base", "..\base", "{3FED550A-78F4-4FBD-8F99-5DB8B5551D8F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{73A4701F-0611-4A5A-AB60-F2B6C4B58CB3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{6E7E8D1B-2E34-49AA-BA63-40DCA75485B1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{1C73F9AC-5A45-43B7-980D-3930D2DB3F26}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Abb.Robotics.blazor", "src\AXOpen.Components.Abb.Robotics.blazor", "{2FEB1764-0AD0-4588-B151-071DD11B9535}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Abb.Robotics", "src\AXOpen.Components.Abb.Robotics", "{2078F2BE-5672-4655-83D5-A8DBC22ADCFA}" @@ -85,6 +67,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{59CD213F-A1E8-4B86-8384-778C5D027284}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor", "{0F0E945F-F00E-4AEA-854C-016BE30521ED}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics", "..\components.robotics\src\AXOpen.Components.Robotics", "{9DDC7A68-2660-4692-ACCA-4E528A7E29CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.robotics\src", "{46E542DD-FA06-4984-8E34-448BE25EFCD9}" @@ -99,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{D802 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{DEDBA190-C519-402C-8CAD-0BAB6B0A26C5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{1E333C5B-8CCE-4499-B319-7F417A2A61D2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{53653043-4CFC-44B8-90DD-A3FABEA59CBF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{179F5DDE-07AF-4C74-8D5E-976447058400}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{A165CD30-56CA-48C5-88EF-EFA19EAA226B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{AD27711D-CB39-47C6-9B48-DA4B7FDAFBC7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{5CB2DC4C-9F69-4404-B020-4015F776FA5B}" @@ -121,19 +97,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{D81723FE-522E-423F-8794-8CDABAE347E7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{FEF47ECC-A729-40CD-B86F-5D9F19366C82}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{664D66CC-EE39-412F-8175-C2E0F2FA47CA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{B37D9B6E-4D5D-4DB5-8A60-CF46AA352236}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{83BFEDB0-10D2-4094-888A-3DF2CA33CDF7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{BCE64133-72A3-4744-A70D-E16E90879687}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{77E12519-D00B-46EF-9AB3-DFDFA08AD258}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{0543BD1E-9878-43BE-812A-116C7A5ECF79}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{244EF86F-3F99-4282-B962-9AED5F0AFAF4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{C38C1DDF-64F0-475B-83A4-D099E4772AB5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{6C678E8F-993E-43B7-9DB6-008537AEF6B5}" EndProject @@ -165,22 +131,10 @@ Global {0F6074CE-5D38-4A98-A7AA-E656CF4D8B60}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F6074CE-5D38-4A98-A7AA-E656CF4D8B60}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F6074CE-5D38-4A98-A7AA-E656CF4D8B60}.Release|Any CPU.Build.0 = Release|Any CPU - {D3783687-F7F5-4418-A893-1905C1D6D528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3783687-F7F5-4418-A893-1905C1D6D528}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3783687-F7F5-4418-A893-1905C1D6D528}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3783687-F7F5-4418-A893-1905C1D6D528}.Release|Any CPU.Build.0 = Release|Any CPU {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}.Release|Any CPU.Build.0 = Release|Any CPU - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331}.Release|Any CPU.Build.0 = Release|Any CPU - {0299E990-7CEE-4217-90ED-3F15F39FDECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0299E990-7CEE-4217-90ED-3F15F39FDECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0299E990-7CEE-4217-90ED-3F15F39FDECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0299E990-7CEE-4217-90ED-3F15F39FDECC}.Release|Any CPU.Build.0 = Release|Any CPU {03763B1D-F6A9-4A92-94F3-594D2C7A2952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {03763B1D-F6A9-4A92-94F3-594D2C7A2952}.Debug|Any CPU.Build.0 = Debug|Any CPU {03763B1D-F6A9-4A92-94F3-594D2C7A2952}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,6 +151,10 @@ Global {58ECB392-DF76-4497-BFDE-9C5F389D31C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {58ECB392-DF76-4497-BFDE-9C5F389D31C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {58ECB392-DF76-4497-BFDE-9C5F389D31C9}.Release|Any CPU.Build.0 = Release|Any CPU + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0}.Release|Any CPU.Build.0 = Release|Any CPU {A15BFAF5-BA77-48E7-8B89-96E0FA354DC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A15BFAF5-BA77-48E7-8B89-96E0FA354DC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {A15BFAF5-BA77-48E7-8B89-96E0FA354DC7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,10 +167,6 @@ Global {09014B87-0239-4561-AF86-1671A98A95C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {09014B87-0239-4561-AF86-1671A98A95C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {09014B87-0239-4561-AF86-1671A98A95C9}.Release|Any CPU.Build.0 = Release|Any CPU - {D65B0597-116A-444C-BEC4-AFED775CCE56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D65B0597-116A-444C-BEC4-AFED775CCE56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D65B0597-116A-444C-BEC4-AFED775CCE56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D65B0597-116A-444C-BEC4-AFED775CCE56}.Release|Any CPU.Build.0 = Release|Any CPU {0F21248F-877C-4189-8222-C790E28E9E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0F21248F-877C-4189-8222-C790E28E9E14}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F21248F-877C-4189-8222-C790E28E9E14}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,18 +179,10 @@ Global {A462DD97-989F-4635-AF74-6D08574F0316}.Debug|Any CPU.Build.0 = Debug|Any CPU {A462DD97-989F-4635-AF74-6D08574F0316}.Release|Any CPU.ActiveCfg = Release|Any CPU {A462DD97-989F-4635-AF74-6D08574F0316}.Release|Any CPU.Build.0 = Release|Any CPU - {73EF84EA-C582-4DAC-96BF-01307176F9DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73EF84EA-C582-4DAC-96BF-01307176F9DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73EF84EA-C582-4DAC-96BF-01307176F9DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73EF84EA-C582-4DAC-96BF-01307176F9DD}.Release|Any CPU.Build.0 = Release|Any CPU - {552D0FAF-57D4-422E-9E91-49EF4521E4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {552D0FAF-57D4-422E-9E91-49EF4521E4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {552D0FAF-57D4-422E-9E91-49EF4521E4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {552D0FAF-57D4-422E-9E91-49EF4521E4BE}.Release|Any CPU.Build.0 = Release|Any CPU - {5F83D89E-D142-435E-BE8F-E89D3FA80425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F83D89E-D142-435E-BE8F-E89D3FA80425}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F83D89E-D142-435E-BE8F-E89D3FA80425}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F83D89E-D142-435E-BE8F-E89D3FA80425}.Release|Any CPU.Build.0 = Release|Any CPU + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}.Release|Any CPU.Build.0 = Release|Any CPU {55181ECB-848C-4FCB-AFFA-A66266836D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55181ECB-848C-4FCB-AFFA-A66266836D05}.Debug|Any CPU.Build.0 = Debug|Any CPU {55181ECB-848C-4FCB-AFFA-A66266836D05}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -255,16 +201,9 @@ Global {02E03A1A-C4D4-4B79-821E-32BC0D714056} = {6DE4150C-AA69-4B8B-AD2D-6FB37F294E2C} {0F6074CE-5D38-4A98-A7AA-E656CF4D8B60} = {08186FCD-AF06-4ACD-849F-781C0BD9CFCA} {08186FCD-AF06-4ACD-849F-781C0BD9CFCA} = {1A788435-BAF9-4974-9458-09BC713D6A53} - {D3783687-F7F5-4418-A893-1905C1D6D528} = {F868DBD5-78D2-4FE6-BB84-DA8F4D4ED6FB} - {F868DBD5-78D2-4FE6-BB84-DA8F4D4ED6FB} = {1A788435-BAF9-4974-9458-09BC713D6A53} {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58} = {FC76ADC2-CDD9-4D6C-93CA-5C3802F7BCDA} {FC76ADC2-CDD9-4D6C-93CA-5C3802F7BCDA} = {1A788435-BAF9-4974-9458-09BC713D6A53} {1A788435-BAF9-4974-9458-09BC713D6A53} = {3FED550A-78F4-4FBD-8F99-5DB8B5551D8F} - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331} = {73A4701F-0611-4A5A-AB60-F2B6C4B58CB3} - {73A4701F-0611-4A5A-AB60-F2B6C4B58CB3} = {1C73F9AC-5A45-43B7-980D-3930D2DB3F26} - {0299E990-7CEE-4217-90ED-3F15F39FDECC} = {6E7E8D1B-2E34-49AA-BA63-40DCA75485B1} - {6E7E8D1B-2E34-49AA-BA63-40DCA75485B1} = {1C73F9AC-5A45-43B7-980D-3930D2DB3F26} - {1C73F9AC-5A45-43B7-980D-3930D2DB3F26} = {D9EC0CEC-705A-46FF-92FE-15A27071ED2D} {03763B1D-F6A9-4A92-94F3-594D2C7A2952} = {2FEB1764-0AD0-4588-B151-071DD11B9535} {2FEB1764-0AD0-4588-B151-071DD11B9535} = {F581E916-FD0A-421C-9E1C-33BA69502B44} {080F1CAA-EE1F-4CE0-8807-EAC2F0976B40} = {2078F2BE-5672-4655-83D5-A8DBC22ADCFA} @@ -276,6 +215,8 @@ Global {58ECB392-DF76-4497-BFDE-9C5F389D31C9} = {BED8FA51-539D-43C7-B2A5-C31F2F7DBB21} {BED8FA51-539D-43C7-B2A5-C31F2F7DBB21} = {8CCB8573-EB15-4554-93E9-14BEB3FA05E6} {8CCB8573-EB15-4554-93E9-14BEB3FA05E6} = {59CD213F-A1E8-4B86-8384-778C5D027284} + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0} = {0F0E945F-F00E-4AEA-854C-016BE30521ED} + {0F0E945F-F00E-4AEA-854C-016BE30521ED} = {46E542DD-FA06-4984-8E34-448BE25EFCD9} {A15BFAF5-BA77-48E7-8B89-96E0FA354DC7} = {9DDC7A68-2660-4692-ACCA-4E528A7E29CE} {9DDC7A68-2660-4692-ACCA-4E528A7E29CE} = {46E542DD-FA06-4984-8E34-448BE25EFCD9} {46E542DD-FA06-4984-8E34-448BE25EFCD9} = {D9A8F7FE-923C-4F60-9A4E-D2A2A6C1F064} @@ -284,10 +225,6 @@ Global {09014B87-0239-4561-AF86-1671A98A95C9} = {33247ADD-901E-4D13-B0FD-7272E609CABC} {33247ADD-901E-4D13-B0FD-7272E609CABC} = {D802A79B-2DBD-4FED-AA42-D21D5C5D7E2E} {D802A79B-2DBD-4FED-AA42-D21D5C5D7E2E} = {DEDBA190-C519-402C-8CAD-0BAB6B0A26C5} - {D65B0597-116A-444C-BEC4-AFED775CCE56} = {1E333C5B-8CCE-4499-B319-7F417A2A61D2} - {1E333C5B-8CCE-4499-B319-7F417A2A61D2} = {53653043-4CFC-44B8-90DD-A3FABEA59CBF} - {53653043-4CFC-44B8-90DD-A3FABEA59CBF} = {179F5DDE-07AF-4C74-8D5E-976447058400} - {179F5DDE-07AF-4C74-8D5E-976447058400} = {A165CD30-56CA-48C5-88EF-EFA19EAA226B} {0F21248F-877C-4189-8222-C790E28E9E14} = {AD27711D-CB39-47C6-9B48-DA4B7FDAFBC7} {AD27711D-CB39-47C6-9B48-DA4B7FDAFBC7} = {EC21F427-5D5F-43C2-B18B-9BB5C7FC8608} {C9642EAC-1A53-436D-8FA7-499BB0A6858B} = {5CB2DC4C-9F69-4404-B020-4015F776FA5B} @@ -296,14 +233,8 @@ Global {A462DD97-989F-4635-AF74-6D08574F0316} = {A76B91CD-2765-43A4-950B-971373C14B17} {A76B91CD-2765-43A4-950B-971373C14B17} = {2FCE7A21-5935-46BC-838F-E9CCCC48030F} {2FCE7A21-5935-46BC-838F-E9CCCC48030F} = {D81723FE-522E-423F-8794-8CDABAE347E7} - {73EF84EA-C582-4DAC-96BF-01307176F9DD} = {FEF47ECC-A729-40CD-B86F-5D9F19366C82} - {FEF47ECC-A729-40CD-B86F-5D9F19366C82} = {B37D9B6E-4D5D-4DB5-8A60-CF46AA352236} - {552D0FAF-57D4-422E-9E91-49EF4521E4BE} = {664D66CC-EE39-412F-8175-C2E0F2FA47CA} - {664D66CC-EE39-412F-8175-C2E0F2FA47CA} = {B37D9B6E-4D5D-4DB5-8A60-CF46AA352236} - {B37D9B6E-4D5D-4DB5-8A60-CF46AA352236} = {83BFEDB0-10D2-4094-888A-3DF2CA33CDF7} - {5F83D89E-D142-435E-BE8F-E89D3FA80425} = {BCE64133-72A3-4744-A70D-E16E90879687} - {BCE64133-72A3-4744-A70D-E16E90879687} = {77E12519-D00B-46EF-9AB3-DFDFA08AD258} - {77E12519-D00B-46EF-9AB3-DFDFA08AD258} = {244EF86F-3F99-4282-B962-9AED5F0AFAF4} + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51} = {0543BD1E-9878-43BE-812A-116C7A5ECF79} + {0543BD1E-9878-43BE-812A-116C7A5ECF79} = {C38C1DDF-64F0-475B-83A4-D099E4772AB5} {55181ECB-848C-4FCB-AFFA-A66266836D05} = {6C678E8F-993E-43B7-9DB6-008537AEF6B5} {6C678E8F-993E-43B7-9DB6-008537AEF6B5} = {29500569-58F0-405A-A841-506E6FFE30F2} {29500569-58F0-405A-A841-506E6FFE30F2} = {C31F03BF-8FEF-4AFC-BBA4-B496D2616FEA} diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoAbbRobotics_Component_Status_v_1_x_x/AxoAbbRobotics_Component_Status_v_1_x_x.cs b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoAbbRobotics_Component_Status_v_1_x_x/AxoAbbRobotics_Component_Status_v_1_x_x.cs deleted file mode 100644 index 7b80aba4c..000000000 --- a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoAbbRobotics_Component_Status_v_1_x_x/AxoAbbRobotics_Component_Status_v_1_x_x.cs +++ /dev/null @@ -1,280 +0,0 @@ -using AXOpen.Messaging.Static; -using AXSharp.Connector; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using static System.Runtime.InteropServices.JavaScript.JSType; - -namespace AXOpen.Components.Abb.Robotics -{ - public partial class AxoAbbRobotics_Component_Status_v_1_x_x : AXOpen.Components.Robotics.AxoRobot_Status - { - Dictionary errorDescriptionDict = new Dictionary(); - Dictionary actionDescriptionDict = new Dictionary(); - - public string ErrorDescription - { - get - { - if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } - if (errorDescriptionDict.Count == 0) - { - errorDescriptionDict.Add(0, " "); - errorDescriptionDict.Add(501, "Waiting for the signal Inputs.CycleOn to be reseted!"); - errorDescriptionDict.Add(502, "Waiting for the signal Inputs.PpMoved to be set!"); - errorDescriptionDict.Add(510, "Waiting for the signal Inputs.AutoOn to be set!"); - errorDescriptionDict.Add(511, "Waiting for the signal Inputs.Error to be reseted!"); - errorDescriptionDict.Add(512, "Waiting for the signal Inputs.EmgStop to be reseted!"); - errorDescriptionDict.Add(513, "Waiting for the signal Inputs.MotorOnState to be set!"); - errorDescriptionDict.Add(514, "Waiting for the signal Inputs.CycleOn to be set!"); - errorDescriptionDict.Add(515, "Waiting for the signal Inputs.Error to be reseted!"); - errorDescriptionDict.Add(520, "Waiting for the signal Inputs.AutoOn to be set!"); - errorDescriptionDict.Add(521, "Waiting for the signal Inputs.Error to be reseted!"); - errorDescriptionDict.Add(522, "Waiting for the signal Inputs.EmgStop to be reseted!"); - errorDescriptionDict.Add(523, "Waiting for the signal Inputs.MotorOnState to be set!"); - errorDescriptionDict.Add(524, "Waiting for the signal Inputs.CycleOn to be set!"); - errorDescriptionDict.Add(525, "Waiting for the signal Inputs.Error to be reseted!"); - errorDescriptionDict.Add(526, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); - errorDescriptionDict.Add(527, "Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `."); - errorDescriptionDict.Add(528, "Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `."); - errorDescriptionDict.Add(529, "Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `."); - errorDescriptionDict.Add(530, "Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `."); - errorDescriptionDict.Add(531, "Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `."); - errorDescriptionDict.Add(532, "Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `."); - errorDescriptionDict.Add(533, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); - errorDescriptionDict.Add(534, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); - errorDescriptionDict.Add(535, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); - errorDescriptionDict.Add(540, "Waiting for the signal Inputs.AutoOn to be set!"); - errorDescriptionDict.Add(541, "Waiting for the signal Inputs.Error to be reseted!"); - errorDescriptionDict.Add(542, "Waiting for the signal Inputs.EmgStop to be reseted!"); - errorDescriptionDict.Add(543, "Waiting for the signal Inputs.MotorOnState to be set!"); - errorDescriptionDict.Add(544, "Waiting for the signal Inputs.Error to be reseted!"); - errorDescriptionDict.Add(550, "Waiting for the signal Inputs.CycleOn to be set!"); - errorDescriptionDict.Add(551, "Waiting for the signal Inputs.MotorOnState to be set!"); - errorDescriptionDict.Add(552, "Waiting for the signal Inputs.Error to be reseted!"); - errorDescriptionDict.Add(553, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); - errorDescriptionDict.Add(554, "Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `."); - errorDescriptionDict.Add(555, "Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `."); - errorDescriptionDict.Add(556, "Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `."); - errorDescriptionDict.Add(557, "Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `."); - errorDescriptionDict.Add(558, "Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `."); - errorDescriptionDict.Add(559, "Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `."); - errorDescriptionDict.Add(560, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); - errorDescriptionDict.Add(561, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); - errorDescriptionDict.Add(562, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); - errorDescriptionDict.Add(570, "Waiting for the signal Inputs.CycleOn to be set!"); - errorDescriptionDict.Add(571, "Waiting for the signal Inputs.SystemInputBusy to be reseted!"); - errorDescriptionDict.Add(580, "Waiting for the signal Inputs.MotorOffState to be set!"); - errorDescriptionDict.Add(581, "Waiting for the signal Inputs.SystemInputBusy to be reseted!"); - errorDescriptionDict.Add(590, "Waiting for the signal Inputs.MoveInactive to be set!"); - errorDescriptionDict.Add(591, "Waiting for the signal Inputs.CycleOn to be reseted!"); - errorDescriptionDict.Add(600, "Waiting for the signal Inputs.MoveInactive to be set!"); - errorDescriptionDict.Add(610, "Waiting for the signal Inputs.CycleOn to be reseted!"); - - // General alarm - errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); - errorDescriptionDict.Add(701, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); - errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); - errorDescriptionDict.Add(710, "Hw configuration error. Value of _hwIdDI_64_bytes is zero."); - errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); - errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); - errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); - errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); - errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); - errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module with 64 input bytes (GsdId=1)."); - errorDescriptionDict.Add(720, "Hw configuration error. Value of _hwIdDO_64_bytes is zero."); - errorDescriptionDict.Add(721, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2."); - errorDescriptionDict.Add(722, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2."); - errorDescriptionDict.Add(723, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2."); - errorDescriptionDict.Add(724, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2."); - errorDescriptionDict.Add(725, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2."); - errorDescriptionDict.Add(726, "Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module with 64 output bytes (GsdId=2)."); - errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); - errorDescriptionDict.Add(1131, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1132, "Input variable `Config.HWIDs.HwID_DI_64_bytes` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1133, "Input variable `Config.HWIDs.HwID_DO_64_bytes` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1201, "Error reading the hwIdDI_64_bytes!" ); - errorDescriptionDict.Add(1231, "Error writing the _hwIdDO_64_bytes!"); - errorDescriptionDict.Add(10000, "Start at main finished with error!"); - errorDescriptionDict.Add(10001, "Start at main was aborted, while not yet completed!"); - errorDescriptionDict.Add(10010, "Start motors and program finished with error!"); - errorDescriptionDict.Add(10011, "Start motors and program was aborted, while not yet completed!"); - errorDescriptionDict.Add(10020, "Start motors program and movements finished with error!"); - errorDescriptionDict.Add(10021, "Start motors program and movements was aborted, while not yet completed!"); - errorDescriptionDict.Add(10040, "Start motors finished with error!"); - errorDescriptionDict.Add(10041, "Start motors was aborted, while not yet completed!"); - errorDescriptionDict.Add(10050, "Start movements finished with error!"); - errorDescriptionDict.Add(10051, "Start movements was aborted, while not yet completed!"); - errorDescriptionDict.Add(10070, "Start program finished with error!"); - errorDescriptionDict.Add(10071, "Start program was aborted, while not yet completed!"); - errorDescriptionDict.Add(10080, "Stop motors finished with error!"); - errorDescriptionDict.Add(10081, "Stop motors was aborted, while not yet completed!"); - errorDescriptionDict.Add(10090, "Stop movements and program finished with error!"); - errorDescriptionDict.Add(10091, "Stop movements and program was aborted, while not yet completed!"); - errorDescriptionDict.Add(10100, "Stop movements finished with error!"); - errorDescriptionDict.Add(10101, "Stop movements was aborted, while not yet completed!"); - errorDescriptionDict.Add(10110, "Stop program finished with error!"); - errorDescriptionDict.Add(10111, "Stop program was aborted, while not yet completed!"); - errorDescriptionDict.Add(20001, "Emergency stop activated!"); - errorDescriptionDict.Add(20002, "Safety circuit interupted!"); - errorDescriptionDict.Add(20003, "Program error active!"); - } - string errorDescription = " "; - - if (Error == null || Error.Id == null) - return errorDescription; - - if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) - { - return errorDescription; - } - else - - { - return " "; - } - } - } - - public string ActionDescription - { - get - { - if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } - if (actionDescriptionDict.Count == 0) - { - actionDescriptionDict.Add(0, " "); - actionDescriptionDict.Add(50, "Restore has been executed."); - - actionDescriptionDict.Add(100, "Start at main started."); - actionDescriptionDict.Add(300, "Start at main running: starting program at main."); - actionDescriptionDict.Add(301, "Start at main running: program started."); - actionDescriptionDict.Add(101, "Start at main finished succesfully."); - actionDescriptionDict.Add(102, "Start at main restored."); - - actionDescriptionDict.Add(110, "Start motors and program started."); - actionDescriptionDict.Add(310, "Start motors and program running: switching to auto."); - actionDescriptionDict.Add(311, "Start motors and program running: reseting error."); - actionDescriptionDict.Add(312, "Start motors and program running: reseting emergency stop error."); - actionDescriptionDict.Add(313, "Start motors and program running: switching motors on."); - actionDescriptionDict.Add(314, "Start motors and program running: starting program."); - actionDescriptionDict.Add(315, "Start motors and program running: checking controller error."); - actionDescriptionDict.Add(316, "Start motors and program finished."); - actionDescriptionDict.Add(111, "Start motors and program finished succesfully."); - actionDescriptionDict.Add(112, "Start motors and program restored."); - - actionDescriptionDict.Add(120, "Start motors program and movements started."); - actionDescriptionDict.Add(320, "Start motors program and movements running: switching to auto."); - actionDescriptionDict.Add(321, "Start motors program and movements running: reseting error."); - actionDescriptionDict.Add(322, "Start motors program and movements running: reseting emergency stop error."); - actionDescriptionDict.Add(323, "Start motors program and movements running: switching motors on."); - actionDescriptionDict.Add(324, "Start motors program and movements running: starting program."); - actionDescriptionDict.Add(325, "Start motors program and movements running: checking controller error."); - actionDescriptionDict.Add(326, "Start motors program and movements running: sending parameters of the movement to the controller."); - actionDescriptionDict.Add(327, "Start motors program and movements running: waiting for the movement parameters sent to the controller to be mirrored back."); - actionDescriptionDict.Add(333, "Start motors program and movements running: acknowleadging of the movement parameters."); - actionDescriptionDict.Add(334, "Start motors program and movements running: waiting for the movement is finished."); - actionDescriptionDict.Add(335, "Start motors program and movements running: acknowleadging of the finished movement."); - actionDescriptionDict.Add(121, "Start motors program and movements finished succesfully."); - actionDescriptionDict.Add(122, "Start motors program and movements restored."); - - actionDescriptionDict.Add(140, "Start motors started."); - actionDescriptionDict.Add(340, "Start motors running: switching to auto."); - actionDescriptionDict.Add(341, "Start motors running: reseting error."); - actionDescriptionDict.Add(342, "Start motors running: reseting emergency stop error."); - actionDescriptionDict.Add(343, "Start motors running: switching motors on."); - actionDescriptionDict.Add(344, "Start motors running: checking controller error."); - actionDescriptionDict.Add(345, "Start motors finished."); - actionDescriptionDict.Add(141, "Start motors finished succesfully."); - actionDescriptionDict.Add(142, "Start motors restored."); - - actionDescriptionDict.Add(150, "Start movements started."); - actionDescriptionDict.Add(350, "Start movements running: waiting for the program is running."); - actionDescriptionDict.Add(351, "Start movements running: waiting for the motors are on."); - actionDescriptionDict.Add(352, "Start movements running: waiting for the error is cleared."); - actionDescriptionDict.Add(353, "Start movements running: sending parameters of the movement to the controller."); - actionDescriptionDict.Add(354, "Start movements running: waiting for the movement parameters sent to the controller to be mirrored back."); - actionDescriptionDict.Add(360, "Start movements running: acknowleadging of the movement parameters."); - actionDescriptionDict.Add(361, "Start movements running: waiting for the movement is finished."); - actionDescriptionDict.Add(362, "Start movements running: acknowleadging of the finished movement."); - actionDescriptionDict.Add(363, "Start movements finished."); - actionDescriptionDict.Add(151, "Start movements finished succesfully."); - actionDescriptionDict.Add(152, "Start movements restored."); - - actionDescriptionDict.Add(170, "Start program started."); - actionDescriptionDict.Add(370, "Start program running: starting program."); - actionDescriptionDict.Add(371, "Start program running: starting program."); - actionDescriptionDict.Add(372, "Start program finished."); - actionDescriptionDict.Add(171, "Start program finished succesfully."); - actionDescriptionDict.Add(172, "Start program restored."); - - actionDescriptionDict.Add(180, "Stop motors started."); - actionDescriptionDict.Add(380, "Stop motors running: switching the motors off."); - actionDescriptionDict.Add(381, "Stop motors running: switching the motors off."); - actionDescriptionDict.Add(382, "Stop motors finished."); - actionDescriptionDict.Add(181, "Stop motors finished succesfully."); - actionDescriptionDict.Add(182, "Stop motors restored."); - - actionDescriptionDict.Add(190, "Stop movements and program started."); - actionDescriptionDict.Add(390, "Stop movements and program running: stopping the movement."); - actionDescriptionDict.Add(391, "Stop movements and program running: stopping the program."); - actionDescriptionDict.Add(392, "Stop movements and program finished."); - actionDescriptionDict.Add(191, "Stop movements and program finished succesfully."); - actionDescriptionDict.Add(192, "Stop movements and program restored."); - - actionDescriptionDict.Add(200, "Stop movements started."); - actionDescriptionDict.Add(400, "Stop movements running: stopping the movement."); - actionDescriptionDict.Add(401, "Stop movements finished."); - actionDescriptionDict.Add(201, "Stop movements finished succesfully."); - actionDescriptionDict.Add(202, "Stop movements restored."); - - actionDescriptionDict.Add(210, "Stop program started."); - actionDescriptionDict.Add(410, "Stop program running: stopping the program."); - actionDescriptionDict.Add(411, "Stop program finished."); - actionDescriptionDict.Add(211, "Stop program finished succesfully"); - actionDescriptionDict.Add(212, "Stop program restored."); - - actionDescriptionDict.Add(10000, "Start at main finished with error!"); - actionDescriptionDict.Add(10001, "Start at main was aborted, while not yet completed!"); - actionDescriptionDict.Add(10010, "Start motors and program finished with error!"); - actionDescriptionDict.Add(10011, "Start motors and program was aborted, while not yet completed!"); - actionDescriptionDict.Add(10020, "Start motors program and movements finished with error!"); - actionDescriptionDict.Add(10021, "Start motors program and movements was aborted, while not yet completed!"); - actionDescriptionDict.Add(10040, "Start motors finished with error!"); - actionDescriptionDict.Add(10041, "Start motors was aborted, while not yet completed!"); - actionDescriptionDict.Add(10050, "Start movements finished with error!"); - actionDescriptionDict.Add(10051, "Start movements was aborted, while not yet completed!"); - actionDescriptionDict.Add(10070, "Start program finished with error!"); - actionDescriptionDict.Add(10071, "Start program was aborted, while not yet completed!"); - actionDescriptionDict.Add(10080, "Stop motors finished with error!"); - actionDescriptionDict.Add(10081, "Stop motors was aborted, while not yet completed!"); - actionDescriptionDict.Add(10090, "Stop movements and program finished with error!"); - actionDescriptionDict.Add(10091, "Stop movements and program was aborted, while not yet completed!"); - actionDescriptionDict.Add(10100, "Stop movements finished with error!"); - actionDescriptionDict.Add(10101, "Stop movements was aborted, while not yet completed!"); - actionDescriptionDict.Add(10110, "Stop program finished with error!"); - actionDescriptionDict.Add(10111, "Stop program was aborted, while not yet completed!"); - - } - - string actionDescription = " "; - - if (Action == null || Action.Id == null) - return actionDescription; - - if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) - { - return actionDescription; - } - else - { - return " "; - } - - } - } - } -} - diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs index 961f0b9dc..04acaefc3 100644 --- a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using Newtonsoft.Json.Linq; using Newtonsoft.Json; @@ -206,6 +206,276 @@ private void InitializeTaskMessenger() TaskMessenger.DotNetMessengerTextList = messengerTextList; } + + } + + public partial class AxoIrc5_v_1_x_x_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status + { + Dictionary errorDescriptionDict = new Dictionary(); + Dictionary actionDescriptionDict = new Dictionary(); + + public string ErrorDescription + { + get + { + if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } + if (errorDescriptionDict.Count == 0) + { + errorDescriptionDict.Add(0, " "); + errorDescriptionDict.Add(501, "Waiting for the signal Inputs.CycleOn to be reseted!"); + errorDescriptionDict.Add(502, "Waiting for the signal Inputs.PpMoved to be set!"); + errorDescriptionDict.Add(510, "Waiting for the signal Inputs.AutoOn to be set!"); + errorDescriptionDict.Add(511, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(512, "Waiting for the signal Inputs.EmgStop to be reseted!"); + errorDescriptionDict.Add(513, "Waiting for the signal Inputs.MotorOnState to be set!"); + errorDescriptionDict.Add(514, "Waiting for the signal Inputs.CycleOn to be set!"); + errorDescriptionDict.Add(515, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(520, "Waiting for the signal Inputs.AutoOn to be set!"); + errorDescriptionDict.Add(521, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(522, "Waiting for the signal Inputs.EmgStop to be reseted!"); + errorDescriptionDict.Add(523, "Waiting for the signal Inputs.MotorOnState to be set!"); + errorDescriptionDict.Add(524, "Waiting for the signal Inputs.CycleOn to be set!"); + errorDescriptionDict.Add(525, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(526, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(527, "Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `."); + errorDescriptionDict.Add(528, "Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `."); + errorDescriptionDict.Add(529, "Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `."); + errorDescriptionDict.Add(530, "Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `."); + errorDescriptionDict.Add(531, "Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `."); + errorDescriptionDict.Add(532, "Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `."); + errorDescriptionDict.Add(533, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(534, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(535, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(540, "Waiting for the signal Inputs.AutoOn to be set!"); + errorDescriptionDict.Add(541, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(542, "Waiting for the signal Inputs.EmgStop to be reseted!"); + errorDescriptionDict.Add(543, "Waiting for the signal Inputs.MotorOnState to be set!"); + errorDescriptionDict.Add(544, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(550, "Waiting for the signal Inputs.CycleOn to be set!"); + errorDescriptionDict.Add(551, "Waiting for the signal Inputs.MotorOnState to be set!"); + errorDescriptionDict.Add(552, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(553, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(554, "Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `."); + errorDescriptionDict.Add(555, "Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `."); + errorDescriptionDict.Add(556, "Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `."); + errorDescriptionDict.Add(557, "Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `."); + errorDescriptionDict.Add(558, "Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `."); + errorDescriptionDict.Add(559, "Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `."); + errorDescriptionDict.Add(560, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(561, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(562, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(570, "Waiting for the signal Inputs.CycleOn to be set!"); + errorDescriptionDict.Add(571, "Waiting for the signal Inputs.SystemInputBusy to be reseted!"); + errorDescriptionDict.Add(580, "Waiting for the signal Inputs.MotorOffState to be set!"); + errorDescriptionDict.Add(581, "Waiting for the signal Inputs.SystemInputBusy to be reseted!"); + errorDescriptionDict.Add(590, "Waiting for the signal Inputs.MoveInactive to be set!"); + errorDescriptionDict.Add(591, "Waiting for the signal Inputs.CycleOn to be reseted!"); + errorDescriptionDict.Add(600, "Waiting for the signal Inputs.MoveInactive to be set!"); + errorDescriptionDict.Add(610, "Waiting for the signal Inputs.CycleOn to be reseted!"); + + // General alarm + errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(701, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); + errorDescriptionDict.Add(710, "Hw configuration error. Value of _hwIdDI_64_bytes is zero."); + errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); + errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); + errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); + errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); + errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); + errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module with 64 input bytes (GsdId=1)."); + errorDescriptionDict.Add(720, "Hw configuration error. Value of _hwIdDO_64_bytes is zero."); + errorDescriptionDict.Add(721, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2."); + errorDescriptionDict.Add(722, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2."); + errorDescriptionDict.Add(723, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2."); + errorDescriptionDict.Add(724, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2."); + errorDescriptionDict.Add(725, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2."); + errorDescriptionDict.Add(726, "Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module with 64 output bytes (GsdId=2)."); + errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(1131, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1132, "Input variable `Config.HWIDs.HwID_DI_64_bytes` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1133, "Input variable `Config.HWIDs.HwID_DO_64_bytes` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1201, "Error reading the hwIdDI_64_bytes!"); + errorDescriptionDict.Add(1231, "Error writing the _hwIdDO_64_bytes!"); + errorDescriptionDict.Add(10000, "Start at main finished with error!"); + errorDescriptionDict.Add(10001, "Start at main was aborted, while not yet completed!"); + errorDescriptionDict.Add(10010, "Start motors and program finished with error!"); + errorDescriptionDict.Add(10011, "Start motors and program was aborted, while not yet completed!"); + errorDescriptionDict.Add(10020, "Start motors program and movements finished with error!"); + errorDescriptionDict.Add(10021, "Start motors program and movements was aborted, while not yet completed!"); + errorDescriptionDict.Add(10040, "Start motors finished with error!"); + errorDescriptionDict.Add(10041, "Start motors was aborted, while not yet completed!"); + errorDescriptionDict.Add(10050, "Start movements finished with error!"); + errorDescriptionDict.Add(10051, "Start movements was aborted, while not yet completed!"); + errorDescriptionDict.Add(10070, "Start program finished with error!"); + errorDescriptionDict.Add(10071, "Start program was aborted, while not yet completed!"); + errorDescriptionDict.Add(10080, "Stop motors finished with error!"); + errorDescriptionDict.Add(10081, "Stop motors was aborted, while not yet completed!"); + errorDescriptionDict.Add(10090, "Stop movements and program finished with error!"); + errorDescriptionDict.Add(10091, "Stop movements and program was aborted, while not yet completed!"); + errorDescriptionDict.Add(10100, "Stop movements finished with error!"); + errorDescriptionDict.Add(10101, "Stop movements was aborted, while not yet completed!"); + errorDescriptionDict.Add(10110, "Stop program finished with error!"); + errorDescriptionDict.Add(10111, "Stop program was aborted, while not yet completed!"); + errorDescriptionDict.Add(20001, "Emergency stop activated!"); + errorDescriptionDict.Add(20002, "Safety circuit interupted!"); + errorDescriptionDict.Add(20003, "Program error active!"); + } + string errorDescription = " "; + + if (Error == null || Error.Id == null) + return errorDescription; + + if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) + { + return errorDescription; + } + else + + { + return " "; + } + } + } + + public string ActionDescription + { + get + { + if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } + if (actionDescriptionDict.Count == 0) + { + actionDescriptionDict.Add(0, " "); + actionDescriptionDict.Add(50, "Restore has been executed."); + + actionDescriptionDict.Add(100, "Start at main started."); + actionDescriptionDict.Add(300, "Start at main running: starting program at main."); + actionDescriptionDict.Add(301, "Start at main running: program started."); + actionDescriptionDict.Add(101, "Start at main finished succesfully."); + actionDescriptionDict.Add(102, "Start at main restored."); + + actionDescriptionDict.Add(110, "Start motors and program started."); + actionDescriptionDict.Add(310, "Start motors and program running: switching to auto."); + actionDescriptionDict.Add(311, "Start motors and program running: reseting error."); + actionDescriptionDict.Add(312, "Start motors and program running: reseting emergency stop error."); + actionDescriptionDict.Add(313, "Start motors and program running: switching motors on."); + actionDescriptionDict.Add(314, "Start motors and program running: starting program."); + actionDescriptionDict.Add(315, "Start motors and program running: checking controller error."); + actionDescriptionDict.Add(316, "Start motors and program finished."); + actionDescriptionDict.Add(111, "Start motors and program finished succesfully."); + actionDescriptionDict.Add(112, "Start motors and program restored."); + + actionDescriptionDict.Add(120, "Start motors program and movements started."); + actionDescriptionDict.Add(320, "Start motors program and movements running: switching to auto."); + actionDescriptionDict.Add(321, "Start motors program and movements running: reseting error."); + actionDescriptionDict.Add(322, "Start motors program and movements running: reseting emergency stop error."); + actionDescriptionDict.Add(323, "Start motors program and movements running: switching motors on."); + actionDescriptionDict.Add(324, "Start motors program and movements running: starting program."); + actionDescriptionDict.Add(325, "Start motors program and movements running: checking controller error."); + actionDescriptionDict.Add(326, "Start motors program and movements running: sending parameters of the movement to the controller."); + actionDescriptionDict.Add(327, "Start motors program and movements running: waiting for the movement parameters sent to the controller to be mirrored back."); + actionDescriptionDict.Add(333, "Start motors program and movements running: acknowleadging of the movement parameters."); + actionDescriptionDict.Add(334, "Start motors program and movements running: waiting for the movement is finished."); + actionDescriptionDict.Add(335, "Start motors program and movements running: acknowleadging of the finished movement."); + actionDescriptionDict.Add(121, "Start motors program and movements finished succesfully."); + actionDescriptionDict.Add(122, "Start motors program and movements restored."); + + actionDescriptionDict.Add(140, "Start motors started."); + actionDescriptionDict.Add(340, "Start motors running: switching to auto."); + actionDescriptionDict.Add(341, "Start motors running: reseting error."); + actionDescriptionDict.Add(342, "Start motors running: reseting emergency stop error."); + actionDescriptionDict.Add(343, "Start motors running: switching motors on."); + actionDescriptionDict.Add(344, "Start motors running: checking controller error."); + actionDescriptionDict.Add(345, "Start motors finished."); + actionDescriptionDict.Add(141, "Start motors finished succesfully."); + actionDescriptionDict.Add(142, "Start motors restored."); + + actionDescriptionDict.Add(150, "Start movements started."); + actionDescriptionDict.Add(350, "Start movements running: waiting for the program is running."); + actionDescriptionDict.Add(351, "Start movements running: waiting for the motors are on."); + actionDescriptionDict.Add(352, "Start movements running: waiting for the error is cleared."); + actionDescriptionDict.Add(353, "Start movements running: sending parameters of the movement to the controller."); + actionDescriptionDict.Add(354, "Start movements running: waiting for the movement parameters sent to the controller to be mirrored back."); + actionDescriptionDict.Add(360, "Start movements running: acknowleadging of the movement parameters."); + actionDescriptionDict.Add(361, "Start movements running: waiting for the movement is finished."); + actionDescriptionDict.Add(362, "Start movements running: acknowleadging of the finished movement."); + actionDescriptionDict.Add(363, "Start movements finished."); + actionDescriptionDict.Add(151, "Start movements finished succesfully."); + actionDescriptionDict.Add(152, "Start movements restored."); + + actionDescriptionDict.Add(170, "Start program started."); + actionDescriptionDict.Add(370, "Start program running: starting program."); + actionDescriptionDict.Add(371, "Start program running: starting program."); + actionDescriptionDict.Add(372, "Start program finished."); + actionDescriptionDict.Add(171, "Start program finished succesfully."); + actionDescriptionDict.Add(172, "Start program restored."); + + actionDescriptionDict.Add(180, "Stop motors started."); + actionDescriptionDict.Add(380, "Stop motors running: switching the motors off."); + actionDescriptionDict.Add(381, "Stop motors running: switching the motors off."); + actionDescriptionDict.Add(382, "Stop motors finished."); + actionDescriptionDict.Add(181, "Stop motors finished succesfully."); + actionDescriptionDict.Add(182, "Stop motors restored."); + + actionDescriptionDict.Add(190, "Stop movements and program started."); + actionDescriptionDict.Add(390, "Stop movements and program running: stopping the movement."); + actionDescriptionDict.Add(391, "Stop movements and program running: stopping the program."); + actionDescriptionDict.Add(392, "Stop movements and program finished."); + actionDescriptionDict.Add(191, "Stop movements and program finished succesfully."); + actionDescriptionDict.Add(192, "Stop movements and program restored."); + + actionDescriptionDict.Add(200, "Stop movements started."); + actionDescriptionDict.Add(400, "Stop movements running: stopping the movement."); + actionDescriptionDict.Add(401, "Stop movements finished."); + actionDescriptionDict.Add(201, "Stop movements finished succesfully."); + actionDescriptionDict.Add(202, "Stop movements restored."); + + actionDescriptionDict.Add(210, "Stop program started."); + actionDescriptionDict.Add(410, "Stop program running: stopping the program."); + actionDescriptionDict.Add(411, "Stop program finished."); + actionDescriptionDict.Add(211, "Stop program finished succesfully"); + actionDescriptionDict.Add(212, "Stop program restored."); + + actionDescriptionDict.Add(10000, "Start at main finished with error!"); + actionDescriptionDict.Add(10001, "Start at main was aborted, while not yet completed!"); + actionDescriptionDict.Add(10010, "Start motors and program finished with error!"); + actionDescriptionDict.Add(10011, "Start motors and program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10020, "Start motors program and movements finished with error!"); + actionDescriptionDict.Add(10021, "Start motors program and movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10040, "Start motors finished with error!"); + actionDescriptionDict.Add(10041, "Start motors was aborted, while not yet completed!"); + actionDescriptionDict.Add(10050, "Start movements finished with error!"); + actionDescriptionDict.Add(10051, "Start movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10070, "Start program finished with error!"); + actionDescriptionDict.Add(10071, "Start program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10080, "Stop motors finished with error!"); + actionDescriptionDict.Add(10081, "Stop motors was aborted, while not yet completed!"); + actionDescriptionDict.Add(10090, "Stop movements and program finished with error!"); + actionDescriptionDict.Add(10091, "Stop movements and program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10100, "Stop movements finished with error!"); + actionDescriptionDict.Add(10101, "Stop movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10110, "Stop program finished with error!"); + actionDescriptionDict.Add(10111, "Stop program was aborted, while not yet completed!"); + + } + + string actionDescription = " "; + + if (Action == null || Action.Id == null) + return actionDescription; + + if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) + { + return actionDescription; + } + else + { + return " "; + } + + } + } } + } diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.cs b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.cs index cf42f0f8f..505946d6c 100644 --- a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.cs +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using System; using System.Collections.Generic; @@ -203,5 +203,274 @@ private void InitializeTaskMessenger() TaskMessenger.DotNetMessengerTextList = messengerTextList; } } + + public partial class AxoOmnicore_v_1_x_x_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status + { + Dictionary errorDescriptionDict = new Dictionary(); + Dictionary actionDescriptionDict = new Dictionary(); + + public string ErrorDescription + { + get + { + if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } + if (errorDescriptionDict.Count == 0) + { + errorDescriptionDict.Add(0, " "); + errorDescriptionDict.Add(501, "Waiting for the signal Inputs.CycleOn to be reseted!"); + errorDescriptionDict.Add(502, "Waiting for the signal Inputs.PpMoved to be set!"); + errorDescriptionDict.Add(510, "Waiting for the signal Inputs.AutoOn to be set!"); + errorDescriptionDict.Add(511, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(512, "Waiting for the signal Inputs.EmgStop to be reseted!"); + errorDescriptionDict.Add(513, "Waiting for the signal Inputs.MotorOnState to be set!"); + errorDescriptionDict.Add(514, "Waiting for the signal Inputs.CycleOn to be set!"); + errorDescriptionDict.Add(515, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(520, "Waiting for the signal Inputs.AutoOn to be set!"); + errorDescriptionDict.Add(521, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(522, "Waiting for the signal Inputs.EmgStop to be reseted!"); + errorDescriptionDict.Add(523, "Waiting for the signal Inputs.MotorOnState to be set!"); + errorDescriptionDict.Add(524, "Waiting for the signal Inputs.CycleOn to be set!"); + errorDescriptionDict.Add(525, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(526, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(527, "Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `."); + errorDescriptionDict.Add(528, "Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `."); + errorDescriptionDict.Add(529, "Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `."); + errorDescriptionDict.Add(530, "Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `."); + errorDescriptionDict.Add(531, "Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `."); + errorDescriptionDict.Add(532, "Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `."); + errorDescriptionDict.Add(533, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(534, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(535, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(540, "Waiting for the signal Inputs.AutoOn to be set!"); + errorDescriptionDict.Add(541, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(542, "Waiting for the signal Inputs.EmgStop to be reseted!"); + errorDescriptionDict.Add(543, "Waiting for the signal Inputs.MotorOnState to be set!"); + errorDescriptionDict.Add(544, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(550, "Waiting for the signal Inputs.CycleOn to be set!"); + errorDescriptionDict.Add(551, "Waiting for the signal Inputs.MotorOnState to be set!"); + errorDescriptionDict.Add(552, "Waiting for the signal Inputs.Error to be reseted!"); + errorDescriptionDict.Add(553, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(554, "Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `."); + errorDescriptionDict.Add(555, "Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `."); + errorDescriptionDict.Add(556, "Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `."); + errorDescriptionDict.Add(557, "Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `."); + errorDescriptionDict.Add(558, "Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `."); + errorDescriptionDict.Add(559, "Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `."); + errorDescriptionDict.Add(560, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(561, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(562, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(570, "Waiting for the signal Inputs.CycleOn to be set!"); + errorDescriptionDict.Add(571, "Waiting for the signal Inputs.SystemInputBusy to be reseted!"); + errorDescriptionDict.Add(580, "Waiting for the signal Inputs.MotorOffState to be set!"); + errorDescriptionDict.Add(581, "Waiting for the signal Inputs.SystemInputBusy to be reseted!"); + errorDescriptionDict.Add(590, "Waiting for the signal Inputs.MoveInactive to be set!"); + errorDescriptionDict.Add(591, "Waiting for the signal Inputs.CycleOn to be reseted!"); + errorDescriptionDict.Add(600, "Waiting for the signal Inputs.MoveInactive to be set!"); + errorDescriptionDict.Add(610, "Waiting for the signal Inputs.CycleOn to be reseted!"); + + // General alarm + errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(701, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); + errorDescriptionDict.Add(710, "Hw configuration error. Value of _hwIdDI_64_bytes is zero."); + errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); + errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); + errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); + errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); + errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); + errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module with 64 input bytes (GsdId=1)."); + errorDescriptionDict.Add(720, "Hw configuration error. Value of _hwIdDO_64_bytes is zero."); + errorDescriptionDict.Add(721, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2."); + errorDescriptionDict.Add(722, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2."); + errorDescriptionDict.Add(723, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2."); + errorDescriptionDict.Add(724, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2."); + errorDescriptionDict.Add(725, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2."); + errorDescriptionDict.Add(726, "Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module with 64 output bytes (GsdId=2)."); + errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(1131, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1132, "Input variable `Config.HWIDs.HwID_DI_64_bytes` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1133, "Input variable `Config.HWIDs.HwID_DO_64_bytes` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1201, "Error reading the hwIdDI_64_bytes!"); + errorDescriptionDict.Add(1231, "Error writing the _hwIdDO_64_bytes!"); + errorDescriptionDict.Add(10000, "Start at main finished with error!"); + errorDescriptionDict.Add(10001, "Start at main was aborted, while not yet completed!"); + errorDescriptionDict.Add(10010, "Start motors and program finished with error!"); + errorDescriptionDict.Add(10011, "Start motors and program was aborted, while not yet completed!"); + errorDescriptionDict.Add(10020, "Start motors program and movements finished with error!"); + errorDescriptionDict.Add(10021, "Start motors program and movements was aborted, while not yet completed!"); + errorDescriptionDict.Add(10040, "Start motors finished with error!"); + errorDescriptionDict.Add(10041, "Start motors was aborted, while not yet completed!"); + errorDescriptionDict.Add(10050, "Start movements finished with error!"); + errorDescriptionDict.Add(10051, "Start movements was aborted, while not yet completed!"); + errorDescriptionDict.Add(10070, "Start program finished with error!"); + errorDescriptionDict.Add(10071, "Start program was aborted, while not yet completed!"); + errorDescriptionDict.Add(10080, "Stop motors finished with error!"); + errorDescriptionDict.Add(10081, "Stop motors was aborted, while not yet completed!"); + errorDescriptionDict.Add(10090, "Stop movements and program finished with error!"); + errorDescriptionDict.Add(10091, "Stop movements and program was aborted, while not yet completed!"); + errorDescriptionDict.Add(10100, "Stop movements finished with error!"); + errorDescriptionDict.Add(10101, "Stop movements was aborted, while not yet completed!"); + errorDescriptionDict.Add(10110, "Stop program finished with error!"); + errorDescriptionDict.Add(10111, "Stop program was aborted, while not yet completed!"); + errorDescriptionDict.Add(20001, "Emergency stop activated!"); + errorDescriptionDict.Add(20002, "Safety circuit interupted!"); + errorDescriptionDict.Add(20003, "Program error active!"); + } + string errorDescription = " "; + + if (Error == null || Error.Id == null) + return errorDescription; + + if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) + { + return errorDescription; + } + else + + { + return " "; + } + } + } + + public string ActionDescription + { + get + { + if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } + if (actionDescriptionDict.Count == 0) + { + actionDescriptionDict.Add(0, " "); + actionDescriptionDict.Add(50, "Restore has been executed."); + + actionDescriptionDict.Add(100, "Start at main started."); + actionDescriptionDict.Add(300, "Start at main running: starting program at main."); + actionDescriptionDict.Add(301, "Start at main running: program started."); + actionDescriptionDict.Add(101, "Start at main finished succesfully."); + actionDescriptionDict.Add(102, "Start at main restored."); + + actionDescriptionDict.Add(110, "Start motors and program started."); + actionDescriptionDict.Add(310, "Start motors and program running: switching to auto."); + actionDescriptionDict.Add(311, "Start motors and program running: reseting error."); + actionDescriptionDict.Add(312, "Start motors and program running: reseting emergency stop error."); + actionDescriptionDict.Add(313, "Start motors and program running: switching motors on."); + actionDescriptionDict.Add(314, "Start motors and program running: starting program."); + actionDescriptionDict.Add(315, "Start motors and program running: checking controller error."); + actionDescriptionDict.Add(316, "Start motors and program finished."); + actionDescriptionDict.Add(111, "Start motors and program finished succesfully."); + actionDescriptionDict.Add(112, "Start motors and program restored."); + + actionDescriptionDict.Add(120, "Start motors program and movements started."); + actionDescriptionDict.Add(320, "Start motors program and movements running: switching to auto."); + actionDescriptionDict.Add(321, "Start motors program and movements running: reseting error."); + actionDescriptionDict.Add(322, "Start motors program and movements running: reseting emergency stop error."); + actionDescriptionDict.Add(323, "Start motors program and movements running: switching motors on."); + actionDescriptionDict.Add(324, "Start motors program and movements running: starting program."); + actionDescriptionDict.Add(325, "Start motors program and movements running: checking controller error."); + actionDescriptionDict.Add(326, "Start motors program and movements running: sending parameters of the movement to the controller."); + actionDescriptionDict.Add(327, "Start motors program and movements running: waiting for the movement parameters sent to the controller to be mirrored back."); + actionDescriptionDict.Add(333, "Start motors program and movements running: acknowleadging of the movement parameters."); + actionDescriptionDict.Add(334, "Start motors program and movements running: waiting for the movement is finished."); + actionDescriptionDict.Add(335, "Start motors program and movements running: acknowleadging of the finished movement."); + actionDescriptionDict.Add(121, "Start motors program and movements finished succesfully."); + actionDescriptionDict.Add(122, "Start motors program and movements restored."); + + actionDescriptionDict.Add(140, "Start motors started."); + actionDescriptionDict.Add(340, "Start motors running: switching to auto."); + actionDescriptionDict.Add(341, "Start motors running: reseting error."); + actionDescriptionDict.Add(342, "Start motors running: reseting emergency stop error."); + actionDescriptionDict.Add(343, "Start motors running: switching motors on."); + actionDescriptionDict.Add(344, "Start motors running: checking controller error."); + actionDescriptionDict.Add(345, "Start motors finished."); + actionDescriptionDict.Add(141, "Start motors finished succesfully."); + actionDescriptionDict.Add(142, "Start motors restored."); + + actionDescriptionDict.Add(150, "Start movements started."); + actionDescriptionDict.Add(350, "Start movements running: waiting for the program is running."); + actionDescriptionDict.Add(351, "Start movements running: waiting for the motors are on."); + actionDescriptionDict.Add(352, "Start movements running: waiting for the error is cleared."); + actionDescriptionDict.Add(353, "Start movements running: sending parameters of the movement to the controller."); + actionDescriptionDict.Add(354, "Start movements running: waiting for the movement parameters sent to the controller to be mirrored back."); + actionDescriptionDict.Add(360, "Start movements running: acknowleadging of the movement parameters."); + actionDescriptionDict.Add(361, "Start movements running: waiting for the movement is finished."); + actionDescriptionDict.Add(362, "Start movements running: acknowleadging of the finished movement."); + actionDescriptionDict.Add(363, "Start movements finished."); + actionDescriptionDict.Add(151, "Start movements finished succesfully."); + actionDescriptionDict.Add(152, "Start movements restored."); + + actionDescriptionDict.Add(170, "Start program started."); + actionDescriptionDict.Add(370, "Start program running: starting program."); + actionDescriptionDict.Add(371, "Start program running: starting program."); + actionDescriptionDict.Add(372, "Start program finished."); + actionDescriptionDict.Add(171, "Start program finished succesfully."); + actionDescriptionDict.Add(172, "Start program restored."); + + actionDescriptionDict.Add(180, "Stop motors started."); + actionDescriptionDict.Add(380, "Stop motors running: switching the motors off."); + actionDescriptionDict.Add(381, "Stop motors running: switching the motors off."); + actionDescriptionDict.Add(382, "Stop motors finished."); + actionDescriptionDict.Add(181, "Stop motors finished succesfully."); + actionDescriptionDict.Add(182, "Stop motors restored."); + + actionDescriptionDict.Add(190, "Stop movements and program started."); + actionDescriptionDict.Add(390, "Stop movements and program running: stopping the movement."); + actionDescriptionDict.Add(391, "Stop movements and program running: stopping the program."); + actionDescriptionDict.Add(392, "Stop movements and program finished."); + actionDescriptionDict.Add(191, "Stop movements and program finished succesfully."); + actionDescriptionDict.Add(192, "Stop movements and program restored."); + + actionDescriptionDict.Add(200, "Stop movements started."); + actionDescriptionDict.Add(400, "Stop movements running: stopping the movement."); + actionDescriptionDict.Add(401, "Stop movements finished."); + actionDescriptionDict.Add(201, "Stop movements finished succesfully."); + actionDescriptionDict.Add(202, "Stop movements restored."); + + actionDescriptionDict.Add(210, "Stop program started."); + actionDescriptionDict.Add(410, "Stop program running: stopping the program."); + actionDescriptionDict.Add(411, "Stop program finished."); + actionDescriptionDict.Add(211, "Stop program finished succesfully"); + actionDescriptionDict.Add(212, "Stop program restored."); + + actionDescriptionDict.Add(10000, "Start at main finished with error!"); + actionDescriptionDict.Add(10001, "Start at main was aborted, while not yet completed!"); + actionDescriptionDict.Add(10010, "Start motors and program finished with error!"); + actionDescriptionDict.Add(10011, "Start motors and program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10020, "Start motors program and movements finished with error!"); + actionDescriptionDict.Add(10021, "Start motors program and movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10040, "Start motors finished with error!"); + actionDescriptionDict.Add(10041, "Start motors was aborted, while not yet completed!"); + actionDescriptionDict.Add(10050, "Start movements finished with error!"); + actionDescriptionDict.Add(10051, "Start movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10070, "Start program finished with error!"); + actionDescriptionDict.Add(10071, "Start program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10080, "Stop motors finished with error!"); + actionDescriptionDict.Add(10081, "Stop motors was aborted, while not yet completed!"); + actionDescriptionDict.Add(10090, "Stop movements and program finished with error!"); + actionDescriptionDict.Add(10091, "Stop movements and program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10100, "Stop movements finished with error!"); + actionDescriptionDict.Add(10101, "Stop movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10110, "Stop program finished with error!"); + actionDescriptionDict.Add(10111, "Stop program was aborted, while not yet completed!"); + + } + + string actionDescription = " "; + + if (Action == null || Action.Id == null) + return actionDescription; + + if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) + { + return actionDescription; + } + else + { + return " "; + } + + } + } + } + } diff --git a/src/components.abb.robotics/this.sln b/src/components.abb.robotics/this.sln index 0470836eb..b38fed543 100644 --- a/src/components.abb.robotics/this.sln +++ b/src/components.abb.robotics/this.sln @@ -5,14 +5,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{0F6074CE-5D38-4A98-A7AA-E656CF4D8B60}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{D3783687-F7F5-4418-A893-1905C1D6D528}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Abb.Robotics.blazorapp", "app\ix-blazor\AXOpen.Components.Abb.Robotics.blazorapp.csproj", "{C9AE09D3-28EF-4ECD-A401-EEE5F7568331}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_abb_robotics", "app\ix\app_axopen_components_abb_robotics.csproj", "{0299E990-7CEE-4217-90ED-3F15F39FDECC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Abb.Robotics.blazor", "src\AXOpen.Components.Abb.Robotics.blazor\AXOpen.Components.Abb.Robotics.blazor.csproj", "{03763B1D-F6A9-4A92-94F3-594D2C7A2952}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abb_robotics", "src\AXOpen.Components.Abb.Robotics\inxton_axopen_components_abb_robotics.csproj", "{080F1CAA-EE1F-4CE0-8807-EAC2F0976B40}" @@ -21,25 +15,21 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Abb.Robot EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{58ECB392-DF76-4497-BFDE-9C5F389D31C9}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor\AXOpen.Components.Robotics.blazor.csproj", "{0DEAC314-938D-4E60-ADC4-9D5CE73152C0}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{A15BFAF5-BA77-48E7-8B89-96E0FA354DC7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\core\src\AXOpen.Core.Blazor\axopen_core_blazor.csproj", "{3D7718C3-8EF4-4D01-BC3D-361ABDDF7635}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{09014B87-0239-4561-AF86-1671A98A95C9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{D65B0597-116A-444C-BEC4-AFED775CCE56}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{0F21248F-877C-4189-8222-C790E28E9E14}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{C9642EAC-1A53-436D-8FA7-499BB0A6858B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{A462DD97-989F-4635-AF74-6D08574F0316}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{73EF84EA-C582-4DAC-96BF-01307176F9DD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{552D0FAF-57D4-422E-9E91-49EF4521E4BE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{5F83D89E-D142-435E-BE8F-E89D3FA80425}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{55181ECB-848C-4FCB-AFFA-A66266836D05}" EndProject @@ -53,20 +43,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{08186FCD-AF06-4ACD-849F-781C0BD9CFCA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{F868DBD5-78D2-4FE6-BB84-DA8F4D4ED6FB}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{FC76ADC2-CDD9-4D6C-93CA-5C3802F7BCDA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{1A788435-BAF9-4974-9458-09BC713D6A53}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "base", "..\base", "{3FED550A-78F4-4FBD-8F99-5DB8B5551D8F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{73A4701F-0611-4A5A-AB60-F2B6C4B58CB3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{6E7E8D1B-2E34-49AA-BA63-40DCA75485B1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{1C73F9AC-5A45-43B7-980D-3930D2DB3F26}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Abb.Robotics.blazor", "src\AXOpen.Components.Abb.Robotics.blazor", "{2FEB1764-0AD0-4588-B151-071DD11B9535}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Abb.Robotics", "src\AXOpen.Components.Abb.Robotics", "{2078F2BE-5672-4655-83D5-A8DBC22ADCFA}" @@ -85,6 +67,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{59CD213F-A1E8-4B86-8384-778C5D027284}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor", "{0F0E945F-F00E-4AEA-854C-016BE30521ED}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics", "..\components.robotics\src\AXOpen.Components.Robotics", "{9DDC7A68-2660-4692-ACCA-4E528A7E29CE}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.robotics\src", "{46E542DD-FA06-4984-8E34-448BE25EFCD9}" @@ -99,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{D802 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{DEDBA190-C519-402C-8CAD-0BAB6B0A26C5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{1E333C5B-8CCE-4499-B319-7F417A2A61D2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{53653043-4CFC-44B8-90DD-A3FABEA59CBF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{179F5DDE-07AF-4C74-8D5E-976447058400}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{A165CD30-56CA-48C5-88EF-EFA19EAA226B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{AD27711D-CB39-47C6-9B48-DA4B7FDAFBC7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{5CB2DC4C-9F69-4404-B020-4015F776FA5B}" @@ -121,19 +97,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{D81723FE-522E-423F-8794-8CDABAE347E7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{FEF47ECC-A729-40CD-B86F-5D9F19366C82}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{664D66CC-EE39-412F-8175-C2E0F2FA47CA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{B37D9B6E-4D5D-4DB5-8A60-CF46AA352236}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{83BFEDB0-10D2-4094-888A-3DF2CA33CDF7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{BCE64133-72A3-4744-A70D-E16E90879687}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{77E12519-D00B-46EF-9AB3-DFDFA08AD258}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{0543BD1E-9878-43BE-812A-116C7A5ECF79}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{244EF86F-3F99-4282-B962-9AED5F0AFAF4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{C38C1DDF-64F0-475B-83A4-D099E4772AB5}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{6C678E8F-993E-43B7-9DB6-008537AEF6B5}" EndProject @@ -165,22 +131,10 @@ Global {0F6074CE-5D38-4A98-A7AA-E656CF4D8B60}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F6074CE-5D38-4A98-A7AA-E656CF4D8B60}.Release|Any CPU.ActiveCfg = Release|Any CPU {0F6074CE-5D38-4A98-A7AA-E656CF4D8B60}.Release|Any CPU.Build.0 = Release|Any CPU - {D3783687-F7F5-4418-A893-1905C1D6D528}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D3783687-F7F5-4418-A893-1905C1D6D528}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D3783687-F7F5-4418-A893-1905C1D6D528}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D3783687-F7F5-4418-A893-1905C1D6D528}.Release|Any CPU.Build.0 = Release|Any CPU {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58}.Release|Any CPU.Build.0 = Release|Any CPU - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331}.Release|Any CPU.Build.0 = Release|Any CPU - {0299E990-7CEE-4217-90ED-3F15F39FDECC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0299E990-7CEE-4217-90ED-3F15F39FDECC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0299E990-7CEE-4217-90ED-3F15F39FDECC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0299E990-7CEE-4217-90ED-3F15F39FDECC}.Release|Any CPU.Build.0 = Release|Any CPU {03763B1D-F6A9-4A92-94F3-594D2C7A2952}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {03763B1D-F6A9-4A92-94F3-594D2C7A2952}.Debug|Any CPU.Build.0 = Debug|Any CPU {03763B1D-F6A9-4A92-94F3-594D2C7A2952}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,6 +151,10 @@ Global {58ECB392-DF76-4497-BFDE-9C5F389D31C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {58ECB392-DF76-4497-BFDE-9C5F389D31C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {58ECB392-DF76-4497-BFDE-9C5F389D31C9}.Release|Any CPU.Build.0 = Release|Any CPU + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0}.Release|Any CPU.Build.0 = Release|Any CPU {A15BFAF5-BA77-48E7-8B89-96E0FA354DC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A15BFAF5-BA77-48E7-8B89-96E0FA354DC7}.Debug|Any CPU.Build.0 = Debug|Any CPU {A15BFAF5-BA77-48E7-8B89-96E0FA354DC7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,10 +167,6 @@ Global {09014B87-0239-4561-AF86-1671A98A95C9}.Debug|Any CPU.Build.0 = Debug|Any CPU {09014B87-0239-4561-AF86-1671A98A95C9}.Release|Any CPU.ActiveCfg = Release|Any CPU {09014B87-0239-4561-AF86-1671A98A95C9}.Release|Any CPU.Build.0 = Release|Any CPU - {D65B0597-116A-444C-BEC4-AFED775CCE56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D65B0597-116A-444C-BEC4-AFED775CCE56}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D65B0597-116A-444C-BEC4-AFED775CCE56}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D65B0597-116A-444C-BEC4-AFED775CCE56}.Release|Any CPU.Build.0 = Release|Any CPU {0F21248F-877C-4189-8222-C790E28E9E14}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0F21248F-877C-4189-8222-C790E28E9E14}.Debug|Any CPU.Build.0 = Debug|Any CPU {0F21248F-877C-4189-8222-C790E28E9E14}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,18 +179,10 @@ Global {A462DD97-989F-4635-AF74-6D08574F0316}.Debug|Any CPU.Build.0 = Debug|Any CPU {A462DD97-989F-4635-AF74-6D08574F0316}.Release|Any CPU.ActiveCfg = Release|Any CPU {A462DD97-989F-4635-AF74-6D08574F0316}.Release|Any CPU.Build.0 = Release|Any CPU - {73EF84EA-C582-4DAC-96BF-01307176F9DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {73EF84EA-C582-4DAC-96BF-01307176F9DD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {73EF84EA-C582-4DAC-96BF-01307176F9DD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {73EF84EA-C582-4DAC-96BF-01307176F9DD}.Release|Any CPU.Build.0 = Release|Any CPU - {552D0FAF-57D4-422E-9E91-49EF4521E4BE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {552D0FAF-57D4-422E-9E91-49EF4521E4BE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {552D0FAF-57D4-422E-9E91-49EF4521E4BE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {552D0FAF-57D4-422E-9E91-49EF4521E4BE}.Release|Any CPU.Build.0 = Release|Any CPU - {5F83D89E-D142-435E-BE8F-E89D3FA80425}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5F83D89E-D142-435E-BE8F-E89D3FA80425}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5F83D89E-D142-435E-BE8F-E89D3FA80425}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5F83D89E-D142-435E-BE8F-E89D3FA80425}.Release|Any CPU.Build.0 = Release|Any CPU + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51}.Release|Any CPU.Build.0 = Release|Any CPU {55181ECB-848C-4FCB-AFFA-A66266836D05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {55181ECB-848C-4FCB-AFFA-A66266836D05}.Debug|Any CPU.Build.0 = Debug|Any CPU {55181ECB-848C-4FCB-AFFA-A66266836D05}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -255,16 +201,9 @@ Global {02E03A1A-C4D4-4B79-821E-32BC0D714056} = {6DE4150C-AA69-4B8B-AD2D-6FB37F294E2C} {0F6074CE-5D38-4A98-A7AA-E656CF4D8B60} = {08186FCD-AF06-4ACD-849F-781C0BD9CFCA} {08186FCD-AF06-4ACD-849F-781C0BD9CFCA} = {1A788435-BAF9-4974-9458-09BC713D6A53} - {D3783687-F7F5-4418-A893-1905C1D6D528} = {F868DBD5-78D2-4FE6-BB84-DA8F4D4ED6FB} - {F868DBD5-78D2-4FE6-BB84-DA8F4D4ED6FB} = {1A788435-BAF9-4974-9458-09BC713D6A53} {1DDF4BAD-D66B-4DBD-B83E-4320EA1C0E58} = {FC76ADC2-CDD9-4D6C-93CA-5C3802F7BCDA} {FC76ADC2-CDD9-4D6C-93CA-5C3802F7BCDA} = {1A788435-BAF9-4974-9458-09BC713D6A53} {1A788435-BAF9-4974-9458-09BC713D6A53} = {3FED550A-78F4-4FBD-8F99-5DB8B5551D8F} - {C9AE09D3-28EF-4ECD-A401-EEE5F7568331} = {73A4701F-0611-4A5A-AB60-F2B6C4B58CB3} - {73A4701F-0611-4A5A-AB60-F2B6C4B58CB3} = {1C73F9AC-5A45-43B7-980D-3930D2DB3F26} - {0299E990-7CEE-4217-90ED-3F15F39FDECC} = {6E7E8D1B-2E34-49AA-BA63-40DCA75485B1} - {6E7E8D1B-2E34-49AA-BA63-40DCA75485B1} = {1C73F9AC-5A45-43B7-980D-3930D2DB3F26} - {1C73F9AC-5A45-43B7-980D-3930D2DB3F26} = {D9EC0CEC-705A-46FF-92FE-15A27071ED2D} {03763B1D-F6A9-4A92-94F3-594D2C7A2952} = {2FEB1764-0AD0-4588-B151-071DD11B9535} {2FEB1764-0AD0-4588-B151-071DD11B9535} = {F581E916-FD0A-421C-9E1C-33BA69502B44} {080F1CAA-EE1F-4CE0-8807-EAC2F0976B40} = {2078F2BE-5672-4655-83D5-A8DBC22ADCFA} @@ -276,6 +215,8 @@ Global {58ECB392-DF76-4497-BFDE-9C5F389D31C9} = {BED8FA51-539D-43C7-B2A5-C31F2F7DBB21} {BED8FA51-539D-43C7-B2A5-C31F2F7DBB21} = {8CCB8573-EB15-4554-93E9-14BEB3FA05E6} {8CCB8573-EB15-4554-93E9-14BEB3FA05E6} = {59CD213F-A1E8-4B86-8384-778C5D027284} + {0DEAC314-938D-4E60-ADC4-9D5CE73152C0} = {0F0E945F-F00E-4AEA-854C-016BE30521ED} + {0F0E945F-F00E-4AEA-854C-016BE30521ED} = {46E542DD-FA06-4984-8E34-448BE25EFCD9} {A15BFAF5-BA77-48E7-8B89-96E0FA354DC7} = {9DDC7A68-2660-4692-ACCA-4E528A7E29CE} {9DDC7A68-2660-4692-ACCA-4E528A7E29CE} = {46E542DD-FA06-4984-8E34-448BE25EFCD9} {46E542DD-FA06-4984-8E34-448BE25EFCD9} = {D9A8F7FE-923C-4F60-9A4E-D2A2A6C1F064} @@ -284,10 +225,6 @@ Global {09014B87-0239-4561-AF86-1671A98A95C9} = {33247ADD-901E-4D13-B0FD-7272E609CABC} {33247ADD-901E-4D13-B0FD-7272E609CABC} = {D802A79B-2DBD-4FED-AA42-D21D5C5D7E2E} {D802A79B-2DBD-4FED-AA42-D21D5C5D7E2E} = {DEDBA190-C519-402C-8CAD-0BAB6B0A26C5} - {D65B0597-116A-444C-BEC4-AFED775CCE56} = {1E333C5B-8CCE-4499-B319-7F417A2A61D2} - {1E333C5B-8CCE-4499-B319-7F417A2A61D2} = {53653043-4CFC-44B8-90DD-A3FABEA59CBF} - {53653043-4CFC-44B8-90DD-A3FABEA59CBF} = {179F5DDE-07AF-4C74-8D5E-976447058400} - {179F5DDE-07AF-4C74-8D5E-976447058400} = {A165CD30-56CA-48C5-88EF-EFA19EAA226B} {0F21248F-877C-4189-8222-C790E28E9E14} = {AD27711D-CB39-47C6-9B48-DA4B7FDAFBC7} {AD27711D-CB39-47C6-9B48-DA4B7FDAFBC7} = {EC21F427-5D5F-43C2-B18B-9BB5C7FC8608} {C9642EAC-1A53-436D-8FA7-499BB0A6858B} = {5CB2DC4C-9F69-4404-B020-4015F776FA5B} @@ -296,14 +233,8 @@ Global {A462DD97-989F-4635-AF74-6D08574F0316} = {A76B91CD-2765-43A4-950B-971373C14B17} {A76B91CD-2765-43A4-950B-971373C14B17} = {2FCE7A21-5935-46BC-838F-E9CCCC48030F} {2FCE7A21-5935-46BC-838F-E9CCCC48030F} = {D81723FE-522E-423F-8794-8CDABAE347E7} - {73EF84EA-C582-4DAC-96BF-01307176F9DD} = {FEF47ECC-A729-40CD-B86F-5D9F19366C82} - {FEF47ECC-A729-40CD-B86F-5D9F19366C82} = {B37D9B6E-4D5D-4DB5-8A60-CF46AA352236} - {552D0FAF-57D4-422E-9E91-49EF4521E4BE} = {664D66CC-EE39-412F-8175-C2E0F2FA47CA} - {664D66CC-EE39-412F-8175-C2E0F2FA47CA} = {B37D9B6E-4D5D-4DB5-8A60-CF46AA352236} - {B37D9B6E-4D5D-4DB5-8A60-CF46AA352236} = {83BFEDB0-10D2-4094-888A-3DF2CA33CDF7} - {5F83D89E-D142-435E-BE8F-E89D3FA80425} = {BCE64133-72A3-4744-A70D-E16E90879687} - {BCE64133-72A3-4744-A70D-E16E90879687} = {77E12519-D00B-46EF-9AB3-DFDFA08AD258} - {77E12519-D00B-46EF-9AB3-DFDFA08AD258} = {244EF86F-3F99-4282-B962-9AED5F0AFAF4} + {6D45D80C-9E0D-47AE-9AF8-07D33F8D5F51} = {0543BD1E-9878-43BE-812A-116C7A5ECF79} + {0543BD1E-9878-43BE-812A-116C7A5ECF79} = {C38C1DDF-64F0-475B-83A4-D099E4772AB5} {55181ECB-848C-4FCB-AFFA-A66266836D05} = {6C678E8F-993E-43B7-9DB6-008537AEF6B5} {6C678E8F-993E-43B7-9DB6-008537AEF6B5} = {29500569-58F0-405A-A841-506E6FFE30F2} {29500569-58F0-405A-A841-506E6FFE30F2} = {C31F03BF-8FEF-4AFC-BBA4-B496D2616FEA} From b95852e37da91a78346e622ce6252e0b385cf681 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:37:03 +0200 Subject: [PATCH 05/33] feat: add new Balluff component structures for enhanced functionality --- .../components.balluff.identification.code-workspace | 3 --- .../Axo_BIS_M_4XX_045_Component_Status.st | 0 .../Axo_BIS_M_4XX_045_Config.st | 0 .../Axo_BIS_M_4XX_045_Control.st | 0 .../Axo_BIS_M_4XX_045_HWIDs.st | 0 .../Axo_BIS_M_4XX_045_State.st | 0 6 files changed, 3 deletions(-) rename src/components.balluff.identification/ctrl/src/{Axo_BIS_M_4XX_045_Datatypes => TypesStructuresAndEnums}/Axo_BIS_M_4XX_045_Component_Status.st (100%) rename src/components.balluff.identification/ctrl/src/{Axo_BIS_M_4XX_045_Datatypes => TypesStructuresAndEnums}/Axo_BIS_M_4XX_045_Config.st (100%) rename src/components.balluff.identification/ctrl/src/{Axo_BIS_M_4XX_045_Datatypes => TypesStructuresAndEnums}/Axo_BIS_M_4XX_045_Control.st (100%) rename src/components.balluff.identification/ctrl/src/{Axo_BIS_M_4XX_045_Datatypes => TypesStructuresAndEnums}/Axo_BIS_M_4XX_045_HWIDs.st (100%) rename src/components.balluff.identification/ctrl/src/{Axo_BIS_M_4XX_045_Datatypes => TypesStructuresAndEnums}/Axo_BIS_M_4XX_045_State.st (100%) diff --git a/src/components.balluff.identification/components.balluff.identification.code-workspace b/src/components.balluff.identification/components.balluff.identification.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.balluff.identification/components.balluff.identification.code-workspace +++ b/src/components.balluff.identification/components.balluff.identification.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_Component_Status.st b/src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_Component_Status.st similarity index 100% rename from src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_Component_Status.st rename to src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_Component_Status.st diff --git a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_Config.st b/src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_Config.st similarity index 100% rename from src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_Config.st rename to src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_Config.st diff --git a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_Control.st b/src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_Control.st similarity index 100% rename from src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_Control.st rename to src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_Control.st diff --git a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_HWIDs.st b/src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_HWIDs.st similarity index 100% rename from src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_HWIDs.st rename to src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_HWIDs.st diff --git a/src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_State.st b/src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_State.st similarity index 100% rename from src/components.balluff.identification/ctrl/src/Axo_BIS_M_4XX_045_Datatypes/Axo_BIS_M_4XX_045_State.st rename to src/components.balluff.identification/ctrl/src/TypesStructuresAndEnums/Axo_BIS_M_4XX_045_State.st From 8e963f89b3f008a5aa47be5605f9ffe7223bcf01 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:41:29 +0200 Subject: [PATCH 06/33] feat: unify component status handling by merging Axo_BIS_M_4XX_045_Component_Status into Axo_BIS_M_4XX_045 --- .../Axo_BIS_M_4XX_045/Axo_BIS_M_4XX_045.cs | 177 ++++++++++++++++- .../Axo_BIS_M_4XX_045_Component_Status.cs | 186 ------------------ 2 files changed, 176 insertions(+), 187 deletions(-) delete mode 100644 src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Axo_BIS_M_4XX_045_Component_Status/Axo_BIS_M_4XX_045_Component_Status.cs diff --git a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Axo_BIS_M_4XX_045/Axo_BIS_M_4XX_045.cs b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Axo_BIS_M_4XX_045/Axo_BIS_M_4XX_045.cs index 1811ed741..16ced2686 100644 --- a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Axo_BIS_M_4XX_045/Axo_BIS_M_4XX_045.cs +++ b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Axo_BIS_M_4XX_045/Axo_BIS_M_4XX_045.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using System; using System.Collections.Generic; @@ -122,4 +122,179 @@ private void InitializeTaskMessenger() TaskMessenger.DotNetMessengerTextList = messengerTextList; } } + + public partial class Axo_BIS_M_4XX_045_Component_Status : AXOpen.Components.Abstractions.AxoComponent_Status + { + Dictionary errorDescriptionDict = new Dictionary(); + Dictionary actionDescriptionDict = new Dictionary(); + + public string ErrorDescription + { + get + { + if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } + if (errorDescriptionDict.Count == 0) + { + errorDescriptionDict.Add(0, " "); + errorDescriptionDict.Add(500, "Waiting for the signal Inputs.BitHeader1_CodeTagPresent to be set!"); + errorDescriptionDict.Add(501, "Waiting for the signal Inputs.BitHeader1_JobAccepted to be reseted!"); + errorDescriptionDict.Add(502, "Waiting for the signal Inputs.BitHeader1_JobEnd to be reseted!"); + errorDescriptionDict.Add(503, "Waiting for the signal Inputs.BitHeader1_ToggleBit to be reseted!"); + errorDescriptionDict.Add(504, "Waiting for the signal Inputs.BitHeader1_JobEnd to be set!"); + errorDescriptionDict.Add(505, "Waiting for the signal Inputs.BitHeader1_JobAccepted to be set!"); + errorDescriptionDict.Add(520, "Waiting for the signal Inputs.BitHeader1_CodeTagPresent to be set!"); + errorDescriptionDict.Add(522, "Waiting for the signal Inputs.BitHeader1_JobAccepted to be reseted!"); + errorDescriptionDict.Add(523, "Waiting for the signal Inputs.BitHeader1_JobEnd to be reseted!"); + errorDescriptionDict.Add(524, "Waiting for the signal Inputs.BitHeader1_ToggleBit to be reseted!"); + errorDescriptionDict.Add(526, "Waiting for the signal Inputs.BitHeader1_JobAccepted to be set!"); + errorDescriptionDict.Add(529, "Waiting for the signal Inputs.BitHeader1_JobEnd to be set!"); + errorDescriptionDict.Add(530, "Waiting for the signal Inputs.BitHeader1_JobAccepted to be reseted!"); + errorDescriptionDict.Add(531, "Waiting for the signal Inputs.BitHeader1_JobError to be reseted!"); + errorDescriptionDict.Add(551, "Waiting for the signal Inputs.BitHeader1_Power to be reseted!"); + errorDescriptionDict.Add(552, "Waiting for the signal Inputs.BitHeader1_Power to be set!"); + errorDescriptionDict.Add(560, "Waiting for the signal Inputs.BitHeader1_CodeTagPresent to be set!"); + errorDescriptionDict.Add(562, "Waiting for the signal Inputs.BitHeader1_JobAccepted to be set!"); + errorDescriptionDict.Add(567, "Waiting for the signal Inputs.BitHeader1_JobAccepted to be reseted!"); + errorDescriptionDict.Add(568, "Waiting for the signal Inputs.BitHeader1_JobError to be reseted!"); + + errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(701, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); + errorDescriptionDict.Add(710, "Hw configuration error. Value of Config.HWIDs.HwId_BISM is zero."); + errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); + errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); + errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); + errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); + errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); + errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module: 'ID_Mod_BIS_M_4XX_045'."); + errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(1131, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1132, "Input variable `Config.HWIDs.HwId_BISM` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1201, "Error reading the data from module with HWID: Config.HWIDs.HwId_BISM!"); + errorDescriptionDict.Add(1231, "Error writing the data to module with HWID: Config.HWIDs.HwId_BISM!"); + errorDescriptionDict.Add(10000, "Read finished with error!"); + errorDescriptionDict.Add(10001, "Read was aborted, while not yet completed!"); + errorDescriptionDict.Add(10020, "Write finished with error!"); + errorDescriptionDict.Add(10021, "Write was aborted, while not yet completed!"); + errorDescriptionDict.Add(10040, "Reset communication finished with error!"); + errorDescriptionDict.Add(10041, "Reset communication was aborted, while not yet completed!"); + errorDescriptionDict.Add(10050, "Reset reader finished with error!"); + errorDescriptionDict.Add(10051, "Reset reader was aborted, while not yet completed!"); + errorDescriptionDict.Add(10060, "Write char to memory finished with error!"); + errorDescriptionDict.Add(10061, "Write char to memory was aborted, while not yet completed!"); + + } + string errorDescription = " "; + + if (Error == null || Error.Id == null) + return errorDescription; + + if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) + { + return errorDescription; + } + else + + { + return " "; + } + } + } + + public string ActionDescription + { + get + { + if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } + if (actionDescriptionDict.Count == 0) + { + actionDescriptionDict.Add(0, " "); + actionDescriptionDict.Add(50, "Restore has been executed."); + + actionDescriptionDict.Add(100, "Read started."); + actionDescriptionDict.Add(300, "Read running: waiting for the presention of the tag."); + actionDescriptionDict.Add(301, "Read running: waiting for the job header to be cleared."); + actionDescriptionDict.Add(304, "Read running: waiting for the job header to be set."); + actionDescriptionDict.Add(305, "Read running: waiting for the job to be accepted."); + actionDescriptionDict.Add(306, "Read running: processing partial segment of the data."); + actionDescriptionDict.Add(307, "Read running: trigger processing the following segment of the data."); + actionDescriptionDict.Add(308, "Read running: waiting for the data of the following data segment."); + actionDescriptionDict.Add(309, "Read running: processing the last segment of the data."); + actionDescriptionDict.Add(310, "Read finished."); + actionDescriptionDict.Add(101, "Read finished succesfully."); + actionDescriptionDict.Add(102, "Read restored."); + + actionDescriptionDict.Add(120, "Write started."); + actionDescriptionDict.Add(320, "Write running: waiting for the presention of the tag."); + actionDescriptionDict.Add(321, "Write running: processing the data to send."); + actionDescriptionDict.Add(322, "Write running: waiting for the job header to be cleared."); + actionDescriptionDict.Add(325, "Write running: trigger sending the job header."); + actionDescriptionDict.Add(326, "Write running: waiting for the job to be accepted."); + actionDescriptionDict.Add(327, "Write running: processing partial segment of the data."); + actionDescriptionDict.Add(328, "Write running: trigger sending the current segment of the data."); + actionDescriptionDict.Add(329, "Write running: processing the last segment of the data."); + actionDescriptionDict.Add(330, "Write running: waiting for the job to be accepted."); + actionDescriptionDict.Add(332, "Write finished."); + actionDescriptionDict.Add(121, "Write finished succesfully."); + actionDescriptionDict.Add(122, "Write restored."); + + actionDescriptionDict.Add(140, "Reset communication started."); + actionDescriptionDict.Add(340, "Reset communication running: restoring tasks."); + actionDescriptionDict.Add(341, "Reset communication running: clearing data and flags."); + actionDescriptionDict.Add(141, "Reset communication finished succesfully."); + actionDescriptionDict.Add(142, "Reset communication restored."); + + actionDescriptionDict.Add(150, "Reset reader started."); + actionDescriptionDict.Add(350, "Reset reader running: clearing of the data and flags."); + actionDescriptionDict.Add(351, "Reset reader running: waiting for the device to be powered off."); + actionDescriptionDict.Add(352, "Reset reader running: waiting for the device to be powered on."); + actionDescriptionDict.Add(353, "Reset reader finished."); + actionDescriptionDict.Add(151, "Reset reader finished succesfully."); + actionDescriptionDict.Add(152, "Reset reader restored."); + + actionDescriptionDict.Add(160, "Write char to memory started."); + actionDescriptionDict.Add(360, "Write char to memory running: waiting for the presention of the tag."); + actionDescriptionDict.Add(361, "Write char to memory running: processing the data to be sent."); + actionDescriptionDict.Add(362, "Write char to memory: waiting for the job to be accepted."); + actionDescriptionDict.Add(363, "Write char to memory: waiting for the job to be finished."); + actionDescriptionDict.Add(364, "Write char to memory finished."); + actionDescriptionDict.Add(366, "Write char to memory running: cleaning the header data."); + actionDescriptionDict.Add(367, "Write char to memory running: cleaning the header data."); + actionDescriptionDict.Add(368, "Write char to memory running: cleaning the header data."); + actionDescriptionDict.Add(369, "Write char to memory finished with an error."); + actionDescriptionDict.Add(161, "Write char to memory finished succesfully."); + actionDescriptionDict.Add(162, "Write char to memory restored."); + + + actionDescriptionDict.Add(10000, "Read finished with error!"); + actionDescriptionDict.Add(10001, "Read was aborted, while not yet completed!"); + actionDescriptionDict.Add(10020, "Write finished with error!"); + actionDescriptionDict.Add(10021, "Write was aborted, while not yet completed!"); + actionDescriptionDict.Add(10040, "Reset communication finished with error!"); + actionDescriptionDict.Add(10041, "Reset communication was aborted, while not yet completed!"); + actionDescriptionDict.Add(10050, "Reset reader finished with error!"); + actionDescriptionDict.Add(10051, "Reset reader was aborted, while not yet completed!"); + actionDescriptionDict.Add(10060, "Write char to memory finished with error!"); + actionDescriptionDict.Add(10061, "Write char to memory was aborted, while not yet completed!"); + + } + + string actionDescription = " "; + + if (Action == null || Action.Id == null) + return actionDescription; + + if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) + { + return actionDescription; + } + else + { + return " "; + } + + } + } + } + } diff --git a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Axo_BIS_M_4XX_045_Component_Status/Axo_BIS_M_4XX_045_Component_Status.cs b/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Axo_BIS_M_4XX_045_Component_Status/Axo_BIS_M_4XX_045_Component_Status.cs deleted file mode 100644 index 10edde70e..000000000 --- a/src/components.balluff.identification/src/AXOpen.Components.Balluff.Identification/Axo_BIS_M_4XX_045_Component_Status/Axo_BIS_M_4XX_045_Component_Status.cs +++ /dev/null @@ -1,186 +0,0 @@ -using AXOpen.Messaging.Static; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Linq; -using System.Reflection.PortableExecutable; -using System.Text; -using System.Threading.Tasks; - -namespace AXOpen.Components.Balluff.Identification -{ - public partial class Axo_BIS_M_4XX_045_Component_Status : AXOpen.Components.Abstractions.AxoComponent_Status - { - Dictionary errorDescriptionDict = new Dictionary(); - Dictionary actionDescriptionDict = new Dictionary(); - - public string ErrorDescription - { - get - { - if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } - if (errorDescriptionDict.Count == 0) - { - errorDescriptionDict.Add(0, " "); - errorDescriptionDict.Add(500,"Waiting for the signal Inputs.BitHeader1_CodeTagPresent to be set!"); - errorDescriptionDict.Add(501,"Waiting for the signal Inputs.BitHeader1_JobAccepted to be reseted!"); - errorDescriptionDict.Add(502,"Waiting for the signal Inputs.BitHeader1_JobEnd to be reseted!"); - errorDescriptionDict.Add(503,"Waiting for the signal Inputs.BitHeader1_ToggleBit to be reseted!"); - errorDescriptionDict.Add(504,"Waiting for the signal Inputs.BitHeader1_JobEnd to be set!"); - errorDescriptionDict.Add(505,"Waiting for the signal Inputs.BitHeader1_JobAccepted to be set!"); - errorDescriptionDict.Add(520,"Waiting for the signal Inputs.BitHeader1_CodeTagPresent to be set!"); - errorDescriptionDict.Add(522,"Waiting for the signal Inputs.BitHeader1_JobAccepted to be reseted!"); - errorDescriptionDict.Add(523,"Waiting for the signal Inputs.BitHeader1_JobEnd to be reseted!"); - errorDescriptionDict.Add(524,"Waiting for the signal Inputs.BitHeader1_ToggleBit to be reseted!"); - errorDescriptionDict.Add(526,"Waiting for the signal Inputs.BitHeader1_JobAccepted to be set!"); - errorDescriptionDict.Add(529,"Waiting for the signal Inputs.BitHeader1_JobEnd to be set!"); - errorDescriptionDict.Add(530,"Waiting for the signal Inputs.BitHeader1_JobAccepted to be reseted!"); - errorDescriptionDict.Add(531,"Waiting for the signal Inputs.BitHeader1_JobError to be reseted!"); - errorDescriptionDict.Add(551,"Waiting for the signal Inputs.BitHeader1_Power to be reseted!"); - errorDescriptionDict.Add(552,"Waiting for the signal Inputs.BitHeader1_Power to be set!"); - errorDescriptionDict.Add(560,"Waiting for the signal Inputs.BitHeader1_CodeTagPresent to be set!"); - errorDescriptionDict.Add(562,"Waiting for the signal Inputs.BitHeader1_JobAccepted to be set!"); - errorDescriptionDict.Add(567,"Waiting for the signal Inputs.BitHeader1_JobAccepted to be reseted!"); - errorDescriptionDict.Add(568,"Waiting for the signal Inputs.BitHeader1_JobError to be reseted!"); - - errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); - errorDescriptionDict.Add(701, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); - errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); - errorDescriptionDict.Add(710, "Hw configuration error. Value of Config.HWIDs.HwId_BISM is zero."); - errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); - errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); - errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); - errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); - errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); - errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module: 'ID_Mod_BIS_M_4XX_045'."); - errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); - errorDescriptionDict.Add(1131, "Input variable `Config.HWIDs.HW_Device` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1132, "Input variable `Config.HWIDs.HwId_BISM` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1201, "Error reading the data from module with HWID: Config.HWIDs.HwId_BISM!"); - errorDescriptionDict.Add(1231, "Error writing the data to module with HWID: Config.HWIDs.HwId_BISM!"); - errorDescriptionDict.Add(10000, "Read finished with error!"); - errorDescriptionDict.Add(10001, "Read was aborted, while not yet completed!"); - errorDescriptionDict.Add(10020, "Write finished with error!"); - errorDescriptionDict.Add(10021, "Write was aborted, while not yet completed!"); - errorDescriptionDict.Add(10040, "Reset communication finished with error!"); - errorDescriptionDict.Add(10041, "Reset communication was aborted, while not yet completed!"); - errorDescriptionDict.Add(10050, "Reset reader finished with error!"); - errorDescriptionDict.Add(10051, "Reset reader was aborted, while not yet completed!"); - errorDescriptionDict.Add(10060, "Write char to memory finished with error!"); - errorDescriptionDict.Add(10061, "Write char to memory was aborted, while not yet completed!"); - - } - string errorDescription = " "; - - if (Error == null || Error.Id == null) - return errorDescription; - - if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) - { - return errorDescription; - } - else - - { - return " "; - } - } - } - - public string ActionDescription - { - get - { - if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } - if (actionDescriptionDict.Count == 0) - { - actionDescriptionDict.Add(0, " "); - actionDescriptionDict.Add(50, "Restore has been executed."); - - actionDescriptionDict.Add(100, "Read started."); - actionDescriptionDict.Add(300, "Read running: waiting for the presention of the tag."); - actionDescriptionDict.Add(301, "Read running: waiting for the job header to be cleared."); - actionDescriptionDict.Add(304, "Read running: waiting for the job header to be set."); - actionDescriptionDict.Add(305, "Read running: waiting for the job to be accepted."); - actionDescriptionDict.Add(306, "Read running: processing partial segment of the data."); - actionDescriptionDict.Add(307, "Read running: trigger processing the following segment of the data."); - actionDescriptionDict.Add(308, "Read running: waiting for the data of the following data segment."); - actionDescriptionDict.Add(309, "Read running: processing the last segment of the data."); - actionDescriptionDict.Add(310, "Read finished."); - actionDescriptionDict.Add(101, "Read finished succesfully."); - actionDescriptionDict.Add(102, "Read restored."); - - actionDescriptionDict.Add(120, "Write started."); - actionDescriptionDict.Add(320, "Write running: waiting for the presention of the tag."); - actionDescriptionDict.Add(321, "Write running: processing the data to send."); - actionDescriptionDict.Add(322, "Write running: waiting for the job header to be cleared."); - actionDescriptionDict.Add(325, "Write running: trigger sending the job header."); - actionDescriptionDict.Add(326, "Write running: waiting for the job to be accepted."); - actionDescriptionDict.Add(327, "Write running: processing partial segment of the data."); - actionDescriptionDict.Add(328, "Write running: trigger sending the current segment of the data."); - actionDescriptionDict.Add(329, "Write running: processing the last segment of the data."); - actionDescriptionDict.Add(330, "Write running: waiting for the job to be accepted."); - actionDescriptionDict.Add(332, "Write finished."); - actionDescriptionDict.Add(121, "Write finished succesfully."); - actionDescriptionDict.Add(122, "Write restored."); - - actionDescriptionDict.Add(140, "Reset communication started."); - actionDescriptionDict.Add(340, "Reset communication running: restoring tasks."); - actionDescriptionDict.Add(341, "Reset communication running: clearing data and flags."); - actionDescriptionDict.Add(141, "Reset communication finished succesfully."); - actionDescriptionDict.Add(142, "Reset communication restored."); - - actionDescriptionDict.Add(150, "Reset reader started."); - actionDescriptionDict.Add(350, "Reset reader running: clearing of the data and flags."); - actionDescriptionDict.Add(351, "Reset reader running: waiting for the device to be powered off."); - actionDescriptionDict.Add(352, "Reset reader running: waiting for the device to be powered on."); - actionDescriptionDict.Add(353, "Reset reader finished."); - actionDescriptionDict.Add(151, "Reset reader finished succesfully."); - actionDescriptionDict.Add(152, "Reset reader restored."); - - actionDescriptionDict.Add(160, "Write char to memory started."); - actionDescriptionDict.Add(360, "Write char to memory running: waiting for the presention of the tag."); - actionDescriptionDict.Add(361, "Write char to memory running: processing the data to be sent."); - actionDescriptionDict.Add(362, "Write char to memory: waiting for the job to be accepted."); - actionDescriptionDict.Add(363, "Write char to memory: waiting for the job to be finished."); - actionDescriptionDict.Add(364, "Write char to memory finished."); - actionDescriptionDict.Add(366, "Write char to memory running: cleaning the header data."); - actionDescriptionDict.Add(367, "Write char to memory running: cleaning the header data."); - actionDescriptionDict.Add(368, "Write char to memory running: cleaning the header data."); - actionDescriptionDict.Add(369, "Write char to memory finished with an error."); - actionDescriptionDict.Add(161, "Write char to memory finished succesfully."); - actionDescriptionDict.Add(162, "Write char to memory restored."); - - - actionDescriptionDict.Add(10000, "Read finished with error!"); - actionDescriptionDict.Add(10001, "Read was aborted, while not yet completed!"); - actionDescriptionDict.Add(10020, "Write finished with error!"); - actionDescriptionDict.Add(10021, "Write was aborted, while not yet completed!"); - actionDescriptionDict.Add(10040, "Reset communication finished with error!"); - actionDescriptionDict.Add(10041, "Reset communication was aborted, while not yet completed!"); - actionDescriptionDict.Add(10050, "Reset reader finished with error!"); - actionDescriptionDict.Add(10051, "Reset reader was aborted, while not yet completed!"); - actionDescriptionDict.Add(10060, "Write char to memory finished with error!"); - actionDescriptionDict.Add(10061, "Write char to memory was aborted, while not yet completed!"); - - } - - string actionDescription = " "; - - if (Action == null || Action.Id == null) - return actionDescription; - - if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) - { - return actionDescription; - } - else - { - return " "; - } - - } - } - } -} - From a6da3da88b1aae36ff45a7cc13e2a3b899a742ff Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:47:08 +0200 Subject: [PATCH 07/33] Refactor solution file by removing obsolete projects and adding new ones - Removed projects: AXOpen.Logging.Serilog, AXOpen.Components.Cognex.Vision.blazorapp, app_axopen_components_cognex_vision, AXOpen.Data.Json, AXOpen.Security.Blazor, AXOpen.Security, inxton_axopen_simatic1500 - Added project: AXOpen.Operon.Blazor - Updated project paths for existing projects to reflect new structure --- .../components.cognex.vision.code-workspace | 3 - .../components.cognex.vision.sln | 97 ++----------------- src/components.cognex.vision/this.sln | 97 ++----------------- 3 files changed, 18 insertions(+), 179 deletions(-) diff --git a/src/components.cognex.vision/components.cognex.vision.code-workspace b/src/components.cognex.vision/components.cognex.vision.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.cognex.vision/components.cognex.vision.code-workspace +++ b/src/components.cognex.vision/components.cognex.vision.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.cognex.vision/components.cognex.vision.sln b/src/components.cognex.vision/components.cognex.vision.sln index ff53eaa69..affe191f6 100644 --- a/src/components.cognex.vision/components.cognex.vision.sln +++ b/src/components.cognex.vision/components.cognex.vision.sln @@ -5,16 +5,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{B79CC515-4BE0-4482-AFE4-4D5C09FACFE3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{EDDEF367-F38B-4708-8331-FA58C86360E1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{E67EE124-EC3A-44F4-AD5C-8539520F1215}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{E8E24CCB-0739-453C-A395-2CB17CCEA6E0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Cognex.Vision.blazorapp", "app\ix-blazor\AXOpen.Components.Cognex.Vision.blazorapp.csproj", "{DE4328AB-7794-46CA-BEF4-99931E11CF73}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_cognex_vision", "app\ix\app_axopen_components_cognex_vision.csproj", "{8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Cognex.Vision.blazor", "src\AXOpen.Components.Cognex.Vision.blazor\AXOpen.Components.Cognex.Vision.blazor.csproj", "{E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_cognex_vision", "src\AXOpen.Components.Cognex.Vision\inxton_axopen_components_cognex_vision.csproj", "{F1BD131D-BD63-4CD2-8ECF-2F03CAD1B7D3}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{7BFB8154-F010-4C17-8954-D70D1050D8E4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{8C47E98C-BABF-4CDB-B901-2C4569233858}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{B8E9E8B1-8FA2-42A0-A04E-49B6EC7D9FA3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{A620918C-98D5-410A-80AA-044D7213D49B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{95411F5B-EB39-4394-8045-D20D88D9C81E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{27F7281F-B691-4986-8006-561D9FA2922A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{43310F97-1C92-4D8F-A82D-E935AC02C7D1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{C8A1D488-657D-4E88-80BA-01D53E86E683}" EndProject @@ -53,8 +41,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{763AADAD-8463-4165-8176-B82E63AAE169}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{1F7C3005-C6E2-4CB0-AD1E-688B5D623CC2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{6D294E5D-C5C2-4310-AC0B-3551E5C74E6F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E}" @@ -67,12 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{B8796442-B17E-4483-B0C6-94B3DED29C91}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{9894F72F-8128-40A2-9261-3F7BDA3EA285}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{35806C10-BD27-4814-99D5-1DB4A157DFEA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{003A04FD-2639-4E61-98FE-4A4EDB0F6E5B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Cognex.Vision.blazor", "src\AXOpen.Components.Cognex.Vision.blazor", "{7F713448-9C1B-496F-B168-2A08970ED4F3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Cognex.Vision", "src\AXOpen.Components.Cognex.Vision", "{AD7CD0D4-0815-4CE4-BFC4-DDCFEE7FE212}" @@ -93,14 +73,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{6DBA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{C712FB42-2F6D-41C8-8516-B79FE6C6D5B8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{710E7B16-8A33-497C-B525-908C97CFA5BB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{D8CB7F51-059F-467C-B60B-86F2186CCAE5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{127E2EDE-336C-4872-BBBC-FE7E0BB97CD9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{C93A57DD-2CBB-4CAB-A508-555CC62D9475}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{F13860A9-F487-46D2-8910-E2A6C6CF1C69}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{B4E0011B-7CC4-4F97-883A-92A34BC860CC}" @@ -115,19 +87,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{50D1A829-B67E-4CBA-BFAC-209CAC8C4C2E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{5F61D60D-8A73-40EC-81FA-E3E978BE0F51}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{48B49393-61A7-43D6-990B-E6D35A24BCA5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{95A07492-BE62-4A6F-BE61-CFD5A9DE8D6D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{D53B316B-AFB0-45AA-BC87-385AADDC9A23}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{69D4FB46-5999-4FC3-AEDC-4E9E8DA9E6F2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{C040498A-21A6-4FB7-BE1F-A944F8193F04}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{1AA2FA36-CBFF-4127-B423-5FF3B9224B21}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{9BC628E8-5483-4F2F-B3AD-44A7ABC13A9E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{05C1EE37-4178-4311-9546-C9D446E814E3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{D6A9CE41-78B8-4A05-A598-B7D4589EADE5}" EndProject @@ -165,10 +127,6 @@ Global {B79CC515-4BE0-4482-AFE4-4D5C09FACFE3}.Debug|Any CPU.Build.0 = Debug|Any CPU {B79CC515-4BE0-4482-AFE4-4D5C09FACFE3}.Release|Any CPU.ActiveCfg = Release|Any CPU {B79CC515-4BE0-4482-AFE4-4D5C09FACFE3}.Release|Any CPU.Build.0 = Release|Any CPU - {EDDEF367-F38B-4708-8331-FA58C86360E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDDEF367-F38B-4708-8331-FA58C86360E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDDEF367-F38B-4708-8331-FA58C86360E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDDEF367-F38B-4708-8331-FA58C86360E1}.Release|Any CPU.Build.0 = Release|Any CPU {E67EE124-EC3A-44F4-AD5C-8539520F1215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E67EE124-EC3A-44F4-AD5C-8539520F1215}.Debug|Any CPU.Build.0 = Debug|Any CPU {E67EE124-EC3A-44F4-AD5C-8539520F1215}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -177,14 +135,6 @@ Global {E8E24CCB-0739-453C-A395-2CB17CCEA6E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8E24CCB-0739-453C-A395-2CB17CCEA6E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {E8E24CCB-0739-453C-A395-2CB17CCEA6E0}.Release|Any CPU.Build.0 = Release|Any CPU - {DE4328AB-7794-46CA-BEF4-99931E11CF73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE4328AB-7794-46CA-BEF4-99931E11CF73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE4328AB-7794-46CA-BEF4-99931E11CF73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE4328AB-7794-46CA-BEF4-99931E11CF73}.Release|Any CPU.Build.0 = Release|Any CPU - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}.Release|Any CPU.Build.0 = Release|Any CPU {E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -205,10 +155,6 @@ Global {7BFB8154-F010-4C17-8954-D70D1050D8E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BFB8154-F010-4C17-8954-D70D1050D8E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BFB8154-F010-4C17-8954-D70D1050D8E4}.Release|Any CPU.Build.0 = Release|Any CPU - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}.Release|Any CPU.Build.0 = Release|Any CPU {8C47E98C-BABF-4CDB-B901-2C4569233858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8C47E98C-BABF-4CDB-B901-2C4569233858}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C47E98C-BABF-4CDB-B901-2C4569233858}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -221,18 +167,10 @@ Global {A620918C-98D5-410A-80AA-044D7213D49B}.Debug|Any CPU.Build.0 = Debug|Any CPU {A620918C-98D5-410A-80AA-044D7213D49B}.Release|Any CPU.ActiveCfg = Release|Any CPU {A620918C-98D5-410A-80AA-044D7213D49B}.Release|Any CPU.Build.0 = Release|Any CPU - {95411F5B-EB39-4394-8045-D20D88D9C81E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95411F5B-EB39-4394-8045-D20D88D9C81E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95411F5B-EB39-4394-8045-D20D88D9C81E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95411F5B-EB39-4394-8045-D20D88D9C81E}.Release|Any CPU.Build.0 = Release|Any CPU - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}.Release|Any CPU.Build.0 = Release|Any CPU - {27F7281F-B691-4986-8006-561D9FA2922A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27F7281F-B691-4986-8006-561D9FA2922A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27F7281F-B691-4986-8006-561D9FA2922A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27F7281F-B691-4986-8006-561D9FA2922A}.Release|Any CPU.Build.0 = Release|Any CPU + {43310F97-1C92-4D8F-A82D-E935AC02C7D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43310F97-1C92-4D8F-A82D-E935AC02C7D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43310F97-1C92-4D8F-A82D-E935AC02C7D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43310F97-1C92-4D8F-A82D-E935AC02C7D1}.Release|Any CPU.Build.0 = Release|Any CPU {C8A1D488-657D-4E88-80BA-01D53E86E683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C8A1D488-657D-4E88-80BA-01D53E86E683}.Debug|Any CPU.Build.0 = Debug|Any CPU {C8A1D488-657D-4E88-80BA-01D53E86E683}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -255,19 +193,12 @@ Global {520C7D6C-E6DD-40BE-8601-BEC8B17079B3} = {9CAB3351-36A4-4492-BEE6-486D03195067} {B79CC515-4BE0-4482-AFE4-4D5C09FACFE3} = {763AADAD-8463-4165-8176-B82E63AAE169} {763AADAD-8463-4165-8176-B82E63AAE169} = {85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E} - {EDDEF367-F38B-4708-8331-FA58C86360E1} = {1F7C3005-C6E2-4CB0-AD1E-688B5D623CC2} - {1F7C3005-C6E2-4CB0-AD1E-688B5D623CC2} = {85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E} {E67EE124-EC3A-44F4-AD5C-8539520F1215} = {6D294E5D-C5C2-4310-AC0B-3551E5C74E6F} {6D294E5D-C5C2-4310-AC0B-3551E5C74E6F} = {85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E} {85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E} = {58F4BB9F-CDD1-4C3B-A291-E0ED6D974EDB} {E8E24CCB-0739-453C-A395-2CB17CCEA6E0} = {DF1A15EE-A156-417C-BF42-06234ADF1D4F} {DF1A15EE-A156-417C-BF42-06234ADF1D4F} = {CD0A27F0-494B-44D4-A412-DEC981081921} {CD0A27F0-494B-44D4-A412-DEC981081921} = {B8796442-B17E-4483-B0C6-94B3DED29C91} - {DE4328AB-7794-46CA-BEF4-99931E11CF73} = {9894F72F-8128-40A2-9261-3F7BDA3EA285} - {9894F72F-8128-40A2-9261-3F7BDA3EA285} = {003A04FD-2639-4E61-98FE-4A4EDB0F6E5B} - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84} = {35806C10-BD27-4814-99D5-1DB4A157DFEA} - {35806C10-BD27-4814-99D5-1DB4A157DFEA} = {003A04FD-2639-4E61-98FE-4A4EDB0F6E5B} - {003A04FD-2639-4E61-98FE-4A4EDB0F6E5B} = {C9FA885C-9927-4C2C-8435-81DB342B771F} {E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB} = {7F713448-9C1B-496F-B168-2A08970ED4F3} {7F713448-9C1B-496F-B168-2A08970ED4F3} = {E23C5715-5A13-42A9-95D7-3BB084499D05} {F1BD131D-BD63-4CD2-8ECF-2F03CAD1B7D3} = {AD7CD0D4-0815-4CE4-BFC4-DDCFEE7FE212} @@ -281,10 +212,6 @@ Global {7BFB8154-F010-4C17-8954-D70D1050D8E4} = {55C4E854-FFAF-412E-B404-C49E6F741650} {55C4E854-FFAF-412E-B404-C49E6F741650} = {6DBA5F71-DB89-4993-B920-BE402C24A8EA} {6DBA5F71-DB89-4993-B920-BE402C24A8EA} = {C712FB42-2F6D-41C8-8516-B79FE6C6D5B8} - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495} = {710E7B16-8A33-497C-B525-908C97CFA5BB} - {710E7B16-8A33-497C-B525-908C97CFA5BB} = {D8CB7F51-059F-467C-B60B-86F2186CCAE5} - {D8CB7F51-059F-467C-B60B-86F2186CCAE5} = {127E2EDE-336C-4872-BBBC-FE7E0BB97CD9} - {127E2EDE-336C-4872-BBBC-FE7E0BB97CD9} = {C93A57DD-2CBB-4CAB-A508-555CC62D9475} {8C47E98C-BABF-4CDB-B901-2C4569233858} = {F13860A9-F487-46D2-8910-E2A6C6CF1C69} {F13860A9-F487-46D2-8910-E2A6C6CF1C69} = {5D873FF7-F331-4D9A-BCB6-10F1CA490C8F} {B8E9E8B1-8FA2-42A0-A04E-49B6EC7D9FA3} = {B4E0011B-7CC4-4F97-883A-92A34BC860CC} @@ -293,14 +220,8 @@ Global {A620918C-98D5-410A-80AA-044D7213D49B} = {25E163EB-0DA8-40E1-8ADC-E04476B2F99F} {25E163EB-0DA8-40E1-8ADC-E04476B2F99F} = {807F14A7-5673-4ADC-85CC-AE81E43490D6} {807F14A7-5673-4ADC-85CC-AE81E43490D6} = {50D1A829-B67E-4CBA-BFAC-209CAC8C4C2E} - {95411F5B-EB39-4394-8045-D20D88D9C81E} = {5F61D60D-8A73-40EC-81FA-E3E978BE0F51} - {5F61D60D-8A73-40EC-81FA-E3E978BE0F51} = {95A07492-BE62-4A6F-BE61-CFD5A9DE8D6D} - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D} = {48B49393-61A7-43D6-990B-E6D35A24BCA5} - {48B49393-61A7-43D6-990B-E6D35A24BCA5} = {95A07492-BE62-4A6F-BE61-CFD5A9DE8D6D} - {95A07492-BE62-4A6F-BE61-CFD5A9DE8D6D} = {D53B316B-AFB0-45AA-BC87-385AADDC9A23} - {27F7281F-B691-4986-8006-561D9FA2922A} = {69D4FB46-5999-4FC3-AEDC-4E9E8DA9E6F2} - {69D4FB46-5999-4FC3-AEDC-4E9E8DA9E6F2} = {C040498A-21A6-4FB7-BE1F-A944F8193F04} - {C040498A-21A6-4FB7-BE1F-A944F8193F04} = {9BC628E8-5483-4F2F-B3AD-44A7ABC13A9E} + {43310F97-1C92-4D8F-A82D-E935AC02C7D1} = {1AA2FA36-CBFF-4127-B423-5FF3B9224B21} + {1AA2FA36-CBFF-4127-B423-5FF3B9224B21} = {05C1EE37-4178-4311-9546-C9D446E814E3} {C8A1D488-657D-4E88-80BA-01D53E86E683} = {D6A9CE41-78B8-4A05-A598-B7D4589EADE5} {D6A9CE41-78B8-4A05-A598-B7D4589EADE5} = {C08BA38D-5082-4F87-84CB-0A5985452BA6} {C08BA38D-5082-4F87-84CB-0A5985452BA6} = {B434E25F-CF8E-4AB2-9800-CA1F17957CD3} diff --git a/src/components.cognex.vision/this.sln b/src/components.cognex.vision/this.sln index ff53eaa69..affe191f6 100644 --- a/src/components.cognex.vision/this.sln +++ b/src/components.cognex.vision/this.sln @@ -5,16 +5,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{B79CC515-4BE0-4482-AFE4-4D5C09FACFE3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{EDDEF367-F38B-4708-8331-FA58C86360E1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{E67EE124-EC3A-44F4-AD5C-8539520F1215}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{E8E24CCB-0739-453C-A395-2CB17CCEA6E0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Cognex.Vision.blazorapp", "app\ix-blazor\AXOpen.Components.Cognex.Vision.blazorapp.csproj", "{DE4328AB-7794-46CA-BEF4-99931E11CF73}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_cognex_vision", "app\ix\app_axopen_components_cognex_vision.csproj", "{8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Cognex.Vision.blazor", "src\AXOpen.Components.Cognex.Vision.blazor\AXOpen.Components.Cognex.Vision.blazor.csproj", "{E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_cognex_vision", "src\AXOpen.Components.Cognex.Vision\inxton_axopen_components_cognex_vision.csproj", "{F1BD131D-BD63-4CD2-8ECF-2F03CAD1B7D3}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{7BFB8154-F010-4C17-8954-D70D1050D8E4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{8C47E98C-BABF-4CDB-B901-2C4569233858}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{B8E9E8B1-8FA2-42A0-A04E-49B6EC7D9FA3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{A620918C-98D5-410A-80AA-044D7213D49B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{95411F5B-EB39-4394-8045-D20D88D9C81E}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{27F7281F-B691-4986-8006-561D9FA2922A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{43310F97-1C92-4D8F-A82D-E935AC02C7D1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{C8A1D488-657D-4E88-80BA-01D53E86E683}" EndProject @@ -53,8 +41,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{763AADAD-8463-4165-8176-B82E63AAE169}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{1F7C3005-C6E2-4CB0-AD1E-688B5D623CC2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{6D294E5D-C5C2-4310-AC0B-3551E5C74E6F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E}" @@ -67,12 +53,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{B8796442-B17E-4483-B0C6-94B3DED29C91}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{9894F72F-8128-40A2-9261-3F7BDA3EA285}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{35806C10-BD27-4814-99D5-1DB4A157DFEA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{003A04FD-2639-4E61-98FE-4A4EDB0F6E5B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Cognex.Vision.blazor", "src\AXOpen.Components.Cognex.Vision.blazor", "{7F713448-9C1B-496F-B168-2A08970ED4F3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Cognex.Vision", "src\AXOpen.Components.Cognex.Vision", "{AD7CD0D4-0815-4CE4-BFC4-DDCFEE7FE212}" @@ -93,14 +73,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{6DBA EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{C712FB42-2F6D-41C8-8516-B79FE6C6D5B8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{710E7B16-8A33-497C-B525-908C97CFA5BB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{D8CB7F51-059F-467C-B60B-86F2186CCAE5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{127E2EDE-336C-4872-BBBC-FE7E0BB97CD9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{C93A57DD-2CBB-4CAB-A508-555CC62D9475}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{F13860A9-F487-46D2-8910-E2A6C6CF1C69}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{B4E0011B-7CC4-4F97-883A-92A34BC860CC}" @@ -115,19 +87,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{50D1A829-B67E-4CBA-BFAC-209CAC8C4C2E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{5F61D60D-8A73-40EC-81FA-E3E978BE0F51}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{48B49393-61A7-43D6-990B-E6D35A24BCA5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{95A07492-BE62-4A6F-BE61-CFD5A9DE8D6D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{D53B316B-AFB0-45AA-BC87-385AADDC9A23}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{69D4FB46-5999-4FC3-AEDC-4E9E8DA9E6F2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{C040498A-21A6-4FB7-BE1F-A944F8193F04}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{1AA2FA36-CBFF-4127-B423-5FF3B9224B21}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{9BC628E8-5483-4F2F-B3AD-44A7ABC13A9E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{05C1EE37-4178-4311-9546-C9D446E814E3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{D6A9CE41-78B8-4A05-A598-B7D4589EADE5}" EndProject @@ -165,10 +127,6 @@ Global {B79CC515-4BE0-4482-AFE4-4D5C09FACFE3}.Debug|Any CPU.Build.0 = Debug|Any CPU {B79CC515-4BE0-4482-AFE4-4D5C09FACFE3}.Release|Any CPU.ActiveCfg = Release|Any CPU {B79CC515-4BE0-4482-AFE4-4D5C09FACFE3}.Release|Any CPU.Build.0 = Release|Any CPU - {EDDEF367-F38B-4708-8331-FA58C86360E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDDEF367-F38B-4708-8331-FA58C86360E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDDEF367-F38B-4708-8331-FA58C86360E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDDEF367-F38B-4708-8331-FA58C86360E1}.Release|Any CPU.Build.0 = Release|Any CPU {E67EE124-EC3A-44F4-AD5C-8539520F1215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E67EE124-EC3A-44F4-AD5C-8539520F1215}.Debug|Any CPU.Build.0 = Debug|Any CPU {E67EE124-EC3A-44F4-AD5C-8539520F1215}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -177,14 +135,6 @@ Global {E8E24CCB-0739-453C-A395-2CB17CCEA6E0}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8E24CCB-0739-453C-A395-2CB17CCEA6E0}.Release|Any CPU.ActiveCfg = Release|Any CPU {E8E24CCB-0739-453C-A395-2CB17CCEA6E0}.Release|Any CPU.Build.0 = Release|Any CPU - {DE4328AB-7794-46CA-BEF4-99931E11CF73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {DE4328AB-7794-46CA-BEF4-99931E11CF73}.Debug|Any CPU.Build.0 = Debug|Any CPU - {DE4328AB-7794-46CA-BEF4-99931E11CF73}.Release|Any CPU.ActiveCfg = Release|Any CPU - {DE4328AB-7794-46CA-BEF4-99931E11CF73}.Release|Any CPU.Build.0 = Release|Any CPU - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84}.Release|Any CPU.Build.0 = Release|Any CPU {E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB}.Debug|Any CPU.Build.0 = Debug|Any CPU {E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -205,10 +155,6 @@ Global {7BFB8154-F010-4C17-8954-D70D1050D8E4}.Debug|Any CPU.Build.0 = Debug|Any CPU {7BFB8154-F010-4C17-8954-D70D1050D8E4}.Release|Any CPU.ActiveCfg = Release|Any CPU {7BFB8154-F010-4C17-8954-D70D1050D8E4}.Release|Any CPU.Build.0 = Release|Any CPU - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}.Debug|Any CPU.Build.0 = Debug|Any CPU - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}.Release|Any CPU.ActiveCfg = Release|Any CPU - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495}.Release|Any CPU.Build.0 = Release|Any CPU {8C47E98C-BABF-4CDB-B901-2C4569233858}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8C47E98C-BABF-4CDB-B901-2C4569233858}.Debug|Any CPU.Build.0 = Debug|Any CPU {8C47E98C-BABF-4CDB-B901-2C4569233858}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -221,18 +167,10 @@ Global {A620918C-98D5-410A-80AA-044D7213D49B}.Debug|Any CPU.Build.0 = Debug|Any CPU {A620918C-98D5-410A-80AA-044D7213D49B}.Release|Any CPU.ActiveCfg = Release|Any CPU {A620918C-98D5-410A-80AA-044D7213D49B}.Release|Any CPU.Build.0 = Release|Any CPU - {95411F5B-EB39-4394-8045-D20D88D9C81E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {95411F5B-EB39-4394-8045-D20D88D9C81E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {95411F5B-EB39-4394-8045-D20D88D9C81E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {95411F5B-EB39-4394-8045-D20D88D9C81E}.Release|Any CPU.Build.0 = Release|Any CPU - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D}.Release|Any CPU.Build.0 = Release|Any CPU - {27F7281F-B691-4986-8006-561D9FA2922A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27F7281F-B691-4986-8006-561D9FA2922A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27F7281F-B691-4986-8006-561D9FA2922A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27F7281F-B691-4986-8006-561D9FA2922A}.Release|Any CPU.Build.0 = Release|Any CPU + {43310F97-1C92-4D8F-A82D-E935AC02C7D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {43310F97-1C92-4D8F-A82D-E935AC02C7D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {43310F97-1C92-4D8F-A82D-E935AC02C7D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {43310F97-1C92-4D8F-A82D-E935AC02C7D1}.Release|Any CPU.Build.0 = Release|Any CPU {C8A1D488-657D-4E88-80BA-01D53E86E683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {C8A1D488-657D-4E88-80BA-01D53E86E683}.Debug|Any CPU.Build.0 = Debug|Any CPU {C8A1D488-657D-4E88-80BA-01D53E86E683}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -255,19 +193,12 @@ Global {520C7D6C-E6DD-40BE-8601-BEC8B17079B3} = {9CAB3351-36A4-4492-BEE6-486D03195067} {B79CC515-4BE0-4482-AFE4-4D5C09FACFE3} = {763AADAD-8463-4165-8176-B82E63AAE169} {763AADAD-8463-4165-8176-B82E63AAE169} = {85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E} - {EDDEF367-F38B-4708-8331-FA58C86360E1} = {1F7C3005-C6E2-4CB0-AD1E-688B5D623CC2} - {1F7C3005-C6E2-4CB0-AD1E-688B5D623CC2} = {85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E} {E67EE124-EC3A-44F4-AD5C-8539520F1215} = {6D294E5D-C5C2-4310-AC0B-3551E5C74E6F} {6D294E5D-C5C2-4310-AC0B-3551E5C74E6F} = {85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E} {85D7E115-9CCF-4A0E-A8FB-06BFF6092E4E} = {58F4BB9F-CDD1-4C3B-A291-E0ED6D974EDB} {E8E24CCB-0739-453C-A395-2CB17CCEA6E0} = {DF1A15EE-A156-417C-BF42-06234ADF1D4F} {DF1A15EE-A156-417C-BF42-06234ADF1D4F} = {CD0A27F0-494B-44D4-A412-DEC981081921} {CD0A27F0-494B-44D4-A412-DEC981081921} = {B8796442-B17E-4483-B0C6-94B3DED29C91} - {DE4328AB-7794-46CA-BEF4-99931E11CF73} = {9894F72F-8128-40A2-9261-3F7BDA3EA285} - {9894F72F-8128-40A2-9261-3F7BDA3EA285} = {003A04FD-2639-4E61-98FE-4A4EDB0F6E5B} - {8E3ACDBA-8F57-48C5-AB40-6795F4C89E84} = {35806C10-BD27-4814-99D5-1DB4A157DFEA} - {35806C10-BD27-4814-99D5-1DB4A157DFEA} = {003A04FD-2639-4E61-98FE-4A4EDB0F6E5B} - {003A04FD-2639-4E61-98FE-4A4EDB0F6E5B} = {C9FA885C-9927-4C2C-8435-81DB342B771F} {E0E85C67-13ED-4F42-BBC3-BBBCB7AB59BB} = {7F713448-9C1B-496F-B168-2A08970ED4F3} {7F713448-9C1B-496F-B168-2A08970ED4F3} = {E23C5715-5A13-42A9-95D7-3BB084499D05} {F1BD131D-BD63-4CD2-8ECF-2F03CAD1B7D3} = {AD7CD0D4-0815-4CE4-BFC4-DDCFEE7FE212} @@ -281,10 +212,6 @@ Global {7BFB8154-F010-4C17-8954-D70D1050D8E4} = {55C4E854-FFAF-412E-B404-C49E6F741650} {55C4E854-FFAF-412E-B404-C49E6F741650} = {6DBA5F71-DB89-4993-B920-BE402C24A8EA} {6DBA5F71-DB89-4993-B920-BE402C24A8EA} = {C712FB42-2F6D-41C8-8516-B79FE6C6D5B8} - {FBD0BDCD-D1AC-436C-BA0C-829B58BBC495} = {710E7B16-8A33-497C-B525-908C97CFA5BB} - {710E7B16-8A33-497C-B525-908C97CFA5BB} = {D8CB7F51-059F-467C-B60B-86F2186CCAE5} - {D8CB7F51-059F-467C-B60B-86F2186CCAE5} = {127E2EDE-336C-4872-BBBC-FE7E0BB97CD9} - {127E2EDE-336C-4872-BBBC-FE7E0BB97CD9} = {C93A57DD-2CBB-4CAB-A508-555CC62D9475} {8C47E98C-BABF-4CDB-B901-2C4569233858} = {F13860A9-F487-46D2-8910-E2A6C6CF1C69} {F13860A9-F487-46D2-8910-E2A6C6CF1C69} = {5D873FF7-F331-4D9A-BCB6-10F1CA490C8F} {B8E9E8B1-8FA2-42A0-A04E-49B6EC7D9FA3} = {B4E0011B-7CC4-4F97-883A-92A34BC860CC} @@ -293,14 +220,8 @@ Global {A620918C-98D5-410A-80AA-044D7213D49B} = {25E163EB-0DA8-40E1-8ADC-E04476B2F99F} {25E163EB-0DA8-40E1-8ADC-E04476B2F99F} = {807F14A7-5673-4ADC-85CC-AE81E43490D6} {807F14A7-5673-4ADC-85CC-AE81E43490D6} = {50D1A829-B67E-4CBA-BFAC-209CAC8C4C2E} - {95411F5B-EB39-4394-8045-D20D88D9C81E} = {5F61D60D-8A73-40EC-81FA-E3E978BE0F51} - {5F61D60D-8A73-40EC-81FA-E3E978BE0F51} = {95A07492-BE62-4A6F-BE61-CFD5A9DE8D6D} - {F4BDED82-C8FE-4CD6-8FB6-87A4C7308D9D} = {48B49393-61A7-43D6-990B-E6D35A24BCA5} - {48B49393-61A7-43D6-990B-E6D35A24BCA5} = {95A07492-BE62-4A6F-BE61-CFD5A9DE8D6D} - {95A07492-BE62-4A6F-BE61-CFD5A9DE8D6D} = {D53B316B-AFB0-45AA-BC87-385AADDC9A23} - {27F7281F-B691-4986-8006-561D9FA2922A} = {69D4FB46-5999-4FC3-AEDC-4E9E8DA9E6F2} - {69D4FB46-5999-4FC3-AEDC-4E9E8DA9E6F2} = {C040498A-21A6-4FB7-BE1F-A944F8193F04} - {C040498A-21A6-4FB7-BE1F-A944F8193F04} = {9BC628E8-5483-4F2F-B3AD-44A7ABC13A9E} + {43310F97-1C92-4D8F-A82D-E935AC02C7D1} = {1AA2FA36-CBFF-4127-B423-5FF3B9224B21} + {1AA2FA36-CBFF-4127-B423-5FF3B9224B21} = {05C1EE37-4178-4311-9546-C9D446E814E3} {C8A1D488-657D-4E88-80BA-01D53E86E683} = {D6A9CE41-78B8-4A05-A598-B7D4589EADE5} {D6A9CE41-78B8-4A05-A598-B7D4589EADE5} = {C08BA38D-5082-4F87-84CB-0A5985452BA6} {C08BA38D-5082-4F87-84CB-0A5985452BA6} = {B434E25F-CF8E-4AB2-9800-CA1F17957CD3} From ec03ae38f410c5b0f73ae4ad4007d9d9d914c7d4 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:49:18 +0200 Subject: [PATCH 08/33] feat: add AxoCVIC II component structures for enhanced functionality and organization --- .../components.desoutter.tightening.code-workspace | 3 --- .../AxoCVIC_II_ComponentStatus.st | 0 .../CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_Config.st | 0 .../{ => TypesStructuresAndEnums}/AxoCVIC_II_Control.st | 0 .../CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_HWIDs.st | 0 .../src/CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_In.st | 0 .../CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_Out.st | 0 .../CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_Status.st | 0 8 files changed, 3 deletions(-) rename src/components.desoutter.tightening/ctrl/src/CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_ComponentStatus.st (100%) rename src/components.desoutter.tightening/ctrl/src/CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_Config.st (100%) rename src/components.desoutter.tightening/ctrl/src/CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_Control.st (100%) rename src/components.desoutter.tightening/ctrl/src/CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_HWIDs.st (100%) rename src/components.desoutter.tightening/ctrl/src/CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_In.st (100%) rename src/components.desoutter.tightening/ctrl/src/CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_Out.st (100%) rename src/components.desoutter.tightening/ctrl/src/CVIC_II/{ => TypesStructuresAndEnums}/AxoCVIC_II_Status.st (100%) diff --git a/src/components.desoutter.tightening/components.desoutter.tightening.code-workspace b/src/components.desoutter.tightening/components.desoutter.tightening.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.desoutter.tightening/components.desoutter.tightening.code-workspace +++ b/src/components.desoutter.tightening/components.desoutter.tightening.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_ComponentStatus.st b/src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_ComponentStatus.st similarity index 100% rename from src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_ComponentStatus.st rename to src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_ComponentStatus.st diff --git a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_Config.st b/src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_Config.st similarity index 100% rename from src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_Config.st rename to src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_Config.st diff --git a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_Control.st b/src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_Control.st similarity index 100% rename from src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_Control.st rename to src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_Control.st diff --git a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_HWIDs.st b/src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_HWIDs.st similarity index 100% rename from src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_HWIDs.st rename to src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_HWIDs.st diff --git a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_In.st b/src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_In.st similarity index 100% rename from src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_In.st rename to src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_In.st diff --git a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_Out.st b/src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_Out.st similarity index 100% rename from src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_Out.st rename to src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_Out.st diff --git a/src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_Status.st b/src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_Status.st similarity index 100% rename from src/components.desoutter.tightening/ctrl/src/CVIC_II/AxoCVIC_II_Status.st rename to src/components.desoutter.tightening/ctrl/src/CVIC_II/TypesStructuresAndEnums/AxoCVIC_II_Status.st From 08958be829e67cbc589849204df58fb2e64ab170 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:52:17 +0200 Subject: [PATCH 09/33] Refactor solution file by removing obsolete projects and updating project references - Removed AXOpen.Logging.Serilog, AXOpen.Components.Desoutter.Tightening.blazorapp, app_axopen_components_desoutter_tightening, AXOpen.Data.Json, AXOpen.Security.Blazor, AXOpen.Security, and inxton_axopen_simatic1500 projects from the solution. - Added AXOpen.Operon.Blazor and updated references to styling projects. - Cleaned up project configurations and build settings for improved maintainability. --- .../components.desoutter.tightening.sln | 97 ++----------------- src/components.desoutter.tightening/this.sln | 97 ++----------------- 2 files changed, 18 insertions(+), 176 deletions(-) diff --git a/src/components.desoutter.tightening/components.desoutter.tightening.sln b/src/components.desoutter.tightening/components.desoutter.tightening.sln index 587dc81ca..8e700fc1e 100644 --- a/src/components.desoutter.tightening/components.desoutter.tightening.sln +++ b/src/components.desoutter.tightening/components.desoutter.tightening.sln @@ -5,16 +5,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{F9D6C8C8-997A-486D-87D3-879FB398DE3E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{AAF9F4E4-36B0-4079-8A87-49CD3B612E62}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{58B13369-CAA2-42BF-844E-434C10E557AE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{13E7DAC5-4C27-4636-BFA0-E01080DD11DB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Desoutter.Tightening.blazorapp", "app\ix-blazor\AXOpen.Components.Desoutter.Tightening.blazorapp.csproj", "{81D9771C-2C6F-43A9-A827-8E3D154D2749}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_desoutter_tightening", "app\ix\app_axopen_components_desoutter_tightening.csproj", "{F66D24FD-7AD4-4518-8605-F402C74FDBAE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Desoutter.Tightening.blazor", "src\AXOpen.Components.Desoutter.Tightening.blazor\AXOpen.Components.Desoutter.Tightening.blazor.csproj", "{1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_desoutter_tightening", "src\AXOpen.Components.Desoutter.Tightening\inxton_axopen_components_desoutter_tightening.csproj", "{AF50FD37-8342-4573-822A-612DBDBFE2AA}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{D5462B6D-5AEA-4C1A-AC87-73EF11C54634}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{25A01731-3B75-4EE6-9AA0-830E2435B6BF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{148EEE9E-F7AD-4667-9783-0D337A91DBCA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{C4467FA1-D967-4B42-B0F0-898D1C5DEFE4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{11090734-D744-409E-ABB9-4A2400230523}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{BBE39CF2-A448-4892-A8C4-DC394D8583AB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{10C82FE3-C0D3-47EF-8C7E-776A3B22292A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{A401DA48-F4BE-4EF1-B52D-3C605893F700}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{5DFF8097-B611-4716-B10D-C15797B323BB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{22BCE518-B668-499B-A40E-41E15278BD7E}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{96657B77-BE98-48F8-9EC9-15A336C954DD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{B6CDA1F2-D5D9-42A5-842C-FEAE224474DE}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{7CCA2FF2-2487-4A31-8BA7-6D8334E74345}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{C19FFDBC-C67B-4A0F-89F7-926A689A248F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{C85E2DF4-AC30-4313-B6F2-5B00B9BBF60D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{3DCD3E41-1485-45F2-BEBF-EAFFCBF4B223}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Desoutter.Tightening.blazor", "src\AXOpen.Components.Desoutter.Tightening.blazor", "{F871477F-6F35-44B9-BF66-7983B4BC1AD0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Desoutter.Tightening", "src\AXOpen.Components.Desoutter.Tightening", "{E37CFB04-031F-4BE2-9AEA-12EC9BD589E7}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{372B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{0387C048-9723-4F46-868E-E89909158137}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{5939C91F-8BA8-454A-BB05-0FD7B862C8E1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{C494E689-B88A-480D-9A98-F9D1E2CF1A03}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{C5939AF4-1203-41FA-93FA-81B7525A107B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{1FC5E1BB-F6D7-41C7-9652-48541FF36419}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{3DD25D5A-4AA1-488E-8616-3895B02670F7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{DD63E390-6173-4D1F-AE6D-C79553A19E75}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{93CF7FE4-D952-4E85-B0DB-4EA8727238B2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{B43300C5-9804-4411-B8AB-63B0B58C03B3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{261E2D6A-5002-4079-80A0-020E2162CF0A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{DB79F951-9CD4-4917-AF1C-D7BFB6086116}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{579B6393-FE07-4764-9CCD-93938270944A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{9FEF7CBC-7545-4065-ACD1-AF93DD4B87AD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{4EAEDBA6-C139-410C-BE84-87958A86F872}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{DCCCD2E4-0D87-48C3-8C14-B43404A93775}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{42AC1ABB-1060-43E3-A2F6-CF4D2F1D2EC1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{D5A42BA8-E9E7-42C0-8DFC-7820FF29F66E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{38A7405F-F962-41F4-A017-D86B824B3877}" EndProject @@ -157,10 +119,6 @@ Global {F9D6C8C8-997A-486D-87D3-879FB398DE3E}.Debug|Any CPU.Build.0 = Debug|Any CPU {F9D6C8C8-997A-486D-87D3-879FB398DE3E}.Release|Any CPU.ActiveCfg = Release|Any CPU {F9D6C8C8-997A-486D-87D3-879FB398DE3E}.Release|Any CPU.Build.0 = Release|Any CPU - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62}.Release|Any CPU.Build.0 = Release|Any CPU {58B13369-CAA2-42BF-844E-434C10E557AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {58B13369-CAA2-42BF-844E-434C10E557AE}.Debug|Any CPU.Build.0 = Debug|Any CPU {58B13369-CAA2-42BF-844E-434C10E557AE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {13E7DAC5-4C27-4636-BFA0-E01080DD11DB}.Debug|Any CPU.Build.0 = Debug|Any CPU {13E7DAC5-4C27-4636-BFA0-E01080DD11DB}.Release|Any CPU.ActiveCfg = Release|Any CPU {13E7DAC5-4C27-4636-BFA0-E01080DD11DB}.Release|Any CPU.Build.0 = Release|Any CPU - {81D9771C-2C6F-43A9-A827-8E3D154D2749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81D9771C-2C6F-43A9-A827-8E3D154D2749}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81D9771C-2C6F-43A9-A827-8E3D154D2749}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81D9771C-2C6F-43A9-A827-8E3D154D2749}.Release|Any CPU.Build.0 = Release|Any CPU - {F66D24FD-7AD4-4518-8605-F402C74FDBAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F66D24FD-7AD4-4518-8605-F402C74FDBAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F66D24FD-7AD4-4518-8605-F402C74FDBAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F66D24FD-7AD4-4518-8605-F402C74FDBAE}.Release|Any CPU.Build.0 = Release|Any CPU {1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {D5462B6D-5AEA-4C1A-AC87-73EF11C54634}.Debug|Any CPU.Build.0 = Debug|Any CPU {D5462B6D-5AEA-4C1A-AC87-73EF11C54634}.Release|Any CPU.ActiveCfg = Release|Any CPU {D5462B6D-5AEA-4C1A-AC87-73EF11C54634}.Release|Any CPU.Build.0 = Release|Any CPU - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}.Release|Any CPU.Build.0 = Release|Any CPU {25A01731-3B75-4EE6-9AA0-830E2435B6BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25A01731-3B75-4EE6-9AA0-830E2435B6BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {25A01731-3B75-4EE6-9AA0-830E2435B6BF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {C4467FA1-D967-4B42-B0F0-898D1C5DEFE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4467FA1-D967-4B42-B0F0-898D1C5DEFE4}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4467FA1-D967-4B42-B0F0-898D1C5DEFE4}.Release|Any CPU.Build.0 = Release|Any CPU - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}.Release|Any CPU.Build.0 = Release|Any CPU - {11090734-D744-409E-ABB9-4A2400230523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11090734-D744-409E-ABB9-4A2400230523}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11090734-D744-409E-ABB9-4A2400230523}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11090734-D744-409E-ABB9-4A2400230523}.Release|Any CPU.Build.0 = Release|Any CPU - {BBE39CF2-A448-4892-A8C4-DC394D8583AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBE39CF2-A448-4892-A8C4-DC394D8583AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBE39CF2-A448-4892-A8C4-DC394D8583AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBE39CF2-A448-4892-A8C4-DC394D8583AB}.Release|Any CPU.Build.0 = Release|Any CPU + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A}.Release|Any CPU.Build.0 = Release|Any CPU {A401DA48-F4BE-4EF1-B52D-3C605893F700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A401DA48-F4BE-4EF1-B52D-3C605893F700}.Debug|Any CPU.Build.0 = Debug|Any CPU {A401DA48-F4BE-4EF1-B52D-3C605893F700}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {763B04D7-779A-4C79-8490-79AFF7D47BA7} = {76C46E6D-16CA-4488-8EFD-6FBAF974A7AF} {F9D6C8C8-997A-486D-87D3-879FB398DE3E} = {5DFF8097-B611-4716-B10D-C15797B323BB} {5DFF8097-B611-4716-B10D-C15797B323BB} = {B6CDA1F2-D5D9-42A5-842C-FEAE224474DE} - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62} = {22BCE518-B668-499B-A40E-41E15278BD7E} - {22BCE518-B668-499B-A40E-41E15278BD7E} = {B6CDA1F2-D5D9-42A5-842C-FEAE224474DE} {58B13369-CAA2-42BF-844E-434C10E557AE} = {96657B77-BE98-48F8-9EC9-15A336C954DD} {96657B77-BE98-48F8-9EC9-15A336C954DD} = {B6CDA1F2-D5D9-42A5-842C-FEAE224474DE} {B6CDA1F2-D5D9-42A5-842C-FEAE224474DE} = {795AC49E-566E-427F-BBCB-260D1B5A8229} {13E7DAC5-4C27-4636-BFA0-E01080DD11DB} = {151D498A-AD5E-4167-8764-95A416A208AB} {151D498A-AD5E-4167-8764-95A416A208AB} = {5C4855A3-FB3A-4C05-97CA-863F47F1EFE4} {5C4855A3-FB3A-4C05-97CA-863F47F1EFE4} = {7CCA2FF2-2487-4A31-8BA7-6D8334E74345} - {81D9771C-2C6F-43A9-A827-8E3D154D2749} = {C19FFDBC-C67B-4A0F-89F7-926A689A248F} - {C19FFDBC-C67B-4A0F-89F7-926A689A248F} = {3DCD3E41-1485-45F2-BEBF-EAFFCBF4B223} - {F66D24FD-7AD4-4518-8605-F402C74FDBAE} = {C85E2DF4-AC30-4313-B6F2-5B00B9BBF60D} - {C85E2DF4-AC30-4313-B6F2-5B00B9BBF60D} = {3DCD3E41-1485-45F2-BEBF-EAFFCBF4B223} - {3DCD3E41-1485-45F2-BEBF-EAFFCBF4B223} = {79507F06-4834-40E5-A4CA-7F6692297C68} {1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8} = {F871477F-6F35-44B9-BF66-7983B4BC1AD0} {F871477F-6F35-44B9-BF66-7983B4BC1AD0} = {44F1E5B3-FD9D-4667-A4B6-6CD935462B85} {AF50FD37-8342-4573-822A-612DBDBFE2AA} = {E37CFB04-031F-4BE2-9AEA-12EC9BD589E7} @@ -269,10 +200,6 @@ Global {D5462B6D-5AEA-4C1A-AC87-73EF11C54634} = {6D5CE991-158D-431C-A18F-A442A0E95238} {6D5CE991-158D-431C-A18F-A442A0E95238} = {372B0738-2893-472B-B3A9-626AB7258BDF} {372B0738-2893-472B-B3A9-626AB7258BDF} = {0387C048-9723-4F46-868E-E89909158137} - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675} = {5939C91F-8BA8-454A-BB05-0FD7B862C8E1} - {5939C91F-8BA8-454A-BB05-0FD7B862C8E1} = {C494E689-B88A-480D-9A98-F9D1E2CF1A03} - {C494E689-B88A-480D-9A98-F9D1E2CF1A03} = {C5939AF4-1203-41FA-93FA-81B7525A107B} - {C5939AF4-1203-41FA-93FA-81B7525A107B} = {1FC5E1BB-F6D7-41C7-9652-48541FF36419} {25A01731-3B75-4EE6-9AA0-830E2435B6BF} = {3DD25D5A-4AA1-488E-8616-3895B02670F7} {3DD25D5A-4AA1-488E-8616-3895B02670F7} = {AF3EEF44-C57F-4E35-A6A7-6320E63D0DE8} {148EEE9E-F7AD-4667-9783-0D337A91DBCA} = {DD63E390-6173-4D1F-AE6D-C79553A19E75} @@ -281,14 +208,8 @@ Global {C4467FA1-D967-4B42-B0F0-898D1C5DEFE4} = {E700C1BA-2640-42DA-A5AA-77F286BAB738} {E700C1BA-2640-42DA-A5AA-77F286BAB738} = {40190475-31DE-46D0-A3AE-AAFC75434FC1} {40190475-31DE-46D0-A3AE-AAFC75434FC1} = {93CF7FE4-D952-4E85-B0DB-4EA8727238B2} - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1} = {B43300C5-9804-4411-B8AB-63B0B58C03B3} - {B43300C5-9804-4411-B8AB-63B0B58C03B3} = {DB79F951-9CD4-4917-AF1C-D7BFB6086116} - {11090734-D744-409E-ABB9-4A2400230523} = {261E2D6A-5002-4079-80A0-020E2162CF0A} - {261E2D6A-5002-4079-80A0-020E2162CF0A} = {DB79F951-9CD4-4917-AF1C-D7BFB6086116} - {DB79F951-9CD4-4917-AF1C-D7BFB6086116} = {579B6393-FE07-4764-9CCD-93938270944A} - {BBE39CF2-A448-4892-A8C4-DC394D8583AB} = {9FEF7CBC-7545-4065-ACD1-AF93DD4B87AD} - {9FEF7CBC-7545-4065-ACD1-AF93DD4B87AD} = {4EAEDBA6-C139-410C-BE84-87958A86F872} - {4EAEDBA6-C139-410C-BE84-87958A86F872} = {42AC1ABB-1060-43E3-A2F6-CF4D2F1D2EC1} + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A} = {DCCCD2E4-0D87-48C3-8C14-B43404A93775} + {DCCCD2E4-0D87-48C3-8C14-B43404A93775} = {D5A42BA8-E9E7-42C0-8DFC-7820FF29F66E} {A401DA48-F4BE-4EF1-B52D-3C605893F700} = {38A7405F-F962-41F4-A017-D86B824B3877} {38A7405F-F962-41F4-A017-D86B824B3877} = {D5392953-8BFB-43DB-A9DD-7C2ADFD0DB24} {D5392953-8BFB-43DB-A9DD-7C2ADFD0DB24} = {C105718D-3B92-48F4-BCB6-AA20085C37BE} diff --git a/src/components.desoutter.tightening/this.sln b/src/components.desoutter.tightening/this.sln index 587dc81ca..8e700fc1e 100644 --- a/src/components.desoutter.tightening/this.sln +++ b/src/components.desoutter.tightening/this.sln @@ -5,16 +5,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{F9D6C8C8-997A-486D-87D3-879FB398DE3E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{AAF9F4E4-36B0-4079-8A87-49CD3B612E62}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{58B13369-CAA2-42BF-844E-434C10E557AE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{13E7DAC5-4C27-4636-BFA0-E01080DD11DB}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Desoutter.Tightening.blazorapp", "app\ix-blazor\AXOpen.Components.Desoutter.Tightening.blazorapp.csproj", "{81D9771C-2C6F-43A9-A827-8E3D154D2749}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_desoutter_tightening", "app\ix\app_axopen_components_desoutter_tightening.csproj", "{F66D24FD-7AD4-4518-8605-F402C74FDBAE}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Desoutter.Tightening.blazor", "src\AXOpen.Components.Desoutter.Tightening.blazor\AXOpen.Components.Desoutter.Tightening.blazor.csproj", "{1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_desoutter_tightening", "src\AXOpen.Components.Desoutter.Tightening\inxton_axopen_components_desoutter_tightening.csproj", "{AF50FD37-8342-4573-822A-612DBDBFE2AA}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{D5462B6D-5AEA-4C1A-AC87-73EF11C54634}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{25A01731-3B75-4EE6-9AA0-830E2435B6BF}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{148EEE9E-F7AD-4667-9783-0D337A91DBCA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{C4467FA1-D967-4B42-B0F0-898D1C5DEFE4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{11090734-D744-409E-ABB9-4A2400230523}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{BBE39CF2-A448-4892-A8C4-DC394D8583AB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{10C82FE3-C0D3-47EF-8C7E-776A3B22292A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{A401DA48-F4BE-4EF1-B52D-3C605893F700}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{5DFF8097-B611-4716-B10D-C15797B323BB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{22BCE518-B668-499B-A40E-41E15278BD7E}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{96657B77-BE98-48F8-9EC9-15A336C954DD}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{B6CDA1F2-D5D9-42A5-842C-FEAE224474DE}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{7CCA2FF2-2487-4A31-8BA7-6D8334E74345}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{C19FFDBC-C67B-4A0F-89F7-926A689A248F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{C85E2DF4-AC30-4313-B6F2-5B00B9BBF60D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{3DCD3E41-1485-45F2-BEBF-EAFFCBF4B223}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Desoutter.Tightening.blazor", "src\AXOpen.Components.Desoutter.Tightening.blazor", "{F871477F-6F35-44B9-BF66-7983B4BC1AD0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Desoutter.Tightening", "src\AXOpen.Components.Desoutter.Tightening", "{E37CFB04-031F-4BE2-9AEA-12EC9BD589E7}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{372B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{0387C048-9723-4F46-868E-E89909158137}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{5939C91F-8BA8-454A-BB05-0FD7B862C8E1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{C494E689-B88A-480D-9A98-F9D1E2CF1A03}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{C5939AF4-1203-41FA-93FA-81B7525A107B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{1FC5E1BB-F6D7-41C7-9652-48541FF36419}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{3DD25D5A-4AA1-488E-8616-3895B02670F7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{DD63E390-6173-4D1F-AE6D-C79553A19E75}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{93CF7FE4-D952-4E85-B0DB-4EA8727238B2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{B43300C5-9804-4411-B8AB-63B0B58C03B3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{261E2D6A-5002-4079-80A0-020E2162CF0A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{DB79F951-9CD4-4917-AF1C-D7BFB6086116}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{579B6393-FE07-4764-9CCD-93938270944A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{9FEF7CBC-7545-4065-ACD1-AF93DD4B87AD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{4EAEDBA6-C139-410C-BE84-87958A86F872}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{DCCCD2E4-0D87-48C3-8C14-B43404A93775}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{42AC1ABB-1060-43E3-A2F6-CF4D2F1D2EC1}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{D5A42BA8-E9E7-42C0-8DFC-7820FF29F66E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{38A7405F-F962-41F4-A017-D86B824B3877}" EndProject @@ -157,10 +119,6 @@ Global {F9D6C8C8-997A-486D-87D3-879FB398DE3E}.Debug|Any CPU.Build.0 = Debug|Any CPU {F9D6C8C8-997A-486D-87D3-879FB398DE3E}.Release|Any CPU.ActiveCfg = Release|Any CPU {F9D6C8C8-997A-486D-87D3-879FB398DE3E}.Release|Any CPU.Build.0 = Release|Any CPU - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62}.Release|Any CPU.Build.0 = Release|Any CPU {58B13369-CAA2-42BF-844E-434C10E557AE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {58B13369-CAA2-42BF-844E-434C10E557AE}.Debug|Any CPU.Build.0 = Debug|Any CPU {58B13369-CAA2-42BF-844E-434C10E557AE}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {13E7DAC5-4C27-4636-BFA0-E01080DD11DB}.Debug|Any CPU.Build.0 = Debug|Any CPU {13E7DAC5-4C27-4636-BFA0-E01080DD11DB}.Release|Any CPU.ActiveCfg = Release|Any CPU {13E7DAC5-4C27-4636-BFA0-E01080DD11DB}.Release|Any CPU.Build.0 = Release|Any CPU - {81D9771C-2C6F-43A9-A827-8E3D154D2749}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {81D9771C-2C6F-43A9-A827-8E3D154D2749}.Debug|Any CPU.Build.0 = Debug|Any CPU - {81D9771C-2C6F-43A9-A827-8E3D154D2749}.Release|Any CPU.ActiveCfg = Release|Any CPU - {81D9771C-2C6F-43A9-A827-8E3D154D2749}.Release|Any CPU.Build.0 = Release|Any CPU - {F66D24FD-7AD4-4518-8605-F402C74FDBAE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F66D24FD-7AD4-4518-8605-F402C74FDBAE}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F66D24FD-7AD4-4518-8605-F402C74FDBAE}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F66D24FD-7AD4-4518-8605-F402C74FDBAE}.Release|Any CPU.Build.0 = Release|Any CPU {1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8}.Debug|Any CPU.Build.0 = Debug|Any CPU {1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {D5462B6D-5AEA-4C1A-AC87-73EF11C54634}.Debug|Any CPU.Build.0 = Debug|Any CPU {D5462B6D-5AEA-4C1A-AC87-73EF11C54634}.Release|Any CPU.ActiveCfg = Release|Any CPU {D5462B6D-5AEA-4C1A-AC87-73EF11C54634}.Release|Any CPU.Build.0 = Release|Any CPU - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675}.Release|Any CPU.Build.0 = Release|Any CPU {25A01731-3B75-4EE6-9AA0-830E2435B6BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {25A01731-3B75-4EE6-9AA0-830E2435B6BF}.Debug|Any CPU.Build.0 = Debug|Any CPU {25A01731-3B75-4EE6-9AA0-830E2435B6BF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {C4467FA1-D967-4B42-B0F0-898D1C5DEFE4}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4467FA1-D967-4B42-B0F0-898D1C5DEFE4}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4467FA1-D967-4B42-B0F0-898D1C5DEFE4}.Release|Any CPU.Build.0 = Release|Any CPU - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1}.Release|Any CPU.Build.0 = Release|Any CPU - {11090734-D744-409E-ABB9-4A2400230523}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {11090734-D744-409E-ABB9-4A2400230523}.Debug|Any CPU.Build.0 = Debug|Any CPU - {11090734-D744-409E-ABB9-4A2400230523}.Release|Any CPU.ActiveCfg = Release|Any CPU - {11090734-D744-409E-ABB9-4A2400230523}.Release|Any CPU.Build.0 = Release|Any CPU - {BBE39CF2-A448-4892-A8C4-DC394D8583AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BBE39CF2-A448-4892-A8C4-DC394D8583AB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BBE39CF2-A448-4892-A8C4-DC394D8583AB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BBE39CF2-A448-4892-A8C4-DC394D8583AB}.Release|Any CPU.Build.0 = Release|Any CPU + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A}.Release|Any CPU.Build.0 = Release|Any CPU {A401DA48-F4BE-4EF1-B52D-3C605893F700}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A401DA48-F4BE-4EF1-B52D-3C605893F700}.Debug|Any CPU.Build.0 = Debug|Any CPU {A401DA48-F4BE-4EF1-B52D-3C605893F700}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {763B04D7-779A-4C79-8490-79AFF7D47BA7} = {76C46E6D-16CA-4488-8EFD-6FBAF974A7AF} {F9D6C8C8-997A-486D-87D3-879FB398DE3E} = {5DFF8097-B611-4716-B10D-C15797B323BB} {5DFF8097-B611-4716-B10D-C15797B323BB} = {B6CDA1F2-D5D9-42A5-842C-FEAE224474DE} - {AAF9F4E4-36B0-4079-8A87-49CD3B612E62} = {22BCE518-B668-499B-A40E-41E15278BD7E} - {22BCE518-B668-499B-A40E-41E15278BD7E} = {B6CDA1F2-D5D9-42A5-842C-FEAE224474DE} {58B13369-CAA2-42BF-844E-434C10E557AE} = {96657B77-BE98-48F8-9EC9-15A336C954DD} {96657B77-BE98-48F8-9EC9-15A336C954DD} = {B6CDA1F2-D5D9-42A5-842C-FEAE224474DE} {B6CDA1F2-D5D9-42A5-842C-FEAE224474DE} = {795AC49E-566E-427F-BBCB-260D1B5A8229} {13E7DAC5-4C27-4636-BFA0-E01080DD11DB} = {151D498A-AD5E-4167-8764-95A416A208AB} {151D498A-AD5E-4167-8764-95A416A208AB} = {5C4855A3-FB3A-4C05-97CA-863F47F1EFE4} {5C4855A3-FB3A-4C05-97CA-863F47F1EFE4} = {7CCA2FF2-2487-4A31-8BA7-6D8334E74345} - {81D9771C-2C6F-43A9-A827-8E3D154D2749} = {C19FFDBC-C67B-4A0F-89F7-926A689A248F} - {C19FFDBC-C67B-4A0F-89F7-926A689A248F} = {3DCD3E41-1485-45F2-BEBF-EAFFCBF4B223} - {F66D24FD-7AD4-4518-8605-F402C74FDBAE} = {C85E2DF4-AC30-4313-B6F2-5B00B9BBF60D} - {C85E2DF4-AC30-4313-B6F2-5B00B9BBF60D} = {3DCD3E41-1485-45F2-BEBF-EAFFCBF4B223} - {3DCD3E41-1485-45F2-BEBF-EAFFCBF4B223} = {79507F06-4834-40E5-A4CA-7F6692297C68} {1B2034A2-9AD5-4E13-87EC-CC5EFD6914E8} = {F871477F-6F35-44B9-BF66-7983B4BC1AD0} {F871477F-6F35-44B9-BF66-7983B4BC1AD0} = {44F1E5B3-FD9D-4667-A4B6-6CD935462B85} {AF50FD37-8342-4573-822A-612DBDBFE2AA} = {E37CFB04-031F-4BE2-9AEA-12EC9BD589E7} @@ -269,10 +200,6 @@ Global {D5462B6D-5AEA-4C1A-AC87-73EF11C54634} = {6D5CE991-158D-431C-A18F-A442A0E95238} {6D5CE991-158D-431C-A18F-A442A0E95238} = {372B0738-2893-472B-B3A9-626AB7258BDF} {372B0738-2893-472B-B3A9-626AB7258BDF} = {0387C048-9723-4F46-868E-E89909158137} - {D5D2ABEE-9CC0-4B31-B68E-7E23A439D675} = {5939C91F-8BA8-454A-BB05-0FD7B862C8E1} - {5939C91F-8BA8-454A-BB05-0FD7B862C8E1} = {C494E689-B88A-480D-9A98-F9D1E2CF1A03} - {C494E689-B88A-480D-9A98-F9D1E2CF1A03} = {C5939AF4-1203-41FA-93FA-81B7525A107B} - {C5939AF4-1203-41FA-93FA-81B7525A107B} = {1FC5E1BB-F6D7-41C7-9652-48541FF36419} {25A01731-3B75-4EE6-9AA0-830E2435B6BF} = {3DD25D5A-4AA1-488E-8616-3895B02670F7} {3DD25D5A-4AA1-488E-8616-3895B02670F7} = {AF3EEF44-C57F-4E35-A6A7-6320E63D0DE8} {148EEE9E-F7AD-4667-9783-0D337A91DBCA} = {DD63E390-6173-4D1F-AE6D-C79553A19E75} @@ -281,14 +208,8 @@ Global {C4467FA1-D967-4B42-B0F0-898D1C5DEFE4} = {E700C1BA-2640-42DA-A5AA-77F286BAB738} {E700C1BA-2640-42DA-A5AA-77F286BAB738} = {40190475-31DE-46D0-A3AE-AAFC75434FC1} {40190475-31DE-46D0-A3AE-AAFC75434FC1} = {93CF7FE4-D952-4E85-B0DB-4EA8727238B2} - {F3A0CEBE-BC70-4F0C-A28A-9660828E79C1} = {B43300C5-9804-4411-B8AB-63B0B58C03B3} - {B43300C5-9804-4411-B8AB-63B0B58C03B3} = {DB79F951-9CD4-4917-AF1C-D7BFB6086116} - {11090734-D744-409E-ABB9-4A2400230523} = {261E2D6A-5002-4079-80A0-020E2162CF0A} - {261E2D6A-5002-4079-80A0-020E2162CF0A} = {DB79F951-9CD4-4917-AF1C-D7BFB6086116} - {DB79F951-9CD4-4917-AF1C-D7BFB6086116} = {579B6393-FE07-4764-9CCD-93938270944A} - {BBE39CF2-A448-4892-A8C4-DC394D8583AB} = {9FEF7CBC-7545-4065-ACD1-AF93DD4B87AD} - {9FEF7CBC-7545-4065-ACD1-AF93DD4B87AD} = {4EAEDBA6-C139-410C-BE84-87958A86F872} - {4EAEDBA6-C139-410C-BE84-87958A86F872} = {42AC1ABB-1060-43E3-A2F6-CF4D2F1D2EC1} + {10C82FE3-C0D3-47EF-8C7E-776A3B22292A} = {DCCCD2E4-0D87-48C3-8C14-B43404A93775} + {DCCCD2E4-0D87-48C3-8C14-B43404A93775} = {D5A42BA8-E9E7-42C0-8DFC-7820FF29F66E} {A401DA48-F4BE-4EF1-B52D-3C605893F700} = {38A7405F-F962-41F4-A017-D86B824B3877} {38A7405F-F962-41F4-A017-D86B824B3877} = {D5392953-8BFB-43DB-A9DD-7C2ADFD0DB24} {D5392953-8BFB-43DB-A9DD-7C2ADFD0DB24} = {C105718D-3B92-48F4-BCB6-AA20085C37BE} From a4919f97b404cc47fb638301216d400754ae3c89 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:54:31 +0200 Subject: [PATCH 10/33] feat: add Axo_IQ_SeriesWelder component structures for enhanced functionality and organization --- .../components.dukane.welders.code-workspace | 3 --- .../Axo_IQ_SeriesWelder_Component_Status.st | 0 .../Axo_IQ_SeriesWelder_Config.st | 0 .../Axo_IQ_SeriesWelder_CyclePartStatusBitDefinition.st | 0 .../Axo_IQ_SeriesWelder_ErrorStatusBitDefinition.st | 0 .../{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_HWIDs.st | 0 .../Axo_IQ_SeriesWelder_PressPartStatusBitDefinition.st | 0 .../Axo_IQ_SeriesWelder_ProcessErrorStatus.st | 0 .../Axo_IQ_SeriesWelder_SystemInputs.st | 0 .../Axo_IQ_SeriesWelder_SystemOutputs.st | 0 .../Axo_IQ_SeriesWelder_SystemStatusBitDefinition.st | 0 11 files changed, 3 deletions(-) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_Component_Status.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_Config.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_CyclePartStatusBitDefinition.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_ErrorStatusBitDefinition.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_HWIDs.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_PressPartStatusBitDefinition.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_ProcessErrorStatus.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_SystemInputs.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_SystemOutputs.st (100%) rename src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/{ => TypesStructuresAndEnums}/Axo_IQ_SeriesWelder_SystemStatusBitDefinition.st (100%) diff --git a/src/components.dukane.welders/components.dukane.welders.code-workspace b/src/components.dukane.welders/components.dukane.welders.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.dukane.welders/components.dukane.welders.code-workspace +++ b/src/components.dukane.welders/components.dukane.welders.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_Component_Status.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_Component_Status.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_Component_Status.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_Component_Status.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_Config.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_Config.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_Config.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_Config.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_CyclePartStatusBitDefinition.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_CyclePartStatusBitDefinition.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_CyclePartStatusBitDefinition.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_CyclePartStatusBitDefinition.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_ErrorStatusBitDefinition.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_ErrorStatusBitDefinition.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_ErrorStatusBitDefinition.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_ErrorStatusBitDefinition.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_HWIDs.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_HWIDs.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_HWIDs.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_HWIDs.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_PressPartStatusBitDefinition.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_PressPartStatusBitDefinition.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_PressPartStatusBitDefinition.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_PressPartStatusBitDefinition.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_ProcessErrorStatus.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_ProcessErrorStatus.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_ProcessErrorStatus.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_ProcessErrorStatus.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_SystemInputs.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_SystemInputs.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_SystemInputs.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_SystemInputs.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_SystemOutputs.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_SystemOutputs.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_SystemOutputs.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_SystemOutputs.st diff --git a/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_SystemStatusBitDefinition.st b/src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_SystemStatusBitDefinition.st similarity index 100% rename from src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/Axo_IQ_SeriesWelder_SystemStatusBitDefinition.st rename to src/components.dukane.welders/ctrl/src/AxoIQSeriesWelder/TypesStructuresAndEnums/Axo_IQ_SeriesWelder_SystemStatusBitDefinition.st From c0b336faf1a3e24fa62f20f1bbc19482b8a796f3 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 20:55:25 +0200 Subject: [PATCH 11/33] Refactor solution file by removing obsolete projects and adding new ones - Removed projects: AXOpen.Logging.Serilog, AXOpen.Components.Dukane.Welders.blazorapp, app_axopen_components_dukane_welders, AXOpen.Data.Json, AXOpen.Security.Blazor, AXOpen.Security, inxton_axopen_simatic1500 - Added project: AXOpen.Operon.Blazor - Updated project paths and configurations for better organization and clarity --- .../components.dukane.welders.sln | 99 ++----------------- src/components.dukane.welders/this.sln | 99 ++----------------- 2 files changed, 20 insertions(+), 178 deletions(-) diff --git a/src/components.dukane.welders/components.dukane.welders.sln b/src/components.dukane.welders/components.dukane.welders.sln index 9f920703b..7822c642f 100644 --- a/src/components.dukane.welders/components.dukane.welders.sln +++ b/src/components.dukane.welders/components.dukane.welders.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{97E8E1AB-4CB6-42E6-88E7-B2C217F5EC98}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{605087BB-AD29-438E-9FAA-A40A26F112A7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{EE306488-DD41-46FB-90EF-55F068BE1661}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{1314096B-23FA-4758-BED5-B6B79C3E3D60}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{2FA090FE-318F-4ADD-AECE-4DC6ED205538}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Dukane.Welders.blazorapp", "app\ix-blazor\AXOpen.Components.Dukane.Welders.blazorapp.csproj", "{52B7784A-7CEB-4C1F-8423-1CEB244A7207}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_dukane_welders", "app\ix\app_axopen_components_dukane_welders.csproj", "{ED73C538-A7E1-4728-96E0-806DDB15189B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Dukane.Welders.blazor", "src\AXOpen.Components.Dukane.Welders.blazor\AXOpen.Components.Dukane.Welders.blazor.csproj", "{71ACD719-1093-4B6D-9405-6FBF069FB903}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_dukane_welders", "src\AXOpen.Components.Dukane.Welders\inxton_axopen_components_dukane_welders.csproj", "{71FCC88B-7CF1-4B7A-A727-F68FBFA67B87}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{B04C9B66-0EF6-4571-8F06-CF8A3F562519}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{AEC81D80-BFD0-499C-9060-166C21DD13E6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{E8AE30D2-8384-4C32-8D49-0826F0897AAC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{292B3A99-7E51-422C-A484-DF6B6AF7A3A4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{A8359917-08D9-461C-A5D7-BE9EBDCA773B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{305FDF13-6061-4F66-9A8E-316BD476CED6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{F2199196-47D9-4920-9058-1435D7B981A6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{65858240-7110-4196-8940-45C9F4B51D51}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{E41F638D-0AE7-45D1-83C3-4775CFC5F934}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{20E88581-0E77-421C-9941-CABCF19AE89D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{2F4AE6F4-51F1-46C7-BD7B-2D9EDD7414A3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{1D5E9712-29C6-4302-9D49-5782D7869109}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{28D91EBF-20D6-4E3D-AE80-5A5E708E8A57}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{8A3EC34C-B78C-4785-9B96-6EF8F5653E71}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{B4C391EA-AC70-4E68-863F-C7354D80B37B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{6A769B71-B69A-474A-A552-B9202DFDA3CD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Dukane.Welders.blazor", "src\AXOpen.Components.Dukane.Welders.blazor", "{125B01EB-EC0B-428B-8244-984BAC0323F1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Dukane.Welders", "src\AXOpen.Components.Dukane.Welders", "{D8CD10DF-9268-42D5-9C3B-764984880DEB}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{DE40 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{8981EEF1-D7FD-43D4-A832-381E56902EE6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{0143B526-5829-42AD-B1F6-BF082F6C820B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{6218573F-CCD7-4056-8F0C-5FFCDE74BE7C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{2B07592E-08A3-4E58-B30E-B7CFF60B3B3D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{3678AA95-E3CB-4A8D-A576-C400DDA65234}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{5531DEC8-AFF9-4E9A-A514-120FF0C9B9BC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{D63AE01E-A909-4F41-88EE-D313F3411D27}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{7F3E62EC-F54B-48FC-B5D5-9E66F4C9CEDE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{A1C05379-52EE-49B2-A83E-8477865F015C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{DEA52C3D-E31C-43CC-B998-E58E263547C4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{BDDC842E-6B89-4004-A101-E6033C995D47}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{677EE965-BF9B-4132-A78B-AA81E7748AEF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{BD5152AA-2B94-409F-A289-2E9369EE8DAC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{DA567A72-7F75-4FD1-917D-B53FDF2A7218}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{A5C35DE7-B4CB-4460-9627-82ED3F3FD88C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{04890483-7562-4921-A04B-27062C209700}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{B8C8D60B-4FD3-4E3C-9308-48074A8C6B02}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{5C73FA9C-4725-484C-BAB1-C87BA272E2C9}" EndProject @@ -157,10 +119,6 @@ Global {EE306488-DD41-46FB-90EF-55F068BE1661}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE306488-DD41-46FB-90EF-55F068BE1661}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE306488-DD41-46FB-90EF-55F068BE1661}.Release|Any CPU.Build.0 = Release|Any CPU - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}.Release|Any CPU.Build.0 = Release|Any CPU {1314096B-23FA-4758-BED5-B6B79C3E3D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1314096B-23FA-4758-BED5-B6B79C3E3D60}.Debug|Any CPU.Build.0 = Debug|Any CPU {1314096B-23FA-4758-BED5-B6B79C3E3D60}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {2FA090FE-318F-4ADD-AECE-4DC6ED205538}.Debug|Any CPU.Build.0 = Debug|Any CPU {2FA090FE-318F-4ADD-AECE-4DC6ED205538}.Release|Any CPU.ActiveCfg = Release|Any CPU {2FA090FE-318F-4ADD-AECE-4DC6ED205538}.Release|Any CPU.Build.0 = Release|Any CPU - {52B7784A-7CEB-4C1F-8423-1CEB244A7207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52B7784A-7CEB-4C1F-8423-1CEB244A7207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52B7784A-7CEB-4C1F-8423-1CEB244A7207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52B7784A-7CEB-4C1F-8423-1CEB244A7207}.Release|Any CPU.Build.0 = Release|Any CPU - {ED73C538-A7E1-4728-96E0-806DDB15189B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED73C538-A7E1-4728-96E0-806DDB15189B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED73C538-A7E1-4728-96E0-806DDB15189B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED73C538-A7E1-4728-96E0-806DDB15189B}.Release|Any CPU.Build.0 = Release|Any CPU {71ACD719-1093-4B6D-9405-6FBF069FB903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {71ACD719-1093-4B6D-9405-6FBF069FB903}.Debug|Any CPU.Build.0 = Debug|Any CPU {71ACD719-1093-4B6D-9405-6FBF069FB903}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {B04C9B66-0EF6-4571-8F06-CF8A3F562519}.Debug|Any CPU.Build.0 = Debug|Any CPU {B04C9B66-0EF6-4571-8F06-CF8A3F562519}.Release|Any CPU.ActiveCfg = Release|Any CPU {B04C9B66-0EF6-4571-8F06-CF8A3F562519}.Release|Any CPU.Build.0 = Release|Any CPU - {AEC81D80-BFD0-499C-9060-166C21DD13E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEC81D80-BFD0-499C-9060-166C21DD13E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEC81D80-BFD0-499C-9060-166C21DD13E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEC81D80-BFD0-499C-9060-166C21DD13E6}.Release|Any CPU.Build.0 = Release|Any CPU {E8AE30D2-8384-4C32-8D49-0826F0897AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E8AE30D2-8384-4C32-8D49-0826F0897AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8AE30D2-8384-4C32-8D49-0826F0897AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25}.Release|Any CPU.ActiveCfg = Release|Any CPU {0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25}.Release|Any CPU.Build.0 = Release|Any CPU - {A8359917-08D9-461C-A5D7-BE9EBDCA773B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8359917-08D9-461C-A5D7-BE9EBDCA773B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8359917-08D9-461C-A5D7-BE9EBDCA773B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8359917-08D9-461C-A5D7-BE9EBDCA773B}.Release|Any CPU.Build.0 = Release|Any CPU - {305FDF13-6061-4F66-9A8E-316BD476CED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {305FDF13-6061-4F66-9A8E-316BD476CED6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {305FDF13-6061-4F66-9A8E-316BD476CED6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {305FDF13-6061-4F66-9A8E-316BD476CED6}.Release|Any CPU.Build.0 = Release|Any CPU - {F2199196-47D9-4920-9058-1435D7B981A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2199196-47D9-4920-9058-1435D7B981A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2199196-47D9-4920-9058-1435D7B981A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2199196-47D9-4920-9058-1435D7B981A6}.Release|Any CPU.Build.0 = Release|Any CPU + {65858240-7110-4196-8940-45C9F4B51D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65858240-7110-4196-8940-45C9F4B51D51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65858240-7110-4196-8940-45C9F4B51D51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65858240-7110-4196-8940-45C9F4B51D51}.Release|Any CPU.Build.0 = Release|Any CPU {3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {B275E09A-47E6-4C2F-B055-A6EC78E1DE96} = {039C267B-0B58-405D-92F9-D4CEB84ABBFA} {EE306488-DD41-46FB-90EF-55F068BE1661} = {E41F638D-0AE7-45D1-83C3-4775CFC5F934} {E41F638D-0AE7-45D1-83C3-4775CFC5F934} = {1D5E9712-29C6-4302-9D49-5782D7869109} - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1} = {20E88581-0E77-421C-9941-CABCF19AE89D} - {20E88581-0E77-421C-9941-CABCF19AE89D} = {1D5E9712-29C6-4302-9D49-5782D7869109} {1314096B-23FA-4758-BED5-B6B79C3E3D60} = {2F4AE6F4-51F1-46C7-BD7B-2D9EDD7414A3} {2F4AE6F4-51F1-46C7-BD7B-2D9EDD7414A3} = {1D5E9712-29C6-4302-9D49-5782D7869109} {1D5E9712-29C6-4302-9D49-5782D7869109} = {C8B014B9-FC70-4468-B0E6-CC9D81726935} {2FA090FE-318F-4ADD-AECE-4DC6ED205538} = {1AE0CF08-CA4D-459B-909D-DB4D9D92F151} {1AE0CF08-CA4D-459B-909D-DB4D9D92F151} = {01AE924B-509C-401D-97B5-943398C40287} {01AE924B-509C-401D-97B5-943398C40287} = {28D91EBF-20D6-4E3D-AE80-5A5E708E8A57} - {52B7784A-7CEB-4C1F-8423-1CEB244A7207} = {8A3EC34C-B78C-4785-9B96-6EF8F5653E71} - {8A3EC34C-B78C-4785-9B96-6EF8F5653E71} = {6A769B71-B69A-474A-A552-B9202DFDA3CD} - {ED73C538-A7E1-4728-96E0-806DDB15189B} = {B4C391EA-AC70-4E68-863F-C7354D80B37B} - {B4C391EA-AC70-4E68-863F-C7354D80B37B} = {6A769B71-B69A-474A-A552-B9202DFDA3CD} - {6A769B71-B69A-474A-A552-B9202DFDA3CD} = {CC03A3D9-6F5F-4380-A752-BEF33F48CB1F} {71ACD719-1093-4B6D-9405-6FBF069FB903} = {125B01EB-EC0B-428B-8244-984BAC0323F1} {125B01EB-EC0B-428B-8244-984BAC0323F1} = {3DC2260E-C1BA-4197-BEAD-345E71B4A227} {71FCC88B-7CF1-4B7A-A727-F68FBFA67B87} = {D8CD10DF-9268-42D5-9C3B-764984880DEB} @@ -269,10 +200,6 @@ Global {B04C9B66-0EF6-4571-8F06-CF8A3F562519} = {15856BF8-91F8-4A95-A043-C6CFC9E3A169} {15856BF8-91F8-4A95-A043-C6CFC9E3A169} = {DE403690-0A85-414C-AC3D-ACEA0C70F164} {DE403690-0A85-414C-AC3D-ACEA0C70F164} = {8981EEF1-D7FD-43D4-A832-381E56902EE6} - {AEC81D80-BFD0-499C-9060-166C21DD13E6} = {0143B526-5829-42AD-B1F6-BF082F6C820B} - {0143B526-5829-42AD-B1F6-BF082F6C820B} = {6218573F-CCD7-4056-8F0C-5FFCDE74BE7C} - {6218573F-CCD7-4056-8F0C-5FFCDE74BE7C} = {2B07592E-08A3-4E58-B30E-B7CFF60B3B3D} - {2B07592E-08A3-4E58-B30E-B7CFF60B3B3D} = {3678AA95-E3CB-4A8D-A576-C400DDA65234} {E8AE30D2-8384-4C32-8D49-0826F0897AAC} = {5531DEC8-AFF9-4E9A-A514-120FF0C9B9BC} {5531DEC8-AFF9-4E9A-A514-120FF0C9B9BC} = {E37A1FA4-744A-430F-9EB6-FBC0EA0CE7EB} {292B3A99-7E51-422C-A484-DF6B6AF7A3A4} = {D63AE01E-A909-4F41-88EE-D313F3411D27} @@ -281,14 +208,8 @@ Global {0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25} = {A488F930-40B0-4BF3-8CFC-9281949E2A00} {A488F930-40B0-4BF3-8CFC-9281949E2A00} = {099D8223-3C4B-4426-A2E1-0841645C0675} {099D8223-3C4B-4426-A2E1-0841645C0675} = {7F3E62EC-F54B-48FC-B5D5-9E66F4C9CEDE} - {A8359917-08D9-461C-A5D7-BE9EBDCA773B} = {A1C05379-52EE-49B2-A83E-8477865F015C} - {A1C05379-52EE-49B2-A83E-8477865F015C} = {BDDC842E-6B89-4004-A101-E6033C995D47} - {305FDF13-6061-4F66-9A8E-316BD476CED6} = {DEA52C3D-E31C-43CC-B998-E58E263547C4} - {DEA52C3D-E31C-43CC-B998-E58E263547C4} = {BDDC842E-6B89-4004-A101-E6033C995D47} - {BDDC842E-6B89-4004-A101-E6033C995D47} = {677EE965-BF9B-4132-A78B-AA81E7748AEF} - {F2199196-47D9-4920-9058-1435D7B981A6} = {BD5152AA-2B94-409F-A289-2E9369EE8DAC} - {BD5152AA-2B94-409F-A289-2E9369EE8DAC} = {DA567A72-7F75-4FD1-917D-B53FDF2A7218} - {DA567A72-7F75-4FD1-917D-B53FDF2A7218} = {04890483-7562-4921-A04B-27062C209700} + {65858240-7110-4196-8940-45C9F4B51D51} = {A5C35DE7-B4CB-4460-9627-82ED3F3FD88C} + {A5C35DE7-B4CB-4460-9627-82ED3F3FD88C} = {B8C8D60B-4FD3-4E3C-9308-48074A8C6B02} {3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C} = {5C73FA9C-4725-484C-BAB1-C87BA272E2C9} {5C73FA9C-4725-484C-BAB1-C87BA272E2C9} = {4FBEFEEF-7B1C-4530-A905-ADFA8FE98ACE} {4FBEFEEF-7B1C-4530-A905-ADFA8FE98ACE} = {D8512F44-819B-4070-8F51-903A839C9B52} diff --git a/src/components.dukane.welders/this.sln b/src/components.dukane.welders/this.sln index 9f920703b..7822c642f 100644 --- a/src/components.dukane.welders/this.sln +++ b/src/components.dukane.welders/this.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{97E8E1AB-4CB6-42E6-88E7-B2C217F5EC98}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{605087BB-AD29-438E-9FAA-A40A26F112A7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{EE306488-DD41-46FB-90EF-55F068BE1661}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{1314096B-23FA-4758-BED5-B6B79C3E3D60}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{2FA090FE-318F-4ADD-AECE-4DC6ED205538}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Dukane.Welders.blazorapp", "app\ix-blazor\AXOpen.Components.Dukane.Welders.blazorapp.csproj", "{52B7784A-7CEB-4C1F-8423-1CEB244A7207}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_dukane_welders", "app\ix\app_axopen_components_dukane_welders.csproj", "{ED73C538-A7E1-4728-96E0-806DDB15189B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Dukane.Welders.blazor", "src\AXOpen.Components.Dukane.Welders.blazor\AXOpen.Components.Dukane.Welders.blazor.csproj", "{71ACD719-1093-4B6D-9405-6FBF069FB903}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_dukane_welders", "src\AXOpen.Components.Dukane.Welders\inxton_axopen_components_dukane_welders.csproj", "{71FCC88B-7CF1-4B7A-A727-F68FBFA67B87}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{B04C9B66-0EF6-4571-8F06-CF8A3F562519}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{AEC81D80-BFD0-499C-9060-166C21DD13E6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{E8AE30D2-8384-4C32-8D49-0826F0897AAC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{292B3A99-7E51-422C-A484-DF6B6AF7A3A4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{A8359917-08D9-461C-A5D7-BE9EBDCA773B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{305FDF13-6061-4F66-9A8E-316BD476CED6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{F2199196-47D9-4920-9058-1435D7B981A6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{65858240-7110-4196-8940-45C9F4B51D51}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{E41F638D-0AE7-45D1-83C3-4775CFC5F934}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{20E88581-0E77-421C-9941-CABCF19AE89D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{2F4AE6F4-51F1-46C7-BD7B-2D9EDD7414A3}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{1D5E9712-29C6-4302-9D49-5782D7869109}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{28D91EBF-20D6-4E3D-AE80-5A5E708E8A57}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{8A3EC34C-B78C-4785-9B96-6EF8F5653E71}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{B4C391EA-AC70-4E68-863F-C7354D80B37B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{6A769B71-B69A-474A-A552-B9202DFDA3CD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Dukane.Welders.blazor", "src\AXOpen.Components.Dukane.Welders.blazor", "{125B01EB-EC0B-428B-8244-984BAC0323F1}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Dukane.Welders", "src\AXOpen.Components.Dukane.Welders", "{D8CD10DF-9268-42D5-9C3B-764984880DEB}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{DE40 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{8981EEF1-D7FD-43D4-A832-381E56902EE6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{0143B526-5829-42AD-B1F6-BF082F6C820B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{6218573F-CCD7-4056-8F0C-5FFCDE74BE7C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{2B07592E-08A3-4E58-B30E-B7CFF60B3B3D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{3678AA95-E3CB-4A8D-A576-C400DDA65234}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{5531DEC8-AFF9-4E9A-A514-120FF0C9B9BC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{D63AE01E-A909-4F41-88EE-D313F3411D27}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{7F3E62EC-F54B-48FC-B5D5-9E66F4C9CEDE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{A1C05379-52EE-49B2-A83E-8477865F015C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{DEA52C3D-E31C-43CC-B998-E58E263547C4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{BDDC842E-6B89-4004-A101-E6033C995D47}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{677EE965-BF9B-4132-A78B-AA81E7748AEF}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{BD5152AA-2B94-409F-A289-2E9369EE8DAC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{DA567A72-7F75-4FD1-917D-B53FDF2A7218}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{A5C35DE7-B4CB-4460-9627-82ED3F3FD88C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{04890483-7562-4921-A04B-27062C209700}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{B8C8D60B-4FD3-4E3C-9308-48074A8C6B02}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{5C73FA9C-4725-484C-BAB1-C87BA272E2C9}" EndProject @@ -157,10 +119,6 @@ Global {EE306488-DD41-46FB-90EF-55F068BE1661}.Debug|Any CPU.Build.0 = Debug|Any CPU {EE306488-DD41-46FB-90EF-55F068BE1661}.Release|Any CPU.ActiveCfg = Release|Any CPU {EE306488-DD41-46FB-90EF-55F068BE1661}.Release|Any CPU.Build.0 = Release|Any CPU - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1}.Release|Any CPU.Build.0 = Release|Any CPU {1314096B-23FA-4758-BED5-B6B79C3E3D60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1314096B-23FA-4758-BED5-B6B79C3E3D60}.Debug|Any CPU.Build.0 = Debug|Any CPU {1314096B-23FA-4758-BED5-B6B79C3E3D60}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {2FA090FE-318F-4ADD-AECE-4DC6ED205538}.Debug|Any CPU.Build.0 = Debug|Any CPU {2FA090FE-318F-4ADD-AECE-4DC6ED205538}.Release|Any CPU.ActiveCfg = Release|Any CPU {2FA090FE-318F-4ADD-AECE-4DC6ED205538}.Release|Any CPU.Build.0 = Release|Any CPU - {52B7784A-7CEB-4C1F-8423-1CEB244A7207}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {52B7784A-7CEB-4C1F-8423-1CEB244A7207}.Debug|Any CPU.Build.0 = Debug|Any CPU - {52B7784A-7CEB-4C1F-8423-1CEB244A7207}.Release|Any CPU.ActiveCfg = Release|Any CPU - {52B7784A-7CEB-4C1F-8423-1CEB244A7207}.Release|Any CPU.Build.0 = Release|Any CPU - {ED73C538-A7E1-4728-96E0-806DDB15189B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {ED73C538-A7E1-4728-96E0-806DDB15189B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {ED73C538-A7E1-4728-96E0-806DDB15189B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {ED73C538-A7E1-4728-96E0-806DDB15189B}.Release|Any CPU.Build.0 = Release|Any CPU {71ACD719-1093-4B6D-9405-6FBF069FB903}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {71ACD719-1093-4B6D-9405-6FBF069FB903}.Debug|Any CPU.Build.0 = Debug|Any CPU {71ACD719-1093-4B6D-9405-6FBF069FB903}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {B04C9B66-0EF6-4571-8F06-CF8A3F562519}.Debug|Any CPU.Build.0 = Debug|Any CPU {B04C9B66-0EF6-4571-8F06-CF8A3F562519}.Release|Any CPU.ActiveCfg = Release|Any CPU {B04C9B66-0EF6-4571-8F06-CF8A3F562519}.Release|Any CPU.Build.0 = Release|Any CPU - {AEC81D80-BFD0-499C-9060-166C21DD13E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AEC81D80-BFD0-499C-9060-166C21DD13E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AEC81D80-BFD0-499C-9060-166C21DD13E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AEC81D80-BFD0-499C-9060-166C21DD13E6}.Release|Any CPU.Build.0 = Release|Any CPU {E8AE30D2-8384-4C32-8D49-0826F0897AAC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E8AE30D2-8384-4C32-8D49-0826F0897AAC}.Debug|Any CPU.Build.0 = Debug|Any CPU {E8AE30D2-8384-4C32-8D49-0826F0897AAC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25}.Debug|Any CPU.Build.0 = Debug|Any CPU {0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25}.Release|Any CPU.ActiveCfg = Release|Any CPU {0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25}.Release|Any CPU.Build.0 = Release|Any CPU - {A8359917-08D9-461C-A5D7-BE9EBDCA773B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A8359917-08D9-461C-A5D7-BE9EBDCA773B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A8359917-08D9-461C-A5D7-BE9EBDCA773B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A8359917-08D9-461C-A5D7-BE9EBDCA773B}.Release|Any CPU.Build.0 = Release|Any CPU - {305FDF13-6061-4F66-9A8E-316BD476CED6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {305FDF13-6061-4F66-9A8E-316BD476CED6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {305FDF13-6061-4F66-9A8E-316BD476CED6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {305FDF13-6061-4F66-9A8E-316BD476CED6}.Release|Any CPU.Build.0 = Release|Any CPU - {F2199196-47D9-4920-9058-1435D7B981A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F2199196-47D9-4920-9058-1435D7B981A6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F2199196-47D9-4920-9058-1435D7B981A6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F2199196-47D9-4920-9058-1435D7B981A6}.Release|Any CPU.Build.0 = Release|Any CPU + {65858240-7110-4196-8940-45C9F4B51D51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65858240-7110-4196-8940-45C9F4B51D51}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65858240-7110-4196-8940-45C9F4B51D51}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65858240-7110-4196-8940-45C9F4B51D51}.Release|Any CPU.Build.0 = Release|Any CPU {3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {B275E09A-47E6-4C2F-B055-A6EC78E1DE96} = {039C267B-0B58-405D-92F9-D4CEB84ABBFA} {EE306488-DD41-46FB-90EF-55F068BE1661} = {E41F638D-0AE7-45D1-83C3-4775CFC5F934} {E41F638D-0AE7-45D1-83C3-4775CFC5F934} = {1D5E9712-29C6-4302-9D49-5782D7869109} - {34C90B03-3FFC-49FE-A610-6E0A3FB14BB1} = {20E88581-0E77-421C-9941-CABCF19AE89D} - {20E88581-0E77-421C-9941-CABCF19AE89D} = {1D5E9712-29C6-4302-9D49-5782D7869109} {1314096B-23FA-4758-BED5-B6B79C3E3D60} = {2F4AE6F4-51F1-46C7-BD7B-2D9EDD7414A3} {2F4AE6F4-51F1-46C7-BD7B-2D9EDD7414A3} = {1D5E9712-29C6-4302-9D49-5782D7869109} {1D5E9712-29C6-4302-9D49-5782D7869109} = {C8B014B9-FC70-4468-B0E6-CC9D81726935} {2FA090FE-318F-4ADD-AECE-4DC6ED205538} = {1AE0CF08-CA4D-459B-909D-DB4D9D92F151} {1AE0CF08-CA4D-459B-909D-DB4D9D92F151} = {01AE924B-509C-401D-97B5-943398C40287} {01AE924B-509C-401D-97B5-943398C40287} = {28D91EBF-20D6-4E3D-AE80-5A5E708E8A57} - {52B7784A-7CEB-4C1F-8423-1CEB244A7207} = {8A3EC34C-B78C-4785-9B96-6EF8F5653E71} - {8A3EC34C-B78C-4785-9B96-6EF8F5653E71} = {6A769B71-B69A-474A-A552-B9202DFDA3CD} - {ED73C538-A7E1-4728-96E0-806DDB15189B} = {B4C391EA-AC70-4E68-863F-C7354D80B37B} - {B4C391EA-AC70-4E68-863F-C7354D80B37B} = {6A769B71-B69A-474A-A552-B9202DFDA3CD} - {6A769B71-B69A-474A-A552-B9202DFDA3CD} = {CC03A3D9-6F5F-4380-A752-BEF33F48CB1F} {71ACD719-1093-4B6D-9405-6FBF069FB903} = {125B01EB-EC0B-428B-8244-984BAC0323F1} {125B01EB-EC0B-428B-8244-984BAC0323F1} = {3DC2260E-C1BA-4197-BEAD-345E71B4A227} {71FCC88B-7CF1-4B7A-A727-F68FBFA67B87} = {D8CD10DF-9268-42D5-9C3B-764984880DEB} @@ -269,10 +200,6 @@ Global {B04C9B66-0EF6-4571-8F06-CF8A3F562519} = {15856BF8-91F8-4A95-A043-C6CFC9E3A169} {15856BF8-91F8-4A95-A043-C6CFC9E3A169} = {DE403690-0A85-414C-AC3D-ACEA0C70F164} {DE403690-0A85-414C-AC3D-ACEA0C70F164} = {8981EEF1-D7FD-43D4-A832-381E56902EE6} - {AEC81D80-BFD0-499C-9060-166C21DD13E6} = {0143B526-5829-42AD-B1F6-BF082F6C820B} - {0143B526-5829-42AD-B1F6-BF082F6C820B} = {6218573F-CCD7-4056-8F0C-5FFCDE74BE7C} - {6218573F-CCD7-4056-8F0C-5FFCDE74BE7C} = {2B07592E-08A3-4E58-B30E-B7CFF60B3B3D} - {2B07592E-08A3-4E58-B30E-B7CFF60B3B3D} = {3678AA95-E3CB-4A8D-A576-C400DDA65234} {E8AE30D2-8384-4C32-8D49-0826F0897AAC} = {5531DEC8-AFF9-4E9A-A514-120FF0C9B9BC} {5531DEC8-AFF9-4E9A-A514-120FF0C9B9BC} = {E37A1FA4-744A-430F-9EB6-FBC0EA0CE7EB} {292B3A99-7E51-422C-A484-DF6B6AF7A3A4} = {D63AE01E-A909-4F41-88EE-D313F3411D27} @@ -281,14 +208,8 @@ Global {0E08CAB8-38B4-4B60-95A8-CC9EEDB83C25} = {A488F930-40B0-4BF3-8CFC-9281949E2A00} {A488F930-40B0-4BF3-8CFC-9281949E2A00} = {099D8223-3C4B-4426-A2E1-0841645C0675} {099D8223-3C4B-4426-A2E1-0841645C0675} = {7F3E62EC-F54B-48FC-B5D5-9E66F4C9CEDE} - {A8359917-08D9-461C-A5D7-BE9EBDCA773B} = {A1C05379-52EE-49B2-A83E-8477865F015C} - {A1C05379-52EE-49B2-A83E-8477865F015C} = {BDDC842E-6B89-4004-A101-E6033C995D47} - {305FDF13-6061-4F66-9A8E-316BD476CED6} = {DEA52C3D-E31C-43CC-B998-E58E263547C4} - {DEA52C3D-E31C-43CC-B998-E58E263547C4} = {BDDC842E-6B89-4004-A101-E6033C995D47} - {BDDC842E-6B89-4004-A101-E6033C995D47} = {677EE965-BF9B-4132-A78B-AA81E7748AEF} - {F2199196-47D9-4920-9058-1435D7B981A6} = {BD5152AA-2B94-409F-A289-2E9369EE8DAC} - {BD5152AA-2B94-409F-A289-2E9369EE8DAC} = {DA567A72-7F75-4FD1-917D-B53FDF2A7218} - {DA567A72-7F75-4FD1-917D-B53FDF2A7218} = {04890483-7562-4921-A04B-27062C209700} + {65858240-7110-4196-8940-45C9F4B51D51} = {A5C35DE7-B4CB-4460-9627-82ED3F3FD88C} + {A5C35DE7-B4CB-4460-9627-82ED3F3FD88C} = {B8C8D60B-4FD3-4E3C-9308-48074A8C6B02} {3C3333F5-3B9F-4525-9722-B4F8A8A4AD0C} = {5C73FA9C-4725-484C-BAB1-C87BA272E2C9} {5C73FA9C-4725-484C-BAB1-C87BA272E2C9} = {4FBEFEEF-7B1C-4530-A905-ADFA8FE98ACE} {4FBEFEEF-7B1C-4530-A905-ADFA8FE98ACE} = {D8512F44-819B-4070-8F51-903A839C9B52} From 161387b7d85dda5b27687068edc2a9ec03bb074e Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 21:05:56 +0200 Subject: [PATCH 12/33] fix: remove obsolete folder references from solution files --- .../components.festo.drives.code-workspace | 3 --- src/components.festo.drives/components.festo.drives.sln | 2 +- src/components.festo.drives/this.sln | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components.festo.drives/components.festo.drives.code-workspace b/src/components.festo.drives/components.festo.drives.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.festo.drives/components.festo.drives.code-workspace +++ b/src/components.festo.drives/components.festo.drives.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.festo.drives/components.festo.drives.sln b/src/components.festo.drives/components.festo.drives.sln index e189f6841..bd4eac4b6 100644 --- a/src/components.festo.drives/components.festo.drives.sln +++ b/src/components.festo.drives/components.festo.drives.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{A29F313C-6B0C-4ECC-857E-27756B306E1A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{383C53AD-5BEE-4DDF-BB09-0E3376512BCC}" diff --git a/src/components.festo.drives/this.sln b/src/components.festo.drives/this.sln index e189f6841..bd4eac4b6 100644 --- a/src/components.festo.drives/this.sln +++ b/src/components.festo.drives/this.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{A29F313C-6B0C-4ECC-857E-27756B306E1A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{383C53AD-5BEE-4DDF-BB09-0E3376512BCC}" From d73679b2405f728af486480beec73ebd526a6c33 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 21:10:12 +0200 Subject: [PATCH 13/33] Add new structures and enums for Axo_SR_750 component - Introduced Axo_SR_750_ParameterBankNumber for managing parameter bank numbers. - Created Axo_SR_750_ReadData to handle read data attributes including counts and sizes. - Added Axo_SR_750_ResultData to represent result data as a byte array. - Implemented Axo_SR_750_TerminalStatus to track terminal input and output statuses. - Developed Axo_SR_750_UnstableReadStatus for monitoring unstable read conditions. - Created Axo_SR_750_User to manage user data size. - Added Axo_SR_750_UserData as a byte array for user data storage. - Defined enums eAxo_SR_750_ResultDataSize and eAxo_SR_750_UserDataSize for result and user data sizes. - Updated solution file to reflect the new project structure and removed obsolete projects. --- .../components.keyence.vision.code-workspace | 3 - .../components.keyence.vision.sln | 99 ++----------------- .../ctrl/src/{ => Axo_SR_1000}/Axo_SR_1000.st | 0 .../Axo_SR_1000_BusyStatus.st | 0 .../Axo_SR_1000_CompletionClearControl.st | 0 .../Axo_SR_1000_CompletionStatus.st | 0 .../Axo_SR_1000_Component_Status.st | 0 .../Axo_SR_1000_Config.st | 0 .../Axo_SR_1000_ErrorStatus.st | 0 .../Axo_SR_1000_HWIDs.st | 0 ..._SR_1000_HandshakeAndGeneralErrorStatus.st | 0 .../Axo_SR_1000_LatchAndErrorClearControl.st | 0 ...chingLevelAndTotalEvaluationGradeStatus.st | 0 ...Axo_SR_1000_OperationInstructionControl.st | 0 .../Axo_SR_1000_OperationalResultStatus.st | 0 .../Axo_SR_1000_ParameterBankNumber.st | 0 .../Axo_SR_1000_ReadData.st | 0 .../Axo_SR_1000_ResultData.st | 0 .../Axo_SR_1000_TerminalStatus.st | 0 .../Axo_SR_1000_UnstableReadStatus.st | 0 .../Axo_SR_1000_User.st | 0 .../Axo_SR_1000_UserData.st | 0 .../eAxo_SR_750_ResultDataSize.st | 0 .../eAxo_SR_750_UserDataSize.st | 0 .../ctrl/src/{ => Axo_SR_750}/Axo_SR_750.st | 0 .../Axo_SR_750_BusyStatus.st | 0 .../Axo_SR_750_CompletionClearControl.st | 0 .../Axo_SR_750_CompletionStatus.st | 0 .../Axo_SR_750_Component_Status.st | 0 .../Axo_SR_750_Config.st | 0 .../Axo_SR_750_ErrorStatus.st | 0 .../Axo_SR_750_HWIDs.st | 0 ...o_SR_750_HandshakeAndGeneralErrorStatus.st | 0 .../Axo_SR_750_LatchAndErrorClearControl.st | 0 ...chingLevelAndTotalEvaluationGradeStatus.st | 0 .../Axo_SR_750_OperationInstructionControl.st | 0 .../Axo_SR_750_OperationalResultStatus.st | 0 .../Axo_SR_750_ParameterBankNumber.st | 0 .../Axo_SR_750_ReadData.st | 0 .../Axo_SR_750_ResultData.st | 0 .../Axo_SR_750_TerminalStatus.st | 0 .../Axo_SR_750_UnstableReadStatus.st | 0 .../Axo_SR_750_User.st | 0 .../Axo_SR_750_UserData.st | 0 .../eAxo_SR_750_ResultDataSize.st | 0 .../eAxo_SR_750_UserDataSize.st | 0 src/components.keyence.vision/this.sln | 99 ++----------------- 47 files changed, 20 insertions(+), 181 deletions(-) rename src/components.keyence.vision/ctrl/src/{ => Axo_SR_1000}/Axo_SR_1000.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_BusyStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_CompletionClearControl.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_CompletionStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_Component_Status.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_Config.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_ErrorStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_HWIDs.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_HandshakeAndGeneralErrorStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_LatchAndErrorClearControl.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_MatchingLevelAndTotalEvaluationGradeStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_OperationInstructionControl.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_OperationalResultStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_ParameterBankNumber.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_ReadData.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_ResultData.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_TerminalStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_UnstableReadStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_User.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/Axo_SR_1000_UserData.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/eAxo_SR_750_ResultDataSize.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_1000_Datatypes => Axo_SR_1000/TypesStructuresAndEnums}/eAxo_SR_750_UserDataSize.st (100%) rename src/components.keyence.vision/ctrl/src/{ => Axo_SR_750}/Axo_SR_750.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_BusyStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_CompletionClearControl.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_CompletionStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_Component_Status.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_Config.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_ErrorStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_HWIDs.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_HandshakeAndGeneralErrorStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_LatchAndErrorClearControl.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_MatchingLevelAndTotalEvaluationGradeStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_OperationInstructionControl.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_OperationalResultStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_ParameterBankNumber.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_ReadData.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_ResultData.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_TerminalStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_UnstableReadStatus.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_User.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/Axo_SR_750_UserData.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/eAxo_SR_750_ResultDataSize.st (100%) rename src/components.keyence.vision/ctrl/src/{Axo_SR_750_Datatypes => Axo_SR_750/TypesStructuresAndEnums}/eAxo_SR_750_UserDataSize.st (100%) diff --git a/src/components.keyence.vision/components.keyence.vision.code-workspace b/src/components.keyence.vision/components.keyence.vision.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.keyence.vision/components.keyence.vision.code-workspace +++ b/src/components.keyence.vision/components.keyence.vision.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.keyence.vision/components.keyence.vision.sln b/src/components.keyence.vision/components.keyence.vision.sln index 2209c9b8c..0443154d5 100644 --- a/src/components.keyence.vision/components.keyence.vision.sln +++ b/src/components.keyence.vision/components.keyence.vision.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{EDEC1919-4CCD-43BA-8F96-1328E1A385C0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{9B2D76E0-7BC3-4AFE-9642-C9E80C33373D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{FE21C67F-3EBA-46D7-87BB-9DF1B497A05D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{8C55D3E8-47E6-4180-86D8-353F9771DAAD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{8D184DBC-E168-4C24-B23C-F6FC2989CAD7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{2C1FC5A3-3C5B-45EA-929C-341CDD424478}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Keyence.Vision.blazorapp", "app\ix-blazor\AXOpen.Components.Keyence.Vision.blazorapp.csproj", "{91F7F58B-8B46-470A-B9F3-6DEE85C47506}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_keyence_vision", "app\ix\app_axopen_components_keyence_vision.csproj", "{6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Keyence.Vision.blazor", "src\AXOpen.Components.Keyence.Vision.blazor\AXOpen.Components.Keyence.Vision.blazor.csproj", "{A6469269-F3BD-4317-99E0-817330E9F8D3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_keyence_vision", "src\AXOpen.Components.Keyence.Vision\inxton_axopen_components_keyence_vision.csproj", "{1CC057EE-70FF-47AD-8D53-06F7D501AB8B}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{349A7404-C4D6-4822-A659-32362ED737F8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{3474AEEC-5387-4AC3-9151-9DC2BFE669AA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{06FB34AA-1257-4A1B-9273-029A2ABBCB19}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{864B09C5-1A77-4D4F-9385-6B63BE29B934}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{D5516896-B429-4239-BA12-A3D13808D1C7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{435436E3-6ED9-45E3-91DF-F5A9E09AF716}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{E338464E-4641-48BF-ABB4-C4E1BEB2B32A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{673F1457-20F1-4A89-A084-D996976B6A9B}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{B46D1161-A356-4286-BB27-CCDCFA6E2A17}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{9C187F97-ECA2-4A62-948C-3F6753AC8709}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{C2E6F38A-338E-4E36-A03F-B6C3102B37AA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{4496CDD8-587B-49A4-9A6C-DBC4225FBCB8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{7726D35A-77B8-4EF1-9636-5BE6F94187D4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{83D43506-D35F-4E63-AD15-6E4E00688037}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{367DE0A2-C0AB-485A-9FCD-1C7A57B360A2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Keyence.Vision.blazor", "src\AXOpen.Components.Keyence.Vision.blazor", "{F3A2747E-8E86-4B72-B707-861B928A0A5F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Keyence.Vision", "src\AXOpen.Components.Keyence.Vision", "{956838A4-F7CB-4003-AB05-678D9B7FD175}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{7E15 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{B6ABDFDC-97CC-44DB-B6EB-E5E54DDEBBFA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{693C0A47-68FB-452B-A1E3-5C802EDE927F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{12207CB1-14C9-4F1B-BF96-B2FECF550677}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{CE37C180-D17D-465D-98D4-CF0839625F73}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{497963B3-77BC-4161-BDFF-83C66E31D6B7}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{2AA1A0BB-C3E6-430F-BD79-32E837E42C42}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{AC3FC511-04AB-4BD2-8947-7BC6A4AC0258}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{E28F8787-2FA2-4411-A60B-752437C133C3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{FA32F3F5-EDA9-4D57-B85E-9B9211F198F6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{7A90026C-1A76-4CD3-8F92-D478EEE45FDC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{D9AB2AA1-BED0-4189-8022-6BB4BD97F53D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{49654A53-C9B3-4FE3-927B-02374F110775}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{2C982589-DA52-4434-B80D-13473187FAE4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{92DCB2C0-5AAC-4721-9237-99E36F3DB49F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{D67AFBF7-21D1-4525-89CB-FDF857BE56B6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{A24FFCBA-633B-430B-B5D3-7EB40FF6E5A3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{EA3EBB34-AC2A-493D-BF21-88635672962A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{4D191013-63BC-44AE-BE70-E6A0885DE184}" EndProject @@ -157,10 +119,6 @@ Global {FE21C67F-3EBA-46D7-87BB-9DF1B497A05D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FE21C67F-3EBA-46D7-87BB-9DF1B497A05D}.Release|Any CPU.ActiveCfg = Release|Any CPU {FE21C67F-3EBA-46D7-87BB-9DF1B497A05D}.Release|Any CPU.Build.0 = Release|Any CPU - {8C55D3E8-47E6-4180-86D8-353F9771DAAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C55D3E8-47E6-4180-86D8-353F9771DAAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C55D3E8-47E6-4180-86D8-353F9771DAAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C55D3E8-47E6-4180-86D8-353F9771DAAD}.Release|Any CPU.Build.0 = Release|Any CPU {8D184DBC-E168-4C24-B23C-F6FC2989CAD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D184DBC-E168-4C24-B23C-F6FC2989CAD7}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D184DBC-E168-4C24-B23C-F6FC2989CAD7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {2C1FC5A3-3C5B-45EA-929C-341CDD424478}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C1FC5A3-3C5B-45EA-929C-341CDD424478}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C1FC5A3-3C5B-45EA-929C-341CDD424478}.Release|Any CPU.Build.0 = Release|Any CPU - {91F7F58B-8B46-470A-B9F3-6DEE85C47506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91F7F58B-8B46-470A-B9F3-6DEE85C47506}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91F7F58B-8B46-470A-B9F3-6DEE85C47506}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91F7F58B-8B46-470A-B9F3-6DEE85C47506}.Release|Any CPU.Build.0 = Release|Any CPU - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}.Release|Any CPU.Build.0 = Release|Any CPU {A6469269-F3BD-4317-99E0-817330E9F8D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6469269-F3BD-4317-99E0-817330E9F8D3}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6469269-F3BD-4317-99E0-817330E9F8D3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {349A7404-C4D6-4822-A659-32362ED737F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {349A7404-C4D6-4822-A659-32362ED737F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {349A7404-C4D6-4822-A659-32362ED737F8}.Release|Any CPU.Build.0 = Release|Any CPU - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA}.Release|Any CPU.Build.0 = Release|Any CPU {6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {864B09C5-1A77-4D4F-9385-6B63BE29B934}.Debug|Any CPU.Build.0 = Debug|Any CPU {864B09C5-1A77-4D4F-9385-6B63BE29B934}.Release|Any CPU.ActiveCfg = Release|Any CPU {864B09C5-1A77-4D4F-9385-6B63BE29B934}.Release|Any CPU.Build.0 = Release|Any CPU - {D5516896-B429-4239-BA12-A3D13808D1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5516896-B429-4239-BA12-A3D13808D1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5516896-B429-4239-BA12-A3D13808D1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5516896-B429-4239-BA12-A3D13808D1C7}.Release|Any CPU.Build.0 = Release|Any CPU - {435436E3-6ED9-45E3-91DF-F5A9E09AF716}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {435436E3-6ED9-45E3-91DF-F5A9E09AF716}.Debug|Any CPU.Build.0 = Debug|Any CPU - {435436E3-6ED9-45E3-91DF-F5A9E09AF716}.Release|Any CPU.ActiveCfg = Release|Any CPU - {435436E3-6ED9-45E3-91DF-F5A9E09AF716}.Release|Any CPU.Build.0 = Release|Any CPU - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A}.Release|Any CPU.Build.0 = Release|Any CPU + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}.Release|Any CPU.Build.0 = Release|Any CPU {673F1457-20F1-4A89-A084-D996976B6A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {673F1457-20F1-4A89-A084-D996976B6A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU {673F1457-20F1-4A89-A084-D996976B6A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {4511C4FA-34FC-4A6A-8FE0-CA1A7E585A86} = {777CD35F-86BB-4E86-8406-D52A3212AEE6} {FE21C67F-3EBA-46D7-87BB-9DF1B497A05D} = {B46D1161-A356-4286-BB27-CCDCFA6E2A17} {B46D1161-A356-4286-BB27-CCDCFA6E2A17} = {3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9} - {8C55D3E8-47E6-4180-86D8-353F9771DAAD} = {9C187F97-ECA2-4A62-948C-3F6753AC8709} - {9C187F97-ECA2-4A62-948C-3F6753AC8709} = {3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9} {8D184DBC-E168-4C24-B23C-F6FC2989CAD7} = {C2E6F38A-338E-4E36-A03F-B6C3102B37AA} {C2E6F38A-338E-4E36-A03F-B6C3102B37AA} = {3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9} {3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9} = {63BF43C7-8760-4B36-9DB9-C9F95E9C71E0} {2C1FC5A3-3C5B-45EA-929C-341CDD424478} = {29B4E4C9-751F-4060-BD45-5A7000108C48} {29B4E4C9-751F-4060-BD45-5A7000108C48} = {B63DB186-1FFE-439D-BD4F-3518B0BC82E6} {B63DB186-1FFE-439D-BD4F-3518B0BC82E6} = {4496CDD8-587B-49A4-9A6C-DBC4225FBCB8} - {91F7F58B-8B46-470A-B9F3-6DEE85C47506} = {7726D35A-77B8-4EF1-9636-5BE6F94187D4} - {7726D35A-77B8-4EF1-9636-5BE6F94187D4} = {367DE0A2-C0AB-485A-9FCD-1C7A57B360A2} - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A} = {83D43506-D35F-4E63-AD15-6E4E00688037} - {83D43506-D35F-4E63-AD15-6E4E00688037} = {367DE0A2-C0AB-485A-9FCD-1C7A57B360A2} - {367DE0A2-C0AB-485A-9FCD-1C7A57B360A2} = {D3FB155D-4081-4C77-A7D6-6D47887D2C4B} {A6469269-F3BD-4317-99E0-817330E9F8D3} = {F3A2747E-8E86-4B72-B707-861B928A0A5F} {F3A2747E-8E86-4B72-B707-861B928A0A5F} = {55360B0C-2853-47D7-8089-1B2349539DC9} {1CC057EE-70FF-47AD-8D53-06F7D501AB8B} = {956838A4-F7CB-4003-AB05-678D9B7FD175} @@ -269,10 +200,6 @@ Global {349A7404-C4D6-4822-A659-32362ED737F8} = {1A774634-978D-4C7D-835C-474637707AA2} {1A774634-978D-4C7D-835C-474637707AA2} = {7E15F7EE-AEAD-4281-A33D-F9C07994215B} {7E15F7EE-AEAD-4281-A33D-F9C07994215B} = {B6ABDFDC-97CC-44DB-B6EB-E5E54DDEBBFA} - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA} = {693C0A47-68FB-452B-A1E3-5C802EDE927F} - {693C0A47-68FB-452B-A1E3-5C802EDE927F} = {12207CB1-14C9-4F1B-BF96-B2FECF550677} - {12207CB1-14C9-4F1B-BF96-B2FECF550677} = {CE37C180-D17D-465D-98D4-CF0839625F73} - {CE37C180-D17D-465D-98D4-CF0839625F73} = {497963B3-77BC-4161-BDFF-83C66E31D6B7} {6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036} = {2AA1A0BB-C3E6-430F-BD79-32E837E42C42} {2AA1A0BB-C3E6-430F-BD79-32E837E42C42} = {C49B7BA0-E7F4-4E0F-88A8-1AACDD5049A0} {06FB34AA-1257-4A1B-9273-029A2ABBCB19} = {AC3FC511-04AB-4BD2-8947-7BC6A4AC0258} @@ -281,14 +208,8 @@ Global {864B09C5-1A77-4D4F-9385-6B63BE29B934} = {C6E79E38-FF61-49C8-A417-DCC8950CE7E4} {C6E79E38-FF61-49C8-A417-DCC8950CE7E4} = {BAA8B8A4-EA9A-406B-89E2-DB52E3561677} {BAA8B8A4-EA9A-406B-89E2-DB52E3561677} = {E28F8787-2FA2-4411-A60B-752437C133C3} - {D5516896-B429-4239-BA12-A3D13808D1C7} = {FA32F3F5-EDA9-4D57-B85E-9B9211F198F6} - {FA32F3F5-EDA9-4D57-B85E-9B9211F198F6} = {D9AB2AA1-BED0-4189-8022-6BB4BD97F53D} - {435436E3-6ED9-45E3-91DF-F5A9E09AF716} = {7A90026C-1A76-4CD3-8F92-D478EEE45FDC} - {7A90026C-1A76-4CD3-8F92-D478EEE45FDC} = {D9AB2AA1-BED0-4189-8022-6BB4BD97F53D} - {D9AB2AA1-BED0-4189-8022-6BB4BD97F53D} = {49654A53-C9B3-4FE3-927B-02374F110775} - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A} = {2C982589-DA52-4434-B80D-13473187FAE4} - {2C982589-DA52-4434-B80D-13473187FAE4} = {92DCB2C0-5AAC-4721-9237-99E36F3DB49F} - {92DCB2C0-5AAC-4721-9237-99E36F3DB49F} = {A24FFCBA-633B-430B-B5D3-7EB40FF6E5A3} + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1} = {D67AFBF7-21D1-4525-89CB-FDF857BE56B6} + {D67AFBF7-21D1-4525-89CB-FDF857BE56B6} = {EA3EBB34-AC2A-493D-BF21-88635672962A} {673F1457-20F1-4A89-A084-D996976B6A9B} = {4D191013-63BC-44AE-BE70-E6A0885DE184} {4D191013-63BC-44AE-BE70-E6A0885DE184} = {8E44A068-ACB6-4134-9086-E780F3344133} {8E44A068-ACB6-4134-9086-E780F3344133} = {49D6A872-A60A-4DDC-9608-A7B7F4C92427} diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/Axo_SR_1000.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/Axo_SR_1000.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_BusyStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_BusyStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_BusyStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_BusyStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_CompletionClearControl.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_CompletionClearControl.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_CompletionClearControl.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_CompletionClearControl.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_CompletionStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_CompletionStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_CompletionStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_CompletionStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_Component_Status.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_Component_Status.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_Component_Status.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_Component_Status.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_Config.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_Config.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_Config.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_Config.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_ErrorStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_ErrorStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_ErrorStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_ErrorStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_HWIDs.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_HWIDs.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_HWIDs.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_HWIDs.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_HandshakeAndGeneralErrorStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_HandshakeAndGeneralErrorStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_HandshakeAndGeneralErrorStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_HandshakeAndGeneralErrorStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_LatchAndErrorClearControl.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_LatchAndErrorClearControl.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_LatchAndErrorClearControl.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_LatchAndErrorClearControl.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_MatchingLevelAndTotalEvaluationGradeStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_MatchingLevelAndTotalEvaluationGradeStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_MatchingLevelAndTotalEvaluationGradeStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_MatchingLevelAndTotalEvaluationGradeStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_OperationInstructionControl.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_OperationInstructionControl.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_OperationInstructionControl.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_OperationInstructionControl.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_OperationalResultStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_OperationalResultStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_OperationalResultStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_OperationalResultStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_ParameterBankNumber.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_ParameterBankNumber.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_ParameterBankNumber.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_ParameterBankNumber.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_ReadData.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_ReadData.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_ReadData.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_ReadData.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_ResultData.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_ResultData.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_ResultData.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_ResultData.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_TerminalStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_TerminalStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_TerminalStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_TerminalStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_UnstableReadStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_UnstableReadStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_UnstableReadStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_UnstableReadStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_User.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_User.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_User.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_User.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_UserData.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_UserData.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/Axo_SR_1000_UserData.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/Axo_SR_1000_UserData.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/eAxo_SR_750_ResultDataSize.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/eAxo_SR_750_ResultDataSize.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/eAxo_SR_750_ResultDataSize.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/eAxo_SR_750_ResultDataSize.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/eAxo_SR_750_UserDataSize.st b/src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/eAxo_SR_750_UserDataSize.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_1000_Datatypes/eAxo_SR_750_UserDataSize.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_1000/TypesStructuresAndEnums/eAxo_SR_750_UserDataSize.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/Axo_SR_750.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/Axo_SR_750.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_BusyStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_BusyStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_BusyStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_BusyStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_CompletionClearControl.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_CompletionClearControl.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_CompletionClearControl.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_CompletionClearControl.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_CompletionStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_CompletionStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_CompletionStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_CompletionStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_Component_Status.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_Component_Status.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_Component_Status.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_Component_Status.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_Config.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_Config.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_Config.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_Config.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_ErrorStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_ErrorStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_ErrorStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_ErrorStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_HWIDs.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_HWIDs.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_HWIDs.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_HWIDs.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_HandshakeAndGeneralErrorStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_HandshakeAndGeneralErrorStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_HandshakeAndGeneralErrorStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_HandshakeAndGeneralErrorStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_LatchAndErrorClearControl.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_LatchAndErrorClearControl.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_LatchAndErrorClearControl.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_LatchAndErrorClearControl.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_MatchingLevelAndTotalEvaluationGradeStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_MatchingLevelAndTotalEvaluationGradeStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_MatchingLevelAndTotalEvaluationGradeStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_MatchingLevelAndTotalEvaluationGradeStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_OperationInstructionControl.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_OperationInstructionControl.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_OperationInstructionControl.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_OperationInstructionControl.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_OperationalResultStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_OperationalResultStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_OperationalResultStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_OperationalResultStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_ParameterBankNumber.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_ParameterBankNumber.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_ParameterBankNumber.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_ParameterBankNumber.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_ReadData.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_ReadData.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_ReadData.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_ReadData.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_ResultData.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_ResultData.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_ResultData.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_ResultData.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_TerminalStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_TerminalStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_TerminalStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_TerminalStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_UnstableReadStatus.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_UnstableReadStatus.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_UnstableReadStatus.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_UnstableReadStatus.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_User.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_User.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_User.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_User.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_UserData.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_UserData.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/Axo_SR_750_UserData.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/Axo_SR_750_UserData.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/eAxo_SR_750_ResultDataSize.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/eAxo_SR_750_ResultDataSize.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/eAxo_SR_750_ResultDataSize.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/eAxo_SR_750_ResultDataSize.st diff --git a/src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/eAxo_SR_750_UserDataSize.st b/src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/eAxo_SR_750_UserDataSize.st similarity index 100% rename from src/components.keyence.vision/ctrl/src/Axo_SR_750_Datatypes/eAxo_SR_750_UserDataSize.st rename to src/components.keyence.vision/ctrl/src/Axo_SR_750/TypesStructuresAndEnums/eAxo_SR_750_UserDataSize.st diff --git a/src/components.keyence.vision/this.sln b/src/components.keyence.vision/this.sln index 2209c9b8c..0443154d5 100644 --- a/src/components.keyence.vision/this.sln +++ b/src/components.keyence.vision/this.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{EDEC1919-4CCD-43BA-8F96-1328E1A385C0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{9B2D76E0-7BC3-4AFE-9642-C9E80C33373D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{FE21C67F-3EBA-46D7-87BB-9DF1B497A05D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{8C55D3E8-47E6-4180-86D8-353F9771DAAD}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{8D184DBC-E168-4C24-B23C-F6FC2989CAD7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{2C1FC5A3-3C5B-45EA-929C-341CDD424478}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Keyence.Vision.blazorapp", "app\ix-blazor\AXOpen.Components.Keyence.Vision.blazorapp.csproj", "{91F7F58B-8B46-470A-B9F3-6DEE85C47506}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_keyence_vision", "app\ix\app_axopen_components_keyence_vision.csproj", "{6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Keyence.Vision.blazor", "src\AXOpen.Components.Keyence.Vision.blazor\AXOpen.Components.Keyence.Vision.blazor.csproj", "{A6469269-F3BD-4317-99E0-817330E9F8D3}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_keyence_vision", "src\AXOpen.Components.Keyence.Vision\inxton_axopen_components_keyence_vision.csproj", "{1CC057EE-70FF-47AD-8D53-06F7D501AB8B}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{349A7404-C4D6-4822-A659-32362ED737F8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{3474AEEC-5387-4AC3-9151-9DC2BFE669AA}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{06FB34AA-1257-4A1B-9273-029A2ABBCB19}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{864B09C5-1A77-4D4F-9385-6B63BE29B934}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{D5516896-B429-4239-BA12-A3D13808D1C7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{435436E3-6ED9-45E3-91DF-F5A9E09AF716}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{E338464E-4641-48BF-ABB4-C4E1BEB2B32A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{673F1457-20F1-4A89-A084-D996976B6A9B}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{B46D1161-A356-4286-BB27-CCDCFA6E2A17}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{9C187F97-ECA2-4A62-948C-3F6753AC8709}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{C2E6F38A-338E-4E36-A03F-B6C3102B37AA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{4496CDD8-587B-49A4-9A6C-DBC4225FBCB8}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{7726D35A-77B8-4EF1-9636-5BE6F94187D4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{83D43506-D35F-4E63-AD15-6E4E00688037}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{367DE0A2-C0AB-485A-9FCD-1C7A57B360A2}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Keyence.Vision.blazor", "src\AXOpen.Components.Keyence.Vision.blazor", "{F3A2747E-8E86-4B72-B707-861B928A0A5F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Keyence.Vision", "src\AXOpen.Components.Keyence.Vision", "{956838A4-F7CB-4003-AB05-678D9B7FD175}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{7E15 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{B6ABDFDC-97CC-44DB-B6EB-E5E54DDEBBFA}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{693C0A47-68FB-452B-A1E3-5C802EDE927F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{12207CB1-14C9-4F1B-BF96-B2FECF550677}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{CE37C180-D17D-465D-98D4-CF0839625F73}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{497963B3-77BC-4161-BDFF-83C66E31D6B7}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{2AA1A0BB-C3E6-430F-BD79-32E837E42C42}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{AC3FC511-04AB-4BD2-8947-7BC6A4AC0258}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{E28F8787-2FA2-4411-A60B-752437C133C3}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{FA32F3F5-EDA9-4D57-B85E-9B9211F198F6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{7A90026C-1A76-4CD3-8F92-D478EEE45FDC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{D9AB2AA1-BED0-4189-8022-6BB4BD97F53D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{49654A53-C9B3-4FE3-927B-02374F110775}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{2C982589-DA52-4434-B80D-13473187FAE4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{92DCB2C0-5AAC-4721-9237-99E36F3DB49F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{D67AFBF7-21D1-4525-89CB-FDF857BE56B6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{A24FFCBA-633B-430B-B5D3-7EB40FF6E5A3}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{EA3EBB34-AC2A-493D-BF21-88635672962A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{4D191013-63BC-44AE-BE70-E6A0885DE184}" EndProject @@ -157,10 +119,6 @@ Global {FE21C67F-3EBA-46D7-87BB-9DF1B497A05D}.Debug|Any CPU.Build.0 = Debug|Any CPU {FE21C67F-3EBA-46D7-87BB-9DF1B497A05D}.Release|Any CPU.ActiveCfg = Release|Any CPU {FE21C67F-3EBA-46D7-87BB-9DF1B497A05D}.Release|Any CPU.Build.0 = Release|Any CPU - {8C55D3E8-47E6-4180-86D8-353F9771DAAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C55D3E8-47E6-4180-86D8-353F9771DAAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C55D3E8-47E6-4180-86D8-353F9771DAAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C55D3E8-47E6-4180-86D8-353F9771DAAD}.Release|Any CPU.Build.0 = Release|Any CPU {8D184DBC-E168-4C24-B23C-F6FC2989CAD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D184DBC-E168-4C24-B23C-F6FC2989CAD7}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D184DBC-E168-4C24-B23C-F6FC2989CAD7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {2C1FC5A3-3C5B-45EA-929C-341CDD424478}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C1FC5A3-3C5B-45EA-929C-341CDD424478}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C1FC5A3-3C5B-45EA-929C-341CDD424478}.Release|Any CPU.Build.0 = Release|Any CPU - {91F7F58B-8B46-470A-B9F3-6DEE85C47506}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {91F7F58B-8B46-470A-B9F3-6DEE85C47506}.Debug|Any CPU.Build.0 = Debug|Any CPU - {91F7F58B-8B46-470A-B9F3-6DEE85C47506}.Release|Any CPU.ActiveCfg = Release|Any CPU - {91F7F58B-8B46-470A-B9F3-6DEE85C47506}.Release|Any CPU.Build.0 = Release|Any CPU - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A}.Release|Any CPU.Build.0 = Release|Any CPU {A6469269-F3BD-4317-99E0-817330E9F8D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A6469269-F3BD-4317-99E0-817330E9F8D3}.Debug|Any CPU.Build.0 = Debug|Any CPU {A6469269-F3BD-4317-99E0-817330E9F8D3}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {349A7404-C4D6-4822-A659-32362ED737F8}.Debug|Any CPU.Build.0 = Debug|Any CPU {349A7404-C4D6-4822-A659-32362ED737F8}.Release|Any CPU.ActiveCfg = Release|Any CPU {349A7404-C4D6-4822-A659-32362ED737F8}.Release|Any CPU.Build.0 = Release|Any CPU - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA}.Release|Any CPU.Build.0 = Release|Any CPU {6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036}.Debug|Any CPU.Build.0 = Debug|Any CPU {6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {864B09C5-1A77-4D4F-9385-6B63BE29B934}.Debug|Any CPU.Build.0 = Debug|Any CPU {864B09C5-1A77-4D4F-9385-6B63BE29B934}.Release|Any CPU.ActiveCfg = Release|Any CPU {864B09C5-1A77-4D4F-9385-6B63BE29B934}.Release|Any CPU.Build.0 = Release|Any CPU - {D5516896-B429-4239-BA12-A3D13808D1C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5516896-B429-4239-BA12-A3D13808D1C7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5516896-B429-4239-BA12-A3D13808D1C7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5516896-B429-4239-BA12-A3D13808D1C7}.Release|Any CPU.Build.0 = Release|Any CPU - {435436E3-6ED9-45E3-91DF-F5A9E09AF716}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {435436E3-6ED9-45E3-91DF-F5A9E09AF716}.Debug|Any CPU.Build.0 = Debug|Any CPU - {435436E3-6ED9-45E3-91DF-F5A9E09AF716}.Release|Any CPU.ActiveCfg = Release|Any CPU - {435436E3-6ED9-45E3-91DF-F5A9E09AF716}.Release|Any CPU.Build.0 = Release|Any CPU - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A}.Release|Any CPU.Build.0 = Release|Any CPU + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1}.Release|Any CPU.Build.0 = Release|Any CPU {673F1457-20F1-4A89-A084-D996976B6A9B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {673F1457-20F1-4A89-A084-D996976B6A9B}.Debug|Any CPU.Build.0 = Debug|Any CPU {673F1457-20F1-4A89-A084-D996976B6A9B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {4511C4FA-34FC-4A6A-8FE0-CA1A7E585A86} = {777CD35F-86BB-4E86-8406-D52A3212AEE6} {FE21C67F-3EBA-46D7-87BB-9DF1B497A05D} = {B46D1161-A356-4286-BB27-CCDCFA6E2A17} {B46D1161-A356-4286-BB27-CCDCFA6E2A17} = {3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9} - {8C55D3E8-47E6-4180-86D8-353F9771DAAD} = {9C187F97-ECA2-4A62-948C-3F6753AC8709} - {9C187F97-ECA2-4A62-948C-3F6753AC8709} = {3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9} {8D184DBC-E168-4C24-B23C-F6FC2989CAD7} = {C2E6F38A-338E-4E36-A03F-B6C3102B37AA} {C2E6F38A-338E-4E36-A03F-B6C3102B37AA} = {3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9} {3C07A178-18F5-4A7E-B87E-C9C9A86DEEC9} = {63BF43C7-8760-4B36-9DB9-C9F95E9C71E0} {2C1FC5A3-3C5B-45EA-929C-341CDD424478} = {29B4E4C9-751F-4060-BD45-5A7000108C48} {29B4E4C9-751F-4060-BD45-5A7000108C48} = {B63DB186-1FFE-439D-BD4F-3518B0BC82E6} {B63DB186-1FFE-439D-BD4F-3518B0BC82E6} = {4496CDD8-587B-49A4-9A6C-DBC4225FBCB8} - {91F7F58B-8B46-470A-B9F3-6DEE85C47506} = {7726D35A-77B8-4EF1-9636-5BE6F94187D4} - {7726D35A-77B8-4EF1-9636-5BE6F94187D4} = {367DE0A2-C0AB-485A-9FCD-1C7A57B360A2} - {6E0A3D41-AA8D-4B72-B536-EFD003E73E5A} = {83D43506-D35F-4E63-AD15-6E4E00688037} - {83D43506-D35F-4E63-AD15-6E4E00688037} = {367DE0A2-C0AB-485A-9FCD-1C7A57B360A2} - {367DE0A2-C0AB-485A-9FCD-1C7A57B360A2} = {D3FB155D-4081-4C77-A7D6-6D47887D2C4B} {A6469269-F3BD-4317-99E0-817330E9F8D3} = {F3A2747E-8E86-4B72-B707-861B928A0A5F} {F3A2747E-8E86-4B72-B707-861B928A0A5F} = {55360B0C-2853-47D7-8089-1B2349539DC9} {1CC057EE-70FF-47AD-8D53-06F7D501AB8B} = {956838A4-F7CB-4003-AB05-678D9B7FD175} @@ -269,10 +200,6 @@ Global {349A7404-C4D6-4822-A659-32362ED737F8} = {1A774634-978D-4C7D-835C-474637707AA2} {1A774634-978D-4C7D-835C-474637707AA2} = {7E15F7EE-AEAD-4281-A33D-F9C07994215B} {7E15F7EE-AEAD-4281-A33D-F9C07994215B} = {B6ABDFDC-97CC-44DB-B6EB-E5E54DDEBBFA} - {3474AEEC-5387-4AC3-9151-9DC2BFE669AA} = {693C0A47-68FB-452B-A1E3-5C802EDE927F} - {693C0A47-68FB-452B-A1E3-5C802EDE927F} = {12207CB1-14C9-4F1B-BF96-B2FECF550677} - {12207CB1-14C9-4F1B-BF96-B2FECF550677} = {CE37C180-D17D-465D-98D4-CF0839625F73} - {CE37C180-D17D-465D-98D4-CF0839625F73} = {497963B3-77BC-4161-BDFF-83C66E31D6B7} {6B93FDBC-334B-4C2A-A3B1-E8DD4AF38036} = {2AA1A0BB-C3E6-430F-BD79-32E837E42C42} {2AA1A0BB-C3E6-430F-BD79-32E837E42C42} = {C49B7BA0-E7F4-4E0F-88A8-1AACDD5049A0} {06FB34AA-1257-4A1B-9273-029A2ABBCB19} = {AC3FC511-04AB-4BD2-8947-7BC6A4AC0258} @@ -281,14 +208,8 @@ Global {864B09C5-1A77-4D4F-9385-6B63BE29B934} = {C6E79E38-FF61-49C8-A417-DCC8950CE7E4} {C6E79E38-FF61-49C8-A417-DCC8950CE7E4} = {BAA8B8A4-EA9A-406B-89E2-DB52E3561677} {BAA8B8A4-EA9A-406B-89E2-DB52E3561677} = {E28F8787-2FA2-4411-A60B-752437C133C3} - {D5516896-B429-4239-BA12-A3D13808D1C7} = {FA32F3F5-EDA9-4D57-B85E-9B9211F198F6} - {FA32F3F5-EDA9-4D57-B85E-9B9211F198F6} = {D9AB2AA1-BED0-4189-8022-6BB4BD97F53D} - {435436E3-6ED9-45E3-91DF-F5A9E09AF716} = {7A90026C-1A76-4CD3-8F92-D478EEE45FDC} - {7A90026C-1A76-4CD3-8F92-D478EEE45FDC} = {D9AB2AA1-BED0-4189-8022-6BB4BD97F53D} - {D9AB2AA1-BED0-4189-8022-6BB4BD97F53D} = {49654A53-C9B3-4FE3-927B-02374F110775} - {E338464E-4641-48BF-ABB4-C4E1BEB2B32A} = {2C982589-DA52-4434-B80D-13473187FAE4} - {2C982589-DA52-4434-B80D-13473187FAE4} = {92DCB2C0-5AAC-4721-9237-99E36F3DB49F} - {92DCB2C0-5AAC-4721-9237-99E36F3DB49F} = {A24FFCBA-633B-430B-B5D3-7EB40FF6E5A3} + {A4F1B16E-B107-4566-8EC6-DBC5DC5A09D1} = {D67AFBF7-21D1-4525-89CB-FDF857BE56B6} + {D67AFBF7-21D1-4525-89CB-FDF857BE56B6} = {EA3EBB34-AC2A-493D-BF21-88635672962A} {673F1457-20F1-4A89-A084-D996976B6A9B} = {4D191013-63BC-44AE-BE70-E6A0885DE184} {4D191013-63BC-44AE-BE70-E6A0885DE184} = {8E44A068-ACB6-4134-9086-E780F3344133} {8E44A068-ACB6-4134-9086-E780F3344133} = {49D6A872-A60A-4DDC-9608-A7B7F4C92427} From a73cc5e8860cb69d519b535ef0defdf24e9ac7d1 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Mon, 4 May 2026 21:37:28 +0200 Subject: [PATCH 14/33] Add AxoKrc5 hardware IDs and state definitions - Introduced AxoKrc5_HWIDs structure to define hardware IDs for various devices and submodules. - Added AxoKrc5_State class to encapsulate the state variables related to the Kuka robotics system, including control readiness, safety switches, and operational states. - Updated solution file to include new robotics components and removed obsolete projects. --- .../Axo_SR_1000/Axo_SR_1000.cs | 313 ++- .../Axo_SR_1000_Component_Status.cs | 323 --- .../Axo_SR_750/Axo_SR_750.cs | 313 ++- .../Axo_SR_750_Component_Status.cs | 323 --- .../components.kuka.robotics.code-workspace | 3 - .../components.kuka.robotics.sln | 103 +- .../ctrl/src/{ => AxoKrc4}/AxoKrc4_v_5_x_x.st | 8 +- .../AxoKrc4_Component_Status.st} | 2 +- .../AxoKrc4_Config.st} | 4 +- .../AxoKrc4_Control.st} | 2 +- .../TypesStructuresAndEnums/AxoKrc4_HWIDs.st} | 2 +- .../TypesStructuresAndEnums/AxoKrc4_State.st} | 2 +- .../ctrl/src/AxoKrc5/AxoKrc5_v_5_x_x.st | 1927 +++++++++++++++++ .../AxoKrc5_Component_Status.st | 13 + .../TypesStructuresAndEnums/AxoKrc5_Config.st | 16 + .../AxoKrc5_Control.st | 73 + .../TypesStructuresAndEnums/AxoKrc5_HWIDs.st | 14 + .../TypesStructuresAndEnums/AxoKrc5_State.st | 115 + src/components.kuka.robotics/this.sln | 103 +- ...ponents.mitsubishi.robotics.code-workspace | 3 - .../components.mitsubishi.robotics.sln | 109 +- .../AxoCr800_v_1_x_x_Component_Status.st} | 2 +- .../AxoCr800_v_1_x_x_Config.st} | 5 +- .../AxoCr800_v_1_x_x_Control.st} | 2 +- .../AxoCr800_v_1_x_x_HWIDs.st} | 3 +- .../AxoCr800_v_1_x_x_State.st} | 2 +- src/components.mitsubishi.robotics/this.sln | 109 +- 27 files changed, 2862 insertions(+), 1032 deletions(-) delete mode 100644 src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_1000_Component_Status/Axo_SR_1000_Component_Status.cs delete mode 100644 src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_750_Component_Status/Axo_SR_750_Component_Status.cs rename src/components.kuka.robotics/ctrl/src/{ => AxoKrc4}/AxoKrc4_v_5_x_x.st (99%) rename src/components.kuka.robotics/ctrl/src/{AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Component_Status.st => AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Component_Status.st} (65%) rename src/components.kuka.robotics/ctrl/src/{AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Config.st => AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Config.st} (84%) rename src/components.kuka.robotics/ctrl/src/{AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Control.st => AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Control.st} (98%) rename src/components.kuka.robotics/ctrl/src/{AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_HWIDs.st => AxoKrc4/TypesStructuresAndEnums/AxoKrc4_HWIDs.st} (93%) rename src/components.kuka.robotics/ctrl/src/{AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_State.st => AxoKrc4/TypesStructuresAndEnums/AxoKrc4_State.st} (99%) create mode 100644 src/components.kuka.robotics/ctrl/src/AxoKrc5/AxoKrc5_v_5_x_x.st create mode 100644 src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Component_Status.st create mode 100644 src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Config.st create mode 100644 src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Control.st create mode 100644 src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_HWIDs.st create mode 100644 src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_State.st rename src/components.mitsubishi.robotics/ctrl/src/{AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Component_Status.st => TypesStructuresAndEnums/AxoCr800_v_1_x_x_Component_Status.st} (64%) rename src/components.mitsubishi.robotics/ctrl/src/{AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Config.st => TypesStructuresAndEnums/AxoCr800_v_1_x_x_Config.st} (84%) rename src/components.mitsubishi.robotics/ctrl/src/{AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Control.st => TypesStructuresAndEnums/AxoCr800_v_1_x_x_Control.st} (98%) rename src/components.mitsubishi.robotics/ctrl/src/{AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_HWIDs.st => TypesStructuresAndEnums/AxoCr800_v_1_x_x_HWIDs.st} (85%) rename src/components.mitsubishi.robotics/ctrl/src/{AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_State.st => TypesStructuresAndEnums/AxoCr800_v_1_x_x_State.st} (99%) diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_1000/Axo_SR_1000.cs b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_1000/Axo_SR_1000.cs index a048a987c..150060d65 100644 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_1000/Axo_SR_1000.cs +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_1000/Axo_SR_1000.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using System; using System.Collections.Generic; @@ -261,4 +261,315 @@ private void InitializeTaskMessenger() TaskMessenger.DotNetMessengerTextList = messengerTextList; } } + public partial class Axo_SR_1000_Component_Status : AXOpen.Components.Abstractions.AxoComponent_Status + { + Dictionary errorDescriptionDict = new Dictionary(); + Dictionary actionDescriptionDict = new Dictionary(); + + public string ErrorDescription + { + get + { + if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } + if (errorDescriptionDict.Count == 0) + { + errorDescriptionDict.Add(0, " "); + // ClearResultDataTask + errorDescriptionDict.Add(531, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); + errorDescriptionDict.Add(532, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); + errorDescriptionDict.Add(533, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); + errorDescriptionDict.Add(534, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); + errorDescriptionDict.Add(535, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); + errorDescriptionDict.Add(536, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); + errorDescriptionDict.Add(537, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); + // ReadTask + errorDescriptionDict.Add(581, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); + errorDescriptionDict.Add(582, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); + errorDescriptionDict.Add(583, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); + errorDescriptionDict.Add(584, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); + errorDescriptionDict.Add(585, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); + errorDescriptionDict.Add(586, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); + errorDescriptionDict.Add(587, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); + errorDescriptionDict.Add(588, "Waiting for the signal/variable `ParameterBankNumber.BankNumberRegister` to be set to value from 0 to 10 !"); + errorDescriptionDict.Add(589, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be set !"); + errorDescriptionDict.Add(590, "Waiting for the signal/variable `ReadData.ResultDataReadyCount` to be incremented !"); + errorDescriptionDict.Add(591, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); + // TuneTask + errorDescriptionDict.Add(601, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); + errorDescriptionDict.Add(602, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); + errorDescriptionDict.Add(603, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); + errorDescriptionDict.Add(604, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); + errorDescriptionDict.Add(605, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); + errorDescriptionDict.Add(606, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); + errorDescriptionDict.Add(607, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); + errorDescriptionDict.Add(608, "Waiting for the signal/variable `ParameterBankNumber.BankNumberRegister` to be set to value from 0 to 10 !"); + errorDescriptionDict.Add(609, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be set !"); + errorDescriptionDict.Add(610, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); + // General alarms + errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(701, "Input variable `Config.HWIDS.HwID_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); + + errorDescriptionDict.Add(710, "Hw configuration error. Value of Config.HWIDS.HwID_HandshakeAndGeneralErrorStatus is zero."); + errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); + errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); + errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); + errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); + errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); + errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module: 'HandshakeAndGeneralErrorStatus' (GsdId=101)."); + + errorDescriptionDict.Add(720, "Hw configuration error. Value of Config.HWIDS.HwID_BUSY_Status is zero."); + errorDescriptionDict.Add(721, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2."); + errorDescriptionDict.Add(722, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2."); + errorDescriptionDict.Add(723, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2."); + errorDescriptionDict.Add(724, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2."); + errorDescriptionDict.Add(725, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2."); + errorDescriptionDict.Add(726, "Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module: 'BUSY_Status' (GsdId=102)."); + + errorDescriptionDict.Add(730, "Hw configuration error. Value of Config.HWIDS.HwID_CompletionStatus is zero."); + errorDescriptionDict.Add(731, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 3."); + errorDescriptionDict.Add(732, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 3."); + errorDescriptionDict.Add(733, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 3."); + errorDescriptionDict.Add(734, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 3."); + errorDescriptionDict.Add(735, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 3."); + errorDescriptionDict.Add(736, "Hw configuration error: Module with unexpected size or type detected in Slot 3. Expected module: 'CompletionStatus '(GsdId=103)."); + + errorDescriptionDict.Add(740, "Hw configuration error. Value of Config.HWIDS.HwID_ErrorStatus is zero."); + errorDescriptionDict.Add(741, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 4."); + errorDescriptionDict.Add(742, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 4."); + errorDescriptionDict.Add(743, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 4."); + errorDescriptionDict.Add(744, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 4."); + errorDescriptionDict.Add(745, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 4."); + errorDescriptionDict.Add(746, "Hw configuration error: Module with unexpected size or type detected in Slot 4. Expected module: 'ErrorStatus' (GsdId=104)."); + + errorDescriptionDict.Add(750, "Hw configuration error. Value of Config.HWIDS.HwID_TerminalStatus is zero."); + errorDescriptionDict.Add(751, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 5."); + errorDescriptionDict.Add(752, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 5."); + errorDescriptionDict.Add(753, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 5."); + errorDescriptionDict.Add(754, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 5."); + errorDescriptionDict.Add(755, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 5."); + errorDescriptionDict.Add(756, "Hw configuration error: Module with unexpected size or type detected in Slot 5. Expected module: 'TerminalStatus' (GsdId=105)."); + + errorDescriptionDict.Add(760, "Hw configuration error. Value of Config.HWIDS.HwID_UnstableReadStatus is zero."); + errorDescriptionDict.Add(761, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 6."); + errorDescriptionDict.Add(762, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 6."); + errorDescriptionDict.Add(763, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 6."); + errorDescriptionDict.Add(764, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 6."); + errorDescriptionDict.Add(765, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 6."); + errorDescriptionDict.Add(766, "Hw configuration error: Module with unexpected size or type detected in Slot 6. Expected module: 'UnstableReadStatus' (GsdId=106)."); + + errorDescriptionDict.Add(770, "Hw configuration error. Value of Config.HWIDS.HwID_MatchingLevelAndTotalEvaluationGradeStatus is zero."); + errorDescriptionDict.Add(771, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 7."); + errorDescriptionDict.Add(772, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 7."); + errorDescriptionDict.Add(773, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 7."); + errorDescriptionDict.Add(774, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 7."); + errorDescriptionDict.Add(775, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 7."); + errorDescriptionDict.Add(776, "Hw configuration error: Module with unexpected size or type detected in Slot 7. Expected module: 'MatchingLevelAndTotalEvaluationGradeStatus' (GsdId=107)."); + + errorDescriptionDict.Add(780, "Hw configuration error. Value of Config.HWIDS.HwID_OperationalResultStatus is zero."); + errorDescriptionDict.Add(781, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 8."); + errorDescriptionDict.Add(782, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 8."); + errorDescriptionDict.Add(783, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 8."); + errorDescriptionDict.Add(784, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 8."); + errorDescriptionDict.Add(785, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 8."); + errorDescriptionDict.Add(786, "Hw configuration error: Module with unexpected size or type detected in Slot 8. Expected module: 'OperationalResultStatus' (GsdId=108)."); + errorDescriptionDict.Add(790, "Hw configuration error. Value of Config.HWIDS.HwID_ReadData is zero."); + errorDescriptionDict.Add(791, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 9."); + errorDescriptionDict.Add(792, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 9."); + errorDescriptionDict.Add(793, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 9."); + errorDescriptionDict.Add(794, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 9."); + errorDescriptionDict.Add(795, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 9."); + errorDescriptionDict.Add(796, "Hw configuration error: Module with unexpected size or type detected in Slot 9. Expected module: 'Result_Data-32_bytes,Result_Data-64_bytes,Result_Data-128_bytes,Result_Data-246_bytes' (GsdId=109,110,111,112)."); + + errorDescriptionDict.Add(800, "Hw configuration error. Value of Config.HWIDS.HwID_LatchAndErrorClearControlBitReg is zero."); + errorDescriptionDict.Add(801, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 10."); + errorDescriptionDict.Add(802, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 10."); + errorDescriptionDict.Add(803, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 10."); + errorDescriptionDict.Add(804, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 10."); + errorDescriptionDict.Add(805, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 10."); + errorDescriptionDict.Add(806, "Hw configuration error: Module with unexpected size or type detected in Slot 10. Expected module: 'LatchAndErrorClearControlBitReg' (GsdId=201)."); + + errorDescriptionDict.Add(810, "Hw configuration error. Value of Config.HWIDS.HwID_OperationInstructionControl is zero."); + errorDescriptionDict.Add(811, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 11."); + errorDescriptionDict.Add(812, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 11."); + errorDescriptionDict.Add(813, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 11."); + errorDescriptionDict.Add(814, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 11."); + errorDescriptionDict.Add(815, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 11."); + errorDescriptionDict.Add(816, "Hw configuration error: Module with unexpected size or type detected in Slot 11. Expected module: 'OperationInstructionControl' (GsdId=202)."); + + errorDescriptionDict.Add(820, "Hw configuration error. Value of Config.HWIDS.HwID_CompletionClearControl is zero."); + errorDescriptionDict.Add(821, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 12."); + errorDescriptionDict.Add(822, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 12."); + errorDescriptionDict.Add(823, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 12."); + errorDescriptionDict.Add(824, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 12."); + errorDescriptionDict.Add(825, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 12."); + errorDescriptionDict.Add(826, "Hw configuration error: Module with unexpected size or type detected in Slot 12. Expected module: 'CompletionClearControl' (GsdId=203)."); + + errorDescriptionDict.Add(830, "Hw configuration error. Value of Config.HWIDS.HwID_ParameterBankNumber is zero."); + errorDescriptionDict.Add(831, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 13."); + errorDescriptionDict.Add(832, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 13."); + errorDescriptionDict.Add(833, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 13."); + errorDescriptionDict.Add(834, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 13."); + errorDescriptionDict.Add(835, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 13."); + errorDescriptionDict.Add(836, "Hw configuration error: Module with unexpected size or type detected in Slot 13. Expected module: 'ParameterBankNumber' (GsdId=204)."); + + errorDescriptionDict.Add(840, "Hw configuration error. Value of Config.HWIDS.HwID_UserData is zero."); + errorDescriptionDict.Add(841, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 14."); + errorDescriptionDict.Add(842, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 14."); + errorDescriptionDict.Add(843, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 14."); + errorDescriptionDict.Add(844, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 14."); + errorDescriptionDict.Add(845, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 14."); + errorDescriptionDict.Add(846, "Hw configuration error: Module with unexpected size or type detected in Slot 14. Allowed modules: 'User_Data-32_bytes,User_Data-64_bytes,User_Data-128_bytes,User_Data-250_bytes' (GsdId=205,206,207,208)."); + + errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(1131, "Input variable `Config.HWIDS.HwID_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1132, "Input variable `Config.HWIDS.HwID_HandshakeAndGeneralErrorStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1133, "Input variable `Config.HWIDS.HwID_BUSY_Status` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1134, "Input variable `Config.HWIDS.HwID_CompletionStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1135, "Input variable `Config.HWIDS.HwID_ErrorStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1136, "Input variable `Config.HWIDS.HwID_TerminalStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1137, "Input variable `Config.HWIDS.HwID_UnstableReadStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1138, "Input variable `Config.HWIDS.HwID_MatchingLevelAndTotalEvaluationGradeStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1139, "Input variable `Config.HWIDS.HwID_OperationalResultStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1140, "Input variable `Config.HWIDS.HwID_ReadData` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1141, "Input variable `Config.HWIDS.HwID_LatchAndErrorClearControl` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1142, "Input variable `Config.HWIDS.HwID_OperationInstructionControl` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1143, "Input variable `Config.HWIDS.HwID_CompletionClearControl` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1144, "Input variable `Config.HWIDS.HwID_ParameterBankNumber` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1145, "Input variable `Config.HWIDS.HwID_UserData` has invalid value in `Run` method!"); + + errorDescriptionDict.Add(1201, "Error reading the HandshakeAndGeneralErrorStatus!"); + errorDescriptionDict.Add(1202, "Error reading the BUSY_Status!"); + errorDescriptionDict.Add(1203, "Error reading the CompletionStatus!"); + errorDescriptionDict.Add(1204, "Error reading the ErrorStatus!"); + errorDescriptionDict.Add(1205, "Error reading the TerminalStatus!"); + errorDescriptionDict.Add(1206, "Error reading the UnstableReadStatus!"); + errorDescriptionDict.Add(1207, "Error reading the MatchingLevelAndTotalEvaluationGradeStatus!"); + errorDescriptionDict.Add(1208, "Error reading the OperationalResultStatus!"); + errorDescriptionDict.Add(1209, "Error reading the ReadData!"); + errorDescriptionDict.Add(1210, "ResultData has invalid size!"); + + errorDescriptionDict.Add(1231, "Error writing the LatchAndErrorClearControl!"); + errorDescriptionDict.Add(1232, "Error writing the OperationInstructionControl!"); + errorDescriptionDict.Add(1233, "Error writing the CompletionClearControl!"); + errorDescriptionDict.Add(1234, "Error writing the ParameterBankNumber!"); + errorDescriptionDict.Add(1235, "UserData has invalid size!"); + errorDescriptionDict.Add(1236, "Error writing the 32bytes of the UserData!"); + errorDescriptionDict.Add(1237, "Error writing the 64bytes of the UserData!"); + errorDescriptionDict.Add(1238, "Error writing the 128bytes of the UserData!"); + errorDescriptionDict.Add(1239, "Error writing the 250bytes of the UserData!"); + + // ClearResultDataTask; + errorDescriptionDict.Add(10030, "ClearResultDataTask finished with error!"); + errorDescriptionDict.Add(10031, "ClearResultDataTask was aborted, while not yet completed!"); + // ReadTask; + errorDescriptionDict.Add(10080, "ReadTask finished with error!"); + errorDescriptionDict.Add(10081, "ReadTask was aborted, while not yet completed!"); + // TuneTask; + errorDescriptionDict.Add(10100, "TuneTask task finished with error!"); + errorDescriptionDict.Add(10101, "TuneTask task was aborted, while not yet completed!"); + + } + string errorDescription = " "; + + if (Error == null || Error.Id == null) + return errorDescription; + + if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) + { + return errorDescription; + } + else + + { + return " "; + } + } + } + + public string ActionDescription + { + get + { + if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } + if (actionDescriptionDict.Count == 0) + { + actionDescriptionDict.Add(0, " "); + actionDescriptionDict.Add(50, "Restore has been executed."); + + // ClearResultDataTask + actionDescriptionDict.Add(130, "ClearResultDataTask started."); + actionDescriptionDict.Add(330, "ClearResultDataTask running: reseting the outputs."); + actionDescriptionDict.Add(331, "ClearResultDataTask running: reseting the error flag."); + actionDescriptionDict.Add(332, "ClearResultDataTask running: reseting the read complete flag."); + actionDescriptionDict.Add(333, "ClearResultDataTask running: reseting the preset complete flag."); + actionDescriptionDict.Add(334, "ClearResultDataTask running: reseting the register preset data complete flag."); + actionDescriptionDict.Add(335, "ClearResultDataTask running: reseting the tune complete flag."); + actionDescriptionDict.Add(336, "ClearResultDataTask running: reseting the external request complete flag."); + actionDescriptionDict.Add(337, "ClearResultDataTask running: waiting for the general error flag is reseted."); + actionDescriptionDict.Add(338, "ClearResultDataTask finished."); + actionDescriptionDict.Add(131, "ClearResultDataTask finished succesfully."); + actionDescriptionDict.Add(132, "ClearResultDataTask restored."); + // ReadTask + actionDescriptionDict.Add(180, "ReadTask started."); + actionDescriptionDict.Add(380, "ReadTask running: reseting the outputs."); + actionDescriptionDict.Add(381, "ReadTask running: reseting the error flag."); + actionDescriptionDict.Add(382, "ReadTask running: reseting the read complete flag."); + actionDescriptionDict.Add(383, "ReadTask running: reseting the preset complete flag."); + actionDescriptionDict.Add(384, "ReadTask running: reseting the register preset data complete flag."); + actionDescriptionDict.Add(385, "ReadTask running: reseting the tune complete flag."); + actionDescriptionDict.Add(386, "ReadTask running: reseting the external request complete flag."); + actionDescriptionDict.Add(387, "ReadTask running: waiting for the general error flag is reseted."); + actionDescriptionDict.Add(388, "ReadTask running: setting bank number."); + actionDescriptionDict.Add(389, "ReadTask running: starting trigger."); + actionDescriptionDict.Add(390, "ReadTask running: waiting for the result data."); + actionDescriptionDict.Add(391, "ReadTask running: acknowledging results."); + actionDescriptionDict.Add(392, "ReadTask finished."); + actionDescriptionDict.Add(181, "ReadTask finished succesfully."); + actionDescriptionDict.Add(182, "ReadTask restored."); + // TuneTask + actionDescriptionDict.Add(200, "TuneTask started."); + actionDescriptionDict.Add(400, "TuneTask running: reseting the outputs."); + actionDescriptionDict.Add(401, "TuneTask running: reseting the error flag."); + actionDescriptionDict.Add(402, "TuneTask running: reseting the read complete flag."); + actionDescriptionDict.Add(403, "TuneTask running: reseting the preset complete flag."); + actionDescriptionDict.Add(404, "TuneTask running: reseting the register preset data complete flag."); + actionDescriptionDict.Add(405, "TuneTask running: reseting the tune complete flag."); + actionDescriptionDict.Add(406, "TuneTask running: reseting the external request complete flag."); + actionDescriptionDict.Add(407, "TuneTask running: waiting for the general error flag is reseted."); + actionDescriptionDict.Add(408, "TuneTask running: setting bank number."); + actionDescriptionDict.Add(409, "TuneTask running: starting the tunning process."); + actionDescriptionDict.Add(410, "TuneTask running: acknowledging the tunning process."); + actionDescriptionDict.Add(411, "TuneTask finished."); + actionDescriptionDict.Add(201, "TuneTask finished succesfully."); + actionDescriptionDict.Add(202, "TuneTask restored."); + // ClearResultDataTask + actionDescriptionDict.Add(10030, "ClearResultDataTask finished with error!"); + actionDescriptionDict.Add(10031, "ClearResultDataTask was aborted, while not yet completed!"); + // ReadTask + actionDescriptionDict.Add(10080, "ReadTask task finished with error!"); + actionDescriptionDict.Add(10081, "ReadTask task was aborted, while not yet completed!"); + // TuneTask + actionDescriptionDict.Add(10100, "TuneTask task finished with error!"); + actionDescriptionDict.Add(10101, "TuneTask task was aborted, while not yet completed!"); + } + + string actionDescription = " "; + + if (Action == null || Action.Id == null) + return actionDescription; + + if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) + { + return actionDescription; + } + else + { + return " "; + } + + } + } + } + } diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_1000_Component_Status/Axo_SR_1000_Component_Status.cs b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_1000_Component_Status/Axo_SR_1000_Component_Status.cs deleted file mode 100644 index 3cf2d5fe8..000000000 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_1000_Component_Status/Axo_SR_1000_Component_Status.cs +++ /dev/null @@ -1,323 +0,0 @@ -using AXOpen.Messaging.Static; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AXOpen.Components.Keyence.Vision -{ - - public partial class Axo_SR_1000_Component_Status : AXOpen.Components.Abstractions.AxoComponent_Status - { - Dictionary errorDescriptionDict = new Dictionary(); - Dictionary actionDescriptionDict = new Dictionary(); - - public string ErrorDescription - { - get - { - if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } - if (errorDescriptionDict.Count == 0) - { - errorDescriptionDict.Add(0, " "); - // ClearResultDataTask - errorDescriptionDict.Add(531, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); - errorDescriptionDict.Add(532, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); - errorDescriptionDict.Add(533, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); - errorDescriptionDict.Add(534, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); - errorDescriptionDict.Add(535, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); - errorDescriptionDict.Add(536, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); - errorDescriptionDict.Add(537, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); - // ReadTask - errorDescriptionDict.Add(581, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); - errorDescriptionDict.Add(582, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); - errorDescriptionDict.Add(583, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); - errorDescriptionDict.Add(584, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); - errorDescriptionDict.Add(585, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); - errorDescriptionDict.Add(586, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); - errorDescriptionDict.Add(587, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); - errorDescriptionDict.Add(588, "Waiting for the signal/variable `ParameterBankNumber.BankNumberRegister` to be set to value from 0 to 10 !"); - errorDescriptionDict.Add(589, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be set !"); - errorDescriptionDict.Add(590, "Waiting for the signal/variable `ReadData.ResultDataReadyCount` to be incremented !"); - errorDescriptionDict.Add(591, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); - // TuneTask - errorDescriptionDict.Add(601, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); - errorDescriptionDict.Add(602, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); - errorDescriptionDict.Add(603, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); - errorDescriptionDict.Add(604, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); - errorDescriptionDict.Add(605, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); - errorDescriptionDict.Add(606, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); - errorDescriptionDict.Add(607, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); - errorDescriptionDict.Add(608, "Waiting for the signal/variable `ParameterBankNumber.BankNumberRegister` to be set to value from 0 to 10 !"); - errorDescriptionDict.Add(609, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be set !"); - errorDescriptionDict.Add(610, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); - // General alarms - errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); - errorDescriptionDict.Add(701, "Input variable `Config.HWIDS.HwID_Device` has invalid value in `Run` method!"); - errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); - - errorDescriptionDict.Add(710, "Hw configuration error. Value of Config.HWIDS.HwID_HandshakeAndGeneralErrorStatus is zero."); - errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); - errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); - errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); - errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); - errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); - errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module: 'HandshakeAndGeneralErrorStatus' (GsdId=101)."); - - errorDescriptionDict.Add(720, "Hw configuration error. Value of Config.HWIDS.HwID_BUSY_Status is zero."); - errorDescriptionDict.Add(721, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2."); - errorDescriptionDict.Add(722, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2."); - errorDescriptionDict.Add(723, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2."); - errorDescriptionDict.Add(724, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2."); - errorDescriptionDict.Add(725, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2."); - errorDescriptionDict.Add(726, "Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module: 'BUSY_Status' (GsdId=102)."); - - errorDescriptionDict.Add(730, "Hw configuration error. Value of Config.HWIDS.HwID_CompletionStatus is zero."); - errorDescriptionDict.Add(731, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 3."); - errorDescriptionDict.Add(732, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 3."); - errorDescriptionDict.Add(733, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 3."); - errorDescriptionDict.Add(734, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 3."); - errorDescriptionDict.Add(735, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 3."); - errorDescriptionDict.Add(736, "Hw configuration error: Module with unexpected size or type detected in Slot 3. Expected module: 'CompletionStatus '(GsdId=103)."); - - errorDescriptionDict.Add(740, "Hw configuration error. Value of Config.HWIDS.HwID_ErrorStatus is zero."); - errorDescriptionDict.Add(741, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 4."); - errorDescriptionDict.Add(742, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 4."); - errorDescriptionDict.Add(743, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 4."); - errorDescriptionDict.Add(744, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 4."); - errorDescriptionDict.Add(745, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 4."); - errorDescriptionDict.Add(746, "Hw configuration error: Module with unexpected size or type detected in Slot 4. Expected module: 'ErrorStatus' (GsdId=104)."); - - errorDescriptionDict.Add(750, "Hw configuration error. Value of Config.HWIDS.HwID_TerminalStatus is zero."); - errorDescriptionDict.Add(751, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 5."); - errorDescriptionDict.Add(752, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 5."); - errorDescriptionDict.Add(753, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 5."); - errorDescriptionDict.Add(754, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 5."); - errorDescriptionDict.Add(755, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 5."); - errorDescriptionDict.Add(756, "Hw configuration error: Module with unexpected size or type detected in Slot 5. Expected module: 'TerminalStatus' (GsdId=105)."); - - errorDescriptionDict.Add(760, "Hw configuration error. Value of Config.HWIDS.HwID_UnstableReadStatus is zero."); - errorDescriptionDict.Add(761, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 6."); - errorDescriptionDict.Add(762, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 6."); - errorDescriptionDict.Add(763, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 6."); - errorDescriptionDict.Add(764, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 6."); - errorDescriptionDict.Add(765, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 6."); - errorDescriptionDict.Add(766, "Hw configuration error: Module with unexpected size or type detected in Slot 6. Expected module: 'UnstableReadStatus' (GsdId=106)."); - - errorDescriptionDict.Add(770, "Hw configuration error. Value of Config.HWIDS.HwID_MatchingLevelAndTotalEvaluationGradeStatus is zero."); - errorDescriptionDict.Add(771, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 7."); - errorDescriptionDict.Add(772, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 7."); - errorDescriptionDict.Add(773, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 7."); - errorDescriptionDict.Add(774, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 7."); - errorDescriptionDict.Add(775, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 7."); - errorDescriptionDict.Add(776, "Hw configuration error: Module with unexpected size or type detected in Slot 7. Expected module: 'MatchingLevelAndTotalEvaluationGradeStatus' (GsdId=107)."); - - errorDescriptionDict.Add(780, "Hw configuration error. Value of Config.HWIDS.HwID_OperationalResultStatus is zero."); - errorDescriptionDict.Add(781, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 8."); - errorDescriptionDict.Add(782, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 8."); - errorDescriptionDict.Add(783, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 8."); - errorDescriptionDict.Add(784, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 8."); - errorDescriptionDict.Add(785, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 8."); - errorDescriptionDict.Add(786, "Hw configuration error: Module with unexpected size or type detected in Slot 8. Expected module: 'OperationalResultStatus' (GsdId=108)."); - errorDescriptionDict.Add(790, "Hw configuration error. Value of Config.HWIDS.HwID_ReadData is zero."); - errorDescriptionDict.Add(791, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 9."); - errorDescriptionDict.Add(792, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 9."); - errorDescriptionDict.Add(793, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 9."); - errorDescriptionDict.Add(794, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 9."); - errorDescriptionDict.Add(795, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 9."); - errorDescriptionDict.Add(796, "Hw configuration error: Module with unexpected size or type detected in Slot 9. Expected module: 'Result_Data-32_bytes,Result_Data-64_bytes,Result_Data-128_bytes,Result_Data-246_bytes' (GsdId=109,110,111,112)."); - - errorDescriptionDict.Add(800, "Hw configuration error. Value of Config.HWIDS.HwID_LatchAndErrorClearControlBitReg is zero."); - errorDescriptionDict.Add(801, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 10."); - errorDescriptionDict.Add(802, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 10."); - errorDescriptionDict.Add(803, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 10."); - errorDescriptionDict.Add(804, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 10."); - errorDescriptionDict.Add(805, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 10."); - errorDescriptionDict.Add(806, "Hw configuration error: Module with unexpected size or type detected in Slot 10. Expected module: 'LatchAndErrorClearControlBitReg' (GsdId=201)."); - - errorDescriptionDict.Add(810, "Hw configuration error. Value of Config.HWIDS.HwID_OperationInstructionControl is zero."); - errorDescriptionDict.Add(811, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 11."); - errorDescriptionDict.Add(812, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 11."); - errorDescriptionDict.Add(813, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 11."); - errorDescriptionDict.Add(814, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 11."); - errorDescriptionDict.Add(815, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 11."); - errorDescriptionDict.Add(816, "Hw configuration error: Module with unexpected size or type detected in Slot 11. Expected module: 'OperationInstructionControl' (GsdId=202)."); - - errorDescriptionDict.Add(820, "Hw configuration error. Value of Config.HWIDS.HwID_CompletionClearControl is zero."); - errorDescriptionDict.Add(821, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 12."); - errorDescriptionDict.Add(822, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 12."); - errorDescriptionDict.Add(823, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 12."); - errorDescriptionDict.Add(824, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 12."); - errorDescriptionDict.Add(825, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 12."); - errorDescriptionDict.Add(826, "Hw configuration error: Module with unexpected size or type detected in Slot 12. Expected module: 'CompletionClearControl' (GsdId=203)."); - - errorDescriptionDict.Add(830, "Hw configuration error. Value of Config.HWIDS.HwID_ParameterBankNumber is zero."); - errorDescriptionDict.Add(831, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 13."); - errorDescriptionDict.Add(832, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 13."); - errorDescriptionDict.Add(833, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 13."); - errorDescriptionDict.Add(834, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 13."); - errorDescriptionDict.Add(835, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 13."); - errorDescriptionDict.Add(836, "Hw configuration error: Module with unexpected size or type detected in Slot 13. Expected module: 'ParameterBankNumber' (GsdId=204)."); - - errorDescriptionDict.Add(840, "Hw configuration error. Value of Config.HWIDS.HwID_UserData is zero."); - errorDescriptionDict.Add(841, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 14."); - errorDescriptionDict.Add(842, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 14."); - errorDescriptionDict.Add(843, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 14."); - errorDescriptionDict.Add(844, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 14."); - errorDescriptionDict.Add(845, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 14."); - errorDescriptionDict.Add(846, "Hw configuration error: Module with unexpected size or type detected in Slot 14. Allowed modules: 'User_Data-32_bytes,User_Data-64_bytes,User_Data-128_bytes,User_Data-250_bytes' (GsdId=205,206,207,208)."); - - errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); - errorDescriptionDict.Add(1131, "Input variable `Config.HWIDS.HwID_Device` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1132, "Input variable `Config.HWIDS.HwID_HandshakeAndGeneralErrorStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1133, "Input variable `Config.HWIDS.HwID_BUSY_Status` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1134, "Input variable `Config.HWIDS.HwID_CompletionStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1135, "Input variable `Config.HWIDS.HwID_ErrorStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1136, "Input variable `Config.HWIDS.HwID_TerminalStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1137, "Input variable `Config.HWIDS.HwID_UnstableReadStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1138, "Input variable `Config.HWIDS.HwID_MatchingLevelAndTotalEvaluationGradeStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1139, "Input variable `Config.HWIDS.HwID_OperationalResultStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1140, "Input variable `Config.HWIDS.HwID_ReadData` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1141, "Input variable `Config.HWIDS.HwID_LatchAndErrorClearControl` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1142, "Input variable `Config.HWIDS.HwID_OperationInstructionControl` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1143, "Input variable `Config.HWIDS.HwID_CompletionClearControl` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1144, "Input variable `Config.HWIDS.HwID_ParameterBankNumber` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1145, "Input variable `Config.HWIDS.HwID_UserData` has invalid value in `Run` method!"); - - errorDescriptionDict.Add(1201, "Error reading the HandshakeAndGeneralErrorStatus!"); - errorDescriptionDict.Add(1202, "Error reading the BUSY_Status!"); - errorDescriptionDict.Add(1203, "Error reading the CompletionStatus!"); - errorDescriptionDict.Add(1204, "Error reading the ErrorStatus!"); - errorDescriptionDict.Add(1205, "Error reading the TerminalStatus!"); - errorDescriptionDict.Add(1206, "Error reading the UnstableReadStatus!"); - errorDescriptionDict.Add(1207, "Error reading the MatchingLevelAndTotalEvaluationGradeStatus!"); - errorDescriptionDict.Add(1208, "Error reading the OperationalResultStatus!"); - errorDescriptionDict.Add(1209, "Error reading the ReadData!"); - errorDescriptionDict.Add(1210, "ResultData has invalid size!"); - - errorDescriptionDict.Add(1231, "Error writing the LatchAndErrorClearControl!"); - errorDescriptionDict.Add(1232, "Error writing the OperationInstructionControl!"); - errorDescriptionDict.Add(1233, "Error writing the CompletionClearControl!"); - errorDescriptionDict.Add(1234, "Error writing the ParameterBankNumber!"); - errorDescriptionDict.Add(1235, "UserData has invalid size!"); - errorDescriptionDict.Add(1236, "Error writing the 32bytes of the UserData!"); - errorDescriptionDict.Add(1237, "Error writing the 64bytes of the UserData!"); - errorDescriptionDict.Add(1238, "Error writing the 128bytes of the UserData!"); - errorDescriptionDict.Add(1239, "Error writing the 250bytes of the UserData!"); - - // ClearResultDataTask; - errorDescriptionDict.Add(10030, "ClearResultDataTask finished with error!"); - errorDescriptionDict.Add(10031, "ClearResultDataTask was aborted, while not yet completed!"); - // ReadTask; - errorDescriptionDict.Add(10080, "ReadTask finished with error!"); - errorDescriptionDict.Add(10081, "ReadTask was aborted, while not yet completed!"); - // TuneTask; - errorDescriptionDict.Add(10100, "TuneTask task finished with error!"); - errorDescriptionDict.Add(10101, "TuneTask task was aborted, while not yet completed!"); - - } - string errorDescription = " "; - - if (Error == null || Error.Id == null) - return errorDescription; - - if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) - { - return errorDescription; - } - else - - { - return " "; - } - } - } - - public string ActionDescription - { - get - { - if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } - if (actionDescriptionDict.Count == 0) - { - actionDescriptionDict.Add(0, " "); - actionDescriptionDict.Add(50, "Restore has been executed."); - - // ClearResultDataTask - actionDescriptionDict.Add(130, "ClearResultDataTask started."); - actionDescriptionDict.Add(330, "ClearResultDataTask running: reseting the outputs."); - actionDescriptionDict.Add(331, "ClearResultDataTask running: reseting the error flag."); - actionDescriptionDict.Add(332, "ClearResultDataTask running: reseting the read complete flag."); - actionDescriptionDict.Add(333, "ClearResultDataTask running: reseting the preset complete flag."); - actionDescriptionDict.Add(334, "ClearResultDataTask running: reseting the register preset data complete flag."); - actionDescriptionDict.Add(335, "ClearResultDataTask running: reseting the tune complete flag."); - actionDescriptionDict.Add(336, "ClearResultDataTask running: reseting the external request complete flag."); - actionDescriptionDict.Add(337, "ClearResultDataTask running: waiting for the general error flag is reseted."); - actionDescriptionDict.Add(338, "ClearResultDataTask finished."); - actionDescriptionDict.Add(131, "ClearResultDataTask finished succesfully."); - actionDescriptionDict.Add(132, "ClearResultDataTask restored."); - // ReadTask - actionDescriptionDict.Add(180, "ReadTask started."); - actionDescriptionDict.Add(380, "ReadTask running: reseting the outputs."); - actionDescriptionDict.Add(381, "ReadTask running: reseting the error flag."); - actionDescriptionDict.Add(382, "ReadTask running: reseting the read complete flag."); - actionDescriptionDict.Add(383, "ReadTask running: reseting the preset complete flag."); - actionDescriptionDict.Add(384, "ReadTask running: reseting the register preset data complete flag."); - actionDescriptionDict.Add(385, "ReadTask running: reseting the tune complete flag."); - actionDescriptionDict.Add(386, "ReadTask running: reseting the external request complete flag."); - actionDescriptionDict.Add(387, "ReadTask running: waiting for the general error flag is reseted."); - actionDescriptionDict.Add(388, "ReadTask running: setting bank number."); - actionDescriptionDict.Add(389, "ReadTask running: starting trigger."); - actionDescriptionDict.Add(390, "ReadTask running: waiting for the result data."); - actionDescriptionDict.Add(391, "ReadTask running: acknowledging results."); - actionDescriptionDict.Add(392, "ReadTask finished."); - actionDescriptionDict.Add(181, "ReadTask finished succesfully."); - actionDescriptionDict.Add(182, "ReadTask restored."); - // TuneTask - actionDescriptionDict.Add(200, "TuneTask started."); - actionDescriptionDict.Add(400, "TuneTask running: reseting the outputs."); - actionDescriptionDict.Add(401, "TuneTask running: reseting the error flag."); - actionDescriptionDict.Add(402, "TuneTask running: reseting the read complete flag."); - actionDescriptionDict.Add(403, "TuneTask running: reseting the preset complete flag."); - actionDescriptionDict.Add(404, "TuneTask running: reseting the register preset data complete flag."); - actionDescriptionDict.Add(405, "TuneTask running: reseting the tune complete flag."); - actionDescriptionDict.Add(406, "TuneTask running: reseting the external request complete flag."); - actionDescriptionDict.Add(407, "TuneTask running: waiting for the general error flag is reseted."); - actionDescriptionDict.Add(408, "TuneTask running: setting bank number."); - actionDescriptionDict.Add(409, "TuneTask running: starting the tunning process."); - actionDescriptionDict.Add(410, "TuneTask running: acknowledging the tunning process."); - actionDescriptionDict.Add(411, "TuneTask finished."); - actionDescriptionDict.Add(201, "TuneTask finished succesfully."); - actionDescriptionDict.Add(202, "TuneTask restored."); - // ClearResultDataTask - actionDescriptionDict.Add(10030, "ClearResultDataTask finished with error!"); - actionDescriptionDict.Add(10031, "ClearResultDataTask was aborted, while not yet completed!"); - // ReadTask - actionDescriptionDict.Add(10080, "ReadTask task finished with error!"); - actionDescriptionDict.Add(10081, "ReadTask task was aborted, while not yet completed!"); - // TuneTask - actionDescriptionDict.Add(10100, "TuneTask task finished with error!"); - actionDescriptionDict.Add(10101, "TuneTask task was aborted, while not yet completed!"); - } - - string actionDescription = " "; - - if (Action == null || Action.Id == null) - return actionDescription; - - if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) - { - return actionDescription; - } - else - { - return " "; - } - - } - } - } -} - diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_750/Axo_SR_750.cs b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_750/Axo_SR_750.cs index af07a96a4..3147588eb 100644 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_750/Axo_SR_750.cs +++ b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_750/Axo_SR_750.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using System; using System.Collections.Generic; @@ -261,4 +261,315 @@ private void InitializeTaskMessenger() TaskMessenger.DotNetMessengerTextList = messengerTextList; } } + + public partial class Axo_SR_750_Component_Status : AXOpen.Components.Abstractions.AxoComponent_Status + { + Dictionary errorDescriptionDict = new Dictionary(); + Dictionary actionDescriptionDict = new Dictionary(); + + public string ErrorDescription + { + get + { + if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } + if (errorDescriptionDict.Count == 0) + { + errorDescriptionDict.Add(0, " "); + // ClearResultDataTask + errorDescriptionDict.Add(531, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); + errorDescriptionDict.Add(532, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); + errorDescriptionDict.Add(533, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); + errorDescriptionDict.Add(534, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); + errorDescriptionDict.Add(535, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); + errorDescriptionDict.Add(536, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); + errorDescriptionDict.Add(537, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); + // ReadTask + errorDescriptionDict.Add(581, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); + errorDescriptionDict.Add(582, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); + errorDescriptionDict.Add(583, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); + errorDescriptionDict.Add(584, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); + errorDescriptionDict.Add(585, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); + errorDescriptionDict.Add(586, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); + errorDescriptionDict.Add(587, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); + errorDescriptionDict.Add(588, "Waiting for the signal/variable `ParameterBankNumber.BankNumberRegister` to be set to value from 0 to 10 !"); + errorDescriptionDict.Add(589, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be set !"); + errorDescriptionDict.Add(590, "Waiting for the signal/variable `ReadData.ResultDataReadyCount` to be incremented !"); + errorDescriptionDict.Add(591, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); + // TuneTask + errorDescriptionDict.Add(601, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); + errorDescriptionDict.Add(602, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); + errorDescriptionDict.Add(603, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); + errorDescriptionDict.Add(604, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); + errorDescriptionDict.Add(605, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); + errorDescriptionDict.Add(606, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); + errorDescriptionDict.Add(607, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); + errorDescriptionDict.Add(608, "Waiting for the signal/variable `ParameterBankNumber.BankNumberRegister` to be set to value from 0 to 10 !"); + errorDescriptionDict.Add(609, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be set !"); + errorDescriptionDict.Add(610, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); + // General alarms + errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(701, "Input variable `Config.HWIDS.HwID_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); + + errorDescriptionDict.Add(710, "Hw configuration error. Value of Config.HWIDS.HwID_HandshakeAndGeneralErrorStatus is zero."); + errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); + errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); + errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); + errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); + errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); + errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module: 'HandshakeAndGeneralErrorStatus' (GsdId=101)."); + + errorDescriptionDict.Add(720, "Hw configuration error. Value of Config.HWIDS.HwID_BUSY_Status is zero."); + errorDescriptionDict.Add(721, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2."); + errorDescriptionDict.Add(722, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2."); + errorDescriptionDict.Add(723, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2."); + errorDescriptionDict.Add(724, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2."); + errorDescriptionDict.Add(725, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2."); + errorDescriptionDict.Add(726, "Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module: 'BUSY_Status' (GsdId=102)."); + + errorDescriptionDict.Add(730, "Hw configuration error. Value of Config.HWIDS.HwID_CompletionStatus is zero."); + errorDescriptionDict.Add(731, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 3."); + errorDescriptionDict.Add(732, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 3."); + errorDescriptionDict.Add(733, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 3."); + errorDescriptionDict.Add(734, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 3."); + errorDescriptionDict.Add(735, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 3."); + errorDescriptionDict.Add(736, "Hw configuration error: Module with unexpected size or type detected in Slot 3. Expected module: 'CompletionStatus '(GsdId=103)."); + + errorDescriptionDict.Add(740, "Hw configuration error. Value of Config.HWIDS.HwID_ErrorStatus is zero."); + errorDescriptionDict.Add(741, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 4."); + errorDescriptionDict.Add(742, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 4."); + errorDescriptionDict.Add(743, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 4."); + errorDescriptionDict.Add(744, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 4."); + errorDescriptionDict.Add(745, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 4."); + errorDescriptionDict.Add(746, "Hw configuration error: Module with unexpected size or type detected in Slot 4. Expected module: 'ErrorStatus' (GsdId=104)."); + + errorDescriptionDict.Add(750, "Hw configuration error. Value of Config.HWIDS.HwID_TerminalStatus is zero."); + errorDescriptionDict.Add(751, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 5."); + errorDescriptionDict.Add(752, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 5."); + errorDescriptionDict.Add(753, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 5."); + errorDescriptionDict.Add(754, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 5."); + errorDescriptionDict.Add(755, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 5."); + errorDescriptionDict.Add(756, "Hw configuration error: Module with unexpected size or type detected in Slot 5. Expected module: 'TerminalStatus' (GsdId=105)."); + + errorDescriptionDict.Add(760, "Hw configuration error. Value of Config.HWIDS.HwID_UnstableReadStatus is zero."); + errorDescriptionDict.Add(761, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 6."); + errorDescriptionDict.Add(762, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 6."); + errorDescriptionDict.Add(763, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 6."); + errorDescriptionDict.Add(764, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 6."); + errorDescriptionDict.Add(765, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 6."); + errorDescriptionDict.Add(766, "Hw configuration error: Module with unexpected size or type detected in Slot 6. Expected module: 'UnstableReadStatus' (GsdId=106)."); + + errorDescriptionDict.Add(770, "Hw configuration error. Value of Config.HWIDS.HwID_MatchingLevelAndTotalEvaluationGradeStatus is zero."); + errorDescriptionDict.Add(771, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 7."); + errorDescriptionDict.Add(772, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 7."); + errorDescriptionDict.Add(773, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 7."); + errorDescriptionDict.Add(774, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 7."); + errorDescriptionDict.Add(775, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 7."); + errorDescriptionDict.Add(776, "Hw configuration error: Module with unexpected size or type detected in Slot 7. Expected module: 'MatchingLevelAndTotalEvaluationGradeStatus' (GsdId=107)."); + + errorDescriptionDict.Add(780, "Hw configuration error. Value of Config.HWIDS.HwID_OperationalResultStatus is zero."); + errorDescriptionDict.Add(781, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 8."); + errorDescriptionDict.Add(782, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 8."); + errorDescriptionDict.Add(783, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 8."); + errorDescriptionDict.Add(784, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 8."); + errorDescriptionDict.Add(785, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 8."); + errorDescriptionDict.Add(786, "Hw configuration error: Module with unexpected size or type detected in Slot 8. Expected module: 'OperationalResultStatus' (GsdId=108)."); + errorDescriptionDict.Add(790, "Hw configuration error. Value of Config.HWIDS.HwID_ReadData is zero."); + errorDescriptionDict.Add(791, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 9."); + errorDescriptionDict.Add(792, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 9."); + errorDescriptionDict.Add(793, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 9."); + errorDescriptionDict.Add(794, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 9."); + errorDescriptionDict.Add(795, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 9."); + errorDescriptionDict.Add(796, "Hw configuration error: Module with unexpected size or type detected in Slot 9. Expected module: 'Result_Data-32_bytes,Result_Data-64_bytes,Result_Data-128_bytes,Result_Data-246_bytes' (GsdId=109,110,111,112)."); + + errorDescriptionDict.Add(800, "Hw configuration error. Value of Config.HWIDS.HwID_LatchAndErrorClearControlBitReg is zero."); + errorDescriptionDict.Add(801, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 10."); + errorDescriptionDict.Add(802, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 10."); + errorDescriptionDict.Add(803, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 10."); + errorDescriptionDict.Add(804, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 10."); + errorDescriptionDict.Add(805, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 10."); + errorDescriptionDict.Add(806, "Hw configuration error: Module with unexpected size or type detected in Slot 10. Expected module: 'LatchAndErrorClearControlBitReg' (GsdId=201)."); + + errorDescriptionDict.Add(810, "Hw configuration error. Value of Config.HWIDS.HwID_OperationInstructionControl is zero."); + errorDescriptionDict.Add(811, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 11."); + errorDescriptionDict.Add(812, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 11."); + errorDescriptionDict.Add(813, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 11."); + errorDescriptionDict.Add(814, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 11."); + errorDescriptionDict.Add(815, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 11."); + errorDescriptionDict.Add(816, "Hw configuration error: Module with unexpected size or type detected in Slot 11. Expected module: 'OperationInstructionControl' (GsdId=202)."); + + errorDescriptionDict.Add(820, "Hw configuration error. Value of Config.HWIDS.HwID_CompletionClearControl is zero."); + errorDescriptionDict.Add(821, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 12."); + errorDescriptionDict.Add(822, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 12."); + errorDescriptionDict.Add(823, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 12."); + errorDescriptionDict.Add(824, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 12."); + errorDescriptionDict.Add(825, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 12."); + errorDescriptionDict.Add(826, "Hw configuration error: Module with unexpected size or type detected in Slot 12. Expected module: 'CompletionClearControl' (GsdId=203)."); + + errorDescriptionDict.Add(830, "Hw configuration error. Value of Config.HWIDS.HwID_ParameterBankNumber is zero."); + errorDescriptionDict.Add(831, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 13."); + errorDescriptionDict.Add(832, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 13."); + errorDescriptionDict.Add(833, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 13."); + errorDescriptionDict.Add(834, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 13."); + errorDescriptionDict.Add(835, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 13."); + errorDescriptionDict.Add(836, "Hw configuration error: Module with unexpected size or type detected in Slot 13. Expected module: 'ParameterBankNumber' (GsdId=204)."); + + errorDescriptionDict.Add(840, "Hw configuration error. Value of Config.HWIDS.HwID_UserData is zero."); + errorDescriptionDict.Add(841, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 14."); + errorDescriptionDict.Add(842, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 14."); + errorDescriptionDict.Add(843, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 14."); + errorDescriptionDict.Add(844, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 14."); + errorDescriptionDict.Add(845, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 14."); + errorDescriptionDict.Add(846, "Hw configuration error: Module with unexpected size or type detected in Slot 14. Allowed modules: 'User_Data-32_bytes,User_Data-64_bytes,User_Data-128_bytes,User_Data-250_bytes' (GsdId=205,206,207,208)."); + + errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(1131, "Input variable `Config.HWIDS.HwID_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1132, "Input variable `Config.HWIDS.HwID_HandshakeAndGeneralErrorStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1133, "Input variable `Config.HWIDS.HwID_BUSY_Status` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1134, "Input variable `Config.HWIDS.HwID_CompletionStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1135, "Input variable `Config.HWIDS.HwID_ErrorStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1136, "Input variable `Config.HWIDS.HwID_TerminalStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1137, "Input variable `Config.HWIDS.HwID_UnstableReadStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1138, "Input variable `Config.HWIDS.HwID_MatchingLevelAndTotalEvaluationGradeStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1139, "Input variable `Config.HWIDS.HwID_OperationalResultStatus` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1140, "Input variable `Config.HWIDS.HwID_ReadData` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1141, "Input variable `Config.HWIDS.HwID_LatchAndErrorClearControl` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1142, "Input variable `Config.HWIDS.HwID_OperationInstructionControl` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1143, "Input variable `Config.HWIDS.HwID_CompletionClearControl` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1144, "Input variable `Config.HWIDS.HwID_ParameterBankNumber` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1145, "Input variable `Config.HWIDS.HwID_UserData` has invalid value in `Run` method!"); + + errorDescriptionDict.Add(1201, "Error reading the HandshakeAndGeneralErrorStatus!"); + errorDescriptionDict.Add(1202, "Error reading the BUSY_Status!"); + errorDescriptionDict.Add(1203, "Error reading the CompletionStatus!"); + errorDescriptionDict.Add(1204, "Error reading the ErrorStatus!"); + errorDescriptionDict.Add(1205, "Error reading the TerminalStatus!"); + errorDescriptionDict.Add(1206, "Error reading the UnstableReadStatus!"); + errorDescriptionDict.Add(1207, "Error reading the MatchingLevelAndTotalEvaluationGradeStatus!"); + errorDescriptionDict.Add(1208, "Error reading the OperationalResultStatus!"); + errorDescriptionDict.Add(1209, "Error reading the ReadData!"); + errorDescriptionDict.Add(1210, "ResultData has invalid size!"); + + errorDescriptionDict.Add(1231, "Error writing the LatchAndErrorClearControl!"); + errorDescriptionDict.Add(1232, "Error writing the OperationInstructionControl!"); + errorDescriptionDict.Add(1233, "Error writing the CompletionClearControl!"); + errorDescriptionDict.Add(1234, "Error writing the ParameterBankNumber!"); + errorDescriptionDict.Add(1235, "UserData has invalid size!"); + errorDescriptionDict.Add(1236, "Error writing the 32bytes of the UserData!"); + errorDescriptionDict.Add(1237, "Error writing the 64bytes of the UserData!"); + errorDescriptionDict.Add(1238, "Error writing the 128bytes of the UserData!"); + errorDescriptionDict.Add(1239, "Error writing the 250bytes of the UserData!"); + + // ClearResultDataTask; + errorDescriptionDict.Add(10030, "ClearResultDataTask finished with error!"); + errorDescriptionDict.Add(10031, "ClearResultDataTask was aborted, while not yet completed!"); + // ReadTask; + errorDescriptionDict.Add(10080, "ReadTask finished with error!"); + errorDescriptionDict.Add(10081, "ReadTask was aborted, while not yet completed!"); + // TuneTask; + errorDescriptionDict.Add(10100, "TuneTask task finished with error!"); + errorDescriptionDict.Add(10101, "TuneTask task was aborted, while not yet completed!"); + + } + string errorDescription = " "; + + if (Error == null || Error.Id == null) + return errorDescription; + + if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) + { + return errorDescription; + } + else + + { + return " "; + } + } + } + + public string ActionDescription + { + get + { + if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } + if (actionDescriptionDict.Count == 0) + { + actionDescriptionDict.Add(0, " "); + actionDescriptionDict.Add(50, "Restore has been executed."); + + // ClearResultDataTask + actionDescriptionDict.Add(130, "ClearResultDataTask started."); + actionDescriptionDict.Add(330, "ClearResultDataTask running: reseting the outputs."); + actionDescriptionDict.Add(331, "ClearResultDataTask running: reseting the error flag."); + actionDescriptionDict.Add(332, "ClearResultDataTask running: reseting the read complete flag."); + actionDescriptionDict.Add(333, "ClearResultDataTask running: reseting the preset complete flag."); + actionDescriptionDict.Add(334, "ClearResultDataTask running: reseting the register preset data complete flag."); + actionDescriptionDict.Add(335, "ClearResultDataTask running: reseting the tune complete flag."); + actionDescriptionDict.Add(336, "ClearResultDataTask running: reseting the external request complete flag."); + actionDescriptionDict.Add(337, "ClearResultDataTask running: waiting for the general error flag is reseted."); + actionDescriptionDict.Add(338, "ClearResultDataTask finished."); + actionDescriptionDict.Add(131, "ClearResultDataTask finished succesfully."); + actionDescriptionDict.Add(132, "ClearResultDataTask restored."); + // ReadTask + actionDescriptionDict.Add(180, "ReadTask started."); + actionDescriptionDict.Add(380, "ReadTask running: reseting the outputs."); + actionDescriptionDict.Add(381, "ReadTask running: reseting the error flag."); + actionDescriptionDict.Add(382, "ReadTask running: reseting the read complete flag."); + actionDescriptionDict.Add(383, "ReadTask running: reseting the preset complete flag."); + actionDescriptionDict.Add(384, "ReadTask running: reseting the register preset data complete flag."); + actionDescriptionDict.Add(385, "ReadTask running: reseting the tune complete flag."); + actionDescriptionDict.Add(386, "ReadTask running: reseting the external request complete flag."); + actionDescriptionDict.Add(387, "ReadTask running: waiting for the general error flag is reseted."); + actionDescriptionDict.Add(388, "ReadTask running: setting bank number."); + actionDescriptionDict.Add(389, "ReadTask running: starting trigger."); + actionDescriptionDict.Add(390, "ReadTask running: waiting for the result data."); + actionDescriptionDict.Add(391, "ReadTask running: acknowledging results."); + actionDescriptionDict.Add(392, "ReadTask finished."); + actionDescriptionDict.Add(181, "ReadTask finished succesfully."); + actionDescriptionDict.Add(182, "ReadTask restored."); + // TuneTask + actionDescriptionDict.Add(200, "TuneTask started."); + actionDescriptionDict.Add(400, "TuneTask running: reseting the outputs."); + actionDescriptionDict.Add(401, "TuneTask running: reseting the error flag."); + actionDescriptionDict.Add(402, "TuneTask running: reseting the read complete flag."); + actionDescriptionDict.Add(403, "TuneTask running: reseting the preset complete flag."); + actionDescriptionDict.Add(404, "TuneTask running: reseting the register preset data complete flag."); + actionDescriptionDict.Add(405, "TuneTask running: reseting the tune complete flag."); + actionDescriptionDict.Add(406, "TuneTask running: reseting the external request complete flag."); + actionDescriptionDict.Add(407, "TuneTask running: waiting for the general error flag is reseted."); + actionDescriptionDict.Add(408, "TuneTask running: setting bank number."); + actionDescriptionDict.Add(409, "TuneTask running: starting the tunning process."); + actionDescriptionDict.Add(410, "TuneTask running: acknowledging the tunning process."); + actionDescriptionDict.Add(411, "TuneTask finished."); + actionDescriptionDict.Add(201, "TuneTask finished succesfully."); + actionDescriptionDict.Add(202, "TuneTask restored."); + // ClearResultDataTask + actionDescriptionDict.Add(10030, "ClearResultDataTask finished with error!"); + actionDescriptionDict.Add(10031, "ClearResultDataTask was aborted, while not yet completed!"); + // ReadTask + actionDescriptionDict.Add(10080, "ReadTask task finished with error!"); + actionDescriptionDict.Add(10081, "ReadTask task was aborted, while not yet completed!"); + // TuneTask + actionDescriptionDict.Add(10100, "TuneTask task finished with error!"); + actionDescriptionDict.Add(10101, "TuneTask task was aborted, while not yet completed!"); + } + + string actionDescription = " "; + + if (Action == null || Action.Id == null) + return actionDescription; + + if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) + { + return actionDescription; + } + else + { + return " "; + } + + } + } + } } diff --git a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_750_Component_Status/Axo_SR_750_Component_Status.cs b/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_750_Component_Status/Axo_SR_750_Component_Status.cs deleted file mode 100644 index e26fe2519..000000000 --- a/src/components.keyence.vision/src/AXOpen.Components.Keyence.Vision/Axo_SR_750_Component_Status/Axo_SR_750_Component_Status.cs +++ /dev/null @@ -1,323 +0,0 @@ -using AXOpen.Messaging.Static; -using System; -using System.Collections.Generic; -using System.Diagnostics; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace AXOpen.Components.Keyence.Vision -{ - - public partial class Axo_SR_750_Component_Status : AXOpen.Components.Abstractions.AxoComponent_Status - { - Dictionary errorDescriptionDict = new Dictionary(); - Dictionary actionDescriptionDict = new Dictionary(); - - public string ErrorDescription - { - get - { - if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } - if (errorDescriptionDict.Count == 0) - { - errorDescriptionDict.Add(0, " "); - // ClearResultDataTask - errorDescriptionDict.Add(531, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); - errorDescriptionDict.Add(532, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); - errorDescriptionDict.Add(533, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); - errorDescriptionDict.Add(534, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); - errorDescriptionDict.Add(535, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); - errorDescriptionDict.Add(536, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); - errorDescriptionDict.Add(537, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); - // ReadTask - errorDescriptionDict.Add(581, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); - errorDescriptionDict.Add(582, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); - errorDescriptionDict.Add(583, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); - errorDescriptionDict.Add(584, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); - errorDescriptionDict.Add(585, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); - errorDescriptionDict.Add(586, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); - errorDescriptionDict.Add(587, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); - errorDescriptionDict.Add(588, "Waiting for the signal/variable `ParameterBankNumber.BankNumberRegister` to be set to value from 0 to 10 !"); - errorDescriptionDict.Add(589, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be set !"); - errorDescriptionDict.Add(590, "Waiting for the signal/variable `ReadData.ResultDataReadyCount` to be incremented !"); - errorDescriptionDict.Add(591, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); - // TuneTask - errorDescriptionDict.Add(601, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.Error` to be reseted !"); - errorDescriptionDict.Add(602, "Waiting for the signal/variable `CompletionStatus.ReadComplete` to be reseted !"); - errorDescriptionDict.Add(603, "Waiting for the signal/variable `CompletionStatus.PresetComplete` to be reseted !"); - errorDescriptionDict.Add(604, "Waiting for the signal/variable `CompletionStatus.RegisterPresetDataComplete` to be reseted !"); - errorDescriptionDict.Add(605, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); - errorDescriptionDict.Add(606, "Waiting for the signal/variable `CompletionStatus.EXT_RequestComplete` to be reseted !"); - errorDescriptionDict.Add(607, "Waiting for the signal/variable `HandshakeAndGeneralErrorStatus.GeneralError` to be reseted !"); - errorDescriptionDict.Add(608, "Waiting for the signal/variable `ParameterBankNumber.BankNumberRegister` to be set to value from 0 to 10 !"); - errorDescriptionDict.Add(609, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be set !"); - errorDescriptionDict.Add(610, "Waiting for the signal/variable `CompletionStatus.TuneComplete` to be reseted !"); - // General alarms - errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); - errorDescriptionDict.Add(701, "Input variable `Config.HWIDS.HwID_Device` has invalid value in `Run` method!"); - errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); - - errorDescriptionDict.Add(710, "Hw configuration error. Value of Config.HWIDS.HwID_HandshakeAndGeneralErrorStatus is zero."); - errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); - errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); - errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); - errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); - errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); - errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module: 'HandshakeAndGeneralErrorStatus' (GsdId=101)."); - - errorDescriptionDict.Add(720, "Hw configuration error. Value of Config.HWIDS.HwID_BUSY_Status is zero."); - errorDescriptionDict.Add(721, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2."); - errorDescriptionDict.Add(722, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2."); - errorDescriptionDict.Add(723, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2."); - errorDescriptionDict.Add(724, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2."); - errorDescriptionDict.Add(725, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2."); - errorDescriptionDict.Add(726, "Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module: 'BUSY_Status' (GsdId=102)."); - - errorDescriptionDict.Add(730, "Hw configuration error. Value of Config.HWIDS.HwID_CompletionStatus is zero."); - errorDescriptionDict.Add(731, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 3."); - errorDescriptionDict.Add(732, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 3."); - errorDescriptionDict.Add(733, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 3."); - errorDescriptionDict.Add(734, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 3."); - errorDescriptionDict.Add(735, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 3."); - errorDescriptionDict.Add(736, "Hw configuration error: Module with unexpected size or type detected in Slot 3. Expected module: 'CompletionStatus '(GsdId=103)."); - - errorDescriptionDict.Add(740, "Hw configuration error. Value of Config.HWIDS.HwID_ErrorStatus is zero."); - errorDescriptionDict.Add(741, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 4."); - errorDescriptionDict.Add(742, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 4."); - errorDescriptionDict.Add(743, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 4."); - errorDescriptionDict.Add(744, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 4."); - errorDescriptionDict.Add(745, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 4."); - errorDescriptionDict.Add(746, "Hw configuration error: Module with unexpected size or type detected in Slot 4. Expected module: 'ErrorStatus' (GsdId=104)."); - - errorDescriptionDict.Add(750, "Hw configuration error. Value of Config.HWIDS.HwID_TerminalStatus is zero."); - errorDescriptionDict.Add(751, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 5."); - errorDescriptionDict.Add(752, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 5."); - errorDescriptionDict.Add(753, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 5."); - errorDescriptionDict.Add(754, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 5."); - errorDescriptionDict.Add(755, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 5."); - errorDescriptionDict.Add(756, "Hw configuration error: Module with unexpected size or type detected in Slot 5. Expected module: 'TerminalStatus' (GsdId=105)."); - - errorDescriptionDict.Add(760, "Hw configuration error. Value of Config.HWIDS.HwID_UnstableReadStatus is zero."); - errorDescriptionDict.Add(761, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 6."); - errorDescriptionDict.Add(762, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 6."); - errorDescriptionDict.Add(763, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 6."); - errorDescriptionDict.Add(764, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 6."); - errorDescriptionDict.Add(765, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 6."); - errorDescriptionDict.Add(766, "Hw configuration error: Module with unexpected size or type detected in Slot 6. Expected module: 'UnstableReadStatus' (GsdId=106)."); - - errorDescriptionDict.Add(770, "Hw configuration error. Value of Config.HWIDS.HwID_MatchingLevelAndTotalEvaluationGradeStatus is zero."); - errorDescriptionDict.Add(771, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 7."); - errorDescriptionDict.Add(772, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 7."); - errorDescriptionDict.Add(773, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 7."); - errorDescriptionDict.Add(774, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 7."); - errorDescriptionDict.Add(775, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 7."); - errorDescriptionDict.Add(776, "Hw configuration error: Module with unexpected size or type detected in Slot 7. Expected module: 'MatchingLevelAndTotalEvaluationGradeStatus' (GsdId=107)."); - - errorDescriptionDict.Add(780, "Hw configuration error. Value of Config.HWIDS.HwID_OperationalResultStatus is zero."); - errorDescriptionDict.Add(781, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 8."); - errorDescriptionDict.Add(782, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 8."); - errorDescriptionDict.Add(783, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 8."); - errorDescriptionDict.Add(784, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 8."); - errorDescriptionDict.Add(785, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 8."); - errorDescriptionDict.Add(786, "Hw configuration error: Module with unexpected size or type detected in Slot 8. Expected module: 'OperationalResultStatus' (GsdId=108)."); - errorDescriptionDict.Add(790, "Hw configuration error. Value of Config.HWIDS.HwID_ReadData is zero."); - errorDescriptionDict.Add(791, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 9."); - errorDescriptionDict.Add(792, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 9."); - errorDescriptionDict.Add(793, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 9."); - errorDescriptionDict.Add(794, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 9."); - errorDescriptionDict.Add(795, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 9."); - errorDescriptionDict.Add(796, "Hw configuration error: Module with unexpected size or type detected in Slot 9. Expected module: 'Result_Data-32_bytes,Result_Data-64_bytes,Result_Data-128_bytes,Result_Data-246_bytes' (GsdId=109,110,111,112)."); - - errorDescriptionDict.Add(800, "Hw configuration error. Value of Config.HWIDS.HwID_LatchAndErrorClearControlBitReg is zero."); - errorDescriptionDict.Add(801, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 10."); - errorDescriptionDict.Add(802, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 10."); - errorDescriptionDict.Add(803, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 10."); - errorDescriptionDict.Add(804, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 10."); - errorDescriptionDict.Add(805, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 10."); - errorDescriptionDict.Add(806, "Hw configuration error: Module with unexpected size or type detected in Slot 10. Expected module: 'LatchAndErrorClearControlBitReg' (GsdId=201)."); - - errorDescriptionDict.Add(810, "Hw configuration error. Value of Config.HWIDS.HwID_OperationInstructionControl is zero."); - errorDescriptionDict.Add(811, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 11."); - errorDescriptionDict.Add(812, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 11."); - errorDescriptionDict.Add(813, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 11."); - errorDescriptionDict.Add(814, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 11."); - errorDescriptionDict.Add(815, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 11."); - errorDescriptionDict.Add(816, "Hw configuration error: Module with unexpected size or type detected in Slot 11. Expected module: 'OperationInstructionControl' (GsdId=202)."); - - errorDescriptionDict.Add(820, "Hw configuration error. Value of Config.HWIDS.HwID_CompletionClearControl is zero."); - errorDescriptionDict.Add(821, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 12."); - errorDescriptionDict.Add(822, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 12."); - errorDescriptionDict.Add(823, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 12."); - errorDescriptionDict.Add(824, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 12."); - errorDescriptionDict.Add(825, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 12."); - errorDescriptionDict.Add(826, "Hw configuration error: Module with unexpected size or type detected in Slot 12. Expected module: 'CompletionClearControl' (GsdId=203)."); - - errorDescriptionDict.Add(830, "Hw configuration error. Value of Config.HWIDS.HwID_ParameterBankNumber is zero."); - errorDescriptionDict.Add(831, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 13."); - errorDescriptionDict.Add(832, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 13."); - errorDescriptionDict.Add(833, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 13."); - errorDescriptionDict.Add(834, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 13."); - errorDescriptionDict.Add(835, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 13."); - errorDescriptionDict.Add(836, "Hw configuration error: Module with unexpected size or type detected in Slot 13. Expected module: 'ParameterBankNumber' (GsdId=204)."); - - errorDescriptionDict.Add(840, "Hw configuration error. Value of Config.HWIDS.HwID_UserData is zero."); - errorDescriptionDict.Add(841, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 14."); - errorDescriptionDict.Add(842, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 14."); - errorDescriptionDict.Add(843, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 14."); - errorDescriptionDict.Add(844, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 14."); - errorDescriptionDict.Add(845, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 14."); - errorDescriptionDict.Add(846, "Hw configuration error: Module with unexpected size or type detected in Slot 14. Allowed modules: 'User_Data-32_bytes,User_Data-64_bytes,User_Data-128_bytes,User_Data-250_bytes' (GsdId=205,206,207,208)."); - - errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); - errorDescriptionDict.Add(1131, "Input variable `Config.HWIDS.HwID_Device` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1132, "Input variable `Config.HWIDS.HwID_HandshakeAndGeneralErrorStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1133, "Input variable `Config.HWIDS.HwID_BUSY_Status` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1134, "Input variable `Config.HWIDS.HwID_CompletionStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1135, "Input variable `Config.HWIDS.HwID_ErrorStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1136, "Input variable `Config.HWIDS.HwID_TerminalStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1137, "Input variable `Config.HWIDS.HwID_UnstableReadStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1138, "Input variable `Config.HWIDS.HwID_MatchingLevelAndTotalEvaluationGradeStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1139, "Input variable `Config.HWIDS.HwID_OperationalResultStatus` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1140, "Input variable `Config.HWIDS.HwID_ReadData` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1141, "Input variable `Config.HWIDS.HwID_LatchAndErrorClearControl` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1142, "Input variable `Config.HWIDS.HwID_OperationInstructionControl` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1143, "Input variable `Config.HWIDS.HwID_CompletionClearControl` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1144, "Input variable `Config.HWIDS.HwID_ParameterBankNumber` has invalid value in `Run` method!"); - errorDescriptionDict.Add(1145, "Input variable `Config.HWIDS.HwID_UserData` has invalid value in `Run` method!"); - - errorDescriptionDict.Add(1201, "Error reading the HandshakeAndGeneralErrorStatus!"); - errorDescriptionDict.Add(1202, "Error reading the BUSY_Status!"); - errorDescriptionDict.Add(1203, "Error reading the CompletionStatus!"); - errorDescriptionDict.Add(1204, "Error reading the ErrorStatus!"); - errorDescriptionDict.Add(1205, "Error reading the TerminalStatus!"); - errorDescriptionDict.Add(1206, "Error reading the UnstableReadStatus!"); - errorDescriptionDict.Add(1207, "Error reading the MatchingLevelAndTotalEvaluationGradeStatus!"); - errorDescriptionDict.Add(1208, "Error reading the OperationalResultStatus!"); - errorDescriptionDict.Add(1209, "Error reading the ReadData!"); - errorDescriptionDict.Add(1210, "ResultData has invalid size!"); - - errorDescriptionDict.Add(1231, "Error writing the LatchAndErrorClearControl!"); - errorDescriptionDict.Add(1232, "Error writing the OperationInstructionControl!"); - errorDescriptionDict.Add(1233, "Error writing the CompletionClearControl!"); - errorDescriptionDict.Add(1234, "Error writing the ParameterBankNumber!"); - errorDescriptionDict.Add(1235, "UserData has invalid size!"); - errorDescriptionDict.Add(1236, "Error writing the 32bytes of the UserData!"); - errorDescriptionDict.Add(1237, "Error writing the 64bytes of the UserData!"); - errorDescriptionDict.Add(1238, "Error writing the 128bytes of the UserData!"); - errorDescriptionDict.Add(1239, "Error writing the 250bytes of the UserData!"); - - // ClearResultDataTask; - errorDescriptionDict.Add(10030, "ClearResultDataTask finished with error!"); - errorDescriptionDict.Add(10031, "ClearResultDataTask was aborted, while not yet completed!"); - // ReadTask; - errorDescriptionDict.Add(10080, "ReadTask finished with error!"); - errorDescriptionDict.Add(10081, "ReadTask was aborted, while not yet completed!"); - // TuneTask; - errorDescriptionDict.Add(10100, "TuneTask task finished with error!"); - errorDescriptionDict.Add(10101, "TuneTask task was aborted, while not yet completed!"); - - } - string errorDescription = " "; - - if (Error == null || Error.Id == null) - return errorDescription; - - if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) - { - return errorDescription; - } - else - - { - return " "; - } - } - } - - public string ActionDescription - { - get - { - if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } - if (actionDescriptionDict.Count == 0) - { - actionDescriptionDict.Add(0, " "); - actionDescriptionDict.Add(50, "Restore has been executed."); - - // ClearResultDataTask - actionDescriptionDict.Add(130, "ClearResultDataTask started."); - actionDescriptionDict.Add(330, "ClearResultDataTask running: reseting the outputs."); - actionDescriptionDict.Add(331, "ClearResultDataTask running: reseting the error flag."); - actionDescriptionDict.Add(332, "ClearResultDataTask running: reseting the read complete flag."); - actionDescriptionDict.Add(333, "ClearResultDataTask running: reseting the preset complete flag."); - actionDescriptionDict.Add(334, "ClearResultDataTask running: reseting the register preset data complete flag."); - actionDescriptionDict.Add(335, "ClearResultDataTask running: reseting the tune complete flag."); - actionDescriptionDict.Add(336, "ClearResultDataTask running: reseting the external request complete flag."); - actionDescriptionDict.Add(337, "ClearResultDataTask running: waiting for the general error flag is reseted."); - actionDescriptionDict.Add(338, "ClearResultDataTask finished."); - actionDescriptionDict.Add(131, "ClearResultDataTask finished succesfully."); - actionDescriptionDict.Add(132, "ClearResultDataTask restored."); - // ReadTask - actionDescriptionDict.Add(180, "ReadTask started."); - actionDescriptionDict.Add(380, "ReadTask running: reseting the outputs."); - actionDescriptionDict.Add(381, "ReadTask running: reseting the error flag."); - actionDescriptionDict.Add(382, "ReadTask running: reseting the read complete flag."); - actionDescriptionDict.Add(383, "ReadTask running: reseting the preset complete flag."); - actionDescriptionDict.Add(384, "ReadTask running: reseting the register preset data complete flag."); - actionDescriptionDict.Add(385, "ReadTask running: reseting the tune complete flag."); - actionDescriptionDict.Add(386, "ReadTask running: reseting the external request complete flag."); - actionDescriptionDict.Add(387, "ReadTask running: waiting for the general error flag is reseted."); - actionDescriptionDict.Add(388, "ReadTask running: setting bank number."); - actionDescriptionDict.Add(389, "ReadTask running: starting trigger."); - actionDescriptionDict.Add(390, "ReadTask running: waiting for the result data."); - actionDescriptionDict.Add(391, "ReadTask running: acknowledging results."); - actionDescriptionDict.Add(392, "ReadTask finished."); - actionDescriptionDict.Add(181, "ReadTask finished succesfully."); - actionDescriptionDict.Add(182, "ReadTask restored."); - // TuneTask - actionDescriptionDict.Add(200, "TuneTask started."); - actionDescriptionDict.Add(400, "TuneTask running: reseting the outputs."); - actionDescriptionDict.Add(401, "TuneTask running: reseting the error flag."); - actionDescriptionDict.Add(402, "TuneTask running: reseting the read complete flag."); - actionDescriptionDict.Add(403, "TuneTask running: reseting the preset complete flag."); - actionDescriptionDict.Add(404, "TuneTask running: reseting the register preset data complete flag."); - actionDescriptionDict.Add(405, "TuneTask running: reseting the tune complete flag."); - actionDescriptionDict.Add(406, "TuneTask running: reseting the external request complete flag."); - actionDescriptionDict.Add(407, "TuneTask running: waiting for the general error flag is reseted."); - actionDescriptionDict.Add(408, "TuneTask running: setting bank number."); - actionDescriptionDict.Add(409, "TuneTask running: starting the tunning process."); - actionDescriptionDict.Add(410, "TuneTask running: acknowledging the tunning process."); - actionDescriptionDict.Add(411, "TuneTask finished."); - actionDescriptionDict.Add(201, "TuneTask finished succesfully."); - actionDescriptionDict.Add(202, "TuneTask restored."); - // ClearResultDataTask - actionDescriptionDict.Add(10030, "ClearResultDataTask finished with error!"); - actionDescriptionDict.Add(10031, "ClearResultDataTask was aborted, while not yet completed!"); - // ReadTask - actionDescriptionDict.Add(10080, "ReadTask task finished with error!"); - actionDescriptionDict.Add(10081, "ReadTask task was aborted, while not yet completed!"); - // TuneTask - actionDescriptionDict.Add(10100, "TuneTask task finished with error!"); - actionDescriptionDict.Add(10101, "TuneTask task was aborted, while not yet completed!"); - } - - string actionDescription = " "; - - if (Action == null || Action.Id == null) - return actionDescription; - - if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) - { - return actionDescription; - } - else - { - return " "; - } - - } - } - } -} - diff --git a/src/components.kuka.robotics/components.kuka.robotics.code-workspace b/src/components.kuka.robotics/components.kuka.robotics.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.kuka.robotics/components.kuka.robotics.code-workspace +++ b/src/components.kuka.robotics/components.kuka.robotics.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.kuka.robotics/components.kuka.robotics.sln b/src/components.kuka.robotics/components.kuka.robotics.sln index 98fe64ad4..90e2c3751 100644 --- a/src/components.kuka.robotics/components.kuka.robotics.sln +++ b/src/components.kuka.robotics/components.kuka.robotics.sln @@ -1,46 +1,34 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{37E0E3A3-CD87-43FF-ACF7-6054B1AE40CB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{C901DF2B-C5A9-4580-94FF-7B7ECCC5B9C0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{7D087DAC-9E72-4E43-94AB-61A09F91629D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{155DE2EB-C261-4958-95C7-0ED17B67C9CC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Kuka.Robotics.blazorapp", "app\ix-blazor\AXOpen.Components.Kuka.Robotics.blazorapp.csproj", "{F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_kuka_robotics", "app\ix\app_axopen_components_kuka_robotics.csproj", "{AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Kuka.Robotics.blazor", "src\AXOpen.Components.Kuka.Robotics.blazor\AXOpen.Components.Kuka.Robotics.blazor.csproj", "{87C5CC3C-9C0B-443B-90CE-4AB787DA572A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_kuka_robotics", "src\AXOpen.Components.Kuka.Robotics\inxton_axopen_components_kuka_robotics.csproj", "{A2D91CB5-668D-432D-95C2-77DE8F933036}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Kuka.Robotics_tests", "tests\AXOpen.Components.Kuka.Robotics.Tests\AXOpen.Components.Kuka.Robotics_tests.csproj", "{4295C961-68C2-461E-838C-08BBC6577B67}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor\AXOpen.Components.Robotics.blazor.csproj", "{9C66CD3E-1475-4F97-BDEB-506843315993}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{9395148E-CFE2-45EC-BF3E-7279DCBB76CB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\core\src\AXOpen.Core.Blazor\axopen_core_blazor.csproj", "{80CFF45D-20F0-480E-8BEC-30A9AA0ADA1A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{C87B881A-6D67-4920-94B4-6C418103EBD1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{2F218921-3050-4C99-AB31-D4CAC192B961}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{1153E2DF-D269-4AA8-9DA9-99A4C68884B5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{A4A2EB3C-0676-44C5-87F6-0513A4EC9C79}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{38215361-E804-4BE0-A2FB-1193C57F9EB2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{F72F2A82-AFB8-40DB-9D40-E342B06E8E18}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{293A159E-CB1D-4976-95CD-BD48D5F42926}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{403C634D-E6B4-438B-A4E2-F53D1C58CAC8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{D84A3926-80EB-47AB-82A2-98BD7CFC135D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{E6BE7D1A-DB5D-495F-8D42-58A4F381E79E}" @@ -55,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{502E287D-A3DD-4E9F-8DC9-0570DBCAA578}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{B01C7AF9-7EA8-45E5-B7BA-6E69DFFBFFFC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{A31C4EF3-DCCB-4490-B926-743760D0E376}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{55C68540-B26E-4535-97C3-9812E211F02F}" @@ -69,12 +55,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{8F708FE4-96C1-4F97-8B2C-ECC1AA3E724E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{696C0508-07FE-4D1B-8B3C-F106CC78E453}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{CF1C752D-8E4A-43B8-AF41-4C67CAD0FD1D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{31D37E17-689A-4743-923E-646CF07BFA31}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Kuka.Robotics.blazor", "src\AXOpen.Components.Kuka.Robotics.blazor", "{6349A998-0DDA-4504-A4EA-D54CC8989A91}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Kuka.Robotics", "src\AXOpen.Components.Kuka.Robotics", "{BA1F304C-AA85-4E1E-A406-C6FB60C1B484}" @@ -87,6 +67,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EE57CC4A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.kuka.robotics", "..\components.kuka.robotics", "{46A89015-B868-47B5-B04C-7E11DFD255EE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor", "{580AD2EF-DA37-49B4-9C5D-178BBA93AEEE}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics", "..\components.robotics\src\AXOpen.Components.Robotics", "{D9A8289F-55D4-45B0-B0B5-46CF8CC19AA2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.robotics\src", "{AB8F7C60-3798-49C5-8F49-E291DE77EB65}" @@ -101,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{9169 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{E4610F0C-7A96-4397-B058-EE71D365233A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{1E5DB742-0215-4F52-9000-89D7AF21D519}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{C08B8DD0-717A-49E6-8D4C-4DF2EB9FA1E3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{C8E64BCD-81C3-4B13-A2DA-9E2AECCCC3CE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{DE97C4FC-77CE-4822-86BB-A82D33AFD997}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{805B503B-50D5-4AAE-9689-3B3875D1CC88}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{144B038C-E8CD-433A-A2EB-C131E2435209}" @@ -123,20 +97,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{A9F65503-48DB-4884-B777-D8D23D475FE5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{7ED296FA-0F45-4E9C-895D-88B921EBE148}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{CF75B87F-3DB1-4850-AA75-3590E4D596C8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{DEFCE7F5-86CD-46F5-AB7F-7906F79C47A6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{9532C930-A53C-4320-9D79-1C81C8DF8617}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{6EC825CC-B581-4F2F-8941-3D7BCF9CE4BA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{01A0BD70-70FA-4448-8F4C-CC0B82197D46}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{06031F02-5EB9-4BB6-AF70-6CD47E633249}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{DA6DFB9F-1159-4539-A7E0-683E48AF03B8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{A0D43580-1560-4FFA-8603-5021DEF92E66}" @@ -171,10 +131,6 @@ Global {7D087DAC-9E72-4E43-94AB-61A09F91629D}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D087DAC-9E72-4E43-94AB-61A09F91629D}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D087DAC-9E72-4E43-94AB-61A09F91629D}.Release|Any CPU.Build.0 = Release|Any CPU - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}.Release|Any CPU.Build.0 = Release|Any CPU {155DE2EB-C261-4958-95C7-0ED17B67C9CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {155DE2EB-C261-4958-95C7-0ED17B67C9CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {155DE2EB-C261-4958-95C7-0ED17B67C9CC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -183,14 +139,6 @@ Global {A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30}.Release|Any CPU.Build.0 = Release|Any CPU - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}.Release|Any CPU.Build.0 = Release|Any CPU - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}.Release|Any CPU.Build.0 = Release|Any CPU {87C5CC3C-9C0B-443B-90CE-4AB787DA572A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {87C5CC3C-9C0B-443B-90CE-4AB787DA572A}.Debug|Any CPU.Build.0 = Debug|Any CPU {87C5CC3C-9C0B-443B-90CE-4AB787DA572A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -203,6 +151,10 @@ Global {4295C961-68C2-461E-838C-08BBC6577B67}.Debug|Any CPU.Build.0 = Debug|Any CPU {4295C961-68C2-461E-838C-08BBC6577B67}.Release|Any CPU.ActiveCfg = Release|Any CPU {4295C961-68C2-461E-838C-08BBC6577B67}.Release|Any CPU.Build.0 = Release|Any CPU + {9C66CD3E-1475-4F97-BDEB-506843315993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C66CD3E-1475-4F97-BDEB-506843315993}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C66CD3E-1475-4F97-BDEB-506843315993}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C66CD3E-1475-4F97-BDEB-506843315993}.Release|Any CPU.Build.0 = Release|Any CPU {9395148E-CFE2-45EC-BF3E-7279DCBB76CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9395148E-CFE2-45EC-BF3E-7279DCBB76CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {9395148E-CFE2-45EC-BF3E-7279DCBB76CB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -215,10 +167,6 @@ Global {C87B881A-6D67-4920-94B4-6C418103EBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU {C87B881A-6D67-4920-94B4-6C418103EBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {C87B881A-6D67-4920-94B4-6C418103EBD1}.Release|Any CPU.Build.0 = Release|Any CPU - {2F218921-3050-4C99-AB31-D4CAC192B961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F218921-3050-4C99-AB31-D4CAC192B961}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F218921-3050-4C99-AB31-D4CAC192B961}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F218921-3050-4C99-AB31-D4CAC192B961}.Release|Any CPU.Build.0 = Release|Any CPU {1153E2DF-D269-4AA8-9DA9-99A4C68884B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1153E2DF-D269-4AA8-9DA9-99A4C68884B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {1153E2DF-D269-4AA8-9DA9-99A4C68884B5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -231,18 +179,6 @@ Global {38215361-E804-4BE0-A2FB-1193C57F9EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU {38215361-E804-4BE0-A2FB-1193C57F9EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU {38215361-E804-4BE0-A2FB-1193C57F9EB2}.Release|Any CPU.Build.0 = Release|Any CPU - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18}.Release|Any CPU.Build.0 = Release|Any CPU - {293A159E-CB1D-4976-95CD-BD48D5F42926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {293A159E-CB1D-4976-95CD-BD48D5F42926}.Debug|Any CPU.Build.0 = Debug|Any CPU - {293A159E-CB1D-4976-95CD-BD48D5F42926}.Release|Any CPU.ActiveCfg = Release|Any CPU - {293A159E-CB1D-4976-95CD-BD48D5F42926}.Release|Any CPU.Build.0 = Release|Any CPU - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8}.Release|Any CPU.Build.0 = Release|Any CPU {D84A3926-80EB-47AB-82A2-98BD7CFC135D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D84A3926-80EB-47AB-82A2-98BD7CFC135D}.Debug|Any CPU.Build.0 = Debug|Any CPU {D84A3926-80EB-47AB-82A2-98BD7CFC135D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -265,19 +201,12 @@ Global {F44955B8-A5DA-4A21-8C08-8698882F09C8} = {82D532EF-6FE7-4365-82A3-AF7331716C34} {7D087DAC-9E72-4E43-94AB-61A09F91629D} = {502E287D-A3DD-4E9F-8DC9-0570DBCAA578} {502E287D-A3DD-4E9F-8DC9-0570DBCAA578} = {55C68540-B26E-4535-97C3-9812E211F02F} - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B} = {B01C7AF9-7EA8-45E5-B7BA-6E69DFFBFFFC} - {B01C7AF9-7EA8-45E5-B7BA-6E69DFFBFFFC} = {55C68540-B26E-4535-97C3-9812E211F02F} {155DE2EB-C261-4958-95C7-0ED17B67C9CC} = {A31C4EF3-DCCB-4490-B926-743760D0E376} {A31C4EF3-DCCB-4490-B926-743760D0E376} = {55C68540-B26E-4535-97C3-9812E211F02F} {55C68540-B26E-4535-97C3-9812E211F02F} = {9D2394B0-E3E4-48C8-B6FC-6694DC359AC5} {A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30} = {DDCF7058-D363-4C6A-A899-0D207F5322CF} {DDCF7058-D363-4C6A-A899-0D207F5322CF} = {21C1FF68-9BBB-44E3-940B-59D7B3B4FAFF} {21C1FF68-9BBB-44E3-940B-59D7B3B4FAFF} = {8F708FE4-96C1-4F97-8B2C-ECC1AA3E724E} - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1} = {696C0508-07FE-4D1B-8B3C-F106CC78E453} - {696C0508-07FE-4D1B-8B3C-F106CC78E453} = {31D37E17-689A-4743-923E-646CF07BFA31} - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3} = {CF1C752D-8E4A-43B8-AF41-4C67CAD0FD1D} - {CF1C752D-8E4A-43B8-AF41-4C67CAD0FD1D} = {31D37E17-689A-4743-923E-646CF07BFA31} - {31D37E17-689A-4743-923E-646CF07BFA31} = {46A89015-B868-47B5-B04C-7E11DFD255EE} {87C5CC3C-9C0B-443B-90CE-4AB787DA572A} = {6349A998-0DDA-4504-A4EA-D54CC8989A91} {6349A998-0DDA-4504-A4EA-D54CC8989A91} = {E6CAA9EB-9020-4794-86AC-9197788897B7} {A2D91CB5-668D-432D-95C2-77DE8F933036} = {BA1F304C-AA85-4E1E-A406-C6FB60C1B484} @@ -286,6 +215,8 @@ Global {4295C961-68C2-461E-838C-08BBC6577B67} = {DC1EA5C9-514F-43B4-895B-B77B0E75A2E4} {DC1EA5C9-514F-43B4-895B-B77B0E75A2E4} = {EE57CC4A-9127-49E2-A9B9-F9EFAF174B53} {EE57CC4A-9127-49E2-A9B9-F9EFAF174B53} = {46A89015-B868-47B5-B04C-7E11DFD255EE} + {9C66CD3E-1475-4F97-BDEB-506843315993} = {580AD2EF-DA37-49B4-9C5D-178BBA93AEEE} + {580AD2EF-DA37-49B4-9C5D-178BBA93AEEE} = {AB8F7C60-3798-49C5-8F49-E291DE77EB65} {9395148E-CFE2-45EC-BF3E-7279DCBB76CB} = {D9A8289F-55D4-45B0-B0B5-46CF8CC19AA2} {D9A8289F-55D4-45B0-B0B5-46CF8CC19AA2} = {AB8F7C60-3798-49C5-8F49-E291DE77EB65} {AB8F7C60-3798-49C5-8F49-E291DE77EB65} = {0074C36A-1DE8-4E8B-9AEC-C132CCB7BB3E} @@ -294,10 +225,6 @@ Global {C87B881A-6D67-4920-94B4-6C418103EBD1} = {D62CBA86-5803-4476-8547-DAE0AEFF5D15} {D62CBA86-5803-4476-8547-DAE0AEFF5D15} = {91697709-6245-435E-BC12-9DCDCF8CF773} {91697709-6245-435E-BC12-9DCDCF8CF773} = {E4610F0C-7A96-4397-B058-EE71D365233A} - {2F218921-3050-4C99-AB31-D4CAC192B961} = {1E5DB742-0215-4F52-9000-89D7AF21D519} - {1E5DB742-0215-4F52-9000-89D7AF21D519} = {C08B8DD0-717A-49E6-8D4C-4DF2EB9FA1E3} - {C08B8DD0-717A-49E6-8D4C-4DF2EB9FA1E3} = {C8E64BCD-81C3-4B13-A2DA-9E2AECCCC3CE} - {C8E64BCD-81C3-4B13-A2DA-9E2AECCCC3CE} = {DE97C4FC-77CE-4822-86BB-A82D33AFD997} {1153E2DF-D269-4AA8-9DA9-99A4C68884B5} = {805B503B-50D5-4AAE-9689-3B3875D1CC88} {805B503B-50D5-4AAE-9689-3B3875D1CC88} = {B07AEE55-1E5A-4DC2-ADD5-964B7F8B1938} {A4A2EB3C-0676-44C5-87F6-0513A4EC9C79} = {144B038C-E8CD-433A-A2EB-C131E2435209} @@ -306,14 +233,6 @@ Global {38215361-E804-4BE0-A2FB-1193C57F9EB2} = {E1E7C105-F95D-40B5-AD8A-9D67CDA73F73} {E1E7C105-F95D-40B5-AD8A-9D67CDA73F73} = {9CF39BB2-5B77-49FC-97C1-7BA630172B7D} {9CF39BB2-5B77-49FC-97C1-7BA630172B7D} = {A9F65503-48DB-4884-B777-D8D23D475FE5} - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18} = {7ED296FA-0F45-4E9C-895D-88B921EBE148} - {7ED296FA-0F45-4E9C-895D-88B921EBE148} = {DEFCE7F5-86CD-46F5-AB7F-7906F79C47A6} - {293A159E-CB1D-4976-95CD-BD48D5F42926} = {CF75B87F-3DB1-4850-AA75-3590E4D596C8} - {CF75B87F-3DB1-4850-AA75-3590E4D596C8} = {DEFCE7F5-86CD-46F5-AB7F-7906F79C47A6} - {DEFCE7F5-86CD-46F5-AB7F-7906F79C47A6} = {9532C930-A53C-4320-9D79-1C81C8DF8617} - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8} = {6EC825CC-B581-4F2F-8941-3D7BCF9CE4BA} - {6EC825CC-B581-4F2F-8941-3D7BCF9CE4BA} = {01A0BD70-70FA-4448-8F4C-CC0B82197D46} - {01A0BD70-70FA-4448-8F4C-CC0B82197D46} = {06031F02-5EB9-4BB6-AF70-6CD47E633249} {D84A3926-80EB-47AB-82A2-98BD7CFC135D} = {DA6DFB9F-1159-4539-A7E0-683E48AF03B8} {DA6DFB9F-1159-4539-A7E0-683E48AF03B8} = {A0D43580-1560-4FFA-8603-5021DEF92E66} {E6BE7D1A-DB5D-495F-8D42-58A4F381E79E} = {C86A5C2B-8E43-451E-A7CE-B747E34616E0} diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc4_v_5_x_x.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/AxoKrc4_v_5_x_x.st similarity index 99% rename from src/components.kuka.robotics/ctrl/src/AxoKrc4_v_5_x_x.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/AxoKrc4_v_5_x_x.st index 04ccf225b..198e1120a 100644 --- a/src/components.kuka.robotics/ctrl/src/AxoKrc4_v_5_x_x.st +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc4/AxoKrc4_v_5_x_x.st @@ -96,14 +96,14 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Config")]} {#ix-attr:[ReadOnly()]} - Config : AxoKukaRobotics_Config; + Config : AxoKrc4_Config; END_VAR VAR PUBLIC //STATUS {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} - Status : AxoKukaRobotics_Component_Status; + Status : AxoKrc4_Component_Status; Messenger : AXOpen.Messaging.Static.AxoMessenger; TaskMessenger : AXOpen.Messaging.Static.AxoMessenger; {#ix-attr:[ComponentDetails("Status")]} @@ -122,13 +122,13 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Inputs#>"} {#ix-attr:[ReadOnly()]} - Inputs : AxoKukaRobotics_State; + Inputs : AxoKrc4_State; {#ix-attr:[ComponentDetails("Hardware signals")]} {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Outputs#>"} {#ix-attr:[ReadOnly()]} - Outputs : AxoKukaRobotics_Control; + Outputs : AxoKrc4_Control; END_VAR VAR PUBLIC //HardwareDiagnostics diff --git a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Component_Status.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Component_Status.st similarity index 65% rename from src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Component_Status.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Component_Status.st index 21fdbde0a..9e9c645a8 100644 --- a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Component_Status.st +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Component_Status.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoKukaRobotics_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + CLASS PUBLIC AxoKrc4_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status VAR PUBLIC END_VAR END_CLASS diff --git a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Config.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Config.st similarity index 84% rename from src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Config.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Config.st index b1d95824c..2080bd51f 100644 --- a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Config.st +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Config.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoKukaRobotics_Config + CLASS PUBLIC AxoKrc4_Config VAR PUBLIC {#ix-set:AttributeName = "<#Info time#>"} InfoTime : LTIME := LT#2S; @@ -10,7 +10,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {#ix-set:AttributeName = "<#Task timeout#>"} TaskTimeout : LTIME := LT#50S; {#ix-set:AttributeName = "<#Hardware IDs#>"} - HWIDs : AxoKukaRobotics_HWIDs; + HWIDs : AxoKrc4_HWIDs; END_VAR END_CLASS END_NAMESPACE diff --git a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Control.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Control.st similarity index 98% rename from src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Control.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Control.st index 8bf440a7f..937e60b80 100644 --- a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_Control.st +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Control.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoKukaRobotics_Control + CLASS AxoKrc4_Control VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_HWIDs.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_HWIDs.st similarity index 93% rename from src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_HWIDs.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_HWIDs.st index 74fb741ec..cf27e561f 100644 --- a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_HWIDs.st +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_HWIDs.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoKukaRobotics_HWIDs + CLASS PUBLIC AxoKrc4_HWIDs VAR PUBLIC {#ix-set:AttributeName = "<#Hardware ID of the device#>"} HwID_Device : UINT; diff --git a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_State.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_State.st similarity index 99% rename from src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_State.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_State.st index c22f5e665..e0e650487 100644 --- a/src/components.kuka.robotics/ctrl/src/AxoKukaRobotics_Datatypes_v_5_x_x/AxoKukaRobotics_State.st +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_State.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoKukaRobotics_State + CLASS AxoKrc4_State VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/AxoKrc5_v_5_x_x.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/AxoKrc5_v_5_x_x.st new file mode 100644 index 000000000..84b845fe2 --- /dev/null +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc5/AxoKrc5_v_5_x_x.st @@ -0,0 +1,1927 @@ +USING AXOpen.Core; +USING AXOpen.Messaging; +USING AXOpen.Messaging.Static; +USING AXOpen.Components.Robotics; +USING AXOpen.Components.Abstractions.Robotics; +USING Siemens.Simatic.Hardware.Utilities; + +NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x + {S7.extern=ReadWrite} + CLASS AxoKrc5 EXTENDS AXOpen.Core.AxoComponent IMPLEMENTS AXOpen.Components.Abstractions.Robotics.IAxoRobotics + VAR PRIVATE + _infoTimer : AXOpen.Timers.OnDelayTimer; + _errorTimer : AXOpen.Timers.OnDelayTimer; + _context : IAxoContext; + _stopTasksAreActive : BOOL; + _stopType : eAxoRoboticsStopType; + _someTaskIsActive : BOOL; + + _dword: DWORD; + _data : ARRAY[0..63] OF BYTE; + + _initHwCheckDone : BOOL; + _retval : WORD; + _geoAddr : GeoAddr; + _outHwid : UINT; + _blink : AXOpen.Timers.AxoBlinker; + _inputsAddress : UDINT; + _inputsCount : UINT; + _outputsAddress : UDINT; + _outputsCount : UINT; + _movementExecuting : BOOL; + _inputsManualPV : BOOL; + END_VAR + + VAR PUBLIC //HEADER + + END_VAR + + VAR PUBLIC //Tasks + {#ix-attr:[Container(Layout.Wrap)]} + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Restore#>"} + RestoreTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Reset all outputs#>"} + ResetAllOutputsTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Start motors#>"} + StartMotorsTask : AxoTask; + + {#ix-attr:[Container(Layout.Wrap)]} + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Start at main#>"} + StartAtMainTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Start motors program and movements#>"} + StartMotorsProgramAndMovementsTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Start movements with extended parameters#>"} + MovementParameters : AXOpen.Components.Abstractions.Robotics.AxoRoboticsMovementsParams; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Start program#>"} + StartProgramTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Start movements#>"} + StartMovementsTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Start motors and program#>"} + StartMotorsAndProgramTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Stop movements#>"} + StopMovementsTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Stop movements and program#>"} + StopMovementsAndProgramTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Stop program#>"} + StopProgramTask : AxoTask; + + {#ix-attr:[ComponentDetails("Tasks")]} + {#ix-set:AttributeName = "<#Stop motors#>"} + StopMotorsTask : AxoTask; + END_VAR + + VAR PUBLIC //CONFIG + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[ComponentDetails("Config")]} + {#ix-attr:[ReadOnly()]} + Config : AxoKrc5_Config; + END_VAR + + VAR PUBLIC //STATUS + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[ComponentDetails("Status")]} + {#ix-attr:[ReadOnly()]} + Status : AxoKrc5_Component_Status; + Messenger : AXOpen.Messaging.Static.AxoMessenger; + TaskMessenger : AXOpen.Messaging.Static.AxoMessenger; + {#ix-attr:[ComponentDetails("Status")]} + {#ix-attr:[ReadOnly()]} + {#ix-set:AttributeName = "<#Power progress#>"} + _power_progress : INT := 0; + {#ix-attr:[ComponentDetails("Status")]} + {#ix-attr:[ReadOnly()]} + {#ix-set:AttributeName = "<#Movement progress#>"} + _movement_progress : INT := 0; + END_VAR + + VAR PUBLIC //Hardware signals + {#ix-attr:[ComponentDetails("Hardware signals")]} + {#ix-attr:[Container(Layout.Wrap)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Inputs#>"} + {#ix-attr:[ReadOnly()]} + Inputs : AxoKrc5_State; + {#ix-attr:[ComponentDetails("Hardware signals")]} + {#ix-attr:[Container(Layout.Wrap)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Outputs#>"} + {#ix-attr:[ReadOnly()]} + Outputs : AxoKrc5_Control; + END_VAR + + VAR PUBLIC //HardwareDiagnostics + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[ComponentDetails("Hardware diagnostics")]} + {#ix-set:AttributeName = "<#Update diagnostics#>"} + HardwareDiagnosticsTask : AXOpen.Io.AxoHardwareDiagnostics; + END_VAR + + /// + /// Runs tasks and logic of this component. + /// >[!IMPORTANT] This method must or one of its overloads be called cyclically. + /// + METHOD PUBLIC Run + VAR_INPUT + inParent : IAxoObject; + hwID : UINT; + END_VAR + + SUPER.Run(inParent); + + Messenger.Serve(THIS); + + IF NOT _initHwCheckDone THEN + IF inParent = NULL THEN + Messenger.Activate(UINT#700, eAxoMessageCategory#ProgrammingError); + Status.Error.Id := UINT#700; + RETURN; + END_IF; + Config.HWIDs.HwID_Device:= hwID; + IF Config.HWIDs.HwID_Device = UINT#0 THEN + Messenger.Activate(UINT#701, eAxoMessageCategory#ProgrammingError); + Status.Error.Id := UINT#701; + RETURN; + END_IF; + + _retval := ReadSlotFromHardwareID(hardwareID := Config.HWIDs.HwID_Device, geoAddr :=_geoAddr); + IF _retval = WORD#8090 THEN + Messenger.Activate(UINT#702,eAxoMessageCategory#Error); + Status.Error.Id := UINT#702; + RETURN; + END_IF; + + //******************Slot 1*****************// + _geoAddr.Slot := UINT#1; //Needs to be checked, by default there is a safety module configured once gsdml file is applied + _geoAddr.HardwareType := UINT#4; // (4-Module) + _retval := ReadHardwareIDFromSlot(geoAddr := _geoAddr, hardwareID => Config.HWIDs.HwID_None); + IF Config.HWIDs.HwID_None <> UINT#0 THEN + Messenger.Activate(UINT#710,eAxoMessageCategory#Error); + Status.Error.Id := UINT#710; + RETURN; + END_IF; + // IF _retval = WORD#8091 THEN + // Messenger.Activate(UINT#711,eAxoMessageCategory#Error); + // Status.Error.Id := UINT#711; + // RETURN; + // END_IF; + // IF _retval = WORD#8094 THEN + // Messenger.Activate(UINT#712,eAxoMessageCategory#Error); + // Status.Error.Id := UINT#712; + // RETURN; + // END_IF; + // IF _retval = WORD#8095 THEN + // Messenger.Activate(UINT#713,eAxoMessageCategory#Error); + // Status.Error.Id := UINT#713; + // RETURN; + // END_IF; + // IF _retval = WORD#8096 THEN + // Messenger.Activate(UINT#714,eAxoMessageCategory#Error); + // Status.Error.Id := UINT#714; + // RETURN; + // END_IF; + // IF _retval = WORD#8097 THEN + // Messenger.Activate(UINT#715,eAxoMessageCategory#Error); + // Status.Error.Id := UINT#715; + // RETURN; + // END_IF; + // ReadHardwareIOAddress(hardwareIdentifier := _hwId_None , inputStartAddress => _inputsAddress , inputCount => _inputsCount , outputStartAddress => _outputsAddress , outputCount => _outputsCount); + // IF _inputsCount <> UINT#0 OR _outputsCount <> UINT#0 THEN + // Messenger.Activate(UINT#716,eAxoMessageCategory#Error); + // Status.Error.Id := UINT#716; + // RETURN; + // END_IF; + //******************Slot 2*****************// + _geoAddr.Slot := UINT#2; + _geoAddr.HardwareType := UINT#4; // (4-Module) + _retval := ReadHardwareIDFromSlot(geoAddr := _geoAddr, hardwareID => Config.HWIDs.HwID_512_DI_DO); + IF Config.HWIDs.HwID_512_DI_DO = UINT#0 THEN + Messenger.Activate(UINT#720,eAxoMessageCategory#Error); + Status.Error.Id := UINT#720; + RETURN; + END_IF; + IF _retval = WORD#8091 THEN + Messenger.Activate(UINT#721,eAxoMessageCategory#Error); + Status.Error.Id := UINT#721; + RETURN; + END_IF; + IF _retval = WORD#8094 THEN + Messenger.Activate(UINT#722,eAxoMessageCategory#Error); + Status.Error.Id := UINT#722; + RETURN; + END_IF; + IF _retval = WORD#8095 THEN + Messenger.Activate(UINT#723,eAxoMessageCategory#Error); + Status.Error.Id := UINT#723; + RETURN; + END_IF; + IF _retval = WORD#8096 THEN + Messenger.Activate(UINT#724,eAxoMessageCategory#Error); + Status.Error.Id := UINT#724; + RETURN; + END_IF; + IF _retval = WORD#8097 THEN + Messenger.Activate(UINT#725,eAxoMessageCategory#Error); + Status.Error.Id := UINT#725; + RETURN; + END_IF; + ReadHardwareIOAddress(hardwareID := (Config.HWIDs.HwID_512_DI_DO) , inputStartAddress => _inputsAddress , inputCount => _inputsCount , outputStartAddress => _outputsAddress , outputCount => _outputsCount); + IF _inputsCount <> UINT#64 OR _outputsCount <> UINT#64 THEN + Messenger.Activate(UINT#726,eAxoMessageCategory#Error); + Status.Error.Id := UINT#726; + RETURN; + END_IF; + + IF inParent = NULL THEN + Messenger.Activate(UINT#1130,eAxoMessageCategory#Error); + Status.Error.Id := UINT#1130; + RETURN; + END_IF; + IF Config.HWIDs.HwID_Device = UINT#0 THEN + Messenger.Activate(UINT#1131,eAxoMessageCategory#Error); + Status.Error.Id := UINT#1131; + RETURN; + END_IF; + IF Config.HWIDs.HwID_None <> UINT#0 THEN + Messenger.Activate(UINT#1132,eAxoMessageCategory#Error); + Status.Error.Id := UINT#1132; + RETURN; + END_IF; + IF Config.HWIDs.HwID_512_DI_DO = UINT#0 THEN + Messenger.Activate(UINT#1133,eAxoMessageCategory#Error); + Status.Error.Id := UINT#1133; + RETURN; + END_IF; + + _initHwCheckDone := TRUE; + END_IF; + + //***********UPDATE**INPUTS****************** + _retVal := Siemens.Simatic.DistributedIO.ReadData((Config.HWIDs.HwID_512_DI_DO) ,_data); + IF _retVal > WORD#0 THEN + Messenger.Activate(UINT#1201, eAxoMessageCategory#Error); + Status.Error.Id := UINT#1201; + RETURN; + END_IF; + + //SYSTEM INPUTS + Inputs.RcReady := _data[0].%X0; + Inputs.AlarmStopActive := _data[0].%X1; + Inputs.UserSafetySwitchClosed := _data[0].%X2; + Inputs.DrivesReady := _data[0].%X3; + Inputs.RobotCalibrated := _data[0].%X4; + Inputs.InterfaceActivated := _data[0].%X5; + Inputs.StopMess := _data[0].%X6; + Inputs.RobotStopped := _data[0].%X7; + + Inputs.InHome := _data[1].%X0; + Inputs.Manual := _data[1].%X1; + Inputs.Automatic := _data[1].%X2; + Inputs.ExternalAutomatic := _data[1].%X3; + Inputs.ProActive := _data[1].%X4; + Inputs.PpMoved := _data[1].%X5; + Inputs.Error := _data[1].%X6; + Inputs.ProgramMoveActive := _data[1].%X7; + + + //Area/positions flags this should be obsolete because Zones and InPosition is used as byte below + Inputs.InArea_1 := _data[2].%X0; + Inputs.InArea_2 := _data[2].%X1; + Inputs.InArea_3 := _data[2].%X2; + Inputs.InArea_4 := _data[2].%X3; + Inputs.InPosition_1 := _data[2].%X4; + Inputs.InPosition_2 := _data[2].%X5; + Inputs.InPosition_3 := _data[2].%X6; + Inputs.InPosition_4 := _data[2].%X7; + + //Tool signals + Inputs.Tool_1_Retract := _data[3].%X0; + Inputs.Tool_1_Extend := _data[3].%X1; + Inputs.Tool_2_Retract := _data[3].%X2; + Inputs.Tool_2_Extend := _data[3].%X3; + Inputs.Tool_3_Retract := _data[3].%X4; + Inputs.Tool_3_Extend := _data[3].%X5; + Inputs.Tool_4_Retract := _data[3].%X6; + Inputs.Tool_4_Extend := _data[3].%X7; + + Inputs.Zone := _data[5]; + Inputs.InPosition := _data[6]; + + //Movement parameters + Inputs.ActionNo := _data[7]; + Inputs.GlobalSpeed := _data[8]; + Inputs.ToolNo := _data[9]; + Inputs.WorkobjectNo := _data[10]; + Inputs.PointNo := _data[11]; + + _dword.%B0 := _data[12]; + _dword.%B1 := _data[13]; + _dword.%B2 := _data[14]; + _dword.%B3 := _data[15]; + Inputs.UserSpecSpeed1 := TO_DINT(_dword); + + _dword.%B0 := _data[16]; + _dword.%B1 := _data[17]; + _dword.%B2 := _data[18]; + _dword.%B3 := _data[19]; + Inputs.UserSpecSpeed2 := TO_DINT(_dword); + + _dword.%B0 := _data[20]; + _dword.%B1 := _data[21]; + _dword.%B2 := _data[22]; + _dword.%B3 := _data[23]; + Inputs.Coordinates.X:= TO_REAL(TO_DINT(_dword))*REAL#0.0001; + + _dword.%B0 := _data[24]; + _dword.%B1 := _data[25]; + _dword.%B2 := _data[26]; + _dword.%B3 := _data[27]; + Inputs.Coordinates.Y:= TO_REAL(TO_DINT(_dword))*REAL#0.0001; + + _dword.%B0 := _data[28]; + _dword.%B1 := _data[29]; + _dword.%B2 := _data[30]; + _dword.%B3 := _data[31]; + Inputs.Coordinates.Z:= TO_REAL(TO_DINT(_dword))*REAL#0.0001; + + _dword.%B0 := _data[32]; + _dword.%B1 := _data[33]; + _dword.%B2 := _data[34]; + _dword.%B3 := _data[35]; + Inputs.Coordinates.Rx:= TO_REAL(TO_DINT(_dword))*REAL#0.0001; + + _dword.%B0 := _data[36]; + _dword.%B1 := _data[37]; + _dword.%B2 := _data[38]; + _dword.%B3 := _data[39]; + Inputs.Coordinates.Ry:= TO_REAL(TO_DINT(_dword))*REAL#0.0001; + + _dword.%B0 := _data[40]; + _dword.%B1 := _data[41]; + _dword.%B2 := _data[42]; + _dword.%B3 := _data[43]; + Inputs.Coordinates.Rz:= TO_REAL(TO_DINT(_dword))*REAL#0.0001; + + _dword.%B0 := _data[44]; + _dword.%B1 := _data[45]; + _dword.%B2 := _data[46]; + _dword.%B3 := _data[47]; + Inputs.EventId := TO_UDINT(_dword); + //******************************************* + _context := THIS.GetContext(); + + //*********MOVE**ENABLE**IN**MANUAL******* + IF Inputs.Manual AND NOT _inputsManualPV THEN + Outputs.MoveEnable := TRUE; + ELSIF NOT Inputs.Manual AND _inputsManualPV THEN + Outputs.MoveEnable := FALSE; + END_IF; + _inputsManualPV := Inputs.Manual; + //**************************************** + //*************INITIALIZATION************* + RestoreTask.Run(THIS); + StopMovementsTask.Run(THIS); + StopMovementsAndProgramTask.Run(THIS); + StopProgramTask.Run(THIS); + StopMotorsTask.Run(THIS); + StartAtMainTask.Run(THIS); + StartMotorsAndProgramTask.Run(THIS); + StartProgramTask.Run(THIS); + StartMotorsTask.Run(THIS); + StartMovementsTask.Run(THIS); + StartMotorsProgramAndMovementsTask.Run(THIS); + ResetAllOutputsTask.Run(THIS); + HardwareDiagnosticsTask.Run(THIS); + + _stopTasksAreActive := StopMovementsTask.IsBusy() OR StopMovementsAndProgramTask.IsBusy() OR StopProgramTask.IsBusy() OR StopMotorsTask.IsBusy(); + _movementExecuting := FALSE; + //**************************************** + //********************Diagnostics********* + HardwareDiagnosticsTask.Run(THIS,Config.HWIDs.HwID_Device); + //**************************************** + + //*************RESTORE******************** + RestoreTask.SetIsDisabled(FALSE); + IF RestoreTask.Execute(THIS) THEN + THIS.Restore(); + END_IF; + //**************************************** + + //*************StartAtMainTask************ + StartAtMainTask.SetIsDisabled(_stopTasksAreActive); + IF StartAtMainTask.StartTriggered() THEN + Status.Action.Id := UINT#100; + END_IF; + Messenger.ActivateOnCondition(ULINT#100,StartAtMainTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#101,StartAtMainTask.IsDone(), eAxoMessageCategory#Info); + IF StartAtMainTask.Execute(THIS) THEN + _blink.Blink(Context := _context, inOnTime:=T#500MS,inOffTime:=T#500MS); + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 300; + END_IF; + // Start at main running: waiting for the program pointer changed. + IF _power_progress = 300 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#500, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#500; + END_IF; + + Outputs.MoveEnable := TRUE; + Outputs.DrivesOff := TRUE; + Outputs.ActionNo := BYTE#255; + + Outputs.StartAtMain := NOT Inputs.PpMoved AND _blink.output; + + IF Inputs.PpMoved THEN + THIS.CallTimers(FALSE); + Outputs.StartAtMain :=FALSE; + _power_progress:=301; + END_IF; + END_IF; + // Start at main finished. + IF _power_progress = 301 THEN + StartAtMainTask.DoneWhen(TRUE); + THIS.CallTimers(FALSE); + _power_progress := 0; + END_IF; + + THIS.CallTimers(TRUE); + StartAtMainTask.ThrowWhen(_errorTimer.output ); + Status.Action.Id := TO_UINT(_power_progress); + StartAtMainTask.ThrowWhen(StartAtMainTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartAtMainTask timeout.#>'); + END_IF; + IF StartAtMainTask.DoneReached() THEN + Status.Action.Id := UINT#101; + Status.Error.Id := UINT#0; + ELSIF StartAtMainTask.ErrorOccured() THEN + Status.Action.Id := UINT#10000; + Status.Error.Id := UINT#10000; + ELSIF StartAtMainTask.AbortTriggered()THEN + Status.Action.Id := UINT#10001; + Status.Error.Id := UINT#10001; + END_IF; + Messenger.ActivateOnCondition(ULINT#10000,StartAtMainTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10001,StartAtMainTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#102,StartAtMainTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StartAtMainTask.RestoreTriggered() AND _power_progress >= 300 AND _power_progress <= 309 THEN + Status.Action.Id := UINT#102; + _power_progress := 0; + END_IF; + //******************************************* + + + //***********StartMotorsAndProgramTask******* + StartMotorsAndProgramTask.SetIsDisabled(_stopTasksAreActive OR StartProgramTask.IsBusy() OR StartMotorsTask.IsBusy()); + IF StartMotorsAndProgramTask.StartTriggered() THEN + Status.Action.Id := UINT#110; + END_IF; + Messenger.ActivateOnCondition(ULINT#110,StartMotorsAndProgramTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#111,StartMotorsAndProgramTask.IsDone(), eAxoMessageCategory#Info); + IF StartMotorsAndProgramTask.Execute(THIS) THEN + _blink.Blink(Context := _context, inOnTime:=T#500MS,inOffTime:=T#500MS); + + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 310; + END_IF; + // Start motors and program running: waiting for the 'UserSafetySwitchClosed' is on. + IF _power_progress = 310 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#510, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#510; + END_IF; + Outputs.MoveEnable := TRUE; + Outputs.DrivesOff := TRUE; + Outputs.ActionNo := BYTE#255; + + IF Inputs.UserSafetySwitchClosed THEN + THIS.CallTimers(FALSE); + _power_progress := 311; + END_IF; + END_IF; + // Start motors and program running: waiting for the 'AlarmStopActive' is on. + IF _power_progress = 311 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#511, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#511; + END_IF; + + IF Inputs.AlarmStopActive THEN + THIS.CallTimers(FALSE); + _power_progress := 312; + END_IF; + END_IF; + // Start motors and program running: waiting for the 'DrivesReady' is on. + IF _power_progress = 312 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#512, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#512; + END_IF; + + Outputs.DrivesOff:=TRUE; + Outputs.DrivesOn:=_blink.output; + + IF Inputs.DrivesReady THEN + Outputs.DrivesOn:=FALSE; + THIS.CallTimers(FALSE); + _power_progress := 313; + END_IF; + END_IF; + // Start motors and program running: waiting for the 'StopMess' is off. + IF _power_progress = 313 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#513, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#513; + END_IF; + + Outputs.ErrorConfirmation := Inputs.StopMess AND _blink.output; + + IF NOT Inputs.StopMess THEN + THIS.CallTimers(FALSE); + _power_progress := 314; + END_IF; + END_IF; + // Start motors and program running: waiting for the 'RcReady' is on. + IF _power_progress = 314 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#514, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#514; + END_IF; + + Outputs.MoveEnable:=TRUE; + + IF Inputs.RcReady THEN + THIS.CallTimers(FALSE); + _power_progress := 315; + END_IF; + END_IF; + // Start motors and program running: waiting for the 'InterfaceActivated' is on. + IF _power_progress = 315 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#515, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#515; + END_IF; + + Outputs.ActivateInterface:=TRUE; + + IF Inputs.InterfaceActivated THEN + THIS.CallTimers(FALSE); + _power_progress := 316; + END_IF; + END_IF; + // Start motors and program running: waiting for the 'ProActive' is on. + IF _power_progress = 316 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#516, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#516; + END_IF; + + IF Inputs.StopMess OR NOT Inputs.AlarmStopActive OR NOT Inputs.RcReady THEN + _power_progress := 310; + END_IF; + + Outputs.ExternalStart:=_blink.output; + + IF Inputs.ProActive THEN + Outputs.ExternalStart:=FALSE; + THIS.CallTimers(FALSE); + _power_progress := 317; + END_IF; + END_IF; + // Start motors and program finished. + IF _power_progress = 317 THEN + StartMotorsAndProgramTask.DoneWhen(TRUE); + THIS.CallTimers(FALSE); + _power_progress := 0; + END_IF; + + THIS.CallTimers(TRUE); + StartMotorsAndProgramTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + StartMotorsAndProgramTask.ThrowWhen(StartMotorsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsAndProgramTask timeout.#>'); + END_IF; + IF StartMotorsAndProgramTask.DoneReached() THEN + Status.Action.Id := UINT#111; + Status.Error.Id := UINT#0; + ELSIF StartMotorsAndProgramTask.ErrorOccured() THEN + Status.Action.Id := UINT#10010; + Status.Error.Id := UINT#10010; + ELSIF StartMotorsAndProgramTask.AbortTriggered() THEN + Status.Action.Id := UINT#10011; + Status.Error.Id := UINT#10011; + END_IF; + Messenger.ActivateOnCondition(ULINT#10010,StartMotorsAndProgramTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10011,StartMotorsAndProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#112,StartMotorsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StartMotorsAndProgramTask.RestoreTriggered() AND _power_progress >= 310 AND _power_progress <= 319 THEN + Status.Action.Id := UINT#112; + _power_progress := 0; + END_IF; + //******************************************* + + //****StartMotorsProgramAndMovementsTask***** + StartMotorsProgramAndMovementsTask.SetIsDisabled(_stopTasksAreActive OR StartProgramTask.IsBusy() OR StartMotorsTask.IsBusy() OR StartMovementsTask.IsBusy()); + IF StartMotorsProgramAndMovementsTask.StartTriggered() THEN + Status.Action.Id := UINT#120; + END_IF; + Messenger.ActivateOnCondition(ULINT#120,StartMotorsProgramAndMovementsTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#121,StartMotorsProgramAndMovementsTask.IsDone(), eAxoMessageCategory#Info); + IF StartMotorsProgramAndMovementsTask.Execute(THIS) THEN + _blink.Blink(Context := _context, inOnTime:=T#500MS,inOffTime:=T#500MS); + + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 320; + END_IF; + // Start motors program and movements running: waiting for the 'UserSafetySwitchClosed' is on. + IF _power_progress = 320 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#520, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#520; + END_IF; + + Outputs.MoveEnable := TRUE; + Outputs.DrivesOff := TRUE; + Outputs.ActionNo := BYTE#255; + + IF Inputs.UserSafetySwitchClosed THEN + THIS.CallTimers(FALSE); + _power_progress := 321; + END_IF; + END_IF; + // Start motors program and movements running: waiting for the 'AlarmStopActive' is on. + IF _power_progress = 321 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#521, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#521; + END_IF; + + IF Inputs.AlarmStopActive THEN + THIS.CallTimers(FALSE); + _power_progress := 322; + END_IF; + END_IF; + // Start motors program and movements running: waiting for the 'DrivesReady' is on. + IF _power_progress = 322 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#522, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#522; + END_IF; + + Outputs.DrivesOff:=TRUE; + Outputs.DrivesOn:=_blink.output; + + IF Inputs.DrivesReady THEN + Outputs.DrivesOn:=FALSE; + THIS.CallTimers(FALSE); + _power_progress := 323; + END_IF; + END_IF; + // Start motors program and movements running: waiting for the 'StopMess' is off. + IF _power_progress = 323 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#523, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#523; + END_IF; + + Outputs.ErrorConfirmation := Inputs.StopMess AND _blink.output; + + IF NOT Inputs.StopMess THEN + THIS.CallTimers(FALSE); + _power_progress := 324; + END_IF; + END_IF; + // Start motors program and movements running: waiting for the 'RcReady' is on. + IF _power_progress = 324 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#524, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#524; + END_IF; + + Outputs.MoveEnable:=TRUE; + + IF Inputs.RcReady THEN + THIS.CallTimers(FALSE); + _power_progress := 325; + END_IF; + END_IF; + // Start motors program and movements running: waiting for the 'InterfaceActivated' is on. + IF _power_progress = 325 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#525, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#525; + END_IF; + + Outputs.ActivateInterface:=TRUE; + + IF Inputs.InterfaceActivated THEN + THIS.CallTimers(FALSE); + _power_progress := 326; + END_IF; + END_IF; + // Start motors program and movements running: waiting for the 'ProActive' is on. + IF _power_progress = 326 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#526, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#526; + END_IF; + + IF Inputs.StopMess OR NOT Inputs.AlarmStopActive OR NOT Inputs.RcReady THEN + _power_progress := 320; + END_IF; + + IF NOT Inputs.ProActive AND Inputs.Error THEN + Outputs.StartAtMain := _blink.output AND NOT Inputs.PpMoved; + ELSE + Outputs.ExternalStart:=_blink.output; + END_IF; + + IF Inputs.ProActive THEN + Outputs.ExternalStart:=FALSE; + THIS.CallTimers(FALSE); + _power_progress := 327; + END_IF; + END_IF; + // Start motors program and movements running: sending parameters of the movement to the controller. + IF _power_progress = 327 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#527, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#527; + END_IF; + + Outputs.GlobalSpeed := Status.CurrentMovementParameters.GlobalSpeed; + Outputs.ToolNo := Status.CurrentMovementParameters.ToolNo; + Outputs.WorkobjectNo := Status.CurrentMovementParameters.WorkobjectNo; + Outputs.PointNo := Status.CurrentMovementParameters.PointNo; + Outputs.UserSpecSpeed1 := Status.CurrentMovementParameters.UserSpecSpeed1; + Outputs.UserSpecSpeed2 := Status.CurrentMovementParameters.UserSpecSpeed2; + Outputs.Coordinates := Status.CurrentMovementParameters.Coordinates; + + Outputs.ActionNo := BYTE#254; + + IF Outputs.ActionNo = Inputs.ActionNo THEN + THIS.CallTimers(FALSE); + _power_progress := 328; + END_IF; + END_IF; + // Start motors program and movements running: waiting for the movement parameters sent to the controller to be mirrored back. + IF _power_progress = 328 THEN + IF _infoTimer.output THEN + IF Inputs.GlobalSpeed <> Status.CurrentMovementParameters.GlobalSpeed THEN + TaskMessenger.Activate( UINT#528, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#528;//<#Waiting for Inputs.GlobalSpeed to be equal to MovementParameters.GlobalSpeed! + END_IF; + IF Inputs.ToolNo <> Status.CurrentMovementParameters.ToolNo THEN + TaskMessenger.Activate( UINT#529, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#529;//<#Waiting for Inputs.ToolNo to be equal to MovementParameters.ToolNo! + END_IF; + IF Inputs.WorkobjectNo <> Status.CurrentMovementParameters.WorkobjectNo THEN + TaskMessenger.Activate( UINT#530, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#530;//<#Waiting for Inputs.WorkobjectNo to be equal to MovementParameters.WorkobjectNo! + END_IF; + IF Inputs.PointNo <> Status.CurrentMovementParameters.PointNo THEN + TaskMessenger.Activate( UINT#531, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#531;//<#Waiting for Inputs.PointNo to be equal to MovementParameters.PointNo! + END_IF; + IF Inputs.UserSpecSpeed1 <> Status.CurrentMovementParameters.UserSpecSpeed1 THEN + TaskMessenger.Activate( UINT#532, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#532;//<#Waiting for Inputs.UserSpecSpeed1 to be equal to MovementParameters.UserSpecSpeed1! + END_IF; + IF Inputs.UserSpecSpeed2 <> Status.CurrentMovementParameters.UserSpecSpeed2 THEN + TaskMessenger.Activate( UINT#533, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#533;//<#Waiting for Inputs.UserSpecSpeed2 to be equal to MovementParameters.UserSpecSpeed2! + END_IF; + END_IF; + + IF Inputs.GlobalSpeed = Status.CurrentMovementParameters.GlobalSpeed AND + Inputs.ToolNo = Status.CurrentMovementParameters.ToolNo AND + Inputs.WorkobjectNo = Status.CurrentMovementParameters.WorkobjectNo AND + Inputs.PointNo = Status.CurrentMovementParameters.PointNo AND + Inputs.UserSpecSpeed1 = Status.CurrentMovementParameters.UserSpecSpeed1 AND + Inputs.UserSpecSpeed2 = Status.CurrentMovementParameters.UserSpecSpeed2 AND + AXOpen.Components.Robotics.CoordinatesAreNearlyEqual(Inputs.Coordinates,Status.CurrentMovementParameters.Coordinates,REAL#0.01,REAL#0.01,REAL#0.01,REAL#0.01,REAL#0.01,REAL#0.01) THEN + THIS.CallTimers(FALSE); + _power_progress:=334; + END_IF; + END_IF; + // Start motors program and movements running: acknowleadging of the movement parameters. + IF _power_progress = 334 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#534, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#534; + END_IF; + + Outputs.ActionNo := BYTE#253; + + IF Outputs.ActionNo = Inputs.ActionNo THEN + THIS.CallTimers(FALSE); + _power_progress:=335; + END_IF; + END_IF; + // Start motors program and movements running: waiting for the movement is finished. + IF _power_progress = 335 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#535, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#535; + END_IF; + + _movementExecuting := TRUE; + + Outputs.ActionNo := Status.CurrentMovementParameters.ActionNo; + + IF Outputs.ActionNo = Inputs.ActionNo THEN + THIS.CallTimers(FALSE); + _power_progress:=336; + END_IF; + END_IF; + // Start motors program and movements running: acknowleadging of the finished movement. + IF _power_progress = 336 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#536, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#536; + END_IF; + + Outputs.ActionNo := BYTE#255; + + IF Outputs.ActionNo = Inputs.ActionNo THEN + THIS.CallTimers(FALSE); + _power_progress := 337; + END_IF; + END_IF; + // Start motors program and movements finished. + IF _power_progress = 337 THEN + _power_progress := 0; + StartMotorsProgramAndMovementsTask.DoneWhen(TRUE); + END_IF; + + THIS.CallTimers(NOT _movementExecuting); + StartMotorsProgramAndMovementsTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + StartMotorsProgramAndMovementsTask.ThrowWhen(StartMotorsProgramAndMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMotorsProgramAndMovementsTask timeout.#>'); + END_IF; + IF StartMotorsProgramAndMovementsTask.IsFirstExecutionCycle() THEN + MovementParameters := Status.CurrentMovementParameters; + END_IF; + IF StartMotorsProgramAndMovementsTask.DoneReached() THEN + Status.Action.Id := UINT#121; + Status.Error.Id := UINT#0; + ELSIF StartMotorsProgramAndMovementsTask.ErrorOccured() THEN + Status.Action.Id := UINT#10020; + Status.Error.Id := UINT#10020; + ELSIF StartMotorsProgramAndMovementsTask.AbortTriggered() THEN + Status.Action.Id := UINT#10021; + Status.Error.Id := UINT#10021; + END_IF; + Messenger.ActivateOnCondition(ULINT#10020,StartMotorsProgramAndMovementsTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10021,StartMotorsProgramAndMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#122,StartMotorsProgramAndMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StartMotorsProgramAndMovementsTask.RestoreTriggered() AND _power_progress >= 320 AND _power_progress <= 339 THEN + Status.Action.Id := UINT#122; + _power_progress := 0; + END_IF; + //******************************************* + + //***********StartMotorsTask***************** + StartMotorsTask.SetIsDisabled(_stopTasksAreActive OR StartMotorsProgramAndMovementsTask.IsBusy() OR StartMotorsAndProgramTask.IsBusy()); + IF StartMotorsTask.StartTriggered() THEN + Status.Action.Id := UINT#140; + END_IF; + Messenger.ActivateOnCondition(ULINT#140,StartMotorsTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#141,StartMotorsTask.IsDone(), eAxoMessageCategory#Info); + IF StartMotorsTask.Execute(THIS) THEN + _blink.Blink(Context := _context, inOnTime:=T#500MS,inOffTime:=T#500MS); + + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 340; + END_IF; + // Start motors running: waiting for the 'UserSafetySwitchClosed' is on. + IF _power_progress = 340 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#540, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#540; + END_IF; + Outputs.MoveEnable := TRUE; + Outputs.DrivesOff := TRUE; + + IF Inputs.UserSafetySwitchClosed THEN + THIS.CallTimers(FALSE); + _power_progress := 341; + END_IF; + END_IF; + // Start motors running: waiting for the 'AlarmStopActive' is on. + IF _power_progress = 341 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#541, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#541; + END_IF; + + IF Inputs.AlarmStopActive THEN + THIS.CallTimers(FALSE); + _power_progress := 342; + END_IF; + END_IF; + // Start motors running: waiting for the 'DrivesReady' is on. + IF _power_progress = 342 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#542, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#542; + END_IF; + + Outputs.DrivesOff:=TRUE; + Outputs.DrivesOn:=_blink.output; + + IF Inputs.DrivesReady THEN + Outputs.DrivesOn:=FALSE; + THIS.CallTimers(FALSE); + _power_progress := 343; + END_IF; + END_IF; + // Start motors finished. + IF _power_progress = 343 THEN + StartMotorsTask.DoneWhen(TRUE); + THIS.CallTimers(FALSE); + _power_progress := 0; + END_IF; + + THIS.CallTimers(TRUE); + StartMotorsTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + END_IF; + IF StartMotorsTask.DoneReached() THEN + Status.Action.Id := UINT#141; + Status.Error.Id := UINT#0; + ELSIF StartMotorsTask.ErrorOccured() THEN + Status.Action.Id := UINT#10040; + Status.Error.Id := UINT#10040; + ELSIF StartMotorsTask.AbortTriggered() THEN + Status.Action.Id := UINT#10041; + Status.Error.Id := UINT#10041; + END_IF; + Messenger.ActivateOnCondition(ULINT#10040,StartMotorsTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10041,StartMotorsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#142,StartMotorsTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StartMotorsTask.RestoreTriggered() AND _power_progress >= 340 AND _power_progress <= 349 THEN + Status.Action.Id := UINT#142; + _power_progress := 0; + END_IF; + //******************************************* + + //***********StartMovementsTask************** + StartMovementsTask.SetIsDisabled(FALSE); + IF StartMovementsTask.StartTriggered() THEN + Status.Action.Id := UINT#150; + END_IF; + Messenger.ActivateOnCondition(ULINT#150,StartMovementsTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#151,StartMovementsTask.IsDone(), eAxoMessageCategory#Info); + IF StartMovementsTask.Execute(THIS) THEN + IF _movement_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _movement_progress := 350; + END_IF; + // Start movements running: waiting for the 'ProActive' is on. + IF _movement_progress = 350 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#550, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#550; + END_IF; + Outputs.MoveEnable := TRUE; + Outputs.DrivesOff := TRUE; + + IF Inputs.ProActive THEN + THIS.CallTimers(FALSE); + _movement_progress := 351; + END_IF; + END_IF; + // Start movements running: waiting for the 'DrivesReady' is on. + IF _movement_progress = 351 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#551, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#551; + END_IF; + + IF Inputs.DrivesReady THEN + THIS.CallTimers(FALSE); + _movement_progress := 352; + END_IF; + END_IF; + // Start movements running: waiting for the 'StopMess' is off. + IF _movement_progress = 352 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#552, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#552; + END_IF; + + IF NOT Inputs.StopMess THEN + THIS.CallTimers(FALSE); + _movement_progress := 353; + END_IF; + END_IF; + // Start movements running: sending parameters of the movement to the controller. + IF _movement_progress = 353 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#553, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#553; + END_IF; + + Outputs.GlobalSpeed := Status.CurrentMovementParameters.GlobalSpeed; + Outputs.ToolNo := Status.CurrentMovementParameters.ToolNo; + Outputs.WorkobjectNo := Status.CurrentMovementParameters.WorkobjectNo; + Outputs.PointNo := Status.CurrentMovementParameters.PointNo; + Outputs.UserSpecSpeed1 := Status.CurrentMovementParameters.UserSpecSpeed1; + Outputs.UserSpecSpeed2 := Status.CurrentMovementParameters.UserSpecSpeed2; + Outputs.Coordinates := Status.CurrentMovementParameters.Coordinates; + + Outputs.ActionNo := BYTE#254; + + IF Outputs.ActionNo = Inputs.ActionNo THEN + THIS.CallTimers(FALSE); + _movement_progress := 354; + END_IF; + END_IF; + // Start movements running: waiting for the movement parameters sent to the controller to be mirrored back. + IF _movement_progress = 354 THEN + IF _infoTimer.output THEN + IF Inputs.GlobalSpeed <> Status.CurrentMovementParameters.GlobalSpeed THEN + TaskMessenger.Activate( UINT#554, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#554;//<#Waiting for Inputs.GlobalSpeed to be equal to MovementParameters.GlobalSpeed! + END_IF; + IF Inputs.ToolNo <> Status.CurrentMovementParameters.ToolNo THEN + TaskMessenger.Activate( UINT#555, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#555;//<#Waiting for Inputs.ToolNo to be equal to MovementParameters.ToolNo! + END_IF; + IF Inputs.WorkobjectNo <> Status.CurrentMovementParameters.WorkobjectNo THEN + TaskMessenger.Activate( UINT#556, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#556;//<#Waiting for Inputs.WorkobjectNo to be equal to MovementParameters.WorkobjectNo! + END_IF; + IF Inputs.PointNo <> Status.CurrentMovementParameters.PointNo THEN + TaskMessenger.Activate( UINT#557, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#557;//<#Waiting for Inputs.PointNo to be equal to MovementParameters.PointNo! + END_IF; + IF Inputs.UserSpecSpeed1 <> Status.CurrentMovementParameters.UserSpecSpeed1 THEN + TaskMessenger.Activate( UINT#558, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#558;//<#Waiting for Inputs.UserSpecSpeed1 to be equal to MovementParameters.UserSpecSpeed1! + END_IF; + IF Inputs.UserSpecSpeed2 <> Status.CurrentMovementParameters.UserSpecSpeed2 THEN + TaskMessenger.Activate( UINT#559, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#559;//<#Waiting for Inputs.UserSpecSpeed2 to be equal to MovementParameters.UserSpecSpeed2! + END_IF; + END_IF; + + IF Inputs.GlobalSpeed = Status.CurrentMovementParameters.GlobalSpeed AND + Inputs.ToolNo = Status.CurrentMovementParameters.ToolNo AND + Inputs.WorkobjectNo = Status.CurrentMovementParameters.WorkobjectNo AND + Inputs.PointNo = Status.CurrentMovementParameters.PointNo AND + Inputs.UserSpecSpeed1 = Status.CurrentMovementParameters.UserSpecSpeed1 AND + Inputs.UserSpecSpeed2 = Status.CurrentMovementParameters.UserSpecSpeed2 AND + AXOpen.Components.Robotics.CoordinatesAreNearlyEqual(Inputs.Coordinates,Status.CurrentMovementParameters.Coordinates,REAL#0.01,REAL#0.01,REAL#0.01,REAL#0.01,REAL#0.01,REAL#0.01) THEN + THIS.CallTimers(FALSE); + _movement_progress:=360; + END_IF; + END_IF; + // Start movements running: acknowleadging of the movement parameters. + IF _movement_progress = 360 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#560, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#560; + END_IF; + + Outputs.ActionNo := BYTE#253; + + IF Outputs.ActionNo = Inputs.ActionNo THEN + THIS.CallTimers(FALSE); + _movement_progress:=361; + END_IF; + END_IF; + // Start movements running: waiting for the movement is finished. + IF _movement_progress = 361 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#561, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#561; + END_IF; + + _movementExecuting := TRUE; + + Outputs.ActionNo := Status.CurrentMovementParameters.ActionNo; + + IF Outputs.ActionNo = Inputs.ActionNo THEN + THIS.CallTimers(FALSE); + _movement_progress:=362; + END_IF; + END_IF; + // Start movements running: acknowleadging of the finished movement. + IF _movement_progress = 362 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#562, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#562; + END_IF; + + Outputs.ActionNo := BYTE#255; + + IF Outputs.ActionNo = Inputs.ActionNo THEN + THIS.CallTimers(FALSE); + _movement_progress := 363; + END_IF; + END_IF; + // Start movements finished. + IF _movement_progress = 363 THEN + _movement_progress := 0; + THIS.CallTimers(FALSE); + StartMovementsTask.DoneWhen(TRUE); + END_IF; + + THIS.CallTimers(NOT _movementExecuting); + + StartMovementsTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_movement_progress); + StartMovementsTask.ThrowWhen(StartMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartMovementsTask timeout.#>'); + END_IF; + IF StartMovementsTask.IsFirstExecutionCycle() THEN + MovementParameters := Status.CurrentMovementParameters; + END_IF; + IF StartMovementsTask.DoneReached() THEN + Status.Action.Id := UINT#151; + Status.Error.Id := UINT#0; + ELSIF StartMovementsTask.ErrorOccured() THEN + Status.Action.Id := UINT#10050; + Status.Error.Id := UINT#10050; + ELSIF StartMovementsTask.AbortTriggered() THEN + Status.Action.Id := UINT#10051; + Status.Error.Id := UINT#10051; + END_IF; + Messenger.ActivateOnCondition(ULINT#10050,StartMovementsTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10051,StartMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#152,StartMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StartMovementsTask.RestoreTriggered() AND _movement_progress >= 350 AND _movement_progress <= 369 THEN + Status.Action.Id := UINT#152; + _movement_progress := 0; + END_IF; + //******************************************* + + //***********StartProgramTask**************** + StartProgramTask.SetIsDisabled(_stopTasksAreActive); + IF StartAtMainTask.StartTriggered() THEN + Status.Action.Id := UINT#170; + END_IF; + Messenger.ActivateOnCondition(ULINT#170,StartAtMainTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#171,StartAtMainTask.IsDone(), eAxoMessageCategory#Info); + IF StartProgramTask.Execute(THIS) THEN + _blink.Blink(Context := _context, inOnTime:=T#500MS,inOffTime:=T#500MS); + + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 370; + END_IF; + // Start program running: waiting for the 'UserSafetySwitchClosed' is on. + IF _power_progress = 370 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#570, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#570; + END_IF; + Outputs.MoveEnable := TRUE; + Outputs.DrivesOff := TRUE; + Outputs.ActionNo := BYTE#255; + + IF Inputs.UserSafetySwitchClosed THEN + THIS.CallTimers(FALSE); + _power_progress := 371; + END_IF; + END_IF; + // Start program running: waiting for the 'AlarmStopActive' is on. + IF _power_progress = 371 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#571, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#571; + END_IF; + + IF Inputs.AlarmStopActive THEN + THIS.CallTimers(FALSE); + _power_progress := 372; + END_IF; + END_IF; + // Start program running: waiting for the 'DrivesReady' is on. + IF _power_progress = 372 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#572, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#572; + END_IF; + + Outputs.DrivesOff:=TRUE; + Outputs.DrivesOn:=_blink.output; + IF Inputs.DrivesReady THEN + Outputs.DrivesOn:=FALSE; + THIS.CallTimers(FALSE); + _power_progress := 373; + END_IF; + END_IF; + // Start program running: waiting for the 'StopMess' is off. + IF _power_progress = 373 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#573, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#573; + END_IF; + + Outputs.ErrorConfirmation := Inputs.StopMess AND _blink.output; + + IF NOT Inputs.StopMess THEN + Outputs.ErrorConfirmation:=FALSE; + THIS.CallTimers(FALSE); + _power_progress := 374; + END_IF; + END_IF; + // Start program running: waiting for the 'RcReady' is on. + IF _power_progress = 374 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#574, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#574; + END_IF; + + Outputs.MoveEnable:=TRUE; + + IF Inputs.RcReady THEN + THIS.CallTimers(FALSE); + _power_progress := 375; + END_IF; + END_IF; + // Start program running: waiting for the 'InterfaceActivated' is on. + IF _power_progress = 375 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#575, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#575; + END_IF; + + Outputs.ActivateInterface:=TRUE; + + IF Inputs.InterfaceActivated THEN + THIS.CallTimers(FALSE); + _power_progress := 376; + END_IF; + END_IF; + // Start program running: waiting for the 'ProActive' is on. + IF _power_progress = 376 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#576, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#576; + END_IF; + + IF Inputs.StopMess OR NOT Inputs.AlarmStopActive OR NOT Inputs.RcReady THEN + _power_progress := 370; + END_IF; + + Outputs.ExternalStart:=_blink.output; + + IF Inputs.ProActive THEN + Outputs.ExternalStart:= FALSE; + THIS.CallTimers(FALSE); + _power_progress := 377; + END_IF; + END_IF; + // Start program finished. + IF _power_progress = 377 THEN + StartProgramTask.DoneWhen(TRUE); + THIS.CallTimers(FALSE); + _power_progress := 0; + END_IF; + + THIS.CallTimers(TRUE); + StartProgramTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + StartProgramTask.ThrowWhen(StartProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StartProgramTask timeout.#>'); + END_IF; + IF StartProgramTask.DoneReached() THEN + Status.Action.Id := UINT#171; + Status.Error.Id := UINT#0; + ELSIF StartProgramTask.ErrorOccured() THEN + Status.Action.Id := UINT#10070; + Status.Error.Id := UINT#10070; + ELSIF StartProgramTask.AbortTriggered()THEN + Status.Action.Id := UINT#10071; + Status.Error.Id := UINT#10071; + END_IF; + Messenger.ActivateOnCondition(ULINT#10070,StartProgramTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10071,StartProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#172,StartProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StartProgramTask.RestoreTriggered() AND _power_progress >= 370 AND _power_progress <= 379 THEN + Status.Action.Id := UINT#172; + _power_progress := 0; + END_IF; + //******************************************* + + //***********StopMotorsTask****************** + StopMotorsTask.SetIsDisabled(FALSE); + IF StartAtMainTask.StartTriggered() THEN + Status.Action.Id := UINT#180; + END_IF; + Messenger.ActivateOnCondition(ULINT#180,StartAtMainTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#181,StartAtMainTask.IsDone(), eAxoMessageCategory#Info); + IF StopMotorsTask.Execute(THIS) THEN + _blink.Blink(Context := _context, inOnTime:=T#500MS,inOffTime:=T#500MS); + + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 380; + END_IF; + // Stop motors running: waiting for the 'DrivesReady' is off. + IF _power_progress = 380 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#580, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#580; + END_IF; + + Outputs.DrivesOn :=TRUE; + Outputs.DrivesOff := _blink.output; + + IF NOT Inputs.DrivesReady THEN + Outputs.DrivesOff :=FALSE; + THIS.CallTimers(FALSE); + _power_progress := 381; + END_IF; + END_IF; + // Stop motors finished. + IF _power_progress = 381 THEN + StopMotorsTask.DoneWhen(TRUE); + THIS.CallTimers(FALSE); + _power_progress := 0; + END_IF; + + THIS.CallTimers(TRUE); + StopMotorsTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + StopMotorsTask.ThrowWhen(StopMotorsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMotorsTask timeout.#>'); + END_IF; + IF StopMotorsTask.DoneReached() THEN + Status.Action.Id := UINT#181; + Status.Error.Id := UINT#0; + ELSIF StopMotorsTask.ErrorOccured() THEN + Status.Action.Id := UINT#10080; + Status.Error.Id := UINT#10080; + ELSIF StopMotorsTask.AbortTriggered()THEN + Status.Action.Id := UINT#10081; + Status.Error.Id := UINT#10081; + END_IF; + Messenger.ActivateOnCondition(ULINT#10080,StopMotorsTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10081,StopMotorsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#182,StopMotorsTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StopMotorsTask.RestoreTriggered() AND _power_progress >= 380 AND _power_progress <= 389 THEN + Status.Action.Id := UINT#182; + _power_progress := 0; + END_IF; + //******************************************* + + //***********StopMovementsAndProgramTask***** + StopMovementsAndProgramTask.SetIsDisabled(FALSE); + IF StopMovementsAndProgramTask.StartTriggered() THEN + Status.Action.Id := UINT#190; + END_IF; + Messenger.ActivateOnCondition(ULINT#190,StopMovementsAndProgramTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#191,StopMovementsAndProgramTask.IsDone(), eAxoMessageCategory#Info); + IF StopMovementsAndProgramTask.Execute(THIS) THEN + IF _power_progress = 0 THEN + _movement_progress := 0; + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 390; + END_IF; + // Stop movements and program running: waiting for the 'RobotStopped' is on. + IF _power_progress = 390 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#590, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#590; + END_IF; + + Outputs.MoveEnable := FALSE; + + IF Inputs.RobotStopped THEN + THIS.CallTimers(FALSE); + _power_progress := 391; + END_IF; + END_IF; + // Stop movements and program running: waiting for the 'ProActive' is off. + IF _power_progress = 391 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#591, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#591; + END_IF; + + IF NOT Inputs.ProActive THEN + THIS.CallTimers(FALSE); + _power_progress := 392; + END_IF; + END_IF; + // Stop movements and program finished. + IF _power_progress = 392 THEN + StopMovementsAndProgramTask.DoneWhen(TRUE); + _power_progress := 0; + END_IF; + + THIS.CallTimers(TRUE); + + StopMovementsAndProgramTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + StopMovementsAndProgramTask.ThrowWhen(StopMovementsAndProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsAndProgramTask timeout.#>'); + END_IF; + IF StopMovementsAndProgramTask.DoneReached() THEN + Status.Action.Id := UINT#191; + Status.Error.Id := UINT#0; + ELSIF StopMovementsAndProgramTask.ErrorOccured() THEN + Status.Action.Id := UINT#10090; + Status.Error.Id := UINT#10090; + ELSIF StopMovementsAndProgramTask.AbortTriggered()THEN + Status.Action.Id := UINT#10091; + Status.Error.Id := UINT#10091; + END_IF; + Messenger.ActivateOnCondition(ULINT#10090,StopMovementsAndProgramTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10091,StopMovementsAndProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#192,StopMovementsAndProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StopMovementsAndProgramTask.RestoreTriggered() AND _power_progress >= 390 AND _power_progress <= 399 THEN + Status.Action.Id := UINT#192; + _power_progress := 0; + END_IF; + //******************************************* + + //***********StopMovementsTask*************** + StopMovementsTask.SetIsDisabled(FALSE); + IF StopMovementsTask.StartTriggered() THEN + Status.Action.Id := UINT#400; + END_IF; + Messenger.ActivateOnCondition(ULINT#200,StopMovementsTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#201,StopMovementsTask.IsDone(), eAxoMessageCategory#Info); + IF StopMovementsTask.Execute(THIS) THEN + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 400; + END_IF; + // Stop movements running: waiting for the 'RobotStopped' is on. + IF _power_progress = 400 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#600, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#600; + END_IF; + + Outputs.MoveEnable := FALSE; + + IF Inputs.RobotStopped THEN + THIS.CallTimers(FALSE); + _power_progress := 401; + END_IF; + END_IF; + // Stop movements finished. + IF _power_progress = 401 THEN + _power_progress := 0; + StopMovementsTask.DoneWhen(TRUE); + END_IF; + + + THIS.CallTimers(TRUE); + + StopMovementsTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + StopMovementsTask.ThrowWhen(StopMovementsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopMovementsTask timeout.#>'); + END_IF; + IF StopMovementsTask.DoneReached() THEN + Status.Action.Id := UINT#201; + Status.Error.Id := UINT#0; + ELSIF StopMovementsTask.ErrorOccured() THEN + Status.Action.Id := UINT#10100; + Status.Error.Id := UINT#10100; + ELSIF StopMovementsTask.AbortTriggered()THEN + Status.Action.Id := UINT#10101; + Status.Error.Id := UINT#10101; + END_IF; + Messenger.ActivateOnCondition(ULINT#10100,StopMovementsTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10101,StopMovementsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#202,StopMovementsTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StopMovementsTask.RestoreTriggered() AND _power_progress >= 400 AND _power_progress <= 409 THEN + Status.Action.Id := UINT#202; + _power_progress := 0; + END_IF; + //******************************************* + + //***********StopProgramTask***************** + StopProgramTask.SetIsDisabled(FALSE); + IF StopProgramTask.StartTriggered() THEN + Status.Action.Id := UINT#210; + END_IF; + Messenger.ActivateOnCondition(ULINT#210,StopProgramTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#211,StopProgramTask.IsDone(), eAxoMessageCategory#Info); + IF StopProgramTask.Execute(THIS) THEN + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 410; + END_IF; + // Stop program running: waiting for the 'ProActive' is off. + IF _power_progress = 410 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#610, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#610; + END_IF; + + Outputs.MoveEnable:=FALSE; + + IF NOT Inputs.ProActive THEN + THIS.CallTimers(FALSE); + _power_progress := 411; + END_IF; + END_IF; + // Stop program finished. + IF _power_progress = 411 THEN + StopProgramTask.DoneWhen(TRUE); + _power_progress := 0; + END_IF; + + THIS.CallTimers(TRUE); + + StopProgramTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + StopProgramTask.ThrowWhen(StopProgramTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#StopProgramTask timeout.#>'); + END_IF; + IF StopProgramTask.DoneReached() THEN + Status.Action.Id := UINT#911; + Status.Error.Id := UINT#0; + ELSIF StopProgramTask.ErrorOccured() THEN + Status.Action.Id := UINT#10110; + Status.Error.Id := UINT#10110; + ELSIF StopProgramTask.AbortTriggered()THEN + Status.Action.Id := UINT#10111; + Status.Error.Id := UINT#10111; + END_IF; + Messenger.ActivateOnCondition(ULINT#10110,StopProgramTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10111,StopProgramTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#212,StopProgramTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF StopProgramTask.RestoreTriggered() AND _power_progress >= 410 AND _power_progress <= 419 THEN + Status.Action.Id := UINT#912; + _power_progress := 0; + END_IF; + //******************************************* + + //***********ResetAllOutputsTask***************** + ResetAllOutputsTask.SetIsDisabled(FALSE); + IF ResetAllOutputsTask.StartTriggered() THEN + Status.Action.Id := UINT#220; + END_IF; + Messenger.ActivateOnCondition(ULINT#220,ResetAllOutputsTask.IsBusy(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#221,ResetAllOutputsTask.IsDone(), eAxoMessageCategory#Info); + IF ResetAllOutputsTask.Execute(THIS) THEN + IF _power_progress = 0 THEN + Status.Error.Id := UINT#0; + TaskMessenger.Restore(); + THIS.CallTimers(FALSE); + _power_progress := 420; + END_IF; + // Reset all outputs running: + IF _power_progress = 420 THEN + IF _infoTimer.output THEN + TaskMessenger.Activate( UINT#620, eAxoMessageCategory#Potential); + Status.Error.Id := UINT#620; + END_IF; + + Outputs.ExternalStart := FALSE; + Outputs.MoveEnable := FALSE; + Outputs.ErrorConfirmation := FALSE; + Outputs.DrivesOff := FALSE; + Outputs.DrivesOn := FALSE; + Outputs.ActivateInterface := FALSE; + Outputs.StartAtMain := FALSE; + + Outputs.MasterMode := BYTE#0; + + Outputs.Tool_1_Retract := FALSE; + Outputs.Tool_1_Extend := FALSE; + Outputs.Tool_2_Retract := FALSE; + Outputs.Tool_2_Extend := FALSE; + Outputs.Tool_3_Retract := FALSE; + Outputs.Tool_3_Extend := FALSE; + Outputs.Tool_4_Retract := FALSE; + Outputs.Tool_4_Extend := FALSE; + + Outputs.Zone := BYTE#0; + Outputs.InPosition := BYTE#0; + Outputs.ActionNo := BYTE#0; + Outputs.GlobalSpeed := BYTE#0; + Outputs.ToolNo := BYTE#0; + Outputs.WorkobjectNo := BYTE#0; + Outputs.PointNo := BYTE#0; + Outputs.UserSpecSpeed1 := REAL#0.0; + Outputs.UserSpecSpeed2 := REAL#0.0; + + Outputs.Coordinates.X := REAL#0.0; + Outputs.Coordinates.Y := REAL#0.0; + Outputs.Coordinates.Z := REAL#0.0; + Outputs.Coordinates.Rx := REAL#0.0; + Outputs.Coordinates.Ry := REAL#0.0; + Outputs.Coordinates.Rz := REAL#0.0; + + IF TRUE THEN + THIS.CallTimers(FALSE); + _power_progress := 421; + END_IF; + END_IF; + // Reset all outputs finished. + IF _power_progress = 421 THEN + ResetAllOutputsTask.DoneWhen(TRUE); + _power_progress := 0; + END_IF; + + THIS.CallTimers(TRUE); + + ResetAllOutputsTask.ThrowWhen(_errorTimer.output); + Status.Action.Id := TO_UINT(_power_progress); + ResetAllOutputsTask.ThrowWhen(ResetAllOutputsTask.Duration >= Config.TaskTimeout AND Config.TaskTimeout > T#0s ,'<#ResetAllOutputsTask timeout.#>'); + END_IF; + IF ResetAllOutputsTask.DoneReached() THEN + Status.Action.Id := UINT#921; + Status.Error.Id := UINT#0; + ELSIF ResetAllOutputsTask.ErrorOccured() THEN + Status.Action.Id := UINT#10120; + Status.Error.Id := UINT#10120; + ELSIF ResetAllOutputsTask.AbortTriggered()THEN + Status.Action.Id := UINT#10121; + Status.Error.Id := UINT#10121; + END_IF; + Messenger.ActivateOnCondition(ULINT#10120,ResetAllOutputsTask.HasError(), eAxoMessageCategory#Error); + Messenger.ActivateOnCondition(ULINT#10121,ResetAllOutputsTask.IsAborted(), eAxoMessageCategory#Info); + Messenger.ActivateOnCondition(ULINT#222,ResetAllOutputsTask.RestoreTriggered() , eAxoMessageCategory#Info); + IF ResetAllOutputsTask.RestoreTriggered() AND _power_progress >= 420 AND _power_progress <= 429 THEN + Status.Action.Id := UINT#922; + _power_progress := 0; + END_IF; + //******************************************* + + _someTaskIsActive := StartAtMainTask.IsBusy() + OR StartMotorsAndProgramTask.IsBusy() + OR StartMovementsTask.IsBusy() + OR StopMovementsTask.IsBusy() + OR StopMovementsAndProgramTask.IsBusy() + OR StopProgramTask.IsBusy(); + + + IF _someTaskIsActive THEN + IF(Inputs.Manual) THEN + Messenger.Activate(UINT#20001,eAxoMessageCategory#Error); + Status.Error.Id := UINT#20001; + END_IF; + IF(NOT Inputs.Automatic) THEN + Messenger.Activate(UINT#20002,eAxoMessageCategory#Error); + Status.Error.Id := UINT#20002; + END_IF; + IF(NOT Inputs.AlarmStopActive) THEN + Messenger.Activate(UINT#20003,eAxoMessageCategory#Error); + Status.Error.Id := UINT#20003; + END_IF; + IF(NOT Inputs.UserSafetySwitchClosed) THEN + Messenger.Activate(UINT#20004,eAxoMessageCategory#Error); + Status.Error.Id := UINT#20004; + END_IF; + IF(Inputs.Error) THEN + Messenger.Activate(UINT#20005,eAxoMessageCategory#Error); + Status.Error.Id := UINT#20005; + END_IF; + END_IF; + + //***********UPDATE**OUTPUTS***************** + //SYSTEM OUTPUTS + _data[0].%X0 := Outputs.ExternalStart; + _data[0].%X1 := Outputs.MoveEnable; + _data[0].%X2 := Outputs.ErrorConfirmation; + _data[0].%X3 := Outputs.DrivesOff; + _data[0].%X4 := Outputs.DrivesOn; + _data[0].%X5 := Outputs.ActivateInterface; + _data[0].%X6 := Outputs.StartAtMain; + _data[0].%X7 := FALSE; + + _data[1].%X0 := FALSE; + _data[1].%X1 := FALSE; + _data[1].%X2 := FALSE; + _data[1].%X3 := FALSE; + _data[1].%X4 := FALSE; + _data[1].%X5 := FALSE; + _data[1].%X6 := FALSE; + _data[1].%X7 := FALSE; + + //Tool signals + _data[2].%X0 := Outputs.Tool_1_Retract; + _data[2].%X1 := Outputs.Tool_1_Extend; + _data[2].%X2 := Outputs.Tool_2_Retract; + _data[2].%X3 := Outputs.Tool_2_Extend; + _data[2].%X4 := Outputs.Tool_3_Retract; + _data[2].%X5 := Outputs.Tool_3_Extend; + _data[2].%X6 := Outputs.Tool_4_Retract; + _data[2].%X7 := Outputs.Tool_4_Extend; + + //master mode such as manual/auto .. + _data[3] := Outputs.MasterMode; + + //zone + _data[5] := Outputs.Zone; + + //position + _data[6] := Outputs.InPosition; + + //Movement parameters + _data[7] := Outputs.ActionNo; + _data[8] := Outputs.GlobalSpeed; + _data[9] := Outputs.ToolNo; + _data[10] := Outputs.WorkobjectNo; + _data[11] := Outputs.PointNo; + + _dword := TO_DWORD(TO_DINT(Outputs.UserSpecSpeed1)); + _data[12] := _dword.%B0; + _data[13] := _dword.%B1; + _data[14] := _dword.%B2; + _data[15] := _dword.%B3; + + _dword := TO_DWORD(TO_DINT(Outputs.UserSpecSpeed2)); + _data[16] := _dword.%B0; + _data[17] := _dword.%B1; + _data[18] := _dword.%B2; + _data[19] := _dword.%B3; + + ////Coordinates + _dword := TO_DWORD(TO_DINT(Outputs.Coordinates.X * REAL#10000.0)); + _data[20] := _dword.%B0; + _data[21] := _dword.%B1; + _data[22] := _dword.%B2; + _data[23] := _dword.%B3; + + _dword := TO_DWORD(TO_DINT(Outputs.Coordinates.Y * REAL#10000.0)); + _data[24] := _dword.%B0; + _data[25] := _dword.%B1; + _data[26] := _dword.%B2; + _data[27] := _dword.%B3; + + _dword := TO_DWORD(TO_DINT(Outputs.Coordinates.Z * REAL#10000.0)); + _data[28] := _dword.%B0; + _data[29] := _dword.%B1; + _data[30] := _dword.%B2; + _data[31] := _dword.%B3; + + _dword := TO_DWORD(TO_DINT(Outputs.Coordinates.Rx * REAL#10000.0)); + _data[32] := _dword.%B0; + _data[33] := _dword.%B1; + _data[34] := _dword.%B2; + _data[35] := _dword.%B3; + + _dword := TO_DWORD(TO_DINT(Outputs.Coordinates.Ry * REAL#10000.0)); + _data[36] := _dword.%B0; + _data[37] := _dword.%B1; + _data[38] := _dword.%B2; + _data[39] := _dword.%B3; + + _dword := TO_DWORD(TO_DINT(Outputs.Coordinates.Rz * REAL#10000.0)); + _data[40] := _dword.%B0; + _data[41] := _dword.%B1; + _data[42] := _dword.%B2; + _data[43] := _dword.%B3; + + _retVal := Siemens.Simatic.DistributedIO.WriteData((Config.HWIDs.HwID_512_DI_DO),_data); + IF _retVal > WORD#0 THEN + Messenger.Activate(UINT#1231, eAxoMessageCategory#Error); + Status.Error.Id := UINT#1231; + RETURN; + END_IF; + //******************************************* + END_METHOD + + METHOD PROTECTED OVERRIDE ManualControl + Status.CurrentMovementParameters := MovementParameters; + END_METHOD + + /// + /// Restores this component into intial state. + /// + METHOD PUBLIC OVERRIDE Restore + + StopMovementsTask.Restore(); + StopMovementsAndProgramTask.Restore(); + StopProgramTask.Restore(); + StopMotorsTask.Restore(); + StartAtMainTask.Restore(); + StartMotorsAndProgramTask.Restore(); + StartProgramTask.Restore(); + StartMotorsTask.Restore(); + StartMovementsTask.Restore(); + StartMotorsProgramAndMovementsTask.Restore(); + ResetAllOutputsTask.Restore(); + _power_progress := 0; + _movement_progress := 0; + Status.Action.Id := UINT#50; + RestoreTask.DoneWhen(TRUE); + END_METHOD + + METHOD PUBLIC StartAtMain : IAxoTaskState + StartAtMain := StartAtMainTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StartMotorsAndProgram : IAxoTaskState + StartMotorsAndProgram := StartMotorsAndProgramTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StartMotorsProgramAndMovements : IAxoTaskState + VAR_IN_OUT + inData : AxoRoboticsMovementsParams; + END_VAR + Status.CurrentMovementParameters := inData; + + StartMotorsProgramAndMovements := StartMotorsProgramAndMovementsTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StartMotors : IAxoTaskState + StartMotors := StartMotorsTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StartMovements : IAxoTaskState + VAR_IN_OUT + inData : AxoRoboticsMovementsParams; + END_VAR + Status.CurrentMovementParameters := inData; + + StartMovements := StartMovementsTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StartProgram : IAxoTaskState + StartProgram := StartProgramTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StopMotors : IAxoTaskState + StopMotors := StopMotorsTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StopMovementsAndProgram : IAxoTaskState + VAR_INPUT + inStopType : eAxoRoboticsStopType; + END_VAR + _stopType := inStopType; + StopMovementsAndProgram := StopMovementsAndProgramTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StopMovements : IAxoTaskState + VAR_INPUT + inStopType : eAxoRoboticsStopType; + END_VAR + _stopType := inStopType; + StopMovements := StopMovementsTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC StopProgram : IAxoTaskState + StopProgram := StopProgramTask.Invoke(THIS); + END_METHOD + + METHOD PUBLIC ResetAllOutputs : IAxoTaskState + ResetAllOutputs := ResetAllOutputsTask.Invoke(THIS); + END_METHOD + + METHOD PRIVATE CallTimers + VAR_INPUT + signal : BOOL; + END_VAR + + _infoTimer.OnDelay(THIS, signal AND Config.InfoTime > LT#0S ,Config.InfoTime); + _errorTimer.OnDelay(THIS, signal AND Config.ErrorTime > LT#0S , Config.ErrorTime); + END_METHOD + END_CLASS +END_NAMESPACE + + + + diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Component_Status.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Component_Status.st new file mode 100644 index 000000000..d38dd0122 --- /dev/null +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Component_Status.st @@ -0,0 +1,13 @@ +NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Stack)]} + CLASS PUBLIC AxoKrc5_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + VAR PUBLIC + END_VAR + END_CLASS +END_NAMESPACE + + + + + diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Config.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Config.st new file mode 100644 index 000000000..0d2b6d845 --- /dev/null +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Config.st @@ -0,0 +1,16 @@ +NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x + {#ix-attr:[Container(Layout.Stack)]} + {S7.extern=ReadWrite} + CLASS PUBLIC AxoKrc5_Config + VAR PUBLIC + {#ix-set:AttributeName = "<#Info time#>"} + InfoTime : LTIME := LT#2S; + {#ix-set:AttributeName = "<#Error time#>"} + ErrorTime : LTIME := LT#5S; + {#ix-set:AttributeName = "<#Task timeout#>"} + TaskTimeout : LTIME := LT#50S; + {#ix-set:AttributeName = "<#Hardware IDs#>"} + HWIDs : AxoKrc5_HWIDs; + END_VAR + END_CLASS +END_NAMESPACE diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Control.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Control.st new file mode 100644 index 000000000..82b33bd9d --- /dev/null +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Control.st @@ -0,0 +1,73 @@ +NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Wrap)]} + CLASS AxoKrc5_Control + VAR PUBLIC + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Program Start [EXT_START]#>"} + ExternalStart : BOOL; + {#ix-set:AttributeName = "<#Move Enable [MOVE_ENABLE]#>"} + MoveEnable : BOOL; + {#ix-set:AttributeName = "<#Error Confirmation [CONF_MESS]#>"} + ErrorConfirmation : BOOL; + {#ix-set:AttributeName = "<#Drives Off [DRIVES_OFF]#>"} + DrivesOff : BOOL; + {#ix-set:AttributeName = "<#Drives On [DRIVES_ON]#>"} + DrivesOn : BOOL; + {#ix-set:AttributeName = "<#Activate Interface [I_O_ACT]#>"} + ActivateInterface : BOOL; + {#ix-set:AttributeName = "<#Start At Main [START_AT_MAIN]#>"} + StartAtMain : BOOL; + {#ix-set:AttributeName = "<#Master mode#>"} + MasterMode : BYTE; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Tool 1 retract#>"} + Tool_1_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 1 extend#>"} + Tool_1_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 2 retract#>"} + Tool_2_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 2 extend#>"} + Tool_2_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 3 retract#>"} + Tool_3_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 3 extend#>"} + Tool_3_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 4 retract#>"} + Tool_4_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 4 extend#>"} + Tool_4_Extend : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Tool 1 retract#>"} + {#ix-set:AttributeName = "<#Zones#>"} + Zone : BYTE; + {#ix-set:AttributeName = "<#In position#>"} + InPosition : BYTE; + {#ix-set:AttributeName = "<#Action number#>"} + ActionNo : BYTE; + {#ix-set:AttributeName = "<#Global robot speed#>"} + GlobalSpeed : BYTE; + {#ix-set:AttributeName = "<#Tool number#>"} + ToolNo : BYTE; + {#ix-set:AttributeName = "<#Workobject number#>"} + WorkobjectNo : BYTE; + {#ix-set:AttributeName = "<#Point number#>"} + PointNo : BYTE; + {#ix-set:AttributeName = "<#User specific speed 1#>"} + UserSpecSpeed1 : REAL; + {#ix-set:AttributeName = "<#User specific speed 2#>"} + UserSpecSpeed2 : REAL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {attribute addProperty Name "<#Coordinates#>"} + Coordinates : AXOpen.Components.Abstractions.Robotics.AxoRoboticsCoordinates; + END_VAR + END_CLASS +END_NAMESPACE + \ No newline at end of file diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_HWIDs.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_HWIDs.st new file mode 100644 index 000000000..ddfddd010 --- /dev/null +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_HWIDs.st @@ -0,0 +1,14 @@ +NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Stack)]} + CLASS PUBLIC AxoKrc5_HWIDs + VAR PUBLIC + {#ix-set:AttributeName = "<#Hardware ID of the device#>"} + HwID_Device : UINT; + {#ix-set:AttributeName = "<#Hardware ID of the 'None' submodule#>"} + HwID_None : UINT; + {#ix-set:AttributeName = "<#Hardware ID of the '512_DI_DO' submodule#>"} + HwID_512_DI_DO : UINT; + END_VAR + END_CLASS +END_NAMESPACE \ No newline at end of file diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_State.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_State.st new file mode 100644 index 000000000..1ccd655be --- /dev/null +++ b/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_State.st @@ -0,0 +1,115 @@ +NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Wrap)]} + CLASS AxoKrc5_State + VAR PUBLIC + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#ControlReady [RC_RDY1]#>"} + RcReady : BOOL; + {#ix-set:AttributeName = "<#AlarmStopActive [ALARM_STOP]#>"} + AlarmStopActive : BOOL; + {#ix-set:AttributeName = "<#UserSafetySwitchClosed [USER_SAF]#>"} + UserSafetySwitchClosed : BOOL; + {#ix-set:AttributeName = "<#DrivesReady [PERI_RDY]#>"} + DrivesReady : BOOL; + {#ix-set:AttributeName = "<#RobotCalibrated [ROB_CAL]#>"} + RobotCalibrated : BOOL; + {#ix-set:AttributeName = "<#InterfaceActivated [I_O_ACTCONF]#>"} + InterfaceActivated : BOOL; + {#ix-set:AttributeName = "<#ErrorCollection [STOPMESS]#>"} + StopMess : BOOL; + {#ix-set:AttributeName = "<#RobotStopped [ROB_STOPPED]#>"} + RobotStopped : BOOL; + + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#InHome [IN_HOME]#>"} + InHome : BOOL; + {#ix-set:AttributeName = "<#Manual [T1]#>"} + Manual : BOOL; + {#ix-set:AttributeName = "<#Automatic [AUT]#>"} + Automatic : BOOL; + {#ix-set:AttributeName = "<#ExternalAutomatic [EXT]#>"} + ExternalAutomatic : BOOL; + {#ix-set:AttributeName = "<#ProcesActive [PRO_ACT]#>"} + ProActive : BOOL; + {#ix-set:AttributeName = "<#ProgramMoveActive [PROGRAM MOVEMENT ACTIVE]#>"} + ProgramMoveActive : BOOL; + {#ix-set:AttributeName = "<#Event ID#>"} + EventId : UDINT; + {#ix-set:AttributeName = "<#PpMoved#>"} + PpMoved : BOOL; + {#ix-set:AttributeName = "<#StartAtMain#>"} + StartAtMain : BOOL; + {#ix-set:AttributeName = "<#Error#>"} + Error : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#In area 1#>"} + InArea_1 : BOOL; + {#ix-set:AttributeName = "<#In area 2#>"} + InArea_2 : BOOL; + {#ix-set:AttributeName = "<#In area 3#>"} + InArea_3 : BOOL; + {#ix-set:AttributeName = "<#In area 4#>"} + InArea_4 : BOOL; + {#ix-set:AttributeName = "<#In position 1#>"} + InPosition_1 : BOOL; + {#ix-set:AttributeName = "<#In position 2#>"} + InPosition_2 : BOOL; + {#ix-set:AttributeName = "<#In position 3#>"} + InPosition_3 : BOOL; + {#ix-set:AttributeName = "<#In position 4#>"} + InPosition_4 : BOOL; + {#ix-set:AttributeName = "<#Zones#>"} + Zone : BYTE; + {#ix-set:AttributeName = "<#In position#>"} + InPosition : BYTE; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Tool 1 retract#>"} + Tool_1_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 1 extend#>"} + Tool_1_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 2 retract#>"} + Tool_2_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 2 extend#>"} + Tool_2_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 3 retract#>"} + Tool_3_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 3 extend#>"} + Tool_3_Extend : BOOL; + {#ix-set:AttributeName = "<#Tool 4 retract#>"} + Tool_4_Retract : BOOL; + {#ix-set:AttributeName = "<#Tool 4 extend#>"} + Tool_4_Extend : BOOL; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {#ix-set:AttributeName = "<#Action number#>"} + ActionNo : BYTE; + {#ix-set:AttributeName = "<#Global speed#>"} + GlobalSpeed : BYTE; + {#ix-set:AttributeName = "<#Tool number#>"} + ToolNo : BYTE; + {#ix-set:AttributeName = "<#Workobject number#>"} + WorkobjectNo : BYTE; + {#ix-set:AttributeName = "<#PointNumber#>"} + PointNo : BYTE; + {#ix-set:AttributeName = "<#User specific speed 1#>"} + UserSpecSpeed1 : DINT; + {#ix-set:AttributeName = "<#User specific speed 2#>"} + UserSpecSpeed2 : DINT; + + {#ix-attr:[Container(Layout.Stack)]} + {#ix-attr:[Group(GroupLayout.GroupBox)]} + {attribute addProperty Name "<#Coordinates#>"} + Coordinates : AXOpen.Components.Abstractions.Robotics.AxoRoboticsCoordinates; + END_VAR + END_CLASS +END_NAMESPACE + \ No newline at end of file diff --git a/src/components.kuka.robotics/this.sln b/src/components.kuka.robotics/this.sln index 98fe64ad4..90e2c3751 100644 --- a/src/components.kuka.robotics/this.sln +++ b/src/components.kuka.robotics/this.sln @@ -1,46 +1,34 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{37E0E3A3-CD87-43FF-ACF7-6054B1AE40CB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{C901DF2B-C5A9-4580-94FF-7B7ECCC5B9C0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{7D087DAC-9E72-4E43-94AB-61A09F91629D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{155DE2EB-C261-4958-95C7-0ED17B67C9CC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Kuka.Robotics.blazorapp", "app\ix-blazor\AXOpen.Components.Kuka.Robotics.blazorapp.csproj", "{F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_kuka_robotics", "app\ix\app_axopen_components_kuka_robotics.csproj", "{AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Kuka.Robotics.blazor", "src\AXOpen.Components.Kuka.Robotics.blazor\AXOpen.Components.Kuka.Robotics.blazor.csproj", "{87C5CC3C-9C0B-443B-90CE-4AB787DA572A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_kuka_robotics", "src\AXOpen.Components.Kuka.Robotics\inxton_axopen_components_kuka_robotics.csproj", "{A2D91CB5-668D-432D-95C2-77DE8F933036}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Kuka.Robotics_tests", "tests\AXOpen.Components.Kuka.Robotics.Tests\AXOpen.Components.Kuka.Robotics_tests.csproj", "{4295C961-68C2-461E-838C-08BBC6577B67}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor\AXOpen.Components.Robotics.blazor.csproj", "{9C66CD3E-1475-4F97-BDEB-506843315993}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{9395148E-CFE2-45EC-BF3E-7279DCBB76CB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\core\src\AXOpen.Core.Blazor\axopen_core_blazor.csproj", "{80CFF45D-20F0-480E-8BEC-30A9AA0ADA1A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{C87B881A-6D67-4920-94B4-6C418103EBD1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{2F218921-3050-4C99-AB31-D4CAC192B961}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{1153E2DF-D269-4AA8-9DA9-99A4C68884B5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{A4A2EB3C-0676-44C5-87F6-0513A4EC9C79}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{38215361-E804-4BE0-A2FB-1193C57F9EB2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{F72F2A82-AFB8-40DB-9D40-E342B06E8E18}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{293A159E-CB1D-4976-95CD-BD48D5F42926}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{403C634D-E6B4-438B-A4E2-F53D1C58CAC8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{D84A3926-80EB-47AB-82A2-98BD7CFC135D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{E6BE7D1A-DB5D-495F-8D42-58A4F381E79E}" @@ -55,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{502E287D-A3DD-4E9F-8DC9-0570DBCAA578}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{B01C7AF9-7EA8-45E5-B7BA-6E69DFFBFFFC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{A31C4EF3-DCCB-4490-B926-743760D0E376}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{55C68540-B26E-4535-97C3-9812E211F02F}" @@ -69,12 +55,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{8F708FE4-96C1-4F97-8B2C-ECC1AA3E724E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{696C0508-07FE-4D1B-8B3C-F106CC78E453}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{CF1C752D-8E4A-43B8-AF41-4C67CAD0FD1D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{31D37E17-689A-4743-923E-646CF07BFA31}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Kuka.Robotics.blazor", "src\AXOpen.Components.Kuka.Robotics.blazor", "{6349A998-0DDA-4504-A4EA-D54CC8989A91}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Kuka.Robotics", "src\AXOpen.Components.Kuka.Robotics", "{BA1F304C-AA85-4E1E-A406-C6FB60C1B484}" @@ -87,6 +67,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EE57CC4A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.kuka.robotics", "..\components.kuka.robotics", "{46A89015-B868-47B5-B04C-7E11DFD255EE}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor", "{580AD2EF-DA37-49B4-9C5D-178BBA93AEEE}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics", "..\components.robotics\src\AXOpen.Components.Robotics", "{D9A8289F-55D4-45B0-B0B5-46CF8CC19AA2}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.robotics\src", "{AB8F7C60-3798-49C5-8F49-E291DE77EB65}" @@ -101,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{9169 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{E4610F0C-7A96-4397-B058-EE71D365233A}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{1E5DB742-0215-4F52-9000-89D7AF21D519}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{C08B8DD0-717A-49E6-8D4C-4DF2EB9FA1E3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{C8E64BCD-81C3-4B13-A2DA-9E2AECCCC3CE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{DE97C4FC-77CE-4822-86BB-A82D33AFD997}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{805B503B-50D5-4AAE-9689-3B3875D1CC88}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{144B038C-E8CD-433A-A2EB-C131E2435209}" @@ -123,20 +97,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{A9F65503-48DB-4884-B777-D8D23D475FE5}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{7ED296FA-0F45-4E9C-895D-88B921EBE148}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{CF75B87F-3DB1-4850-AA75-3590E4D596C8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{DEFCE7F5-86CD-46F5-AB7F-7906F79C47A6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{9532C930-A53C-4320-9D79-1C81C8DF8617}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{6EC825CC-B581-4F2F-8941-3D7BCF9CE4BA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{01A0BD70-70FA-4448-8F4C-CC0B82197D46}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{06031F02-5EB9-4BB6-AF70-6CD47E633249}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{DA6DFB9F-1159-4539-A7E0-683E48AF03B8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{A0D43580-1560-4FFA-8603-5021DEF92E66}" @@ -171,10 +131,6 @@ Global {7D087DAC-9E72-4E43-94AB-61A09F91629D}.Debug|Any CPU.Build.0 = Debug|Any CPU {7D087DAC-9E72-4E43-94AB-61A09F91629D}.Release|Any CPU.ActiveCfg = Release|Any CPU {7D087DAC-9E72-4E43-94AB-61A09F91629D}.Release|Any CPU.Build.0 = Release|Any CPU - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B}.Release|Any CPU.Build.0 = Release|Any CPU {155DE2EB-C261-4958-95C7-0ED17B67C9CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {155DE2EB-C261-4958-95C7-0ED17B67C9CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {155DE2EB-C261-4958-95C7-0ED17B67C9CC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -183,14 +139,6 @@ Global {A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30}.Debug|Any CPU.Build.0 = Debug|Any CPU {A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30}.Release|Any CPU.ActiveCfg = Release|Any CPU {A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30}.Release|Any CPU.Build.0 = Release|Any CPU - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1}.Release|Any CPU.Build.0 = Release|Any CPU - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3}.Release|Any CPU.Build.0 = Release|Any CPU {87C5CC3C-9C0B-443B-90CE-4AB787DA572A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {87C5CC3C-9C0B-443B-90CE-4AB787DA572A}.Debug|Any CPU.Build.0 = Debug|Any CPU {87C5CC3C-9C0B-443B-90CE-4AB787DA572A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -203,6 +151,10 @@ Global {4295C961-68C2-461E-838C-08BBC6577B67}.Debug|Any CPU.Build.0 = Debug|Any CPU {4295C961-68C2-461E-838C-08BBC6577B67}.Release|Any CPU.ActiveCfg = Release|Any CPU {4295C961-68C2-461E-838C-08BBC6577B67}.Release|Any CPU.Build.0 = Release|Any CPU + {9C66CD3E-1475-4F97-BDEB-506843315993}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9C66CD3E-1475-4F97-BDEB-506843315993}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9C66CD3E-1475-4F97-BDEB-506843315993}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9C66CD3E-1475-4F97-BDEB-506843315993}.Release|Any CPU.Build.0 = Release|Any CPU {9395148E-CFE2-45EC-BF3E-7279DCBB76CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9395148E-CFE2-45EC-BF3E-7279DCBB76CB}.Debug|Any CPU.Build.0 = Debug|Any CPU {9395148E-CFE2-45EC-BF3E-7279DCBB76CB}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -215,10 +167,6 @@ Global {C87B881A-6D67-4920-94B4-6C418103EBD1}.Debug|Any CPU.Build.0 = Debug|Any CPU {C87B881A-6D67-4920-94B4-6C418103EBD1}.Release|Any CPU.ActiveCfg = Release|Any CPU {C87B881A-6D67-4920-94B4-6C418103EBD1}.Release|Any CPU.Build.0 = Release|Any CPU - {2F218921-3050-4C99-AB31-D4CAC192B961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F218921-3050-4C99-AB31-D4CAC192B961}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F218921-3050-4C99-AB31-D4CAC192B961}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F218921-3050-4C99-AB31-D4CAC192B961}.Release|Any CPU.Build.0 = Release|Any CPU {1153E2DF-D269-4AA8-9DA9-99A4C68884B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1153E2DF-D269-4AA8-9DA9-99A4C68884B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {1153E2DF-D269-4AA8-9DA9-99A4C68884B5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -231,18 +179,6 @@ Global {38215361-E804-4BE0-A2FB-1193C57F9EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU {38215361-E804-4BE0-A2FB-1193C57F9EB2}.Release|Any CPU.ActiveCfg = Release|Any CPU {38215361-E804-4BE0-A2FB-1193C57F9EB2}.Release|Any CPU.Build.0 = Release|Any CPU - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18}.Release|Any CPU.Build.0 = Release|Any CPU - {293A159E-CB1D-4976-95CD-BD48D5F42926}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {293A159E-CB1D-4976-95CD-BD48D5F42926}.Debug|Any CPU.Build.0 = Debug|Any CPU - {293A159E-CB1D-4976-95CD-BD48D5F42926}.Release|Any CPU.ActiveCfg = Release|Any CPU - {293A159E-CB1D-4976-95CD-BD48D5F42926}.Release|Any CPU.Build.0 = Release|Any CPU - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8}.Release|Any CPU.Build.0 = Release|Any CPU {D84A3926-80EB-47AB-82A2-98BD7CFC135D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D84A3926-80EB-47AB-82A2-98BD7CFC135D}.Debug|Any CPU.Build.0 = Debug|Any CPU {D84A3926-80EB-47AB-82A2-98BD7CFC135D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -265,19 +201,12 @@ Global {F44955B8-A5DA-4A21-8C08-8698882F09C8} = {82D532EF-6FE7-4365-82A3-AF7331716C34} {7D087DAC-9E72-4E43-94AB-61A09F91629D} = {502E287D-A3DD-4E9F-8DC9-0570DBCAA578} {502E287D-A3DD-4E9F-8DC9-0570DBCAA578} = {55C68540-B26E-4535-97C3-9812E211F02F} - {9C9E139A-96F3-4978-A2DE-76D3E7D6B06B} = {B01C7AF9-7EA8-45E5-B7BA-6E69DFFBFFFC} - {B01C7AF9-7EA8-45E5-B7BA-6E69DFFBFFFC} = {55C68540-B26E-4535-97C3-9812E211F02F} {155DE2EB-C261-4958-95C7-0ED17B67C9CC} = {A31C4EF3-DCCB-4490-B926-743760D0E376} {A31C4EF3-DCCB-4490-B926-743760D0E376} = {55C68540-B26E-4535-97C3-9812E211F02F} {55C68540-B26E-4535-97C3-9812E211F02F} = {9D2394B0-E3E4-48C8-B6FC-6694DC359AC5} {A4D5A0B6-FB76-4A5B-A8B0-7A75DF6ABD30} = {DDCF7058-D363-4C6A-A899-0D207F5322CF} {DDCF7058-D363-4C6A-A899-0D207F5322CF} = {21C1FF68-9BBB-44E3-940B-59D7B3B4FAFF} {21C1FF68-9BBB-44E3-940B-59D7B3B4FAFF} = {8F708FE4-96C1-4F97-8B2C-ECC1AA3E724E} - {F13C8E82-AB20-4EA6-A8FD-66DDF13606A1} = {696C0508-07FE-4D1B-8B3C-F106CC78E453} - {696C0508-07FE-4D1B-8B3C-F106CC78E453} = {31D37E17-689A-4743-923E-646CF07BFA31} - {AE3D7E2F-348C-4625-9D9A-093EFBDB5AD3} = {CF1C752D-8E4A-43B8-AF41-4C67CAD0FD1D} - {CF1C752D-8E4A-43B8-AF41-4C67CAD0FD1D} = {31D37E17-689A-4743-923E-646CF07BFA31} - {31D37E17-689A-4743-923E-646CF07BFA31} = {46A89015-B868-47B5-B04C-7E11DFD255EE} {87C5CC3C-9C0B-443B-90CE-4AB787DA572A} = {6349A998-0DDA-4504-A4EA-D54CC8989A91} {6349A998-0DDA-4504-A4EA-D54CC8989A91} = {E6CAA9EB-9020-4794-86AC-9197788897B7} {A2D91CB5-668D-432D-95C2-77DE8F933036} = {BA1F304C-AA85-4E1E-A406-C6FB60C1B484} @@ -286,6 +215,8 @@ Global {4295C961-68C2-461E-838C-08BBC6577B67} = {DC1EA5C9-514F-43B4-895B-B77B0E75A2E4} {DC1EA5C9-514F-43B4-895B-B77B0E75A2E4} = {EE57CC4A-9127-49E2-A9B9-F9EFAF174B53} {EE57CC4A-9127-49E2-A9B9-F9EFAF174B53} = {46A89015-B868-47B5-B04C-7E11DFD255EE} + {9C66CD3E-1475-4F97-BDEB-506843315993} = {580AD2EF-DA37-49B4-9C5D-178BBA93AEEE} + {580AD2EF-DA37-49B4-9C5D-178BBA93AEEE} = {AB8F7C60-3798-49C5-8F49-E291DE77EB65} {9395148E-CFE2-45EC-BF3E-7279DCBB76CB} = {D9A8289F-55D4-45B0-B0B5-46CF8CC19AA2} {D9A8289F-55D4-45B0-B0B5-46CF8CC19AA2} = {AB8F7C60-3798-49C5-8F49-E291DE77EB65} {AB8F7C60-3798-49C5-8F49-E291DE77EB65} = {0074C36A-1DE8-4E8B-9AEC-C132CCB7BB3E} @@ -294,10 +225,6 @@ Global {C87B881A-6D67-4920-94B4-6C418103EBD1} = {D62CBA86-5803-4476-8547-DAE0AEFF5D15} {D62CBA86-5803-4476-8547-DAE0AEFF5D15} = {91697709-6245-435E-BC12-9DCDCF8CF773} {91697709-6245-435E-BC12-9DCDCF8CF773} = {E4610F0C-7A96-4397-B058-EE71D365233A} - {2F218921-3050-4C99-AB31-D4CAC192B961} = {1E5DB742-0215-4F52-9000-89D7AF21D519} - {1E5DB742-0215-4F52-9000-89D7AF21D519} = {C08B8DD0-717A-49E6-8D4C-4DF2EB9FA1E3} - {C08B8DD0-717A-49E6-8D4C-4DF2EB9FA1E3} = {C8E64BCD-81C3-4B13-A2DA-9E2AECCCC3CE} - {C8E64BCD-81C3-4B13-A2DA-9E2AECCCC3CE} = {DE97C4FC-77CE-4822-86BB-A82D33AFD997} {1153E2DF-D269-4AA8-9DA9-99A4C68884B5} = {805B503B-50D5-4AAE-9689-3B3875D1CC88} {805B503B-50D5-4AAE-9689-3B3875D1CC88} = {B07AEE55-1E5A-4DC2-ADD5-964B7F8B1938} {A4A2EB3C-0676-44C5-87F6-0513A4EC9C79} = {144B038C-E8CD-433A-A2EB-C131E2435209} @@ -306,14 +233,6 @@ Global {38215361-E804-4BE0-A2FB-1193C57F9EB2} = {E1E7C105-F95D-40B5-AD8A-9D67CDA73F73} {E1E7C105-F95D-40B5-AD8A-9D67CDA73F73} = {9CF39BB2-5B77-49FC-97C1-7BA630172B7D} {9CF39BB2-5B77-49FC-97C1-7BA630172B7D} = {A9F65503-48DB-4884-B777-D8D23D475FE5} - {F72F2A82-AFB8-40DB-9D40-E342B06E8E18} = {7ED296FA-0F45-4E9C-895D-88B921EBE148} - {7ED296FA-0F45-4E9C-895D-88B921EBE148} = {DEFCE7F5-86CD-46F5-AB7F-7906F79C47A6} - {293A159E-CB1D-4976-95CD-BD48D5F42926} = {CF75B87F-3DB1-4850-AA75-3590E4D596C8} - {CF75B87F-3DB1-4850-AA75-3590E4D596C8} = {DEFCE7F5-86CD-46F5-AB7F-7906F79C47A6} - {DEFCE7F5-86CD-46F5-AB7F-7906F79C47A6} = {9532C930-A53C-4320-9D79-1C81C8DF8617} - {403C634D-E6B4-438B-A4E2-F53D1C58CAC8} = {6EC825CC-B581-4F2F-8941-3D7BCF9CE4BA} - {6EC825CC-B581-4F2F-8941-3D7BCF9CE4BA} = {01A0BD70-70FA-4448-8F4C-CC0B82197D46} - {01A0BD70-70FA-4448-8F4C-CC0B82197D46} = {06031F02-5EB9-4BB6-AF70-6CD47E633249} {D84A3926-80EB-47AB-82A2-98BD7CFC135D} = {DA6DFB9F-1159-4539-A7E0-683E48AF03B8} {DA6DFB9F-1159-4539-A7E0-683E48AF03B8} = {A0D43580-1560-4FFA-8603-5021DEF92E66} {E6BE7D1A-DB5D-495F-8D42-58A4F381E79E} = {C86A5C2B-8E43-451E-A7CE-B747E34616E0} diff --git a/src/components.mitsubishi.robotics/components.mitsubishi.robotics.code-workspace b/src/components.mitsubishi.robotics/components.mitsubishi.robotics.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.mitsubishi.robotics/components.mitsubishi.robotics.code-workspace +++ b/src/components.mitsubishi.robotics/components.mitsubishi.robotics.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.mitsubishi.robotics/components.mitsubishi.robotics.sln b/src/components.mitsubishi.robotics/components.mitsubishi.robotics.sln index 8084d833c..42a776317 100644 --- a/src/components.mitsubishi.robotics/components.mitsubishi.robotics.sln +++ b/src/components.mitsubishi.robotics/components.mitsubishi.robotics.sln @@ -1,45 +1,35 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{8E3E6B13-3254-46C5-BEEF-B5C76D5562DA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{FF379860-88AC-4078-8A66-E30207B9B7FB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{AB231AE5-223A-419E-A7C7-5FFC23F4FB0C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{B3826052-F19F-44E7-A5A8-D096D2ABBDF9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{090140BE-7E8E-48CB-9ED2-9655EC96B43A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Mitsubishi.Robotics.blazorapp", "app\ix-blazor\AXOpen.Components.Mitsubishi.Robotics.blazorapp.csproj", "{F853ECA7-36B6-4E27-90E4-6B574591684F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_mitsubishi_robotics", "app\ix\app_axopen_components_mitsubishi_robotics.csproj", "{3B70F251-561B-4893-98ED-6765369618C1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Mitsubishi.Robotics.blazor", "src\AXOpen.Components.Mitsubishi.Robotics.blazor\AXOpen.Components.Mitsubishi.Robotics.blazor.csproj", "{15974C54-EFE4-4053-8386-0E263109AC8F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_mitsubishi_robotics", "src\AXOpen.Components.Mitsubishi.Robotics\inxton_axopen_components_mitsubishi_robotics.csproj", "{3246DC9E-40BB-487F-91B8-1674823A03B1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Mitsubishi.Robotics_tests", "tests\AXOpen.Components.Mitsubishi.Robotics.Tests\AXOpen.Components.Mitsubishi.Robotics_tests.csproj", "{C4A64423-C0E2-4A2A-A0D8-3693A7898DF3}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor\AXOpen.Components.Robotics.blazor.csproj", "{724B62D7-CEEF-4C95-865E-2F2724495801}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{12F48C50-435A-47B4-B37D-0D8602D337A7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\core\src\AXOpen.Core.Blazor\axopen_core_blazor.csproj", "{B7C26C4B-02F5-4D5A-AD70-078467B85A11}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{DAF05825-DDCF-4310-AC4D-5406DF0AEFB9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{BEA7EEA1-D2CE-492F-98B4-8FEB9201088A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{1A22CB5F-3CD7-426F-BC18-A42B93954886}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{4561735A-4E63-415B-94D6-6A57D123D3EA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{27FDD702-D826-4449-9753-A7136E46C0BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{769F771F-A0D0-4A15-ABAA-AE4239CA0822}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD}" EndProject @@ -53,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{2EFCBDC7-ECCA-4C6D-9055-51EF51F9E14F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{058200DB-FDC8-4819-B2E4-50994063139A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{E9E96F90-0FD0-480A-A713-0167020D96D9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{69C5BBE4-8812-49D4-B337-0EB4C51B8AF6}" @@ -67,12 +55,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{9BC33C3F-5564-4B60-AC0A-6E46C7D76B57}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{D23ED445-E857-451E-A84D-A1F73D0695E8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{FEFD0281-7FDA-4A94-80CC-8E4A3E0F664C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{96BFA472-7977-4DE9-87A8-C619BEE2AFB0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Mitsubishi.Robotics.blazor", "src\AXOpen.Components.Mitsubishi.Robotics.blazor", "{7FFD4E32-B4C7-45BD-99B9-27A2D9873307}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Mitsubishi.Robotics", "src\AXOpen.Components.Mitsubishi.Robotics", "{55D2EE72-8000-479B-B9CF-1A10538EBB2D}" @@ -85,6 +67,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EA7AA901 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.mitsubishi.robotics", "..\components.mitsubishi.robotics", "{21A55E17-09D8-4E42-BCB0-41A432979CE3}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor", "{EE6D3C51-B627-4CFE-A8DA-9394143A848C}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics", "..\components.robotics\src\AXOpen.Components.Robotics", "{D386E289-368B-4A28-BA45-D997F66E0907}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.robotics\src", "{643AA89C-B60C-45AF-B7BD-453B0B715D12}" @@ -99,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{AC43 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{D233D4D3-36BB-4C70-B114-05145A70DD02}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{A69F8998-97BB-4297-9EFA-E900D053B1DD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{C4868AF5-1ED3-43B1-AA98-6F691B78C14D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{ADFE42AC-DD95-4206-9504-9CE7D6152363}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{B2BB9E7F-1BF9-4B23-BBBE-CC4933A260D9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{615D16F7-3C47-4440-8A9D-239C1D84EF35}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{E02D699E-2D54-49D4-A078-FCB2E2F4F49C}" @@ -121,19 +97,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{990F34CE-EAFE-4C8E-8D75-34A38286C7C2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{85D221F3-1558-4B16-B495-3600A1887DFC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{296B49D3-E174-41F8-90F6-E50D7EB315F3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{C673D392-5FF8-4DD9-97EE-8951D3C70F28}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{A2BA0166-E1C5-470C-80A9-18F529A9928F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{A0339736-D9C8-40B8-BC7F-8BC3AD70E8AD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{235937C9-E550-4BF4-B19A-BBEE8B7F7866}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{97341590-9A31-4EB8-AE55-5F4A34FB79F6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{3FE5DA25-3218-460D-A7A4-9C4BBAC5569F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{990EB887-7668-49A0-BCF0-18F2AC637AE9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{AE5140A8-443E-480B-85C0-D1078FA1BF2A}" EndProject @@ -165,10 +131,6 @@ Global {AB231AE5-223A-419E-A7C7-5FFC23F4FB0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB231AE5-223A-419E-A7C7-5FFC23F4FB0C}.Release|Any CPU.ActiveCfg = Release|Any CPU {AB231AE5-223A-419E-A7C7-5FFC23F4FB0C}.Release|Any CPU.Build.0 = Release|Any CPU - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9}.Release|Any CPU.Build.0 = Release|Any CPU {090140BE-7E8E-48CB-9ED2-9655EC96B43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {090140BE-7E8E-48CB-9ED2-9655EC96B43A}.Debug|Any CPU.Build.0 = Debug|Any CPU {090140BE-7E8E-48CB-9ED2-9655EC96B43A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -177,14 +139,6 @@ Global {62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1}.Release|Any CPU.ActiveCfg = Release|Any CPU {62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1}.Release|Any CPU.Build.0 = Release|Any CPU - {F853ECA7-36B6-4E27-90E4-6B574591684F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F853ECA7-36B6-4E27-90E4-6B574591684F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F853ECA7-36B6-4E27-90E4-6B574591684F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F853ECA7-36B6-4E27-90E4-6B574591684F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B70F251-561B-4893-98ED-6765369618C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B70F251-561B-4893-98ED-6765369618C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B70F251-561B-4893-98ED-6765369618C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B70F251-561B-4893-98ED-6765369618C1}.Release|Any CPU.Build.0 = Release|Any CPU {15974C54-EFE4-4053-8386-0E263109AC8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {15974C54-EFE4-4053-8386-0E263109AC8F}.Debug|Any CPU.Build.0 = Debug|Any CPU {15974C54-EFE4-4053-8386-0E263109AC8F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,6 +151,10 @@ Global {C4A64423-C0E2-4A2A-A0D8-3693A7898DF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4A64423-C0E2-4A2A-A0D8-3693A7898DF3}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4A64423-C0E2-4A2A-A0D8-3693A7898DF3}.Release|Any CPU.Build.0 = Release|Any CPU + {724B62D7-CEEF-4C95-865E-2F2724495801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {724B62D7-CEEF-4C95-865E-2F2724495801}.Debug|Any CPU.Build.0 = Debug|Any CPU + {724B62D7-CEEF-4C95-865E-2F2724495801}.Release|Any CPU.ActiveCfg = Release|Any CPU + {724B62D7-CEEF-4C95-865E-2F2724495801}.Release|Any CPU.Build.0 = Release|Any CPU {12F48C50-435A-47B4-B37D-0D8602D337A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {12F48C50-435A-47B4-B37D-0D8602D337A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {12F48C50-435A-47B4-B37D-0D8602D337A7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,10 +167,6 @@ Global {DAF05825-DDCF-4310-AC4D-5406DF0AEFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU {DAF05825-DDCF-4310-AC4D-5406DF0AEFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU {DAF05825-DDCF-4310-AC4D-5406DF0AEFB9}.Release|Any CPU.Build.0 = Release|Any CPU - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}.Release|Any CPU.Build.0 = Release|Any CPU {BEA7EEA1-D2CE-492F-98B4-8FEB9201088A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BEA7EEA1-D2CE-492F-98B4-8FEB9201088A}.Debug|Any CPU.Build.0 = Debug|Any CPU {BEA7EEA1-D2CE-492F-98B4-8FEB9201088A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,18 +179,10 @@ Global {4561735A-4E63-415B-94D6-6A57D123D3EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {4561735A-4E63-415B-94D6-6A57D123D3EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {4561735A-4E63-415B-94D6-6A57D123D3EA}.Release|Any CPU.Build.0 = Release|Any CPU - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}.Release|Any CPU.Build.0 = Release|Any CPU - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}.Release|Any CPU.Build.0 = Release|Any CPU - {27FDD702-D826-4449-9753-A7136E46C0BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27FDD702-D826-4449-9753-A7136E46C0BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27FDD702-D826-4449-9753-A7136E46C0BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27FDD702-D826-4449-9753-A7136E46C0BA}.Release|Any CPU.Build.0 = Release|Any CPU + {769F771F-A0D0-4A15-ABAA-AE4239CA0822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {769F771F-A0D0-4A15-ABAA-AE4239CA0822}.Debug|Any CPU.Build.0 = Debug|Any CPU + {769F771F-A0D0-4A15-ABAA-AE4239CA0822}.Release|Any CPU.ActiveCfg = Release|Any CPU + {769F771F-A0D0-4A15-ABAA-AE4239CA0822}.Release|Any CPU.Build.0 = Release|Any CPU {9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD}.Debug|Any CPU.Build.0 = Debug|Any CPU {9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -255,19 +201,12 @@ Global {577CF7B5-933D-4B70-A6FC-FE98DB7E024D} = {D0A91854-5E23-4E0D-903C-53C98B476851} {AB231AE5-223A-419E-A7C7-5FFC23F4FB0C} = {2EFCBDC7-ECCA-4C6D-9055-51EF51F9E14F} {2EFCBDC7-ECCA-4C6D-9055-51EF51F9E14F} = {69C5BBE4-8812-49D4-B337-0EB4C51B8AF6} - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9} = {058200DB-FDC8-4819-B2E4-50994063139A} - {058200DB-FDC8-4819-B2E4-50994063139A} = {69C5BBE4-8812-49D4-B337-0EB4C51B8AF6} {090140BE-7E8E-48CB-9ED2-9655EC96B43A} = {E9E96F90-0FD0-480A-A713-0167020D96D9} {E9E96F90-0FD0-480A-A713-0167020D96D9} = {69C5BBE4-8812-49D4-B337-0EB4C51B8AF6} {69C5BBE4-8812-49D4-B337-0EB4C51B8AF6} = {CC551A65-BC52-4BCC-9348-35948C78A539} {62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1} = {7CDBA471-2EB0-49FB-9D7A-21971EB258E7} {7CDBA471-2EB0-49FB-9D7A-21971EB258E7} = {AC68D569-0AE9-4BF8-9C95-6923DA7AC443} {AC68D569-0AE9-4BF8-9C95-6923DA7AC443} = {9BC33C3F-5564-4B60-AC0A-6E46C7D76B57} - {F853ECA7-36B6-4E27-90E4-6B574591684F} = {D23ED445-E857-451E-A84D-A1F73D0695E8} - {D23ED445-E857-451E-A84D-A1F73D0695E8} = {96BFA472-7977-4DE9-87A8-C619BEE2AFB0} - {3B70F251-561B-4893-98ED-6765369618C1} = {FEFD0281-7FDA-4A94-80CC-8E4A3E0F664C} - {FEFD0281-7FDA-4A94-80CC-8E4A3E0F664C} = {96BFA472-7977-4DE9-87A8-C619BEE2AFB0} - {96BFA472-7977-4DE9-87A8-C619BEE2AFB0} = {21A55E17-09D8-4E42-BCB0-41A432979CE3} {15974C54-EFE4-4053-8386-0E263109AC8F} = {7FFD4E32-B4C7-45BD-99B9-27A2D9873307} {7FFD4E32-B4C7-45BD-99B9-27A2D9873307} = {FC7A1822-FCC6-4C18-A02C-559C35F89A54} {3246DC9E-40BB-487F-91B8-1674823A03B1} = {55D2EE72-8000-479B-B9CF-1A10538EBB2D} @@ -276,6 +215,8 @@ Global {C4A64423-C0E2-4A2A-A0D8-3693A7898DF3} = {8DDFE372-A690-456B-BC89-22EF8CF806EF} {8DDFE372-A690-456B-BC89-22EF8CF806EF} = {EA7AA901-2F7D-47AA-B285-F23C62203898} {EA7AA901-2F7D-47AA-B285-F23C62203898} = {21A55E17-09D8-4E42-BCB0-41A432979CE3} + {724B62D7-CEEF-4C95-865E-2F2724495801} = {EE6D3C51-B627-4CFE-A8DA-9394143A848C} + {EE6D3C51-B627-4CFE-A8DA-9394143A848C} = {643AA89C-B60C-45AF-B7BD-453B0B715D12} {12F48C50-435A-47B4-B37D-0D8602D337A7} = {D386E289-368B-4A28-BA45-D997F66E0907} {D386E289-368B-4A28-BA45-D997F66E0907} = {643AA89C-B60C-45AF-B7BD-453B0B715D12} {643AA89C-B60C-45AF-B7BD-453B0B715D12} = {C6E5F6DE-BB3F-451C-ABBE-5ED34459FFAF} @@ -284,10 +225,6 @@ Global {DAF05825-DDCF-4310-AC4D-5406DF0AEFB9} = {77A2FF6A-DB7A-4739-8C5F-16FB625EEFDB} {77A2FF6A-DB7A-4739-8C5F-16FB625EEFDB} = {AC4328DF-18B7-4F89-ACAF-7F5643F4C55F} {AC4328DF-18B7-4F89-ACAF-7F5643F4C55F} = {D233D4D3-36BB-4C70-B114-05145A70DD02} - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A} = {A69F8998-97BB-4297-9EFA-E900D053B1DD} - {A69F8998-97BB-4297-9EFA-E900D053B1DD} = {C4868AF5-1ED3-43B1-AA98-6F691B78C14D} - {C4868AF5-1ED3-43B1-AA98-6F691B78C14D} = {ADFE42AC-DD95-4206-9504-9CE7D6152363} - {ADFE42AC-DD95-4206-9504-9CE7D6152363} = {B2BB9E7F-1BF9-4B23-BBBE-CC4933A260D9} {BEA7EEA1-D2CE-492F-98B4-8FEB9201088A} = {615D16F7-3C47-4440-8A9D-239C1D84EF35} {615D16F7-3C47-4440-8A9D-239C1D84EF35} = {BB0B74C7-ABD2-4B4A-ABF1-80F208C12F15} {1A22CB5F-3CD7-426F-BC18-A42B93954886} = {E02D699E-2D54-49D4-A078-FCB2E2F4F49C} @@ -296,14 +233,8 @@ Global {4561735A-4E63-415B-94D6-6A57D123D3EA} = {D56C9449-E0EC-432F-AC33-65DCA806A3EF} {D56C9449-E0EC-432F-AC33-65DCA806A3EF} = {C8D45279-4906-4571-BDAE-7C1F58CB1E66} {C8D45279-4906-4571-BDAE-7C1F58CB1E66} = {990F34CE-EAFE-4C8E-8D75-34A38286C7C2} - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4} = {85D221F3-1558-4B16-B495-3600A1887DFC} - {85D221F3-1558-4B16-B495-3600A1887DFC} = {C673D392-5FF8-4DD9-97EE-8951D3C70F28} - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C} = {296B49D3-E174-41F8-90F6-E50D7EB315F3} - {296B49D3-E174-41F8-90F6-E50D7EB315F3} = {C673D392-5FF8-4DD9-97EE-8951D3C70F28} - {C673D392-5FF8-4DD9-97EE-8951D3C70F28} = {A2BA0166-E1C5-470C-80A9-18F529A9928F} - {27FDD702-D826-4449-9753-A7136E46C0BA} = {A0339736-D9C8-40B8-BC7F-8BC3AD70E8AD} - {A0339736-D9C8-40B8-BC7F-8BC3AD70E8AD} = {235937C9-E550-4BF4-B19A-BBEE8B7F7866} - {235937C9-E550-4BF4-B19A-BBEE8B7F7866} = {3FE5DA25-3218-460D-A7A4-9C4BBAC5569F} + {769F771F-A0D0-4A15-ABAA-AE4239CA0822} = {97341590-9A31-4EB8-AE55-5F4A34FB79F6} + {97341590-9A31-4EB8-AE55-5F4A34FB79F6} = {990EB887-7668-49A0-BCF0-18F2AC637AE9} {9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD} = {AE5140A8-443E-480B-85C0-D1078FA1BF2A} {AE5140A8-443E-480B-85C0-D1078FA1BF2A} = {6514B9F1-CFAB-4764-A15C-99076C39E87B} {6514B9F1-CFAB-4764-A15C-99076C39E87B} = {93DD02E0-1185-4CCA-AAD5-211C0A084E69} diff --git a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Component_Status.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Component_Status.st similarity index 64% rename from src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Component_Status.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Component_Status.st index aed5091b2..d20e6984f 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Component_Status.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Component_Status.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoMitsubishiRobotics_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + CLASS PUBLIC AxoCr800_v_1_x_x_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status VAR PUBLIC END_VAR END_CLASS diff --git a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Config.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Config.st similarity index 84% rename from src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Config.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Config.st index 4805d965a..332984ee6 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Config.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Config.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoMitsubishiRobotics_Config + CLASS PUBLIC AxoCr800_v_1_x_x_Config VAR PUBLIC {#ix-set:AttributeName = "<#Info time#>"} InfoTime : LTIME := LT#2S; @@ -10,7 +10,8 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {#ix-set:AttributeName = "<#Task timeout#>"} TaskTimeout : LTIME := LT#0S; {#ix-set:AttributeName = "<#Hardware IDs#>"} - HWIDs : AxoMitsubishiRobotics_HWIDs; + HWIDs : AxoCr800_v_1_x_x_HWIDs; END_VAR END_CLASS END_NAMESPACE + \ No newline at end of file diff --git a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Control.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Control.st similarity index 98% rename from src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Control.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Control.st index 616e7a9b3..d756af265 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_Control.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Control.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoMitsubishiRobotics_Control + CLASS AxoCr800_v_1_x_x_Control VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_HWIDs.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_HWIDs.st similarity index 85% rename from src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_HWIDs.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_HWIDs.st index d32f8b720..b7a800046 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_HWIDs.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_HWIDs.st @@ -1,7 +1,8 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoMitsubishiRobotics_HWIDs + CLASS PUBLIC NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x + VAR PUBLIC {#ix-set:AttributeName = "<#Hardware ID of the device#>"} HwID_Device : UINT; diff --git a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_State.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_State.st similarity index 99% rename from src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_State.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_State.st index d4496de5e..ad0b3ed81 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/AxoMitsubishiRobotics_Datatypes_v_1_x_x/AxoMitsubishiRobotics_State.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_State.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoMitsubishiRobotics_State + CLASS AxoCr800_v_1_x_x_State VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.mitsubishi.robotics/this.sln b/src/components.mitsubishi.robotics/this.sln index 8084d833c..42a776317 100644 --- a/src/components.mitsubishi.robotics/this.sln +++ b/src/components.mitsubishi.robotics/this.sln @@ -1,45 +1,35 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{8E3E6B13-3254-46C5-BEEF-B5C76D5562DA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{FF379860-88AC-4078-8A66-E30207B9B7FB}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{AB231AE5-223A-419E-A7C7-5FFC23F4FB0C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{B3826052-F19F-44E7-A5A8-D096D2ABBDF9}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{090140BE-7E8E-48CB-9ED2-9655EC96B43A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Mitsubishi.Robotics.blazorapp", "app\ix-blazor\AXOpen.Components.Mitsubishi.Robotics.blazorapp.csproj", "{F853ECA7-36B6-4E27-90E4-6B574591684F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_mitsubishi_robotics", "app\ix\app_axopen_components_mitsubishi_robotics.csproj", "{3B70F251-561B-4893-98ED-6765369618C1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Mitsubishi.Robotics.blazor", "src\AXOpen.Components.Mitsubishi.Robotics.blazor\AXOpen.Components.Mitsubishi.Robotics.blazor.csproj", "{15974C54-EFE4-4053-8386-0E263109AC8F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_mitsubishi_robotics", "src\AXOpen.Components.Mitsubishi.Robotics\inxton_axopen_components_mitsubishi_robotics.csproj", "{3246DC9E-40BB-487F-91B8-1674823A03B1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Mitsubishi.Robotics_tests", "tests\AXOpen.Components.Mitsubishi.Robotics.Tests\AXOpen.Components.Mitsubishi.Robotics_tests.csproj", "{C4A64423-C0E2-4A2A-A0D8-3693A7898DF3}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor\AXOpen.Components.Robotics.blazor.csproj", "{724B62D7-CEEF-4C95-865E-2F2724495801}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{12F48C50-435A-47B4-B37D-0D8602D337A7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\core\src\AXOpen.Core.Blazor\axopen_core_blazor.csproj", "{B7C26C4B-02F5-4D5A-AD70-078467B85A11}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{DAF05825-DDCF-4310-AC4D-5406DF0AEFB9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{BEA7EEA1-D2CE-492F-98B4-8FEB9201088A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{1A22CB5F-3CD7-426F-BC18-A42B93954886}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{4561735A-4E63-415B-94D6-6A57D123D3EA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{27FDD702-D826-4449-9753-A7136E46C0BA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{769F771F-A0D0-4A15-ABAA-AE4239CA0822}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD}" EndProject @@ -53,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{2EFCBDC7-ECCA-4C6D-9055-51EF51F9E14F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{058200DB-FDC8-4819-B2E4-50994063139A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{E9E96F90-0FD0-480A-A713-0167020D96D9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{69C5BBE4-8812-49D4-B337-0EB4C51B8AF6}" @@ -67,12 +55,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{9BC33C3F-5564-4B60-AC0A-6E46C7D76B57}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{D23ED445-E857-451E-A84D-A1F73D0695E8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{FEFD0281-7FDA-4A94-80CC-8E4A3E0F664C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{96BFA472-7977-4DE9-87A8-C619BEE2AFB0}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Mitsubishi.Robotics.blazor", "src\AXOpen.Components.Mitsubishi.Robotics.blazor", "{7FFD4E32-B4C7-45BD-99B9-27A2D9873307}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Mitsubishi.Robotics", "src\AXOpen.Components.Mitsubishi.Robotics", "{55D2EE72-8000-479B-B9CF-1A10538EBB2D}" @@ -85,6 +67,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EA7AA901 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.mitsubishi.robotics", "..\components.mitsubishi.robotics", "{21A55E17-09D8-4E42-BCB0-41A432979CE3}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor", "{EE6D3C51-B627-4CFE-A8DA-9394143A848C}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics", "..\components.robotics\src\AXOpen.Components.Robotics", "{D386E289-368B-4A28-BA45-D997F66E0907}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.robotics\src", "{643AA89C-B60C-45AF-B7BD-453B0B715D12}" @@ -99,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{AC43 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{D233D4D3-36BB-4C70-B114-05145A70DD02}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{A69F8998-97BB-4297-9EFA-E900D053B1DD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{C4868AF5-1ED3-43B1-AA98-6F691B78C14D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{ADFE42AC-DD95-4206-9504-9CE7D6152363}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{B2BB9E7F-1BF9-4B23-BBBE-CC4933A260D9}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{615D16F7-3C47-4440-8A9D-239C1D84EF35}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{E02D699E-2D54-49D4-A078-FCB2E2F4F49C}" @@ -121,19 +97,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{990F34CE-EAFE-4C8E-8D75-34A38286C7C2}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{85D221F3-1558-4B16-B495-3600A1887DFC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{296B49D3-E174-41F8-90F6-E50D7EB315F3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{C673D392-5FF8-4DD9-97EE-8951D3C70F28}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{A2BA0166-E1C5-470C-80A9-18F529A9928F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{A0339736-D9C8-40B8-BC7F-8BC3AD70E8AD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{235937C9-E550-4BF4-B19A-BBEE8B7F7866}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{97341590-9A31-4EB8-AE55-5F4A34FB79F6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{3FE5DA25-3218-460D-A7A4-9C4BBAC5569F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{990EB887-7668-49A0-BCF0-18F2AC637AE9}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{AE5140A8-443E-480B-85C0-D1078FA1BF2A}" EndProject @@ -165,10 +131,6 @@ Global {AB231AE5-223A-419E-A7C7-5FFC23F4FB0C}.Debug|Any CPU.Build.0 = Debug|Any CPU {AB231AE5-223A-419E-A7C7-5FFC23F4FB0C}.Release|Any CPU.ActiveCfg = Release|Any CPU {AB231AE5-223A-419E-A7C7-5FFC23F4FB0C}.Release|Any CPU.Build.0 = Release|Any CPU - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9}.Release|Any CPU.Build.0 = Release|Any CPU {090140BE-7E8E-48CB-9ED2-9655EC96B43A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {090140BE-7E8E-48CB-9ED2-9655EC96B43A}.Debug|Any CPU.Build.0 = Debug|Any CPU {090140BE-7E8E-48CB-9ED2-9655EC96B43A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -177,14 +139,6 @@ Global {62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1}.Debug|Any CPU.Build.0 = Debug|Any CPU {62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1}.Release|Any CPU.ActiveCfg = Release|Any CPU {62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1}.Release|Any CPU.Build.0 = Release|Any CPU - {F853ECA7-36B6-4E27-90E4-6B574591684F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F853ECA7-36B6-4E27-90E4-6B574591684F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F853ECA7-36B6-4E27-90E4-6B574591684F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F853ECA7-36B6-4E27-90E4-6B574591684F}.Release|Any CPU.Build.0 = Release|Any CPU - {3B70F251-561B-4893-98ED-6765369618C1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3B70F251-561B-4893-98ED-6765369618C1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3B70F251-561B-4893-98ED-6765369618C1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3B70F251-561B-4893-98ED-6765369618C1}.Release|Any CPU.Build.0 = Release|Any CPU {15974C54-EFE4-4053-8386-0E263109AC8F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {15974C54-EFE4-4053-8386-0E263109AC8F}.Debug|Any CPU.Build.0 = Debug|Any CPU {15974C54-EFE4-4053-8386-0E263109AC8F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,6 +151,10 @@ Global {C4A64423-C0E2-4A2A-A0D8-3693A7898DF3}.Debug|Any CPU.Build.0 = Debug|Any CPU {C4A64423-C0E2-4A2A-A0D8-3693A7898DF3}.Release|Any CPU.ActiveCfg = Release|Any CPU {C4A64423-C0E2-4A2A-A0D8-3693A7898DF3}.Release|Any CPU.Build.0 = Release|Any CPU + {724B62D7-CEEF-4C95-865E-2F2724495801}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {724B62D7-CEEF-4C95-865E-2F2724495801}.Debug|Any CPU.Build.0 = Debug|Any CPU + {724B62D7-CEEF-4C95-865E-2F2724495801}.Release|Any CPU.ActiveCfg = Release|Any CPU + {724B62D7-CEEF-4C95-865E-2F2724495801}.Release|Any CPU.Build.0 = Release|Any CPU {12F48C50-435A-47B4-B37D-0D8602D337A7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {12F48C50-435A-47B4-B37D-0D8602D337A7}.Debug|Any CPU.Build.0 = Debug|Any CPU {12F48C50-435A-47B4-B37D-0D8602D337A7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,10 +167,6 @@ Global {DAF05825-DDCF-4310-AC4D-5406DF0AEFB9}.Debug|Any CPU.Build.0 = Debug|Any CPU {DAF05825-DDCF-4310-AC4D-5406DF0AEFB9}.Release|Any CPU.ActiveCfg = Release|Any CPU {DAF05825-DDCF-4310-AC4D-5406DF0AEFB9}.Release|Any CPU.Build.0 = Release|Any CPU - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A}.Release|Any CPU.Build.0 = Release|Any CPU {BEA7EEA1-D2CE-492F-98B4-8FEB9201088A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BEA7EEA1-D2CE-492F-98B4-8FEB9201088A}.Debug|Any CPU.Build.0 = Debug|Any CPU {BEA7EEA1-D2CE-492F-98B4-8FEB9201088A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,18 +179,10 @@ Global {4561735A-4E63-415B-94D6-6A57D123D3EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {4561735A-4E63-415B-94D6-6A57D123D3EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {4561735A-4E63-415B-94D6-6A57D123D3EA}.Release|Any CPU.Build.0 = Release|Any CPU - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4}.Release|Any CPU.Build.0 = Release|Any CPU - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C}.Release|Any CPU.Build.0 = Release|Any CPU - {27FDD702-D826-4449-9753-A7136E46C0BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27FDD702-D826-4449-9753-A7136E46C0BA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27FDD702-D826-4449-9753-A7136E46C0BA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27FDD702-D826-4449-9753-A7136E46C0BA}.Release|Any CPU.Build.0 = Release|Any CPU + {769F771F-A0D0-4A15-ABAA-AE4239CA0822}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {769F771F-A0D0-4A15-ABAA-AE4239CA0822}.Debug|Any CPU.Build.0 = Debug|Any CPU + {769F771F-A0D0-4A15-ABAA-AE4239CA0822}.Release|Any CPU.ActiveCfg = Release|Any CPU + {769F771F-A0D0-4A15-ABAA-AE4239CA0822}.Release|Any CPU.Build.0 = Release|Any CPU {9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD}.Debug|Any CPU.Build.0 = Debug|Any CPU {9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -255,19 +201,12 @@ Global {577CF7B5-933D-4B70-A6FC-FE98DB7E024D} = {D0A91854-5E23-4E0D-903C-53C98B476851} {AB231AE5-223A-419E-A7C7-5FFC23F4FB0C} = {2EFCBDC7-ECCA-4C6D-9055-51EF51F9E14F} {2EFCBDC7-ECCA-4C6D-9055-51EF51F9E14F} = {69C5BBE4-8812-49D4-B337-0EB4C51B8AF6} - {B3826052-F19F-44E7-A5A8-D096D2ABBDF9} = {058200DB-FDC8-4819-B2E4-50994063139A} - {058200DB-FDC8-4819-B2E4-50994063139A} = {69C5BBE4-8812-49D4-B337-0EB4C51B8AF6} {090140BE-7E8E-48CB-9ED2-9655EC96B43A} = {E9E96F90-0FD0-480A-A713-0167020D96D9} {E9E96F90-0FD0-480A-A713-0167020D96D9} = {69C5BBE4-8812-49D4-B337-0EB4C51B8AF6} {69C5BBE4-8812-49D4-B337-0EB4C51B8AF6} = {CC551A65-BC52-4BCC-9348-35948C78A539} {62D2E2F9-7C8F-4B1B-B8E1-E3B3228424C1} = {7CDBA471-2EB0-49FB-9D7A-21971EB258E7} {7CDBA471-2EB0-49FB-9D7A-21971EB258E7} = {AC68D569-0AE9-4BF8-9C95-6923DA7AC443} {AC68D569-0AE9-4BF8-9C95-6923DA7AC443} = {9BC33C3F-5564-4B60-AC0A-6E46C7D76B57} - {F853ECA7-36B6-4E27-90E4-6B574591684F} = {D23ED445-E857-451E-A84D-A1F73D0695E8} - {D23ED445-E857-451E-A84D-A1F73D0695E8} = {96BFA472-7977-4DE9-87A8-C619BEE2AFB0} - {3B70F251-561B-4893-98ED-6765369618C1} = {FEFD0281-7FDA-4A94-80CC-8E4A3E0F664C} - {FEFD0281-7FDA-4A94-80CC-8E4A3E0F664C} = {96BFA472-7977-4DE9-87A8-C619BEE2AFB0} - {96BFA472-7977-4DE9-87A8-C619BEE2AFB0} = {21A55E17-09D8-4E42-BCB0-41A432979CE3} {15974C54-EFE4-4053-8386-0E263109AC8F} = {7FFD4E32-B4C7-45BD-99B9-27A2D9873307} {7FFD4E32-B4C7-45BD-99B9-27A2D9873307} = {FC7A1822-FCC6-4C18-A02C-559C35F89A54} {3246DC9E-40BB-487F-91B8-1674823A03B1} = {55D2EE72-8000-479B-B9CF-1A10538EBB2D} @@ -276,6 +215,8 @@ Global {C4A64423-C0E2-4A2A-A0D8-3693A7898DF3} = {8DDFE372-A690-456B-BC89-22EF8CF806EF} {8DDFE372-A690-456B-BC89-22EF8CF806EF} = {EA7AA901-2F7D-47AA-B285-F23C62203898} {EA7AA901-2F7D-47AA-B285-F23C62203898} = {21A55E17-09D8-4E42-BCB0-41A432979CE3} + {724B62D7-CEEF-4C95-865E-2F2724495801} = {EE6D3C51-B627-4CFE-A8DA-9394143A848C} + {EE6D3C51-B627-4CFE-A8DA-9394143A848C} = {643AA89C-B60C-45AF-B7BD-453B0B715D12} {12F48C50-435A-47B4-B37D-0D8602D337A7} = {D386E289-368B-4A28-BA45-D997F66E0907} {D386E289-368B-4A28-BA45-D997F66E0907} = {643AA89C-B60C-45AF-B7BD-453B0B715D12} {643AA89C-B60C-45AF-B7BD-453B0B715D12} = {C6E5F6DE-BB3F-451C-ABBE-5ED34459FFAF} @@ -284,10 +225,6 @@ Global {DAF05825-DDCF-4310-AC4D-5406DF0AEFB9} = {77A2FF6A-DB7A-4739-8C5F-16FB625EEFDB} {77A2FF6A-DB7A-4739-8C5F-16FB625EEFDB} = {AC4328DF-18B7-4F89-ACAF-7F5643F4C55F} {AC4328DF-18B7-4F89-ACAF-7F5643F4C55F} = {D233D4D3-36BB-4C70-B114-05145A70DD02} - {8C0C9D33-EAEB-47B9-BE64-340BB8C03B5A} = {A69F8998-97BB-4297-9EFA-E900D053B1DD} - {A69F8998-97BB-4297-9EFA-E900D053B1DD} = {C4868AF5-1ED3-43B1-AA98-6F691B78C14D} - {C4868AF5-1ED3-43B1-AA98-6F691B78C14D} = {ADFE42AC-DD95-4206-9504-9CE7D6152363} - {ADFE42AC-DD95-4206-9504-9CE7D6152363} = {B2BB9E7F-1BF9-4B23-BBBE-CC4933A260D9} {BEA7EEA1-D2CE-492F-98B4-8FEB9201088A} = {615D16F7-3C47-4440-8A9D-239C1D84EF35} {615D16F7-3C47-4440-8A9D-239C1D84EF35} = {BB0B74C7-ABD2-4B4A-ABF1-80F208C12F15} {1A22CB5F-3CD7-426F-BC18-A42B93954886} = {E02D699E-2D54-49D4-A078-FCB2E2F4F49C} @@ -296,14 +233,8 @@ Global {4561735A-4E63-415B-94D6-6A57D123D3EA} = {D56C9449-E0EC-432F-AC33-65DCA806A3EF} {D56C9449-E0EC-432F-AC33-65DCA806A3EF} = {C8D45279-4906-4571-BDAE-7C1F58CB1E66} {C8D45279-4906-4571-BDAE-7C1F58CB1E66} = {990F34CE-EAFE-4C8E-8D75-34A38286C7C2} - {BDE6ECD4-D6FF-4B3C-954F-FE2C5512F5E4} = {85D221F3-1558-4B16-B495-3600A1887DFC} - {85D221F3-1558-4B16-B495-3600A1887DFC} = {C673D392-5FF8-4DD9-97EE-8951D3C70F28} - {1EB068BD-B4C5-4CB1-A80D-ECAD66CA342C} = {296B49D3-E174-41F8-90F6-E50D7EB315F3} - {296B49D3-E174-41F8-90F6-E50D7EB315F3} = {C673D392-5FF8-4DD9-97EE-8951D3C70F28} - {C673D392-5FF8-4DD9-97EE-8951D3C70F28} = {A2BA0166-E1C5-470C-80A9-18F529A9928F} - {27FDD702-D826-4449-9753-A7136E46C0BA} = {A0339736-D9C8-40B8-BC7F-8BC3AD70E8AD} - {A0339736-D9C8-40B8-BC7F-8BC3AD70E8AD} = {235937C9-E550-4BF4-B19A-BBEE8B7F7866} - {235937C9-E550-4BF4-B19A-BBEE8B7F7866} = {3FE5DA25-3218-460D-A7A4-9C4BBAC5569F} + {769F771F-A0D0-4A15-ABAA-AE4239CA0822} = {97341590-9A31-4EB8-AE55-5F4A34FB79F6} + {97341590-9A31-4EB8-AE55-5F4A34FB79F6} = {990EB887-7668-49A0-BCF0-18F2AC637AE9} {9EDFED1D-80D0-4DEA-A4BE-4B30CB3A75FD} = {AE5140A8-443E-480B-85C0-D1078FA1BF2A} {AE5140A8-443E-480B-85C0-D1078FA1BF2A} = {6514B9F1-CFAB-4764-A15C-99076C39E87B} {6514B9F1-CFAB-4764-A15C-99076C39E87B} = {93DD02E0-1185-4CCA-AAD5-211C0A084E69} From fc8825c35773cd0a93abc21a667a777280152bfd Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 13:31:18 +0200 Subject: [PATCH 15/33] wip --- .../v_1_x_x/AxoIrc5.st} | 12 +- .../AxoIrc5_Component_Status.st | 13 + .../AxoIrc5_Config.st} | 6 +- .../AxoIrc5_Control.st} | 4 +- .../TypesStructuresAndEnums/AxoIrc5_HWIDs.st} | 4 +- .../TypesStructuresAndEnums/AxoIrc5_State.st} | 4 +- .../AxoIrc5_v_1_x_x_Component_Status.st | 13 - .../AxoOmnicore_v_1_x_x.st | 0 .../AxoOmnicore_v_1_x_x_Component_Status.st | 0 .../AxoOmnicore_v_1_x_x_Config.st | 0 .../AxoOmnicore_v_1_x_x_Control.st | 0 .../AxoOmnicore_v_1_x_x_HWIDs.st | 0 .../AxoOmnicore_v_1_x_x_State.st | 0 .../AxoKrc4_v_5_x_x/AxoKrc4_v_5_x_x.cs | 6 +- .../AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs | 521 ++++++++++++++++++ src/traversals/apax/apax.yml | 51 ++ 16 files changed, 603 insertions(+), 31 deletions(-) rename src/components.abb.robotics/ctrl/src/{AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st => AxoIrc5/v_1_x_x/AxoIrc5.st} (99%) create mode 100644 src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Component_Status.st rename src/components.abb.robotics/ctrl/src/{AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Config.st => AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Config.st} (79%) rename src/components.abb.robotics/ctrl/src/{AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Control.st => AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Control.st} (98%) rename src/components.abb.robotics/ctrl/src/{AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_HWIDs.st => AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_HWIDs.st} (85%) rename src/components.abb.robotics/ctrl/src/{AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_State.st => AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_State.st} (98%) delete mode 100644 src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Component_Status.st rename src/components.abb.robotics/ctrl/src/{AxoOmnicore_v_1_x_x => AxoOmnicore}/AxoOmnicore_v_1_x_x.st (100%) rename src/components.abb.robotics/ctrl/src/{AxoOmnicore_v_1_x_x => AxoOmnicore}/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st (100%) rename src/components.abb.robotics/ctrl/src/{AxoOmnicore_v_1_x_x => AxoOmnicore}/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st (100%) rename src/components.abb.robotics/ctrl/src/{AxoOmnicore_v_1_x_x => AxoOmnicore}/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st (100%) rename src/components.abb.robotics/ctrl/src/{AxoOmnicore_v_1_x_x => AxoOmnicore}/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st (100%) rename src/components.abb.robotics/ctrl/src/{AxoOmnicore_v_1_x_x => AxoOmnicore}/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st (100%) create mode 100644 src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs create mode 100644 src/traversals/apax/apax.yml diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/AxoIrc5.st similarity index 99% rename from src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/AxoIrc5.st index 5da3eba72..3db050ff9 100644 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/AxoIrc5.st @@ -6,9 +6,9 @@ USING AXOpen.Components.Abstractions.Robotics; USING Siemens.Simatic.Hardware.Utilities; USING Siemens.Simatic.MemoryAccess; -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {S7.extern=ReadWrite} - CLASS AxoIrc5_v_1_x_x EXTENDS AXOpen.Core.AxoComponent IMPLEMENTS AXOpen.Components.Abstractions.Robotics.IAxoRobotics + CLASS AxoIrc5 EXTENDS AXOpen.Core.AxoComponent IMPLEMENTS AXOpen.Components.Abstractions.Robotics.IAxoRobotics VAR PUBLIC //HEADER {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[ComponentHeader()]} @@ -73,14 +73,14 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Config")]} {#ix-attr:[ReadOnly()]} - Config : AxoIrc5_v_1_x_x_Config; + Config : AxoIrc5_Config; END_VAR VAR PUBLIC //STATUS {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} - Status : AxoIrc5_v_1_x_x_Component_Status; + Status : AxoIrc5_Component_Status; Messenger : AXOpen.Messaging.Static.AxoMessenger; TaskMessenger : AXOpen.Messaging.Static.AxoMessenger; _progress : INT := 0; @@ -92,13 +92,13 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Inputs#>"} {#ix-attr:[ReadOnly()]} - Inputs : AxoIrc5_v_1_x_x_State; + Inputs : AxoIrc5_State; {#ix-attr:[ComponentDetails("Hardware signals")]} {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Outputs#>"} {#ix-attr:[ReadOnly()]} - Outputs : AxoIrc5_v_1_x_x_Control; + Outputs : AxoIrc5_Control; END_VAR VAR PUBLIC //HardwareDiagnostics diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Component_Status.st b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Component_Status.st new file mode 100644 index 000000000..ef5d4d603 --- /dev/null +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Component_Status.st @@ -0,0 +1,13 @@ +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Stack)]} + CLASS PUBLIC AxoIrc5_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + VAR PUBLIC + END_VAR + END_CLASS +END_NAMESPACE + + + + + diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Config.st b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Config.st similarity index 79% rename from src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Config.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Config.st index 094f00416..166d57b8f 100644 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Config.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Config.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoIrc5_v_1_x_x_Config + CLASS PUBLIC AxoIrc5_Config VAR PUBLIC {#ix-set:AttributeName = "<#Info time#>"} InfoTime : LTIME := LT#2S; @@ -10,7 +10,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-set:AttributeName = "<#Task timeout#>"} TaskTimeout : LTIME := LT#0S; {#ix-set:AttributeName = "<#Hardware IDs#>"} - HWIDs : AxoIrc5_v_1_x_x_HWIDs; + HWIDs : AxoIrc5_HWIDs; END_VAR END_CLASS END_NAMESPACE \ No newline at end of file diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Control.st b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Control.st similarity index 98% rename from src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Control.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Control.st index b69e8256d..8427f95d9 100644 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Control.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_Control.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoIrc5_v_1_x_x_Control + CLASS AxoIrc5_Control VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_HWIDs.st b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_HWIDs.st similarity index 85% rename from src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_HWIDs.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_HWIDs.st index f94441433..4f0ffe147 100644 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_HWIDs.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_HWIDs.st @@ -1,6 +1,6 @@ -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {S7.extern=ReadWrite} -CLASS AxoIrc5_v_1_x_x_HWIDs +CLASS AxoIrc5_HWIDs VAR PUBLIC {#ix-set:AttributeName = "<#Hardware ID of the device#>"} HW_Device : UINT; diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_State.st b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_State.st similarity index 98% rename from src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_State.st rename to src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_State.st index 46d3e1ca4..c7ccaaeed 100644 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_State.st +++ b/src/components.abb.robotics/ctrl/src/AxoIrc5/v_1_x_x/TypesStructuresAndEnums/AxoIrc5_State.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoIrc5_v_1_x_x_State + CLASS AxoIrc5_State VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Component_Status.st b/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Component_Status.st deleted file mode 100644 index 49a5b87db..000000000 --- a/src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x/TypesStructuresAndEnums/AxoIrc5_v_1_x_x_Component_Status.st +++ /dev/null @@ -1,13 +0,0 @@ -NAMESPACE AXOpen.Components.Abb.Robotics - {S7.extern=ReadWrite} - {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoIrc5_v_1_x_x_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status - VAR PUBLIC - END_VAR - END_CLASS -END_NAMESPACE - - - - - diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/AxoOmnicore_v_1_x_x.st similarity index 100% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/AxoOmnicore_v_1_x_x.st diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st similarity index 100% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st similarity index 100% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st similarity index 100% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st similarity index 100% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st similarity index 100% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4_v_5_x_x/AxoKrc4_v_5_x_x.cs b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4_v_5_x_x/AxoKrc4_v_5_x_x.cs index 450fd722c..c3f61b3c8 100644 --- a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4_v_5_x_x/AxoKrc4_v_5_x_x.cs +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4_v_5_x_x/AxoKrc4_v_5_x_x.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using System; using System.Collections.Generic; @@ -8,7 +8,7 @@ namespace AXOpen.Components.Kuka.Robotics.v_5_x_x { - public partial class AxoKrc4 : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics + public partial class AxoKrc5 : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics { partial void PostConstruct(ITwinObject parent, string readableTail, string symbolTail) { @@ -219,7 +219,7 @@ private void InitializeTaskMessenger() } } - public partial class AxoKukaRobotics_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status + public partial class AxoKrc5_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status { Dictionary errorDescriptionDict = new Dictionary(); Dictionary actionDescriptionDict = new Dictionary(); diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs new file mode 100644 index 000000000..450fd722c --- /dev/null +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs @@ -0,0 +1,521 @@ +using AXOpen.Messaging.Static; +using AXSharp.Connector; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace AXOpen.Components.Kuka.Robotics.v_5_x_x +{ + public partial class AxoKrc4 : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics + { + partial void PostConstruct(ITwinObject parent, string readableTail, string symbolTail) + { + try + { + InitializeMessenger(); + InitializeTaskMessenger(); + } + catch (Exception) + { + + throw; + } + } + + private void InitializeMessenger() + { + List> messengerTextList = new List> + { + new KeyValuePair(0, new AxoMessengerTextItem(" ", " ")), + new KeyValuePair(50, new AxoMessengerTextItem("Restore has been executed.", "")), + + new KeyValuePair(100, new AxoMessengerTextItem("Start at main started.", "")), + new KeyValuePair(101, new AxoMessengerTextItem("Start at main finished succesfully.", "")), + new KeyValuePair(102, new AxoMessengerTextItem("Start at main restored.", "")), + + new KeyValuePair(110, new AxoMessengerTextItem("Start motors and program started.", "")), + new KeyValuePair(111, new AxoMessengerTextItem("Start motors and program finished succesfully.", "")), + new KeyValuePair(112, new AxoMessengerTextItem("Start motors and program restored.", "")), + + new KeyValuePair(120, new AxoMessengerTextItem("Start motors program and movements started.", "")), + new KeyValuePair(121, new AxoMessengerTextItem("Start motors program and movements finished succesfully.", "")), + new KeyValuePair(122, new AxoMessengerTextItem("Start motors program and movements restored.", "")), + + new KeyValuePair(140, new AxoMessengerTextItem("Start motors started.", "")), + new KeyValuePair(141, new AxoMessengerTextItem("Start motors finished succesfully.", "")), + new KeyValuePair(142, new AxoMessengerTextItem("Start motors restored.", "")), + + new KeyValuePair(150, new AxoMessengerTextItem("Start movements started.", "")), + new KeyValuePair(151, new AxoMessengerTextItem("Start movements finished succesfully.", "")), + new KeyValuePair(152, new AxoMessengerTextItem("Start movements restored.", "")), + + new KeyValuePair(170, new AxoMessengerTextItem("Start program started.", "")), + new KeyValuePair(171, new AxoMessengerTextItem("Start program finished succesfully.", "")), + new KeyValuePair(172, new AxoMessengerTextItem("Start program restored.", "")), + + new KeyValuePair(180, new AxoMessengerTextItem("Stop motors started.", "")), + new KeyValuePair(181, new AxoMessengerTextItem("Stop motors finished succesfully.", "")), + new KeyValuePair(182, new AxoMessengerTextItem("Stop motors restored.", "")), + + new KeyValuePair(190, new AxoMessengerTextItem("Stop movements and program started.", "")), + new KeyValuePair(191, new AxoMessengerTextItem("Stop movements and program finished succesfully.", "")), + new KeyValuePair(192, new AxoMessengerTextItem("Stop movements and program restored.", "")), + + new KeyValuePair(200, new AxoMessengerTextItem("Stop movements started.", "")), + new KeyValuePair(201, new AxoMessengerTextItem("Stop movements finished succesfully.", "")), + new KeyValuePair(202, new AxoMessengerTextItem("Stop movements restored.", "")), + + new KeyValuePair(210, new AxoMessengerTextItem("Stop program started.", "")), + new KeyValuePair(211, new AxoMessengerTextItem("Stop program finished succesfully.", "")), + new KeyValuePair(212, new AxoMessengerTextItem("Stop program restored.", "")), + + new KeyValuePair(220, new AxoMessengerTextItem("Reset all outputs started.", "")), + new KeyValuePair(221, new AxoMessengerTextItem("Reset all outputs finished succesfully.", "")), + new KeyValuePair(222, new AxoMessengerTextItem("Reset all outputs restored.", "")), + + // General alarms + new KeyValuePair(700, new AxoMessengerTextItem("Input variable `parent` has NULL reference in `Run` method!" ,"Check the call of the `Run` method, if the `parent` parameter is assigned.")), + new KeyValuePair(701, new AxoMessengerTextItem("Input variable `Config.HWIDs.HwID_Device` has invalid value in `Run` method!" ,"Check the call of the `Run` method, if the `Config.HWIDs.HwID_Device` parameter is assigned.")), + new KeyValuePair(702, new AxoMessengerTextItem("Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)." ,"Check the hardware configuration.")), + + new KeyValuePair(710, new AxoMessengerTextItem("Hw configuration error. Value of Config.HWIDs.HwID_None is zero." ,"Check the hardware configuration.")), + new KeyValuePair(711, new AxoMessengerTextItem("Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1." ,"Check the hardware configuration.")), + new KeyValuePair(712, new AxoMessengerTextItem("Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1." ,"Check the hardware configuration.")), + new KeyValuePair(713, new AxoMessengerTextItem("Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1." ,"Check the hardware configuration.")), + new KeyValuePair(714, new AxoMessengerTextItem("Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1." ,"Check the hardware configuration.")), + new KeyValuePair(715, new AxoMessengerTextItem("Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1." ,"Check the hardware configuration.")), + new KeyValuePair(716, new AxoMessengerTextItem("Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module: 'NotAssigned'." ,"Check the hardware configuration.")), + + new KeyValuePair(720, new AxoMessengerTextItem("Hw configuration error. Value of Config.HWIDs.HwID_512_DI_DO is zero." ,"Check the hardware configuration.")), + new KeyValuePair(721, new AxoMessengerTextItem("Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2." ,"Check the hardware configuration.")), + new KeyValuePair(722, new AxoMessengerTextItem("Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2." ,"Check the hardware configuration.")), + new KeyValuePair(723, new AxoMessengerTextItem("Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2." ,"Check the hardware configuration.")), + new KeyValuePair(724, new AxoMessengerTextItem("Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2." ,"Check the hardware configuration.")), + new KeyValuePair(725, new AxoMessengerTextItem("Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2." ,"Check the hardware configuration.")), + new KeyValuePair(726, new AxoMessengerTextItem("Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module: 'DIO512'." ,"Check the hardware configuration.")), + + new KeyValuePair(1130, new AxoMessengerTextItem("Input variable `parent` has NULL reference in `Run` method!" ,"Check the call of the `Run` method, if the `parent` parameter is assigned.")), + new KeyValuePair(1131, new AxoMessengerTextItem("Input variable `Config.HWIDs.HwID_Device` has invalid value in `Run` method!" ,"Check the call of the `Run` method, if the `Config.HWIDs.HwID_Device` parameter is assigned.")), + new KeyValuePair(1132, new AxoMessengerTextItem("Input variable `Config.HWIDs.HwID_None` has invalid value in `Run` method!" ,"Check the call of the `Run` method, if the `Config.HWIDs.HwID_None` parameter is assigned.")), + new KeyValuePair(1133, new AxoMessengerTextItem("Input variable `Config.HWIDs.HwID_512_DI_DO` has invalid value in `Run` method!" ,"Check the call of the `Run` method, if the `Config.HWIDs.HwID_512_DI_DO` parameter is assigned.")), + + new KeyValuePair(1201, new AxoMessengerTextItem("Error reading the input data (Config.HWIDs.HwID_512_DI_DO)!" ,"Check the value of the Config.HWIDs.HwID_512_DI_DO and reacheability of the device!")), + + new KeyValuePair(1231, new AxoMessengerTextItem("Error writing the output data (Config.HWIDs.HwID_512_DI_DO)!" ,"Check the value of the Config.HWIDs.HwID_512_DI_DO and reacheability of the device!")), + + new KeyValuePair(10000, new AxoMessengerTextItem("Start at main finished with error!","Check the details.")), + new KeyValuePair(10001, new AxoMessengerTextItem("Start at main was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10010, new AxoMessengerTextItem("Start motors and program finished with error!","Check the details.")), + new KeyValuePair(10011, new AxoMessengerTextItem("Start motors and program was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10020, new AxoMessengerTextItem("Start motors program and movements finished with error!","Check the details.")), + new KeyValuePair(10021, new AxoMessengerTextItem("Start motors program and movements was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10040, new AxoMessengerTextItem("Start motors task finished with error!","Check the details.")), + new KeyValuePair(10041, new AxoMessengerTextItem("Start motors task was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10050, new AxoMessengerTextItem("Start movements task finished with error!","Check the details.")), + new KeyValuePair(10051, new AxoMessengerTextItem("Start movements task was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10070, new AxoMessengerTextItem("Start program task finished with error!","Check the details.")), + new KeyValuePair(10071, new AxoMessengerTextItem("Start program task was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10080, new AxoMessengerTextItem("Stop motors task finished with error!","Check the details.")), + new KeyValuePair(10081, new AxoMessengerTextItem("Stop motors task was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10090, new AxoMessengerTextItem("Stop movements and program task finished with error!","Check the details.")), + new KeyValuePair(10091, new AxoMessengerTextItem("Stop movements and program task was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10100, new AxoMessengerTextItem("Stop movements task finished with error!","Check the details.")), + new KeyValuePair(10101, new AxoMessengerTextItem("Stop movements task was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10110, new AxoMessengerTextItem("Stop program task finished with error!","Check the details.")), + new KeyValuePair(10111, new AxoMessengerTextItem("Stop program task was aborted, while not yet completed!","Check the details.")), + new KeyValuePair(10120, new AxoMessengerTextItem("Reset all outputs task finished with error!","Check the details.")), + new KeyValuePair(10121, new AxoMessengerTextItem("Reset all outputs task was aborted, while not yet completed!","Check the details.")), + + new KeyValuePair(20001, new AxoMessengerTextItem("Robot is switched into manual mode, while action requested!","Switch robot to automatic mode.")), + new KeyValuePair(20002, new AxoMessengerTextItem("Robot is not switched into automat mode, while action requested!","Switch robot to automatic mode.")), + new KeyValuePair(20003, new AxoMessengerTextItem("Waiting for signal 'Inputs.AlarmStopActive' to be set!","Check the signal.")), + new KeyValuePair(20004, new AxoMessengerTextItem("Waiting for signal 'Inputs.UserSafetySwitchClosed' to be set!","Check the signal.")), + new KeyValuePair(20005, new AxoMessengerTextItem("Waiting for signal 'Inputs.Error' to be reseted!","Check the signal.")), + + + + + }; + + Messenger.DotNetMessengerTextList = messengerTextList; + } + + private void InitializeTaskMessenger() + { + List> messengerTextList = new List> + { + new KeyValuePair(0, new AxoMessengerTextItem(" ", " ")), + new KeyValuePair(500, new AxoMessengerTextItem("Waiting for the signal Inputs.PpMoved to be set!", "Check the status of the `Inputs.PpMoved` signal.")), + + + new KeyValuePair(510, new AxoMessengerTextItem("Waiting for the signal Inputs.UserSafetySwitchClosed to be set!", "Check the status of the `Inputs.UserSafetySwitchClosed` signal.")), + new KeyValuePair(511, new AxoMessengerTextItem("Waiting for the signal Inputs.AlarmStopActive to be set!", "Check the status of the `AlarmStopActive` signal.")), + new KeyValuePair(512, new AxoMessengerTextItem("Waiting for the signal Inputs.DrivesReady to be set!", "Check the status of the `DrivesReady` signal.")), + new KeyValuePair(513, new AxoMessengerTextItem("Waiting for the signal Inputs.StopMess to be reseted!", "Check the status of the `Inputs.StopMess` signal.")), + new KeyValuePair(514, new AxoMessengerTextItem("Waiting for the signal Inputs.RcReady to be set!", "Check the status of the `Inputs.RcReady` signal.")), + new KeyValuePair(515, new AxoMessengerTextItem("Waiting for the signal Inputs.InterfaceActivated to be set!", "Check the status of the `InterfaceActivated` signal.")), + new KeyValuePair(516, new AxoMessengerTextItem("Waiting for the signal Inputs.ProActive to be set!", "Check the status of the `ProActive` signal.")), + + new KeyValuePair(520, new AxoMessengerTextItem("Waiting for the signal Inputs.UserSafetySwitchClosed to be set!", "Check the status of the `Inputs.UserSafetySwitchClosed` signal.")), + new KeyValuePair(521, new AxoMessengerTextItem("Waiting for the signal Inputs.AlarmStopActive to be set!", "Check the status of the `AlarmStopActive` signal.")), + new KeyValuePair(522, new AxoMessengerTextItem("Waiting for the signal Inputs.DrivesReady to be set!", "Check the status of the `DrivesReady` signal.")), + new KeyValuePair(523, new AxoMessengerTextItem("Waiting for the signal Inputs.StopMess to be reseted!", "Check the status of the `Inputs.StopMess` signal.")), + new KeyValuePair(524, new AxoMessengerTextItem("Waiting for the signal Inputs.RcReady to be set!", "Check the status of the `Inputs.RcReady` signal.")), + new KeyValuePair(525, new AxoMessengerTextItem("Waiting for the signal Inputs.InterfaceActivated to be set!", "Check the status of the `InterfaceActivated` signal.")), + new KeyValuePair(526, new AxoMessengerTextItem("Waiting for the signal Inputs.ProActive to be set!", "Check the status of the `ProActive` signal.")), + new KeyValuePair(527, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`.", "Check the value of the Inputs.ActionNo signal")), + new KeyValuePair(528, new AxoMessengerTextItem("Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `.", "Check the value of the Inputs.GlobalSpeedsignal")), + new KeyValuePair(529, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `.", "Check the value of the Inputs.ToolNosignal")), + new KeyValuePair(530, new AxoMessengerTextItem("Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `.", "Check the value of the Inputs.WorkobjectNosignal")), + new KeyValuePair(531, new AxoMessengerTextItem("Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `.", "Check the value of the Inputs.PointNosignal")), + new KeyValuePair(532, new AxoMessengerTextItem("Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `.", "Check the value of the Inputs.UserSpecSpeed1signal")), + new KeyValuePair(533, new AxoMessengerTextItem("Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `.", "Check the value of the Inputs.UserSpecSpeed2signal")), + new KeyValuePair(534, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`.", "Check the value of the Inputs.ActionNosignal")), + new KeyValuePair(535, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`.", "Check the value of the Inputs.ActionNo signal")), + new KeyValuePair(536, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`.", "Check the value of the Inputs.ActionNo signal")), + + new KeyValuePair(540, new AxoMessengerTextItem("Waiting for the signal Inputs.UserSafetySwitchClosed to be set!", "Check the status of the `Inputs.UserSafetySwitchClosed` signal.")), + new KeyValuePair(541, new AxoMessengerTextItem("Waiting for the signal Inputs.AlarmStopActive to be set!", "Check the status of the `AlarmStopActive` signal.")), + new KeyValuePair(542, new AxoMessengerTextItem("Waiting for the signal Inputs.DrivesReady to be set!", "Check the status of the `DrivesReady` signal.")), + + new KeyValuePair(550, new AxoMessengerTextItem("Waiting for the signal Inputs.ProActive to be set!", "Check the status of the `Inputs.ProActive` signal.")), + new KeyValuePair(551, new AxoMessengerTextItem("Waiting for the signal Inputs.DrivesReady to be set!", "Check the status of the `Inputs.DrivesReady` signal.")), + new KeyValuePair(552, new AxoMessengerTextItem("Waiting for the signal Inputs.StopMess to be reseted!", "Check the status of the `StopMess` signal.")), + new KeyValuePair(553, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`.", "Check the value of the Inputs.ActionNo signal")), + new KeyValuePair(554, new AxoMessengerTextItem("Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `.", "Check the value of the Inputs.GlobalSpeedsignal")), + new KeyValuePair(555, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `.", "Check the value of the Inputs.ToolNosignal")), + new KeyValuePair(556, new AxoMessengerTextItem("Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `.", "Check the value of the Inputs.WorkobjectNosignal")), + new KeyValuePair(557, new AxoMessengerTextItem("Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `.", "Check the value of the Inputs.PointNosignal")), + new KeyValuePair(558, new AxoMessengerTextItem("Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `.", "Check the value of the Inputs.UserSpecSpeed1signal")), + new KeyValuePair(559, new AxoMessengerTextItem("Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `.", "Check the value of the Inputs.UserSpecSpeed2signal")), + new KeyValuePair(560, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`.", "Check the value of the Inputs.ActionNosignal")), + new KeyValuePair(561, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`.", "Check the value of the Inputs.ActionNo signal")), + new KeyValuePair(562, new AxoMessengerTextItem("Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`.", "Check the value of the Inputs.ActionNo signal")), + + new KeyValuePair(570, new AxoMessengerTextItem("Waiting for the signal Inputs.UserSafetySwitchClosed to be set!", "Check the status of the `Inputs.UserSafetySwitchClosed` signal.")), + new KeyValuePair(571, new AxoMessengerTextItem("Waiting for the signal Inputs.AlarmStopActive to be set!", "Check the status of the `AlarmStopActive` signal.")), + new KeyValuePair(572, new AxoMessengerTextItem("Waiting for the signal Inputs.DrivesReady to be set!", "Check the status of the `Inputs.DrivesReady` signal.")), + new KeyValuePair(573, new AxoMessengerTextItem("Waiting for the signal Inputs.StopMess to be reseted!", "Check the status of the `StopMess` signal.")), + new KeyValuePair(574, new AxoMessengerTextItem("Waiting for the signal Inputs.RcReady to be set!", "Check the status of the `Inputs.RcReady` signal.")), + new KeyValuePair(575, new AxoMessengerTextItem("Waiting for the signal Inputs.InterfaceActivated to be set!", "Check the status of the `Inputs.InterfaceActivated` signal.")), + new KeyValuePair(576, new AxoMessengerTextItem("Waiting for the signal Inputs.ProActive to be set!", "Check the status of the `Inputs.ProActive` signal.")), + + new KeyValuePair(580, new AxoMessengerTextItem("Waiting for the signal Inputs.DrivesReady to be reseted!", "Check the status of the `DrivesReady` signal.")), + + new KeyValuePair(590, new AxoMessengerTextItem("Waiting for the signal Inputs.RobotStopped to be set!", "Check the status of the `Inputs.RobotStopped` signal.")), + new KeyValuePair(591, new AxoMessengerTextItem("Waiting for the signal Inputs.ProActive to be reseted!", "Check the status of the `ProActive` signal.")), + + new KeyValuePair(600, new AxoMessengerTextItem("Waiting for the signal Inputs.RobotStopped to be set!", "Check the status of the `Inputs.RobotStopped` signal.")), + + new KeyValuePair(610, new AxoMessengerTextItem("Waiting for the signal Inputs.ProActive to be reseted!", "Check the status of the `ProActive` signal.")), + + new KeyValuePair(620, new AxoMessengerTextItem("Waiting for all output signals to be reseted!", "Check the status of the `ProActive` signal.")), + + }; + + TaskMessenger.DotNetMessengerTextList = messengerTextList; + } + + } + public partial class AxoKukaRobotics_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status + { + Dictionary errorDescriptionDict = new Dictionary(); + Dictionary actionDescriptionDict = new Dictionary(); + + public string ErrorDescription + { + get + { + if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary(); } + if (errorDescriptionDict.Count == 0) + { + errorDescriptionDict.Add(0, " "); + errorDescriptionDict.Add(500, "Waiting for the signal Inputs.PpMoved to be set!"); + errorDescriptionDict.Add(510, "Waiting for the signal Inputs.UserSafetySwitchClosed to be set!"); + errorDescriptionDict.Add(511, "Waiting for the signal Inputs.AlarmStopActive to be set!"); + errorDescriptionDict.Add(512, "Waiting for the signal Inputs.DrivesReady to be set!"); + errorDescriptionDict.Add(513, "Waiting for the signal Inputs.StopMess to be reseted!"); + errorDescriptionDict.Add(514, "Waiting for the signal Inputs.RcReady to be set!"); + errorDescriptionDict.Add(515, "Waiting for the signal Inputs.InterfaceActivated to be set!"); + errorDescriptionDict.Add(516, "Waiting for the signal Inputs.ProActive to be set!"); + errorDescriptionDict.Add(520, "Waiting for the signal Inputs.UserSafetySwitchClosed to be set!"); + errorDescriptionDict.Add(521, "Waiting for the signal Inputs.AlarmStopActive to be set!"); + errorDescriptionDict.Add(522, "Waiting for the signal Inputs.DrivesReady to be set!"); + errorDescriptionDict.Add(523, "Waiting for the signal Inputs.StopMess to be reseted!"); + errorDescriptionDict.Add(524, "Waiting for the signal Inputs.RcReady to be set!"); + errorDescriptionDict.Add(525, "Waiting for the signal Inputs.InterfaceActivated to be set!"); + errorDescriptionDict.Add(526, "Waiting for the signal Inputs.ProActive to be set!"); + errorDescriptionDict.Add(527, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(528, "Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `."); + errorDescriptionDict.Add(529, "Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `."); + errorDescriptionDict.Add(530, "Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `."); + errorDescriptionDict.Add(531, "Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `."); + errorDescriptionDict.Add(532, "Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `."); + errorDescriptionDict.Add(533, "Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `."); + errorDescriptionDict.Add(534, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(535, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(536, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(540, "Waiting for the signal Inputs.UserSafetySwitchClosed to be set!"); + errorDescriptionDict.Add(541, "Waiting for the signal Inputs.AlarmStopActive to be set!"); + errorDescriptionDict.Add(542, "Waiting for the signal Inputs.DrivesReady to be set!"); + errorDescriptionDict.Add(550, "Waiting for the signal Inputs.ProActive to be set!"); + errorDescriptionDict.Add(551, "Waiting for the signal Inputs.DrivesReady to be set!"); + errorDescriptionDict.Add(552, "Waiting for the signal Inputs.StopMess to be reseted!"); + errorDescriptionDict.Add(553, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(554, "Waiting for the value of the `Inputs.GlobalSpeed` to be the same as the value of the `CurrentMovementParameters.GlobalSpeed `."); + errorDescriptionDict.Add(555, "Waiting for the value of the `Inputs.ToolNo` to be the same as the value of the `CurrentMovementParameters.ToolNo `."); + errorDescriptionDict.Add(556, "Waiting for the value of the `Inputs.WorkobjectNo` to be the same as the value of the `CurrentMovementParameters.WorkobjectNo `."); + errorDescriptionDict.Add(557, "Waiting for the value of the `Inputs.PointNo` to be the same as the value of the `CurrentMovementParameters.PointNo `."); + errorDescriptionDict.Add(558, "Waiting for the value of the `Inputs.UserSpecSpeed1` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed1 `."); + errorDescriptionDict.Add(559, "Waiting for the value of the `Inputs.UserSpecSpeed2` to be the same as the value of the `CurrentMovementParameters.UserSpecSpeed2 `."); + errorDescriptionDict.Add(560, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(561, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(562, "Waiting for the value of the `Inputs.ActionNo` to be the same as the value of the `Outputs.ActionNo`."); + errorDescriptionDict.Add(570, "Waiting for the signal Inputs.UserSafetySwitchClosed to be set!"); + errorDescriptionDict.Add(571, "Waiting for the signal Inputs.AlarmStopActive to be set!"); + errorDescriptionDict.Add(572, "Waiting for the signal Inputs.DrivesReady to be set!"); + errorDescriptionDict.Add(573, "Waiting for the signal Inputs.StopMess to be reseted!"); + errorDescriptionDict.Add(574, "Waiting for the signal Inputs.RcReady to be set!"); + errorDescriptionDict.Add(575, "Waiting for the signal Inputs.InterfaceActivated to be set!"); + errorDescriptionDict.Add(576, "Waiting for the signal Inputs.ProActive to be set!"); + errorDescriptionDict.Add(580, "Waiting for the signal Inputs.DrivesReady to be reseted!"); + errorDescriptionDict.Add(590, "Waiting for the signal Inputs.RobotStopped to be set!"); + errorDescriptionDict.Add(591, "Waiting for the signal Inputs.ProActive to be reseted!"); + errorDescriptionDict.Add(600, "Waiting for the signal Inputs.RobotStopped to be set!"); + errorDescriptionDict.Add(610, "Waiting for the signal Inputs.ProActive to be reseted!"); + errorDescriptionDict.Add(620, "Waiting for all output signals to be reseted!"); + + + + // General alarms + errorDescriptionDict.Add(700, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(701, "Input variable `Config.HWIDs.HwID_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(702, "Hw configuration error. The address specified at the hardwareID parameter is invalid in ReadSlotFromHardwareID (8090)."); + + errorDescriptionDict.Add(710, "Hw configuration error. Value of Config.HWIDs.HwID_None is non zero."); + errorDescriptionDict.Add(711, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 1."); + errorDescriptionDict.Add(712, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 1."); + errorDescriptionDict.Add(713, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 1."); + errorDescriptionDict.Add(714, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 1."); + errorDescriptionDict.Add(715, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 1."); + errorDescriptionDict.Add(716, "Hw configuration error: Module with unexpected size or type detected in Slot 1. Expected module: 'NotAssigned'."); + + errorDescriptionDict.Add(720, "Hw configuration error. Value of Config.HWIDs.HwID_512_DI_DO is zero."); + errorDescriptionDict.Add(721, "Hw configuration error. Invalid value for HardwareType in GeoAddr in ReadHardwareIDFromSlot (8091) for slot 2."); + errorDescriptionDict.Add(722, "Hw configuration error. Invalid value for IOSystem in GeoAddr in ReadHardwareIDFromSlot (8094) for slot 2."); + errorDescriptionDict.Add(723, "Hw configuration error. Invalid value for Station in GeoAddr in ReadHardwareIDFromSlot (8095) for slot 2."); + errorDescriptionDict.Add(724, "Hw configuration error. Invalid value for Slot in GeoAddr in ReadHardwareIDFromSlot (8096) for slot 2."); + errorDescriptionDict.Add(725, "Hw configuration error. Invalid value for Subslot in GeoAddr in ReadHardwareIDFromSlot (8097) for slot 2."); + errorDescriptionDict.Add(726, "Hw configuration error: Module with unexpected size or type detected in Slot 2. Expected module: 'DIO512'."); + + + errorDescriptionDict.Add(1130, "Input variable `parent` has NULL reference in `Run` method!"); + errorDescriptionDict.Add(1131, "Input variable `Config.HWIDs.HwID_Device` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1132, "Input variable `Config.HWIDs.HwID_in_1` has invalid value in `Run` method!"); + errorDescriptionDict.Add(1133, "Input variable `Config.HWIDs.HwID_512_DI_DO` has invalid value in `Run` method!"); + + errorDescriptionDict.Add(1201, "Error reading the input data (Config.HWIDs.HwID_512_DI_DO)!"); + + errorDescriptionDict.Add(1231, "Error writing the output data (Config.HWIDs.HwID_512_DI_DO)!"); + + errorDescriptionDict.Add(10000, "Start at main finished with error!"); + errorDescriptionDict.Add(10001, "Start at main was aborted, while not yet completed!"); + errorDescriptionDict.Add(10010, "Start motors and program finished with error!"); + errorDescriptionDict.Add(10011, "Start motors and program was aborted, while not yet completed!"); + errorDescriptionDict.Add(10020, "Start motors program and movements finished with error!"); + errorDescriptionDict.Add(10021, "Start motors program and movements was aborted, while not yet completed!"); + errorDescriptionDict.Add(10040, "Start motors task finished with error!"); + errorDescriptionDict.Add(10041, "Start motors task was aborted, while not yet completed!"); + errorDescriptionDict.Add(10050, "Start movements task finished with error!"); + errorDescriptionDict.Add(10051, "Start movements task was aborted, while not yet completed!"); + errorDescriptionDict.Add(10070, "Start program task finished with error!"); + errorDescriptionDict.Add(10071, "Start program task was aborted, while not yet completed!"); + errorDescriptionDict.Add(10080, "Stop motors task finished with error!"); + errorDescriptionDict.Add(10081, "Stop motors task was aborted, while not yet completed!"); + errorDescriptionDict.Add(10090, "Stop movements and program task finished with error!"); + errorDescriptionDict.Add(10091, "Stop movements and program task was aborted, while not yet completed!"); + errorDescriptionDict.Add(10100, "Stop movements task finished with error!"); + errorDescriptionDict.Add(10101, "Stop movements task was aborted, while not yet completed!"); + errorDescriptionDict.Add(10110, "Stop program task finished with error!"); + errorDescriptionDict.Add(10111, "Stop program task was aborted, while not yet completed!"); + errorDescriptionDict.Add(10120, "Reset all outputs task finished with error!"); + errorDescriptionDict.Add(10121, "Reset all outputs task was aborted, while not yet completed!"); + + errorDescriptionDict.Add(20001, "Robot is switched into manual mode, while action requested!"); + errorDescriptionDict.Add(20002, "Robot is not switched into automat mode, while action requested!"); + errorDescriptionDict.Add(20003, "Waiting for signal 'Inputs.AlarmStopActive' to be set!"); + errorDescriptionDict.Add(20004, "Waiting for signal 'Inputs.UserSafetySwitchClosed' to be set!"); + errorDescriptionDict.Add(20005, "Waiting for signal 'Inputs.Error' to be reseted!"); + } + string errorDescription = " "; + + if (Error == null || Error.Id == null) + return errorDescription; + + if (errorDescriptionDict.TryGetValue(Error.Id.Cyclic, out errorDescription)) + { + return errorDescription; + } + else + + { + return " "; + } + } + } + + public string ActionDescription + { + get + { + if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary(); } + if (actionDescriptionDict.Count == 0) + { + actionDescriptionDict.Add(0, " "); + actionDescriptionDict.Add(50, "Restore has been executed."); + + actionDescriptionDict.Add(100, "Start at main started."); + actionDescriptionDict.Add(300, "Start at main running: waiting for the program pointer changed."); + actionDescriptionDict.Add(301, "Start at main finished."); + actionDescriptionDict.Add(101, "Start at main finished succesfully."); + actionDescriptionDict.Add(102, "Start at main restored."); + + actionDescriptionDict.Add(110, "Start motors and program started."); + actionDescriptionDict.Add(310, "Start motors and program running: waiting for the 'UserSafetySwitchClosed' is on."); + actionDescriptionDict.Add(311, "Start motors and program running: waiting for the 'AlarmStopActive' is on."); + actionDescriptionDict.Add(312, "Start motors and program running: waiting for the 'DrivesReady' is on."); + actionDescriptionDict.Add(313, "Start motors and program running: waiting for the 'StopMess' is off."); + actionDescriptionDict.Add(314, "Start motors and program running: waiting for the 'RcReady' is on."); + actionDescriptionDict.Add(315, "Start motors and program running: waiting for the 'InterfaceActivated' is on."); + actionDescriptionDict.Add(316, "Start motors and program running: waiting for the 'ProActive' is on."); + actionDescriptionDict.Add(317, "Start motors and program finished."); + actionDescriptionDict.Add(111, "Start motors and program finished succesfully."); + actionDescriptionDict.Add(112, "Start motors and program restored."); + + actionDescriptionDict.Add(120, "Start motors program and movements started."); + actionDescriptionDict.Add(320, "Start motors program and movements running: waiting for the 'UserSafetySwitchClosed' is on."); + actionDescriptionDict.Add(321, "Start motors program and movements running: waiting for the 'AlarmStopActive' is on."); + actionDescriptionDict.Add(322, "Start motors program and movements running: waiting for the 'DrivesReady' is on."); + actionDescriptionDict.Add(323, "Start motors program and movements running: waiting for the 'StopMess' is off."); + actionDescriptionDict.Add(324, "Start motors program and movements running: waiting for the 'RcReady' is on."); + actionDescriptionDict.Add(325, "Start motors program and movements running: waiting for the 'InterfaceActivated' is on."); + actionDescriptionDict.Add(326, "Start motors program and movements running: waiting for the 'ProActive' is on."); + actionDescriptionDict.Add(327, "Start motors program and movements running: sending parameters of the movement to the controller."); + actionDescriptionDict.Add(328, "Start motors program and movements running: waiting for the movement parameters sent to the controller to be mirrored back."); + actionDescriptionDict.Add(334, "Start motors program and movements running: acknowleadging of the movement parameters."); + actionDescriptionDict.Add(335, "Start motors program and movements running: waiting for the movement is finished."); + actionDescriptionDict.Add(336, "Start motors program and movements running: acknowleadging of the finished movement."); + actionDescriptionDict.Add(337, "Start motors program and movements finished."); + actionDescriptionDict.Add(121, "Start motors program and movements finished succesfully."); + actionDescriptionDict.Add(122, "Start motors program and movements restored."); + + actionDescriptionDict.Add(140, "Start motors started."); + actionDescriptionDict.Add(340, "Start motors running: waiting for the 'UserSafetySwitchClosed' is on."); + actionDescriptionDict.Add(341, "Start motors running: waiting for the 'AlarmStopActive' is on."); + actionDescriptionDict.Add(342, "Start motors running: waiting for the 'DrivesReady' is on."); + actionDescriptionDict.Add(343, "Start motors finished."); + actionDescriptionDict.Add(141, "Start motors finished succesfully."); + actionDescriptionDict.Add(142, "Start motors restored."); + + actionDescriptionDict.Add(150, "Start movements started."); + actionDescriptionDict.Add(350, "Start movements running: waiting for the 'ProActive' is on."); + actionDescriptionDict.Add(351, "Start movements running: waiting for the 'DrivesReady' is on."); + actionDescriptionDict.Add(352, "Start movements running: waiting for the 'StopMess' is off."); + actionDescriptionDict.Add(353, "Start movements running: sending parameters of the movement to the controller."); + actionDescriptionDict.Add(354, "Start movements running: waiting for the movement parameters sent to the controller to be mirrored back."); + actionDescriptionDict.Add(360, "Start movements running: acknowleadging of the movement parameters."); + actionDescriptionDict.Add(361, "Start movements running: waiting for the movement is finished."); + actionDescriptionDict.Add(362, "Start movements running: acknowleadging of the finished movement."); + actionDescriptionDict.Add(363, "Start movements finished."); + actionDescriptionDict.Add(151, "Start movements finished succesfully."); + actionDescriptionDict.Add(152, "Start movements restored."); + + actionDescriptionDict.Add(170, "Start program started."); + actionDescriptionDict.Add(370, "Start program running: waiting for the 'UserSafetySwitchClosed' is on."); + actionDescriptionDict.Add(371, "Start program running: waiting for the 'AlarmStopActive' is on."); + actionDescriptionDict.Add(372, "Start program running: waiting for the 'DrivesReady' is on."); + actionDescriptionDict.Add(373, "Start program running: waiting for the 'StopMess' is off."); + actionDescriptionDict.Add(374, "Start program running: waiting for the 'RcReady' is on."); + actionDescriptionDict.Add(375, "Start program running: waiting for the 'InterfaceActivated' is on."); + actionDescriptionDict.Add(376, "Start program running: waiting for the 'ProActive' is on."); + actionDescriptionDict.Add(377, "Start program finished."); + actionDescriptionDict.Add(171, "Start program finished succesfully."); + actionDescriptionDict.Add(172, "Start program restored."); + + actionDescriptionDict.Add(180, "Stop motors started."); + actionDescriptionDict.Add(380, "Stop motors running: waiting for the 'DrivesReady' is off."); + actionDescriptionDict.Add(381, "Stop motors finished."); + actionDescriptionDict.Add(181, "Stop motors finished succesfully."); + actionDescriptionDict.Add(182, "Stop motors restored."); + + actionDescriptionDict.Add(190, "Stop movements and program started."); + actionDescriptionDict.Add(390, "Stop movements and program running: waiting for the 'RobotStopped' is on."); + actionDescriptionDict.Add(391, "Stop movements and program running: waiting for the 'ProActive' is off."); + actionDescriptionDict.Add(392, "Stop movements and program finished."); + actionDescriptionDict.Add(191, "Stop movements and program finished succesfully."); + actionDescriptionDict.Add(192, "Stop movements and program restored."); + + actionDescriptionDict.Add(200, "Stop movements started."); + actionDescriptionDict.Add(400, "Stop movements running: waiting for the 'RobotStopped' is on."); + actionDescriptionDict.Add(401, "Stop movements finished."); + actionDescriptionDict.Add(201, "Stop movements finished succesfully."); + actionDescriptionDict.Add(202, "Stop movements restored."); + + actionDescriptionDict.Add(210, "Stop program started."); + actionDescriptionDict.Add(410, "Stop program running: waiting for the 'ProActive' is off."); + actionDescriptionDict.Add(411, "Stop program finished."); + actionDescriptionDict.Add(211, "Stop program finished succesfully"); + actionDescriptionDict.Add(212, "Stop program restored."); + + actionDescriptionDict.Add(220, "Reset all outputs started."); + actionDescriptionDict.Add(420, "Reset all outputs running: waiting for the 'ProActive' is off."); + actionDescriptionDict.Add(421, "Reset all outputs finished."); + actionDescriptionDict.Add(221, "Reset all outputs finished succesfully"); + actionDescriptionDict.Add(222, "Reset all outputs restored."); + + actionDescriptionDict.Add(10000, "Start at main finished with error!"); + actionDescriptionDict.Add(10001, "Start at main was aborted, while not yet completed!"); + actionDescriptionDict.Add(10010, "Start motors and program finished with error!"); + actionDescriptionDict.Add(10011, "Start motors and program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10020, "Start motors program and movements finished with error!"); + actionDescriptionDict.Add(10021, "Start motors program and movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10040, "Start motors finished with error!"); + actionDescriptionDict.Add(10041, "Start motors was aborted, while not yet completed!"); + actionDescriptionDict.Add(10050, "Start movements finished with error!"); + actionDescriptionDict.Add(10051, "Start movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10070, "Start program finished with error!"); + actionDescriptionDict.Add(10071, "Start program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10080, "Stop motors finished with error!"); + actionDescriptionDict.Add(10081, "Stop motors was aborted, while not yet completed!"); + actionDescriptionDict.Add(10090, "Stop movements and program finished with error!"); + actionDescriptionDict.Add(10091, "Stop movements and program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10100, "Stop movements finished with error!"); + actionDescriptionDict.Add(10101, "Stop movements was aborted, while not yet completed!"); + actionDescriptionDict.Add(10110, "Stop program finished with error!"); + actionDescriptionDict.Add(10111, "Stop program was aborted, while not yet completed!"); + actionDescriptionDict.Add(10120, "Reset all outputs finished with error!"); + actionDescriptionDict.Add(10121, "Reset all outputs was aborted, while not yet completed!"); + + + } + + string actionDescription = " "; + + if (Action == null || Action.Id == null) + return actionDescription; + + if (actionDescriptionDict.TryGetValue(Action.Id.Cyclic, out actionDescription)) + { + return actionDescription; + } + else + { + return " "; + } + + } + } + } +} diff --git a/src/traversals/apax/apax.yml b/src/traversals/apax/apax.yml new file mode 100644 index 000000000..c378aea9f --- /dev/null +++ b/src/traversals/apax/apax.yml @@ -0,0 +1,51 @@ +name: "apax.traversal" +version: "0.0.0-dev.0" +type: "app" +targets: +- "1500" +registries: + '@inxton': "https://npm.pkg.github.com/" +devDependencies: + '@inxton/ax-sdk': "0.0.0-dev.0" +dependencies: + "@inxton/axopen.abstractions": "0.0.0-dev.0" + "@inxton/ax.axopen.app": "0.0.0-dev.0" + "@inxton/ax.axopen.hwlibrary": "0.0.0-dev.0" + "@inxton/ax.axopen.min": "0.0.0-dev.0" + "@inxton/ax.catalog": "0.0.48" + "@inxton/axopen.components.abb.robotics": "0.0.0-dev.0" + "@inxton/axopen.components.abstractions": "0.0.0-dev.0" + "@inxton/axopen.components.balluff.identification": "0.0.0-dev.0" + "@inxton/axopen.components.cognex.vision": "0.0.0-dev.0" + "@inxton/axopen.components.desoutter.tightening": "0.0.0-dev.0" + "@inxton/axopen.components.drives": "0.0.0-dev.0" + "@inxton/axopen.components.dukane.welders": "0.0.0-dev.0" + "@inxton/axopen.components.elements": "0.0.0-dev.0" + "@inxton/axopen.components.festo.drives": "0.0.0-dev.0" + "@inxton/axopen.components.keyence.vision": "0.0.0-dev.0" + "@inxton/axopen.components.kuka.robotics": "0.0.0-dev.0" + "@inxton/axopen.components.mitsubishi.robotics": "0.0.0-dev.0" + "@inxton/axopen.components.pneumatics": "0.0.0-dev.0" + "@inxton/axopen.components.rexroth.drives": "0.0.0-dev.0" + "@inxton/axopen.components.rexroth.press": "0.0.0-dev.0" + "@inxton/axopen.components.rexroth.tightening": "0.0.0-dev.0" + "@inxton/axopen.components.robotics": "0.0.0-dev.0" + "@inxton/axopen.components.siem.communication": "0.0.0-dev.0" + "@inxton/axopen.components.siem.identification": "0.0.0-dev.0" + "@inxton/axopen.components.ur.robotics": "0.0.0-dev.0" + "@inxton/axopen.components.zebra.vision": "0.0.0-dev.0" + "@inxton/axopen.core": "0.0.0-dev.0" + "@inxton/axopen.data": "0.0.0-dev.0" + "axopen_data_distributed_tests_l4": "0.0.0-dev.0" + "axopen.data.tests_l1": "0.0.0-dev.0" + "axopen.integration.tests_l4": "0.0.0-dev.0" + "@inxton/axopen.inspectors": "0.0.0-dev.0" + "@inxton/axopen.io": "0.0.0-dev.0" + "@inxton/axopen.probers": "0.0.0-dev.0" + "showcase": "0.0.0-dev.0" + "@inxton/axopen.simatic1500": "0.0.0-dev.0" + "@inxton/apaxlibname": "0.0.0-dev.0" + "@inxton/axopen.timers": "0.0.0-dev.0" + "@inxton/axopen.utils": "0.0.0-dev.0" +installStrategy: "overridable" +... From 2c2c6a5252c7631b4cf476ffa4fcf946672fe571 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 13:38:02 +0200 Subject: [PATCH 16/33] Add AxoOmnicore component structures and enums - Introduced AxoOmnicore_Component_Status for component status representation. - Added AxoOmnicore_Config to manage configuration parameters including InfoTime, ErrorTime, and TaskTimeout. - Created AxoOmnicore_Control class to handle various control commands and states for the AxoOmnicore system. - Defined AxoOmnicore_HWIDs to store hardware IDs for devices and submodules. - Implemented AxoOmnicore_State to encapsulate the operational state and status indicators of the AxoOmnicore system. --- .../AxoOmnicore_v_1_x_x_Component_Status.st | 13 ------------- .../AxoOmnicore.st} | 12 ++++++------ .../AxoOmnicore_Component_Status.st | 13 +++++++++++++ .../TypesStructuresAndEnums/AxoOmnicore_Config.st} | 6 +++--- .../TypesStructuresAndEnums/AxoOmnicore_Control.st} | 4 ++-- .../TypesStructuresAndEnums/AxoOmnicore_HWIDs.st} | 4 ++-- .../TypesStructuresAndEnums/AxoOmnicore_State.st} | 4 ++-- 7 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st rename src/components.abb.robotics/ctrl/src/AxoOmnicore/{AxoOmnicore_v_1_x_x.st => v_1_x_x/AxoOmnicore.st} (99%) create mode 100644 src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Component_Status.st rename src/components.abb.robotics/ctrl/src/AxoOmnicore/{TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st => v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Config.st} (78%) rename src/components.abb.robotics/ctrl/src/AxoOmnicore/{TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st => v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Control.st} (98%) rename src/components.abb.robotics/ctrl/src/AxoOmnicore/{TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st => v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_HWIDs.st} (84%) rename src/components.abb.robotics/ctrl/src/AxoOmnicore/{TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st => v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_State.st} (98%) diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st deleted file mode 100644 index b73abab27..000000000 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Component_Status.st +++ /dev/null @@ -1,13 +0,0 @@ -NAMESPACE AXOpen.Components.Abb.Robotics - {S7.extern=ReadWrite} - {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoOmnicore_v_1_x_x_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status - VAR PUBLIC - END_VAR - END_CLASS -END_NAMESPACE - - - - - diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore/AxoOmnicore_v_1_x_x.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/AxoOmnicore.st similarity index 99% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore/AxoOmnicore_v_1_x_x.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/AxoOmnicore.st index aa399459b..2ac6f698e 100644 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore/AxoOmnicore_v_1_x_x.st +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/AxoOmnicore.st @@ -6,9 +6,9 @@ USING AXOpen.Components.Abstractions.Robotics; USING Siemens.Simatic.Hardware.Utilities; USING Siemens.Simatic.MemoryAccess; -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {S7.extern=ReadWrite} - CLASS AxoOmnicore_v_1_x_x EXTENDS AXOpen.Core.AxoComponent IMPLEMENTS AXOpen.Components.Abstractions.Robotics.IAxoRobotics + CLASS AxoOmnicore EXTENDS AXOpen.Core.AxoComponent IMPLEMENTS AXOpen.Components.Abstractions.Robotics.IAxoRobotics VAR PUBLIC //HEADER END_VAR @@ -68,14 +68,14 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Config")]} {#ix-attr:[ReadOnly()]} - Config : AxoOmnicore_v_1_x_x_Config; + Config : AxoOmnicore_Config; END_VAR VAR PUBLIC //STATUS {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} - Status : AxoOmnicore_v_1_x_x_Component_Status; + Status : AxoOmnicore_Component_Status; {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} {#ix-set:AttributeName = "<#Power progress#>"} @@ -94,13 +94,13 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Inputs#>"} {#ix-attr:[ReadOnly()]} - Inputs : AxoOmnicore_v_1_x_x_State; + Inputs : AxoOmnicore_State; {#ix-attr:[ComponentDetails("Hardware signals")]} {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Outputs#>"} {#ix-attr:[ReadOnly()]} - Outputs : AxoOmnicore_v_1_x_x_Control; + Outputs : AxoOmnicore_Control; END_VAR VAR PUBLIC //HardwareDiagnostics diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Component_Status.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Component_Status.st new file mode 100644 index 000000000..69cde58a3 --- /dev/null +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Component_Status.st @@ -0,0 +1,13 @@ +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Stack)]} + CLASS PUBLIC AxoOmnicore_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + VAR PUBLIC + END_VAR + END_CLASS +END_NAMESPACE + + + + + diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Config.st similarity index 78% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Config.st index 290112665..a3e30e501 100644 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Config.st +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Config.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoOmnicore_v_1_x_x_Config + CLASS PUBLIC AxoOmnicore_Config VAR PUBLIC {#ix-set:AttributeName = "<#Info time#>"} InfoTime : LTIME := LT#2S; @@ -10,7 +10,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics {#ix-set:AttributeName = "<#Task timeout#>"} TaskTimeout : LTIME := LT#0S; {#ix-set:AttributeName = "<#Hardware IDs#>"} - HWIDs : AxoOmnicore_v_1_x_x_HWIDs; + HWIDs : AxoOmnicore_HWIDs; END_VAR END_CLASS END_NAMESPACE \ No newline at end of file diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Control.st similarity index 98% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Control.st index 9d5f6d299..06b29599d 100644 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_Control.st +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Control.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoOmnicore_v_1_x_x_Control + CLASS AxoOmnicore_Control VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_HWIDs.st similarity index 84% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_HWIDs.st index 6d9d94306..e645d4bfa 100644 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_HWIDs.st +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_HWIDs.st @@ -1,6 +1,6 @@ -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {S7.extern=ReadWrite} -CLASS AxoOmnicore_v_1_x_x_HWIDs +CLASS AxoOmnicore_HWIDs VAR PUBLIC {#ix-set:AttributeName = "<#Hardware ID of the device#>"} HW_Device : UINT; diff --git a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_State.st similarity index 98% rename from src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st rename to src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_State.st index a3b45b147..4800833e5 100644 --- a/src/components.abb.robotics/ctrl/src/AxoOmnicore/TypesStructuresAndEnums/AxoOmnicore_v_1_x_x_State.st +++ b/src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_State.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Abb.Robotics +NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoOmnicore_v_1_x_x_State + CLASS AxoOmnicore_State VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} From 9d56192b1236e6ec9c8a3308f2412fad5fb82ba6 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 13:48:25 +0200 Subject: [PATCH 17/33] Implement code changes to enhance functionality and improve performance --- .../AxoIrc5_v_1_x_x.cs => AxoIrc5/v_1_x_x/AxoIrc5.cs} | 6 +++--- .../v_1_x_x/AxoOmnicore.cs} | 6 +++--- .../AxoDataman/{ => v_6_0_0}/AxoDataman.cs | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/{AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs => AxoIrc5/v_1_x_x/AxoIrc5.cs} (99%) rename src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/{AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.cs => AxoOmnicore/v_1_x_x/AxoOmnicore.cs} (99%) rename src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/AxoDataman/{ => v_6_0_0}/AxoDataman.cs (100%) diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5/v_1_x_x/AxoIrc5.cs similarity index 99% rename from src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs rename to src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5/v_1_x_x/AxoIrc5.cs index 04acaefc3..b2b4a3632 100644 --- a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5_v_1_x_x/AxoIrc5_v_1_x_x.cs +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoIrc5/v_1_x_x/AxoIrc5.cs @@ -9,9 +9,9 @@ using System.Text; using System.Threading.Tasks; -namespace AXOpen.Components.Abb.Robotics +namespace AXOpen.Components.Abb.Robotics.v_1_x_x { - public partial class AxoIrc5_v_1_x_x : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics + public partial class AxoIrc5 : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics { partial void PostConstruct(ITwinObject parent, string readableTail, string symbolTail) @@ -209,7 +209,7 @@ private void InitializeTaskMessenger() } - public partial class AxoIrc5_v_1_x_x_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status + public partial class AxoIrc5_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status { Dictionary errorDescriptionDict = new Dictionary(); Dictionary actionDescriptionDict = new Dictionary(); diff --git a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.cs b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore/v_1_x_x/AxoOmnicore.cs similarity index 99% rename from src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.cs rename to src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore/v_1_x_x/AxoOmnicore.cs index 505946d6c..4ef8935f1 100644 --- a/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore_v_1_x_x/AxoOmnicore_v_1_x_x.cs +++ b/src/components.abb.robotics/src/AXOpen.Components.Abb.Robotics/AxoOmnicore/v_1_x_x/AxoOmnicore.cs @@ -6,9 +6,9 @@ using System.Text; using System.Threading.Tasks; -namespace AXOpen.Components.Abb.Robotics +namespace AXOpen.Components.Abb.Robotics.v_1_x_x { - public partial class AxoOmnicore_v_1_x_x : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics + public partial class AxoOmnicore : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics { partial void PostConstruct(ITwinObject parent, string readableTail, string symbolTail) @@ -204,7 +204,7 @@ private void InitializeTaskMessenger() } } - public partial class AxoOmnicore_v_1_x_x_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status + public partial class AxoOmnicore_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status { Dictionary errorDescriptionDict = new Dictionary(); Dictionary actionDescriptionDict = new Dictionary(); diff --git a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/AxoDataman/AxoDataman.cs b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/AxoDataman/v_6_0_0/AxoDataman.cs similarity index 100% rename from src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/AxoDataman/AxoDataman.cs rename to src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/AxoDataman/v_6_0_0/AxoDataman.cs From 08c3dbc563f35a50d270bf488c99c865614df181 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 15:16:59 +0200 Subject: [PATCH 18/33] Refactor project references in Rexroth Drives solution - Updated `this.proj` to include all project references using a wildcard pattern, excluding specific directories. - Removed obsolete project references from `this.sln`, including those related to logging and security components. - Added new project references for styling components and adjusted configurations accordingly. --- .../src/{AxoCr800_v_1_x_x.st => AxoCr800.st} | 8 +- ...Status.st => AxoCr800_Component_Status.st} | 2 +- ...0_v_1_x_x_Config.st => AxoCr800_Config.st} | 4 +- ...v_1_x_x_Control.st => AxoCr800_Control.st} | 2 +- ...800_v_1_x_x_HWIDs.st => AxoCr800_HWIDs.st} | 2 +- ...800_v_1_x_x_State.st => AxoCr800_State.st} | 2 +- .../v_1_x_x/AxoCr800.cs} | 4 +- .../components.rexroth.drives.code-workspace | 3 - .../components.rexroth.drives.sln | 97 ++----------------- src/components.rexroth.drives/this.proj | 6 +- src/components.rexroth.drives/this.sln | 97 ++----------------- 11 files changed, 31 insertions(+), 196 deletions(-) rename src/components.mitsubishi.robotics/ctrl/src/{AxoCr800_v_1_x_x.st => AxoCr800.st} (99%) rename src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/{AxoCr800_v_1_x_x_Component_Status.st => AxoCr800_Component_Status.st} (65%) rename src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/{AxoCr800_v_1_x_x_Config.st => AxoCr800_Config.st} (85%) rename src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/{AxoCr800_v_1_x_x_Control.st => AxoCr800_Control.st} (99%) rename src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/{AxoCr800_v_1_x_x_HWIDs.st => AxoCr800_HWIDs.st} (85%) rename src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/{AxoCr800_v_1_x_x_State.st => AxoCr800_State.st} (99%) rename src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/{AxoCr800_v_1_x_x/AxoCr800_v_1_x_x.cs => AxoCr800/v_1_x_x/AxoCr800.cs} (99%) diff --git a/src/components.mitsubishi.robotics/ctrl/src/AxoCr800_v_1_x_x.st b/src/components.mitsubishi.robotics/ctrl/src/AxoCr800.st similarity index 99% rename from src/components.mitsubishi.robotics/ctrl/src/AxoCr800_v_1_x_x.st rename to src/components.mitsubishi.robotics/ctrl/src/AxoCr800.st index 454c0364e..0e29cbdcb 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/AxoCr800_v_1_x_x.st +++ b/src/components.mitsubishi.robotics/ctrl/src/AxoCr800.st @@ -66,14 +66,14 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Config")]} {#ix-attr:[ReadOnly()]} - Config : AxoMitsubishiRobotics_Config; + Config : AxoCr800_Config; END_VAR VAR PUBLIC //STATUS {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} - Status : AxoMitsubishiRobotics_Component_Status; + Status : AxoCr800_Component_Status; {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} {#ix-set:AttributeName = "<#Power progress#>"} @@ -92,13 +92,13 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Inputs#>"} {#ix-attr:[ReadOnly()]} - Inputs : AxoMitsubishiRobotics_State; + Inputs : AxoCr800_State; {#ix-attr:[ComponentDetails("Hardware signals")]} {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Outputs#>"} {#ix-attr:[ReadOnly()]} - Outputs : AxoMitsubishiRobotics_Control; + Outputs : AxoCr800_Control; END_VAR VAR PUBLIC //HardwareDiagnostics diff --git a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Component_Status.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Component_Status.st similarity index 65% rename from src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Component_Status.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Component_Status.st index d20e6984f..1521a76ed 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Component_Status.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Component_Status.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoCr800_v_1_x_x_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + CLASS PUBLIC AxoCr800_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status VAR PUBLIC END_VAR END_CLASS diff --git a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Config.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Config.st similarity index 85% rename from src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Config.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Config.st index 332984ee6..e4c81be79 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Config.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Config.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoCr800_v_1_x_x_Config + CLASS PUBLIC AxoCr800_Config VAR PUBLIC {#ix-set:AttributeName = "<#Info time#>"} InfoTime : LTIME := LT#2S; @@ -10,7 +10,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {#ix-set:AttributeName = "<#Task timeout#>"} TaskTimeout : LTIME := LT#0S; {#ix-set:AttributeName = "<#Hardware IDs#>"} - HWIDs : AxoCr800_v_1_x_x_HWIDs; + HWIDs : AxoCr800_HWIDs; END_VAR END_CLASS END_NAMESPACE diff --git a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Control.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Control.st similarity index 99% rename from src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Control.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Control.st index d756af265..b467f6b88 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_Control.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_Control.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoCr800_v_1_x_x_Control + CLASS AxoCr800_Control VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_HWIDs.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_HWIDs.st similarity index 85% rename from src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_HWIDs.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_HWIDs.st index b7a800046..2f0974a23 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_HWIDs.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_HWIDs.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x + CLASS PUBLIC AxoCr800_HWIDs VAR PUBLIC {#ix-set:AttributeName = "<#Hardware ID of the device#>"} diff --git a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_State.st b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_State.st similarity index 99% rename from src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_State.st rename to src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_State.st index ad0b3ed81..68ed7fbe0 100644 --- a/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_v_1_x_x_State.st +++ b/src/components.mitsubishi.robotics/ctrl/src/TypesStructuresAndEnums/AxoCr800_State.st @@ -1,7 +1,7 @@ NAMESPACE AXOpen.Components.Mitsubishi.Robotics.v_1_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoCr800_v_1_x_x_State + CLASS AxoCr800_State VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/AxoCr800_v_1_x_x/AxoCr800_v_1_x_x.cs b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/AxoCr800/v_1_x_x/AxoCr800.cs similarity index 99% rename from src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/AxoCr800_v_1_x_x/AxoCr800_v_1_x_x.cs rename to src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/AxoCr800/v_1_x_x/AxoCr800.cs index 5b7bdfcb1..155146f05 100644 --- a/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/AxoCr800_v_1_x_x/AxoCr800_v_1_x_x.cs +++ b/src/components.mitsubishi.robotics/src/AXOpen.Components.Mitsubishi.Robotics/AxoCr800/v_1_x_x/AxoCr800.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -137,7 +137,7 @@ private void InitializeTaskMessenger() TaskMessenger.DotNetMessengerTextList = messengerTextList; } } - public partial class AxoMitsubishiRobotics_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status + public partial class AxoCr800_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status { Dictionary errorDescriptionDict = new Dictionary(); Dictionary actionDescriptionDict = new Dictionary(); diff --git a/src/components.rexroth.drives/components.rexroth.drives.code-workspace b/src/components.rexroth.drives/components.rexroth.drives.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.rexroth.drives/components.rexroth.drives.code-workspace +++ b/src/components.rexroth.drives/components.rexroth.drives.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.rexroth.drives/components.rexroth.drives.sln b/src/components.rexroth.drives/components.rexroth.drives.sln index 7ed530616..09ad8a235 100644 --- a/src/components.rexroth.drives/components.rexroth.drives.sln +++ b/src/components.rexroth.drives/components.rexroth.drives.sln @@ -5,8 +5,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{6C31DFBB-5E54-46B6-935A-1C450B2CECF5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{272B8BF7-0B6F-4C4C-98EF-7150263B7596}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{430AC356-787C-40A0-A2A1-497BC517A98E}" @@ -15,10 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Drives.bl EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_drives", "..\components.drives\src\AXOpen.Components.Drives\inxton_axopen_components_drives.csproj", "{4C44211C-E515-45BF-A30F-1A80221CA14B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Drives.blazorapp", "app\ix-blazor\AXOpen.Components.Rexroth.Drives.blazorapp.csproj", "{58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_rexroth_drives", "app\ix\app_axopen_components_rexroth_drives.csproj", "{AC526A25-7C08-407B-846D-C1DA4958C3C4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Drives.blazor", "src\AXOpen.Components.Rexroth.Drives.blazor\AXOpen.Components.Rexroth.Drives.blazor.csproj", "{D677E3FA-21E2-42B5-93C6-D632EA421351}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_rexroth_drives", "src\AXOpen.Components.Rexroth.Drives\inxton_axopen_components_rexroth_drives.csproj", "{A5E7D0FB-1D2E-49DB-8FC6-32212C2262E5}" @@ -29,19 +23,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{D9915B82-8B1D-4854-BBF1-3A70B1156AB4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{84F299AF-7664-40F8-9041-2D43BE5AFD16}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{D843ADF9-BEC0-4DEA-BBA4-1D6546502471}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{CB77FE45-6E27-40B1-970C-C83589FA6C13}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{792E2303-AC33-4458-A3DA-014814B841EC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{965BADC7-7272-4254-8E91-51261ABED2A5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{71A46037-246E-47AA-BC49-F41C0E2111D3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{05B739DC-C6B2-47E8-B890-BD62FD45CAB6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{A40C0DA0-F787-4936-9B1C-76217B5B5603}" EndProject @@ -55,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{11B13475-86AB-4E7E-A419-8C555DC9FB89}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{19C5DFF2-F67F-4BCA-95B4-BB1929322371}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{CA7A38C7-0DF3-4B3D-8FA0-EB46731D9A5C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{5D25E034-B04B-449F-A93A-2CDFC8337972}" @@ -77,12 +63,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.drives EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.drives", "..\components.drives", "{F7155DFD-8B62-44C1-9A86-C2FDDC7076E0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{F1A409A6-9790-4E1A-9F91-B2C9C1977229}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{9441D628-52BC-4E90-9B97-3F5502C0D11A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{81729BD7-3C2A-4876-8BA8-81AE65DED619}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Drives.blazor", "src\AXOpen.Components.Rexroth.Drives.blazor", "{BCDBE7DB-7095-4437-9B1F-30E0DE231473}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Drives", "src\AXOpen.Components.Rexroth.Drives", "{E9C6B169-D6F5-477D-A7CC-9B86EDADB57B}" @@ -103,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{8B2A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{2F50691B-F216-4595-9B12-E985356DA653}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{98500B29-8AB4-435C-A194-CEE47C5F67C0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{77F6625C-FDE6-44BD-9294-523C4CF31CAE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{37441943-45F1-40C5-A89D-8FA968E90443}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{C14697CC-3A79-4FAF-8164-8DFC917CD8B4}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{5799F773-F37A-4F78-BA9B-9EC8D9A2E8FC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{2F5C9E38-7B65-46D5-BC81-2D98B1183A20}" @@ -125,19 +97,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{86EBFF68-CD4B-4A69-84B1-588DC0FFFA3D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{F6B98FF4-7D83-45D7-9A91-33B78C03181E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{AE70A528-A227-4830-8336-0671464707AD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{53DA7C46-1E47-4CBE-A5CF-14507A73D661}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{622167C7-B284-451E-BC52-C1E433B3DA5F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{5BB2762A-B069-4784-A75D-30A0613FE0B2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{5C082DFC-B029-46E2-907A-66225FE6EB7C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{03F1E16D-FCCE-4438-8A45-174DBE15E422}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{59BC585F-A48C-4F15-B2A4-1108ACFBEF5F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{8108FF0D-9D7E-478D-B4EC-5536846F9061}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{4DD1B4C9-D82B-4AB4-9E5A-AA9A3D1B4276}" EndProject @@ -169,10 +131,6 @@ Global {6C31DFBB-5E54-46B6-935A-1C450B2CECF5}.Debug|Any CPU.Build.0 = Debug|Any CPU {6C31DFBB-5E54-46B6-935A-1C450B2CECF5}.Release|Any CPU.ActiveCfg = Release|Any CPU {6C31DFBB-5E54-46B6-935A-1C450B2CECF5}.Release|Any CPU.Build.0 = Release|Any CPU - {272B8BF7-0B6F-4C4C-98EF-7150263B7596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {272B8BF7-0B6F-4C4C-98EF-7150263B7596}.Debug|Any CPU.Build.0 = Debug|Any CPU - {272B8BF7-0B6F-4C4C-98EF-7150263B7596}.Release|Any CPU.ActiveCfg = Release|Any CPU - {272B8BF7-0B6F-4C4C-98EF-7150263B7596}.Release|Any CPU.Build.0 = Release|Any CPU {8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -189,14 +147,6 @@ Global {4C44211C-E515-45BF-A30F-1A80221CA14B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C44211C-E515-45BF-A30F-1A80221CA14B}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C44211C-E515-45BF-A30F-1A80221CA14B}.Release|Any CPU.Build.0 = Release|Any CPU - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}.Release|Any CPU.Build.0 = Release|Any CPU - {AC526A25-7C08-407B-846D-C1DA4958C3C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC526A25-7C08-407B-846D-C1DA4958C3C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC526A25-7C08-407B-846D-C1DA4958C3C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC526A25-7C08-407B-846D-C1DA4958C3C4}.Release|Any CPU.Build.0 = Release|Any CPU {D677E3FA-21E2-42B5-93C6-D632EA421351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D677E3FA-21E2-42B5-93C6-D632EA421351}.Debug|Any CPU.Build.0 = Debug|Any CPU {D677E3FA-21E2-42B5-93C6-D632EA421351}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -217,10 +167,6 @@ Global {D9915B82-8B1D-4854-BBF1-3A70B1156AB4}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9915B82-8B1D-4854-BBF1-3A70B1156AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9915B82-8B1D-4854-BBF1-3A70B1156AB4}.Release|Any CPU.Build.0 = Release|Any CPU - {84F299AF-7664-40F8-9041-2D43BE5AFD16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84F299AF-7664-40F8-9041-2D43BE5AFD16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84F299AF-7664-40F8-9041-2D43BE5AFD16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84F299AF-7664-40F8-9041-2D43BE5AFD16}.Release|Any CPU.Build.0 = Release|Any CPU {D843ADF9-BEC0-4DEA-BBA4-1D6546502471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D843ADF9-BEC0-4DEA-BBA4-1D6546502471}.Debug|Any CPU.Build.0 = Debug|Any CPU {D843ADF9-BEC0-4DEA-BBA4-1D6546502471}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -233,18 +179,10 @@ Global {4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED}.Release|Any CPU.Build.0 = Release|Any CPU - {792E2303-AC33-4458-A3DA-014814B841EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {792E2303-AC33-4458-A3DA-014814B841EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {792E2303-AC33-4458-A3DA-014814B841EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {792E2303-AC33-4458-A3DA-014814B841EC}.Release|Any CPU.Build.0 = Release|Any CPU - {965BADC7-7272-4254-8E91-51261ABED2A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {965BADC7-7272-4254-8E91-51261ABED2A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {965BADC7-7272-4254-8E91-51261ABED2A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {965BADC7-7272-4254-8E91-51261ABED2A5}.Release|Any CPU.Build.0 = Release|Any CPU - {71A46037-246E-47AA-BC49-F41C0E2111D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71A46037-246E-47AA-BC49-F41C0E2111D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71A46037-246E-47AA-BC49-F41C0E2111D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71A46037-246E-47AA-BC49-F41C0E2111D3}.Release|Any CPU.Build.0 = Release|Any CPU + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6}.Release|Any CPU.Build.0 = Release|Any CPU {A40C0DA0-F787-4936-9B1C-76217B5B5603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A40C0DA0-F787-4936-9B1C-76217B5B5603}.Debug|Any CPU.Build.0 = Debug|Any CPU {A40C0DA0-F787-4936-9B1C-76217B5B5603}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -263,8 +201,6 @@ Global {A3A7EE59-B812-4012-A8E3-CC85301E2520} = {6D5CEBF2-F6E9-41FB-88E9-281C6AB20D03} {6C31DFBB-5E54-46B6-935A-1C450B2CECF5} = {11B13475-86AB-4E7E-A419-8C555DC9FB89} {11B13475-86AB-4E7E-A419-8C555DC9FB89} = {5D25E034-B04B-449F-A93A-2CDFC8337972} - {272B8BF7-0B6F-4C4C-98EF-7150263B7596} = {19C5DFF2-F67F-4BCA-95B4-BB1929322371} - {19C5DFF2-F67F-4BCA-95B4-BB1929322371} = {5D25E034-B04B-449F-A93A-2CDFC8337972} {8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2} = {CA7A38C7-0DF3-4B3D-8FA0-EB46731D9A5C} {CA7A38C7-0DF3-4B3D-8FA0-EB46731D9A5C} = {5D25E034-B04B-449F-A93A-2CDFC8337972} {5D25E034-B04B-449F-A93A-2CDFC8337972} = {8CBDE1D0-AC41-4826-857D-02D81C35B0B3} @@ -276,11 +212,6 @@ Global {4C44211C-E515-45BF-A30F-1A80221CA14B} = {D19D2D33-EE5A-421D-A418-6C926B0B5826} {D19D2D33-EE5A-421D-A418-6C926B0B5826} = {51DD8162-910D-4067-969D-7B77E44C4156} {51DD8162-910D-4067-969D-7B77E44C4156} = {F7155DFD-8B62-44C1-9A86-C2FDDC7076E0} - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581} = {F1A409A6-9790-4E1A-9F91-B2C9C1977229} - {F1A409A6-9790-4E1A-9F91-B2C9C1977229} = {81729BD7-3C2A-4876-8BA8-81AE65DED619} - {AC526A25-7C08-407B-846D-C1DA4958C3C4} = {9441D628-52BC-4E90-9B97-3F5502C0D11A} - {9441D628-52BC-4E90-9B97-3F5502C0D11A} = {81729BD7-3C2A-4876-8BA8-81AE65DED619} - {81729BD7-3C2A-4876-8BA8-81AE65DED619} = {3AF0FA63-1F7C-4BAC-8AD8-54E52C5A922D} {D677E3FA-21E2-42B5-93C6-D632EA421351} = {BCDBE7DB-7095-4437-9B1F-30E0DE231473} {BCDBE7DB-7095-4437-9B1F-30E0DE231473} = {7EC28853-0DD3-4DBF-BA34-24818D566047} {A5E7D0FB-1D2E-49DB-8FC6-32212C2262E5} = {E9C6B169-D6F5-477D-A7CC-9B86EDADB57B} @@ -294,10 +225,6 @@ Global {D9915B82-8B1D-4854-BBF1-3A70B1156AB4} = {08F25B87-87C9-45E2-82BA-6E1A28227426} {08F25B87-87C9-45E2-82BA-6E1A28227426} = {8B2AF899-83F1-4002-B226-DAFCA46804EB} {8B2AF899-83F1-4002-B226-DAFCA46804EB} = {2F50691B-F216-4595-9B12-E985356DA653} - {84F299AF-7664-40F8-9041-2D43BE5AFD16} = {98500B29-8AB4-435C-A194-CEE47C5F67C0} - {98500B29-8AB4-435C-A194-CEE47C5F67C0} = {77F6625C-FDE6-44BD-9294-523C4CF31CAE} - {77F6625C-FDE6-44BD-9294-523C4CF31CAE} = {37441943-45F1-40C5-A89D-8FA968E90443} - {37441943-45F1-40C5-A89D-8FA968E90443} = {C14697CC-3A79-4FAF-8164-8DFC917CD8B4} {D843ADF9-BEC0-4DEA-BBA4-1D6546502471} = {5799F773-F37A-4F78-BA9B-9EC8D9A2E8FC} {5799F773-F37A-4F78-BA9B-9EC8D9A2E8FC} = {0963F97B-6549-446B-A187-B3DE4C0B40DF} {CB77FE45-6E27-40B1-970C-C83589FA6C13} = {2F5C9E38-7B65-46D5-BC81-2D98B1183A20} @@ -306,14 +233,8 @@ Global {4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED} = {7488AFC6-AA51-4C00-95B8-BED0C270547B} {7488AFC6-AA51-4C00-95B8-BED0C270547B} = {9AF766B7-A12B-4FD2-9422-4ED804419D27} {9AF766B7-A12B-4FD2-9422-4ED804419D27} = {86EBFF68-CD4B-4A69-84B1-588DC0FFFA3D} - {792E2303-AC33-4458-A3DA-014814B841EC} = {F6B98FF4-7D83-45D7-9A91-33B78C03181E} - {F6B98FF4-7D83-45D7-9A91-33B78C03181E} = {53DA7C46-1E47-4CBE-A5CF-14507A73D661} - {965BADC7-7272-4254-8E91-51261ABED2A5} = {AE70A528-A227-4830-8336-0671464707AD} - {AE70A528-A227-4830-8336-0671464707AD} = {53DA7C46-1E47-4CBE-A5CF-14507A73D661} - {53DA7C46-1E47-4CBE-A5CF-14507A73D661} = {622167C7-B284-451E-BC52-C1E433B3DA5F} - {71A46037-246E-47AA-BC49-F41C0E2111D3} = {5BB2762A-B069-4784-A75D-30A0613FE0B2} - {5BB2762A-B069-4784-A75D-30A0613FE0B2} = {5C082DFC-B029-46E2-907A-66225FE6EB7C} - {5C082DFC-B029-46E2-907A-66225FE6EB7C} = {59BC585F-A48C-4F15-B2A4-1108ACFBEF5F} + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6} = {03F1E16D-FCCE-4438-8A45-174DBE15E422} + {03F1E16D-FCCE-4438-8A45-174DBE15E422} = {8108FF0D-9D7E-478D-B4EC-5536846F9061} {A40C0DA0-F787-4936-9B1C-76217B5B5603} = {4DD1B4C9-D82B-4AB4-9E5A-AA9A3D1B4276} {4DD1B4C9-D82B-4AB4-9E5A-AA9A3D1B4276} = {A74FCAF6-5C58-4105-9916-06A439813107} {A74FCAF6-5C58-4105-9916-06A439813107} = {860CD702-001C-4D4F-96FE-7CB403862273} diff --git a/src/components.rexroth.drives/this.proj b/src/components.rexroth.drives/this.proj index c5525a4c3..e5ffbf79c 100644 --- a/src/components.rexroth.drives/this.proj +++ b/src/components.rexroth.drives/this.proj @@ -1,9 +1,5 @@  - - - - - + \ No newline at end of file diff --git a/src/components.rexroth.drives/this.sln b/src/components.rexroth.drives/this.sln index 7ed530616..09ad8a235 100644 --- a/src/components.rexroth.drives/this.sln +++ b/src/components.rexroth.drives/this.sln @@ -5,8 +5,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{6C31DFBB-5E54-46B6-935A-1C450B2CECF5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{272B8BF7-0B6F-4C4C-98EF-7150263B7596}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{430AC356-787C-40A0-A2A1-497BC517A98E}" @@ -15,10 +13,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Drives.bl EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_drives", "..\components.drives\src\AXOpen.Components.Drives\inxton_axopen_components_drives.csproj", "{4C44211C-E515-45BF-A30F-1A80221CA14B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Drives.blazorapp", "app\ix-blazor\AXOpen.Components.Rexroth.Drives.blazorapp.csproj", "{58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_rexroth_drives", "app\ix\app_axopen_components_rexroth_drives.csproj", "{AC526A25-7C08-407B-846D-C1DA4958C3C4}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Drives.blazor", "src\AXOpen.Components.Rexroth.Drives.blazor\AXOpen.Components.Rexroth.Drives.blazor.csproj", "{D677E3FA-21E2-42B5-93C6-D632EA421351}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_rexroth_drives", "src\AXOpen.Components.Rexroth.Drives\inxton_axopen_components_rexroth_drives.csproj", "{A5E7D0FB-1D2E-49DB-8FC6-32212C2262E5}" @@ -29,19 +23,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{D9915B82-8B1D-4854-BBF1-3A70B1156AB4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{84F299AF-7664-40F8-9041-2D43BE5AFD16}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{D843ADF9-BEC0-4DEA-BBA4-1D6546502471}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{CB77FE45-6E27-40B1-970C-C83589FA6C13}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{792E2303-AC33-4458-A3DA-014814B841EC}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{965BADC7-7272-4254-8E91-51261ABED2A5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{71A46037-246E-47AA-BC49-F41C0E2111D3}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{05B739DC-C6B2-47E8-B890-BD62FD45CAB6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{A40C0DA0-F787-4936-9B1C-76217B5B5603}" EndProject @@ -55,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{11B13475-86AB-4E7E-A419-8C555DC9FB89}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{19C5DFF2-F67F-4BCA-95B4-BB1929322371}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{CA7A38C7-0DF3-4B3D-8FA0-EB46731D9A5C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{5D25E034-B04B-449F-A93A-2CDFC8337972}" @@ -77,12 +63,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.drives EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.drives", "..\components.drives", "{F7155DFD-8B62-44C1-9A86-C2FDDC7076E0}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{F1A409A6-9790-4E1A-9F91-B2C9C1977229}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{9441D628-52BC-4E90-9B97-3F5502C0D11A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{81729BD7-3C2A-4876-8BA8-81AE65DED619}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Drives.blazor", "src\AXOpen.Components.Rexroth.Drives.blazor", "{BCDBE7DB-7095-4437-9B1F-30E0DE231473}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Drives", "src\AXOpen.Components.Rexroth.Drives", "{E9C6B169-D6F5-477D-A7CC-9B86EDADB57B}" @@ -103,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{8B2A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{2F50691B-F216-4595-9B12-E985356DA653}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{98500B29-8AB4-435C-A194-CEE47C5F67C0}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{77F6625C-FDE6-44BD-9294-523C4CF31CAE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{37441943-45F1-40C5-A89D-8FA968E90443}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{C14697CC-3A79-4FAF-8164-8DFC917CD8B4}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{5799F773-F37A-4F78-BA9B-9EC8D9A2E8FC}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{2F5C9E38-7B65-46D5-BC81-2D98B1183A20}" @@ -125,19 +97,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{86EBFF68-CD4B-4A69-84B1-588DC0FFFA3D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{F6B98FF4-7D83-45D7-9A91-33B78C03181E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{AE70A528-A227-4830-8336-0671464707AD}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{53DA7C46-1E47-4CBE-A5CF-14507A73D661}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{622167C7-B284-451E-BC52-C1E433B3DA5F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{5BB2762A-B069-4784-A75D-30A0613FE0B2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{5C082DFC-B029-46E2-907A-66225FE6EB7C}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{03F1E16D-FCCE-4438-8A45-174DBE15E422}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{59BC585F-A48C-4F15-B2A4-1108ACFBEF5F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{8108FF0D-9D7E-478D-B4EC-5536846F9061}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{4DD1B4C9-D82B-4AB4-9E5A-AA9A3D1B4276}" EndProject @@ -169,10 +131,6 @@ Global {6C31DFBB-5E54-46B6-935A-1C450B2CECF5}.Debug|Any CPU.Build.0 = Debug|Any CPU {6C31DFBB-5E54-46B6-935A-1C450B2CECF5}.Release|Any CPU.ActiveCfg = Release|Any CPU {6C31DFBB-5E54-46B6-935A-1C450B2CECF5}.Release|Any CPU.Build.0 = Release|Any CPU - {272B8BF7-0B6F-4C4C-98EF-7150263B7596}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {272B8BF7-0B6F-4C4C-98EF-7150263B7596}.Debug|Any CPU.Build.0 = Debug|Any CPU - {272B8BF7-0B6F-4C4C-98EF-7150263B7596}.Release|Any CPU.ActiveCfg = Release|Any CPU - {272B8BF7-0B6F-4C4C-98EF-7150263B7596}.Release|Any CPU.Build.0 = Release|Any CPU {8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2}.Debug|Any CPU.Build.0 = Debug|Any CPU {8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -189,14 +147,6 @@ Global {4C44211C-E515-45BF-A30F-1A80221CA14B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C44211C-E515-45BF-A30F-1A80221CA14B}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C44211C-E515-45BF-A30F-1A80221CA14B}.Release|Any CPU.Build.0 = Release|Any CPU - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581}.Release|Any CPU.Build.0 = Release|Any CPU - {AC526A25-7C08-407B-846D-C1DA4958C3C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AC526A25-7C08-407B-846D-C1DA4958C3C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AC526A25-7C08-407B-846D-C1DA4958C3C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AC526A25-7C08-407B-846D-C1DA4958C3C4}.Release|Any CPU.Build.0 = Release|Any CPU {D677E3FA-21E2-42B5-93C6-D632EA421351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D677E3FA-21E2-42B5-93C6-D632EA421351}.Debug|Any CPU.Build.0 = Debug|Any CPU {D677E3FA-21E2-42B5-93C6-D632EA421351}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -217,10 +167,6 @@ Global {D9915B82-8B1D-4854-BBF1-3A70B1156AB4}.Debug|Any CPU.Build.0 = Debug|Any CPU {D9915B82-8B1D-4854-BBF1-3A70B1156AB4}.Release|Any CPU.ActiveCfg = Release|Any CPU {D9915B82-8B1D-4854-BBF1-3A70B1156AB4}.Release|Any CPU.Build.0 = Release|Any CPU - {84F299AF-7664-40F8-9041-2D43BE5AFD16}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {84F299AF-7664-40F8-9041-2D43BE5AFD16}.Debug|Any CPU.Build.0 = Debug|Any CPU - {84F299AF-7664-40F8-9041-2D43BE5AFD16}.Release|Any CPU.ActiveCfg = Release|Any CPU - {84F299AF-7664-40F8-9041-2D43BE5AFD16}.Release|Any CPU.Build.0 = Release|Any CPU {D843ADF9-BEC0-4DEA-BBA4-1D6546502471}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D843ADF9-BEC0-4DEA-BBA4-1D6546502471}.Debug|Any CPU.Build.0 = Debug|Any CPU {D843ADF9-BEC0-4DEA-BBA4-1D6546502471}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -233,18 +179,10 @@ Global {4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED}.Release|Any CPU.ActiveCfg = Release|Any CPU {4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED}.Release|Any CPU.Build.0 = Release|Any CPU - {792E2303-AC33-4458-A3DA-014814B841EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {792E2303-AC33-4458-A3DA-014814B841EC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {792E2303-AC33-4458-A3DA-014814B841EC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {792E2303-AC33-4458-A3DA-014814B841EC}.Release|Any CPU.Build.0 = Release|Any CPU - {965BADC7-7272-4254-8E91-51261ABED2A5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {965BADC7-7272-4254-8E91-51261ABED2A5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {965BADC7-7272-4254-8E91-51261ABED2A5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {965BADC7-7272-4254-8E91-51261ABED2A5}.Release|Any CPU.Build.0 = Release|Any CPU - {71A46037-246E-47AA-BC49-F41C0E2111D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {71A46037-246E-47AA-BC49-F41C0E2111D3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {71A46037-246E-47AA-BC49-F41C0E2111D3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {71A46037-246E-47AA-BC49-F41C0E2111D3}.Release|Any CPU.Build.0 = Release|Any CPU + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6}.Debug|Any CPU.Build.0 = Debug|Any CPU + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6}.Release|Any CPU.ActiveCfg = Release|Any CPU + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6}.Release|Any CPU.Build.0 = Release|Any CPU {A40C0DA0-F787-4936-9B1C-76217B5B5603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A40C0DA0-F787-4936-9B1C-76217B5B5603}.Debug|Any CPU.Build.0 = Debug|Any CPU {A40C0DA0-F787-4936-9B1C-76217B5B5603}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -263,8 +201,6 @@ Global {A3A7EE59-B812-4012-A8E3-CC85301E2520} = {6D5CEBF2-F6E9-41FB-88E9-281C6AB20D03} {6C31DFBB-5E54-46B6-935A-1C450B2CECF5} = {11B13475-86AB-4E7E-A419-8C555DC9FB89} {11B13475-86AB-4E7E-A419-8C555DC9FB89} = {5D25E034-B04B-449F-A93A-2CDFC8337972} - {272B8BF7-0B6F-4C4C-98EF-7150263B7596} = {19C5DFF2-F67F-4BCA-95B4-BB1929322371} - {19C5DFF2-F67F-4BCA-95B4-BB1929322371} = {5D25E034-B04B-449F-A93A-2CDFC8337972} {8E7B244D-7C9B-4D39-9EFF-F77BA38D55E2} = {CA7A38C7-0DF3-4B3D-8FA0-EB46731D9A5C} {CA7A38C7-0DF3-4B3D-8FA0-EB46731D9A5C} = {5D25E034-B04B-449F-A93A-2CDFC8337972} {5D25E034-B04B-449F-A93A-2CDFC8337972} = {8CBDE1D0-AC41-4826-857D-02D81C35B0B3} @@ -276,11 +212,6 @@ Global {4C44211C-E515-45BF-A30F-1A80221CA14B} = {D19D2D33-EE5A-421D-A418-6C926B0B5826} {D19D2D33-EE5A-421D-A418-6C926B0B5826} = {51DD8162-910D-4067-969D-7B77E44C4156} {51DD8162-910D-4067-969D-7B77E44C4156} = {F7155DFD-8B62-44C1-9A86-C2FDDC7076E0} - {58CFBA6B-1BEC-4A8E-9FF3-7AB97ABCB581} = {F1A409A6-9790-4E1A-9F91-B2C9C1977229} - {F1A409A6-9790-4E1A-9F91-B2C9C1977229} = {81729BD7-3C2A-4876-8BA8-81AE65DED619} - {AC526A25-7C08-407B-846D-C1DA4958C3C4} = {9441D628-52BC-4E90-9B97-3F5502C0D11A} - {9441D628-52BC-4E90-9B97-3F5502C0D11A} = {81729BD7-3C2A-4876-8BA8-81AE65DED619} - {81729BD7-3C2A-4876-8BA8-81AE65DED619} = {3AF0FA63-1F7C-4BAC-8AD8-54E52C5A922D} {D677E3FA-21E2-42B5-93C6-D632EA421351} = {BCDBE7DB-7095-4437-9B1F-30E0DE231473} {BCDBE7DB-7095-4437-9B1F-30E0DE231473} = {7EC28853-0DD3-4DBF-BA34-24818D566047} {A5E7D0FB-1D2E-49DB-8FC6-32212C2262E5} = {E9C6B169-D6F5-477D-A7CC-9B86EDADB57B} @@ -294,10 +225,6 @@ Global {D9915B82-8B1D-4854-BBF1-3A70B1156AB4} = {08F25B87-87C9-45E2-82BA-6E1A28227426} {08F25B87-87C9-45E2-82BA-6E1A28227426} = {8B2AF899-83F1-4002-B226-DAFCA46804EB} {8B2AF899-83F1-4002-B226-DAFCA46804EB} = {2F50691B-F216-4595-9B12-E985356DA653} - {84F299AF-7664-40F8-9041-2D43BE5AFD16} = {98500B29-8AB4-435C-A194-CEE47C5F67C0} - {98500B29-8AB4-435C-A194-CEE47C5F67C0} = {77F6625C-FDE6-44BD-9294-523C4CF31CAE} - {77F6625C-FDE6-44BD-9294-523C4CF31CAE} = {37441943-45F1-40C5-A89D-8FA968E90443} - {37441943-45F1-40C5-A89D-8FA968E90443} = {C14697CC-3A79-4FAF-8164-8DFC917CD8B4} {D843ADF9-BEC0-4DEA-BBA4-1D6546502471} = {5799F773-F37A-4F78-BA9B-9EC8D9A2E8FC} {5799F773-F37A-4F78-BA9B-9EC8D9A2E8FC} = {0963F97B-6549-446B-A187-B3DE4C0B40DF} {CB77FE45-6E27-40B1-970C-C83589FA6C13} = {2F5C9E38-7B65-46D5-BC81-2D98B1183A20} @@ -306,14 +233,8 @@ Global {4C53DB47-AEC1-4781-9F80-53A7BFA1B0ED} = {7488AFC6-AA51-4C00-95B8-BED0C270547B} {7488AFC6-AA51-4C00-95B8-BED0C270547B} = {9AF766B7-A12B-4FD2-9422-4ED804419D27} {9AF766B7-A12B-4FD2-9422-4ED804419D27} = {86EBFF68-CD4B-4A69-84B1-588DC0FFFA3D} - {792E2303-AC33-4458-A3DA-014814B841EC} = {F6B98FF4-7D83-45D7-9A91-33B78C03181E} - {F6B98FF4-7D83-45D7-9A91-33B78C03181E} = {53DA7C46-1E47-4CBE-A5CF-14507A73D661} - {965BADC7-7272-4254-8E91-51261ABED2A5} = {AE70A528-A227-4830-8336-0671464707AD} - {AE70A528-A227-4830-8336-0671464707AD} = {53DA7C46-1E47-4CBE-A5CF-14507A73D661} - {53DA7C46-1E47-4CBE-A5CF-14507A73D661} = {622167C7-B284-451E-BC52-C1E433B3DA5F} - {71A46037-246E-47AA-BC49-F41C0E2111D3} = {5BB2762A-B069-4784-A75D-30A0613FE0B2} - {5BB2762A-B069-4784-A75D-30A0613FE0B2} = {5C082DFC-B029-46E2-907A-66225FE6EB7C} - {5C082DFC-B029-46E2-907A-66225FE6EB7C} = {59BC585F-A48C-4F15-B2A4-1108ACFBEF5F} + {05B739DC-C6B2-47E8-B890-BD62FD45CAB6} = {03F1E16D-FCCE-4438-8A45-174DBE15E422} + {03F1E16D-FCCE-4438-8A45-174DBE15E422} = {8108FF0D-9D7E-478D-B4EC-5536846F9061} {A40C0DA0-F787-4936-9B1C-76217B5B5603} = {4DD1B4C9-D82B-4AB4-9E5A-AA9A3D1B4276} {4DD1B4C9-D82B-4AB4-9E5A-AA9A3D1B4276} = {A74FCAF6-5C58-4105-9916-06A439813107} {A74FCAF6-5C58-4105-9916-06A439813107} = {860CD702-001C-4D4F-96FE-7CB403862273} From 2af1aaf44bb1826e161d59f2b936d6b82502ccae Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 15:40:35 +0200 Subject: [PATCH 19/33] Add REST API client and request handling for curve data retrieval - Introduced RestClient class for making API calls to the curve data endpoint. - Implemented methods to fetch the last curve data, curve data by ID, and curve data by custom ID. - Created RestRequest class to handle HTTP requests with methods for GET, POST, PUT, and DELETE operations. - Configured error handling and logging for HTTP requests. - Updated solution file to reflect the new structure and removed obsolete projects. --- .../components.rexroth.press.code-workspace | 3 - .../components.rexroth.press.sln | 99 ++----------------- .../v_4_x_x/AxoSmartFunctionKit.st} | 48 ++++----- .../AxoSmartFunctionKitRequest.st} | 6 +- .../AxoSmartFunctionKitResponse.st} | 4 +- .../AxoSmartFunctionKitResults.st} | 4 +- .../AxoSmartFunctionKitStatus.st} | 8 +- .../AxoSmartFunctionKit_ComponentStatus.st} | 8 +- .../AxoSmartFunctionKit_Config.st} | 6 +- .../AxoSmartFunctionKit_Control.st} | 4 +- .../AxoSmartFunctionKit_HWIDs.st} | 4 +- .../AxoSmartFunctionKit_State.st} | 4 +- .../eAxoSmartFunctionKitCommand.st} | 4 +- .../eAxoSmartFunctionKitParticipant.st} | 4 +- .../eAxoSmartFunctionKitStatusInformation.st} | 4 +- .../v_4_x_x/AxoSmartFunctionKit.cs} | 10 +- .../v_4_x_x}/RestApi/CurveItem.cs | 4 +- .../v_4_x_x}/RestApi/Logger.cs | 4 +- .../v_4_x_x}/RestApi/RestClient.cs | 4 +- .../v_4_x_x}/RestApi/RestRequest.cs | 4 +- src/components.rexroth.press/this.sln | 99 ++----------------- 21 files changed, 87 insertions(+), 248 deletions(-) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKit_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/AxoSmartFunctionKit.st} (96%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitRequest_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitRequest.st} (82%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitResponse_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitResponse.st} (93%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitResults_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitResults.st} (92%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitStatus_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitStatus.st} (83%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_ComponentStatus_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_ComponentStatus.st} (54%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_Config_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_Config.st} (81%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_Control_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_Control.st} (94%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_HWIDs_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_HWIDs.st} (88%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_State_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_State.st} (95%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitCommand_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitCommand.st} (83%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitParticipant_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitParticipant.st} (62%) rename src/components.rexroth.press/ctrl/src/{AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitStatusInformation_v_4_x_x.st => AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitStatusInformation.st} (85%) rename src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/{AxoSmartFunctionKit_v_4_x_x/AxoSmartFunctionKit_v_4_x_x.cs => AxoSmartFunctionKit/v_4_x_x/AxoSmartFunctionKit.cs} (99%) rename src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/{AxoSmartFunctionKit_v_4_x_x => AxoSmartFunctionKit/v_4_x_x}/RestApi/CurveItem.cs (97%) rename src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/{AxoSmartFunctionKit_v_4_x_x => AxoSmartFunctionKit/v_4_x_x}/RestApi/Logger.cs (90%) rename src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/{AxoSmartFunctionKit_v_4_x_x => AxoSmartFunctionKit/v_4_x_x}/RestApi/RestClient.cs (96%) rename src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/{AxoSmartFunctionKit_v_4_x_x => AxoSmartFunctionKit/v_4_x_x}/RestApi/RestRequest.cs (99%) diff --git a/src/components.rexroth.press/components.rexroth.press.code-workspace b/src/components.rexroth.press/components.rexroth.press.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.rexroth.press/components.rexroth.press.code-workspace +++ b/src/components.rexroth.press/components.rexroth.press.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.rexroth.press/components.rexroth.press.sln b/src/components.rexroth.press/components.rexroth.press.sln index e56bc27e3..b4046b81a 100644 --- a/src/components.rexroth.press/components.rexroth.press.sln +++ b/src/components.rexroth.press/components.rexroth.press.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{FEBD8454-A4D4-4641-B2D7-7ACE4800FF75}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{EE585E90-583D-4115-9C89-D8C06490E049}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{83F8377B-613E-4A91-9666-8115197AA422}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{3C6078F1-6FCA-4DE2-8F62-556521CFAE20}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{D05807C9-4A3B-4ABD-A223-9FB166324711}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{000DDA84-D4B9-4403-9D4E-B319F00E2CF2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Press.blazorapp", "app\ix-blazor\AXOpen.Components.Rexroth.Press.blazorapp.csproj", "{8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_rexroth_press", "app\ix\app_axopen_components_rexroth_press.csproj", "{6F566E3F-0B88-435F-B1A3-63EB111A0B86}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Press.blazor", "src\AXOpen.Components.Rexroth.Press.blazor\AXOpen.Components.Rexroth.Press.blazor.csproj", "{8D62E4BE-989E-43C4-B310-BCB36EDFF141}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_rexroth_press", "src\AXOpen.Components.Rexroth.Press\inxton_axopen_components_rexroth_press.csproj", "{0BDAAA4C-91AF-4EF9-BA12-3B66C26E1233}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{723001DD-7D46-44E3-9166-E37BEEC1D8B5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{F50457E5-9A5C-45E9-8CBD-E36F92893BFF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{D7F32D99-AA51-4816-9B27-873C2F17232A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{6CE5528D-3A09-456C-82F6-B8EC375A8161}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{E82B678E-1810-45A3-9FC2-AE92AC15093C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{565BEC50-C14D-45F9-9AA2-329319D44E81}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{2020C132-2D1F-4AEC-8703-60B5645D7141}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{ABF2A11C-1EFD-4F31-9388-61003F9E0721}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{4484F7FF-5C02-4271-A0A8-6DD75958BE9F}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{4D0D4C1B-85D3-40D5-BF1B-6F30BC763546}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{E3042E7C-9A47-4729-8FF7-BD9A8A7B55EC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{46CF1AEF-6B14-4532-8995-62542A7BAE5A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{028FCCE1-4B57-4552-B8E1-39F8CD47C569}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{0DCDD10A-252C-4A51-B88E-14A0BB6F113C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{E7443D8A-3FE2-4592-A2EE-34D242212678}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{1EBC051C-124F-4989-B7B6-9EBABE959A01}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Press.blazor", "src\AXOpen.Components.Rexroth.Press.blazor", "{F5F137EC-5E95-478D-854A-E20FFAB34D75}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Press", "src\AXOpen.Components.Rexroth.Press", "{2793681D-63FC-4ADF-B0A2-A374A8FD34A5}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{D246 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{4194535A-65DC-4D65-BDD5-61F37D0870BD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{E400FA81-746B-41EA-A4FD-754E936DC0B3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{E3AA29D5-6CEC-4AB4-A6BF-4632699A8F09}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{0D3668E9-4EAD-4C29-8D69-68FCD142BDCC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{914605CE-853F-4A33-BA11-523649B91732}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{920CAF82-E23E-46AE-B104-5F47298EB26F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{3D4794BD-1ED7-4C4A-8E26-A1B5CD869682}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{51268308-2987-46E1-B89D-CBDC948569C7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{CE1C10D7-5E57-410E-821F-4205745F57BC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{D3532E0D-606B-4FFB-A6BE-BAE0A0176176}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{2B284085-0D40-454D-BBEF-063859109AC1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{74F4F0D7-A338-4ED9-A8E1-1916F680C74E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{CB367740-6993-4410-A756-3D5512ADFC47}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{F02587F4-2E14-4492-BE3D-EB33A0112811}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{B33D0B32-87E7-4E19-8D87-83BF58F95523}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{F356C6FC-EF36-4C46-A6A4-4A215E13540F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{91EDA14B-0AEB-44AE-949E-123C595AEF81}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{6CBC198A-AF58-4717-814F-6DCB70FF6999}" EndProject @@ -157,10 +119,6 @@ Global {83F8377B-613E-4A91-9666-8115197AA422}.Debug|Any CPU.Build.0 = Debug|Any CPU {83F8377B-613E-4A91-9666-8115197AA422}.Release|Any CPU.ActiveCfg = Release|Any CPU {83F8377B-613E-4A91-9666-8115197AA422}.Release|Any CPU.Build.0 = Release|Any CPU - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20}.Release|Any CPU.Build.0 = Release|Any CPU {D05807C9-4A3B-4ABD-A223-9FB166324711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D05807C9-4A3B-4ABD-A223-9FB166324711}.Debug|Any CPU.Build.0 = Debug|Any CPU {D05807C9-4A3B-4ABD-A223-9FB166324711}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {000DDA84-D4B9-4403-9D4E-B319F00E2CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {000DDA84-D4B9-4403-9D4E-B319F00E2CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU {000DDA84-D4B9-4403-9D4E-B319F00E2CF2}.Release|Any CPU.Build.0 = Release|Any CPU - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}.Release|Any CPU.Build.0 = Release|Any CPU - {6F566E3F-0B88-435F-B1A3-63EB111A0B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F566E3F-0B88-435F-B1A3-63EB111A0B86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F566E3F-0B88-435F-B1A3-63EB111A0B86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F566E3F-0B88-435F-B1A3-63EB111A0B86}.Release|Any CPU.Build.0 = Release|Any CPU {8D62E4BE-989E-43C4-B310-BCB36EDFF141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D62E4BE-989E-43C4-B310-BCB36EDFF141}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D62E4BE-989E-43C4-B310-BCB36EDFF141}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {723001DD-7D46-44E3-9166-E37BEEC1D8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {723001DD-7D46-44E3-9166-E37BEEC1D8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU {723001DD-7D46-44E3-9166-E37BEEC1D8B5}.Release|Any CPU.Build.0 = Release|Any CPU - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF}.Release|Any CPU.Build.0 = Release|Any CPU {D7F32D99-AA51-4816-9B27-873C2F17232A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D7F32D99-AA51-4816-9B27-873C2F17232A}.Debug|Any CPU.Build.0 = Debug|Any CPU {D7F32D99-AA51-4816-9B27-873C2F17232A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {E82B678E-1810-45A3-9FC2-AE92AC15093C}.Debug|Any CPU.Build.0 = Debug|Any CPU {E82B678E-1810-45A3-9FC2-AE92AC15093C}.Release|Any CPU.ActiveCfg = Release|Any CPU {E82B678E-1810-45A3-9FC2-AE92AC15093C}.Release|Any CPU.Build.0 = Release|Any CPU - {565BEC50-C14D-45F9-9AA2-329319D44E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {565BEC50-C14D-45F9-9AA2-329319D44E81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {565BEC50-C14D-45F9-9AA2-329319D44E81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {565BEC50-C14D-45F9-9AA2-329319D44E81}.Release|Any CPU.Build.0 = Release|Any CPU - {2020C132-2D1F-4AEC-8703-60B5645D7141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2020C132-2D1F-4AEC-8703-60B5645D7141}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2020C132-2D1F-4AEC-8703-60B5645D7141}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2020C132-2D1F-4AEC-8703-60B5645D7141}.Release|Any CPU.Build.0 = Release|Any CPU - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}.Release|Any CPU.Build.0 = Release|Any CPU + {ABF2A11C-1EFD-4F31-9388-61003F9E0721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ABF2A11C-1EFD-4F31-9388-61003F9E0721}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ABF2A11C-1EFD-4F31-9388-61003F9E0721}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ABF2A11C-1EFD-4F31-9388-61003F9E0721}.Release|Any CPU.Build.0 = Release|Any CPU {4484F7FF-5C02-4271-A0A8-6DD75958BE9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4484F7FF-5C02-4271-A0A8-6DD75958BE9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {4484F7FF-5C02-4271-A0A8-6DD75958BE9F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {3FAE7BB2-FD1F-4F06-AA3C-3541EBC9ABA1} = {60BCAD8D-6226-4C50-AEB9-704E3CB84A95} {83F8377B-613E-4A91-9666-8115197AA422} = {4D0D4C1B-85D3-40D5-BF1B-6F30BC763546} {4D0D4C1B-85D3-40D5-BF1B-6F30BC763546} = {C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8} - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20} = {E3042E7C-9A47-4729-8FF7-BD9A8A7B55EC} - {E3042E7C-9A47-4729-8FF7-BD9A8A7B55EC} = {C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8} {D05807C9-4A3B-4ABD-A223-9FB166324711} = {46CF1AEF-6B14-4532-8995-62542A7BAE5A} {46CF1AEF-6B14-4532-8995-62542A7BAE5A} = {C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8} {C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8} = {77B483C5-DDFE-4E21-A565-CA3DCC421665} {000DDA84-D4B9-4403-9D4E-B319F00E2CF2} = {6EF23F4D-CA51-4F3E-B5F0-46AA9339D71F} {6EF23F4D-CA51-4F3E-B5F0-46AA9339D71F} = {0569E334-8796-4639-99D1-27657C451208} {0569E334-8796-4639-99D1-27657C451208} = {028FCCE1-4B57-4552-B8E1-39F8CD47C569} - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33} = {0DCDD10A-252C-4A51-B88E-14A0BB6F113C} - {0DCDD10A-252C-4A51-B88E-14A0BB6F113C} = {1EBC051C-124F-4989-B7B6-9EBABE959A01} - {6F566E3F-0B88-435F-B1A3-63EB111A0B86} = {E7443D8A-3FE2-4592-A2EE-34D242212678} - {E7443D8A-3FE2-4592-A2EE-34D242212678} = {1EBC051C-124F-4989-B7B6-9EBABE959A01} - {1EBC051C-124F-4989-B7B6-9EBABE959A01} = {B56D4CAC-B5D9-4939-9CCA-346722C9297B} {8D62E4BE-989E-43C4-B310-BCB36EDFF141} = {F5F137EC-5E95-478D-854A-E20FFAB34D75} {F5F137EC-5E95-478D-854A-E20FFAB34D75} = {66900B88-135E-4C5C-941C-D4F3D9ED304C} {0BDAAA4C-91AF-4EF9-BA12-3B66C26E1233} = {2793681D-63FC-4ADF-B0A2-A374A8FD34A5} @@ -269,10 +200,6 @@ Global {723001DD-7D46-44E3-9166-E37BEEC1D8B5} = {33CD077B-CAEF-4BE7-92A0-93F18162C6B2} {33CD077B-CAEF-4BE7-92A0-93F18162C6B2} = {D246D5A6-26EB-4EFB-AF12-2840F6697140} {D246D5A6-26EB-4EFB-AF12-2840F6697140} = {4194535A-65DC-4D65-BDD5-61F37D0870BD} - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF} = {E400FA81-746B-41EA-A4FD-754E936DC0B3} - {E400FA81-746B-41EA-A4FD-754E936DC0B3} = {E3AA29D5-6CEC-4AB4-A6BF-4632699A8F09} - {E3AA29D5-6CEC-4AB4-A6BF-4632699A8F09} = {0D3668E9-4EAD-4C29-8D69-68FCD142BDCC} - {0D3668E9-4EAD-4C29-8D69-68FCD142BDCC} = {914605CE-853F-4A33-BA11-523649B91732} {D7F32D99-AA51-4816-9B27-873C2F17232A} = {920CAF82-E23E-46AE-B104-5F47298EB26F} {920CAF82-E23E-46AE-B104-5F47298EB26F} = {E50C3DC3-43B4-41EC-92D9-88E15B2A3268} {6CE5528D-3A09-456C-82F6-B8EC375A8161} = {3D4794BD-1ED7-4C4A-8E26-A1B5CD869682} @@ -281,14 +208,8 @@ Global {E82B678E-1810-45A3-9FC2-AE92AC15093C} = {8C0A6167-E27B-4873-BCA7-5E1E0D7B6609} {8C0A6167-E27B-4873-BCA7-5E1E0D7B6609} = {B7304C85-E289-470F-ADD7-63C6A5AE10E7} {B7304C85-E289-470F-ADD7-63C6A5AE10E7} = {51268308-2987-46E1-B89D-CBDC948569C7} - {565BEC50-C14D-45F9-9AA2-329319D44E81} = {CE1C10D7-5E57-410E-821F-4205745F57BC} - {CE1C10D7-5E57-410E-821F-4205745F57BC} = {2B284085-0D40-454D-BBEF-063859109AC1} - {2020C132-2D1F-4AEC-8703-60B5645D7141} = {D3532E0D-606B-4FFB-A6BE-BAE0A0176176} - {D3532E0D-606B-4FFB-A6BE-BAE0A0176176} = {2B284085-0D40-454D-BBEF-063859109AC1} - {2B284085-0D40-454D-BBEF-063859109AC1} = {74F4F0D7-A338-4ED9-A8E1-1916F680C74E} - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5} = {CB367740-6993-4410-A756-3D5512ADFC47} - {CB367740-6993-4410-A756-3D5512ADFC47} = {F02587F4-2E14-4492-BE3D-EB33A0112811} - {F02587F4-2E14-4492-BE3D-EB33A0112811} = {F356C6FC-EF36-4C46-A6A4-4A215E13540F} + {ABF2A11C-1EFD-4F31-9388-61003F9E0721} = {B33D0B32-87E7-4E19-8D87-83BF58F95523} + {B33D0B32-87E7-4E19-8D87-83BF58F95523} = {91EDA14B-0AEB-44AE-949E-123C595AEF81} {4484F7FF-5C02-4271-A0A8-6DD75958BE9F} = {6CBC198A-AF58-4717-814F-6DCB70FF6999} {6CBC198A-AF58-4717-814F-6DCB70FF6999} = {617605C5-ADA7-441A-AE60-756ECCD34CC5} {617605C5-ADA7-441A-AE60-756ECCD34CC5} = {56A64A4E-048C-4EC1-992B-88D884AF2F93} diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/AxoSmartFunctionKit.st similarity index 96% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/AxoSmartFunctionKit.st index 52037f2af..d4a4f7a44 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/AxoSmartFunctionKit.st @@ -7,11 +7,11 @@ USING AXOpen.Components.Abstractions; USING System.Serialization; USING Siemens.Simatic.Hardware.Utilities; -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {#ix-attr:[Container(Layout.Wrap)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoSmartFunctionKit_v_4_x_x EXTENDS AXOpen.Core.AxoComponent + CLASS PUBLIC AxoSmartFunctionKit EXTENDS AXOpen.Core.AxoComponent VAR PRIVATE _infoTimer : AXOpen.Timers.OnDelayTimer; _errorTimer : AXOpen.Timers.OnDelayTimer; @@ -37,7 +37,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[ComponentHeader()]} {#ix-set:AttributeName = "<#Results#>"} - Results : AxoSmartFunctionKitResults_v_4_x_x; + Results : AxoSmartFunctionKitResults; END_VAR VAR PUBLIC //Tasks @@ -52,7 +52,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[ComponentDetails("Tasks")]} {#ix-set:AttributeName = "<#Run command parameters#>"} - RunCommandParameters : AXOpen.Components.Rexroth.Press.AxoSmartFunctionKitRequest_v_4_x_x; + RunCommandParameters : AxoSmartFunctionKitRequest; {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[ComponentDetails("Tasks")]} {#ix-set:AttributeName = "<#Get results#>"} @@ -67,14 +67,14 @@ NAMESPACE AXOpen.Components.Rexroth.Press {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Config")]} {#ix-attr:[ReadOnly()]} - Config : AxoSmartFunctionKit_Config_v_4_x_x; + Config : AxoSmartFunctionKit_Config; END_VAR VAR PUBLIC //STATUS {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} - Status : AxoSmartFunctionKit_ComponentStatus_v_4_x_x; + Status : AxoSmartFunctionKit_ComponentStatus; Messenger : AXOpen.Messaging.Static.AxoMessenger; TaskMessenger : AXOpen.Messaging.Static.AxoMessenger; _progress : INT := 0; @@ -86,13 +86,13 @@ NAMESPACE AXOpen.Components.Rexroth.Press {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Inputs#>"} {#ix-attr:[ReadOnly()]} - Inputs : AxoSmartFunctionKit_State_v_4_x_x; + Inputs : AxoSmartFunctionKit_State; {#ix-attr:[ComponentDetails("Hardware signals")]} {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Outputs#>"} {#ix-attr:[ReadOnly()]} - Outputs : AxoSmartFunctionKit_Control_v_4_x_x; + Outputs : AxoSmartFunctionKit_Control; END_VAR VAR PUBLIC //HardwareDiagnostics @@ -434,16 +434,16 @@ NAMESPACE AXOpen.Components.Rexroth.Press Status.Status.NotificationId := TO_UINT(Inputs.NotificationId); CASE Status.Status.NotificationId of - eAxoSmartFunctionKitStatusInformation_v_4_x_x#ActiveProgramNumber: - Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation_v_4_x_x#ActiveProgramNumber; - eAxoSmartFunctionKitStatusInformation_v_4_x_x#CurrentForce: - Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation_v_4_x_x#CurrentForce; - eAxoSmartFunctionKitStatusInformation_v_4_x_x#CurrentPosition: - Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation_v_4_x_x#CurrentPosition; - eAxoSmartFunctionKitStatusInformation_v_4_x_x#CurrentTravelSpeed: - Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation_v_4_x_x#CurrentTravelSpeed; - eAxoSmartFunctionKitStatusInformation_v_4_x_x#RemainingStorageSpaceOnIPC: - Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation_v_4_x_x#RemainingStorageSpaceOnIPC; + eAxoSmartFunctionKitStatusInformation#ActiveProgramNumber: + Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation#ActiveProgramNumber; + eAxoSmartFunctionKitStatusInformation#CurrentForce: + Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation#CurrentForce; + eAxoSmartFunctionKitStatusInformation#CurrentPosition: + Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation#CurrentPosition; + eAxoSmartFunctionKitStatusInformation#CurrentTravelSpeed: + Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation#CurrentTravelSpeed; + eAxoSmartFunctionKitStatusInformation#RemainingStorageSpaceOnIPC: + Status.Status.NotificationToDisplay:=eAxoSmartFunctionKitStatusInformation#RemainingStorageSpaceOnIPC; END_CASE; Status.Status.DigitalIoMapping:=Inputs.DigitalIoMapping; @@ -485,7 +485,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press Outputs.Value6 := DWORD#0; Outputs.Value7 := DWORD#0; CASE Status.CurrentCommandParameters.Command OF - eAxoSmartFunctionKitCommand_v_4_x_x#StartProgram: + eAxoSmartFunctionKitCommand#StartProgram: Serialize(UINT#0, Status.CurrentCommandParameters.SerialNumber, _data42); //todo check if the rest of the array needs to be cleaned @@ -524,17 +524,17 @@ NAMESPACE AXOpen.Components.Rexroth.Press Outputs.Value7.%B2 := _data42[26]; Outputs.Value7.%B3 := _data42[25]; - eAxoSmartFunctionKitCommand_v_4_x_x#SetProgramActive: + eAxoSmartFunctionKitCommand#SetProgramActive: Outputs.Value1:= TO_DWORD(Status.CurrentCommandParameters.ProgramId*1000); - eAxoSmartFunctionKitCommand_v_4_x_x#Positioning: + eAxoSmartFunctionKitCommand#Positioning: Outputs.Value1:= TO_DWORD(Status.CurrentCommandParameters.PositionDistanceTara*1000); Outputs.Value2:= TO_DWORD(Status.CurrentCommandParameters.TravelSpeed*1000); Outputs.Value3:= TO_DWORD(Status.CurrentCommandParameters.Acceleration*1000); - eAxoSmartFunctionKitCommand_v_4_x_x#Jog: + eAxoSmartFunctionKitCommand#Jog: Outputs.Value1:= TO_DWORD(Status.CurrentCommandParameters.PositionDistanceTara*1000); Outputs.Value2:= TO_DWORD(Status.CurrentCommandParameters.TravelSpeed*1000); Outputs.Value3:= TO_DWORD(Status.CurrentCommandParameters.Acceleration*1000); - eAxoSmartFunctionKitCommand_v_4_x_x#Tare: + eAxoSmartFunctionKitCommand#Tare: Outputs.Value1:= TO_DWORD(Status.CurrentCommandParameters.Offset*1000); END_CASE; Outputs.Command := TO_WORD(Status.CurrentCommandParameters.Command); @@ -723,7 +723,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press /// METHOD PUBLIC RunCommand : IAxoTaskState VAR_INPUT - Parameters : REF_TO AxoSmartFunctionKitRequest_v_4_x_x; + Parameters : REF_TO AxoSmartFunctionKitRequest; END_VAR IF Parameters = NULL THEN diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitRequest_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitRequest.st similarity index 82% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitRequest_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitRequest.st index e2eb0d6de..7dcf8675b 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitRequest_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitRequest.st @@ -1,10 +1,10 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoSmartFunctionKitRequest_v_4_x_x + CLASS PUBLIC AxoSmartFunctionKitRequest VAR PUBLIC {#ix-set:AttributeName = "<#Command#>"} - Command : eAxoSmartFunctionKitCommand_v_4_x_x; + Command : eAxoSmartFunctionKitCommand; {#ix-set:AttributeName = "<#Serial number#>"} SerialNumber:STRING[28]; {#ix-set:AttributeName = "<#Program Id#>"} diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitResponse_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitResponse.st similarity index 93% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitResponse_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitResponse.st index d8a005678..571b43db2 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitResponse_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitResponse.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoSmartFunctionKitResponse_v_4_x_x + CLASS PUBLIC AxoSmartFunctionKitResponse VAR PUBLIC {#ix-set:AttributeName = "<#Axis in reference#>"} AxisInReference : BOOL; diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitResults_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitResults.st similarity index 92% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitResults_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitResults.st index bdd6b1d1e..af33e1d1e 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitResults_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitResults.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoSmartFunctionKitResults_v_4_x_x + CLASS PUBLIC AxoSmartFunctionKitResults VAR PUBLIC {#ix-set:AttributeName = "<#Id#>"} id : STRING; diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitStatus_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitStatus.st similarity index 83% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitStatus_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitStatus.st index 0cdfa4e20..5ac155160 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKitStatus_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKitStatus.st @@ -1,14 +1,14 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoSmartFunctionKitStatus_v_4_x_x + CLASS PUBLIC AxoSmartFunctionKitStatus VAR PUBLIC {#ix-set:AttributeName = "<#Response status#>"} - ResponseStatus : AxoSmartFunctionKitResponse_v_4_x_x; + ResponseStatus : AxoSmartFunctionKitResponse; {#ix-set:AttributeName = "<#Notification Id#>"} NotificationId : UINT; {#ix-set:AttributeName = "<#Notification to display#>"} - NotificationToDisplay : eAxoSmartFunctionKitStatusInformation_v_4_x_x; + NotificationToDisplay : eAxoSmartFunctionKitStatusInformation; {#ix-set:AttributeName = "<#Notification position#>"} NotificationPosition : REAL; {#ix-set:AttributeName = "<#Notification velocity#>"} diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_ComponentStatus_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_ComponentStatus.st similarity index 54% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_ComponentStatus_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_ComponentStatus.st index c8f46f6c2..3f170eb90 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_ComponentStatus_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_ComponentStatus.st @@ -1,11 +1,11 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoSmartFunctionKit_ComponentStatus_v_4_x_x EXTENDS AXOpen.Components.Abstractions.AxoComponent_Status + CLASS PUBLIC AxoSmartFunctionKit_ComponentStatus EXTENDS AXOpen.Components.Abstractions.AxoComponent_Status VAR PUBLIC - Status : AxoSmartFunctionKitStatus_v_4_x_x; + Status : AxoSmartFunctionKitStatus; {#ix-set:AttributeName = "<#Current command parameters#>"} - CurrentCommandParameters : AxoSmartFunctionKitRequest_v_4_x_x; + CurrentCommandParameters : AxoSmartFunctionKitRequest; END_VAR END_CLASS END_NAMESPACE diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_Config_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_Config.st similarity index 81% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_Config_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_Config.st index 96611b124..d9bd3120a 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_Config_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_Config.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoSmartFunctionKit_Config_v_4_x_x + CLASS PUBLIC AxoSmartFunctionKit_Config VAR PUBLIC {#ix-set:AttributeName = "<#Info time#>"} InfoTime : LTIME := LT#10S; @@ -10,7 +10,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press {#ix-set:AttributeName = "<#Task timeout#>"} TaskTimeout : LTIME := LT#50S; {#ix-set:AttributeName = "<#Hardware IDs#>"} - HWIDs : AxoSmartFunctionKit_HWIDs_v_4_x_x; + HWIDs : AxoSmartFunctionKit_HWIDs; {#ix-set:AttributeName = "<#Location of the curve export#>"} CurveExportLocation : STRING ; {#ix-set:AttributeName = "<#Ip address#>"} diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_Control_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_Control.st similarity index 94% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_Control_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_Control.st index 7dfcaaf4d..ec0dd577f 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_Control_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_Control.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoSmartFunctionKit_Control_v_4_x_x + CLASS AxoSmartFunctionKit_Control VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_HWIDs_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_HWIDs.st similarity index 88% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_HWIDs_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_HWIDs.st index 158a46f53..79a6f8192 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_HWIDs_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_HWIDs.st @@ -1,6 +1,6 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {S7.extern=ReadWrite} - CLASS AxoSmartFunctionKit_HWIDs_v_4_x_x + CLASS AxoSmartFunctionKit_HWIDs VAR PUBLIC {#ix-set:AttributeName = "<#Hardware ID Device#>"} HW_Device : UINT; diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_State_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_State.st similarity index 95% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_State_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_State.st index ab6a53dff..a9bec2509 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/AxoSmartFunctionKit_State_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/AxoSmartFunctionKit_State.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoSmartFunctionKit_State_v_4_x_x + CLASS AxoSmartFunctionKit_State VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitCommand_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitCommand.st similarity index 83% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitCommand_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitCommand.st index efd523318..45bba619c 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitCommand_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitCommand.st @@ -1,6 +1,6 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x TYPE PUBLIC - eAxoSmartFunctionKitCommand_v_4_x_x : INT + eAxoSmartFunctionKitCommand : INT ( StartProgram := 1, SetProgramActive := 2, diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitParticipant_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitParticipant.st similarity index 62% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitParticipant_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitParticipant.st index ff54da7b9..c79be8f56 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitParticipant_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitParticipant.st @@ -1,6 +1,6 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x TYPE PUBLIC - eAxoSmartFunctionKitParticipant_v_4_x_x : INT + eAxoSmartFunctionKitParticipant : INT ( WebInterface := 1, Fieldbus := 2, diff --git a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitStatusInformation_v_4_x_x.st b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitStatusInformation.st similarity index 85% rename from src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitStatusInformation_v_4_x_x.st rename to src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitStatusInformation.st index 8eecd6a93..8ef1a760b 100644 --- a/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKitDataTypes_v_4_x_x/eAxoSmartFunctionKitStatusInformation_v_4_x_x.st +++ b/src/components.rexroth.press/ctrl/src/AxoSmartFunctionKit/v_4_x_x/TypeStructuresAndEnums/eAxoSmartFunctionKitStatusInformation.st @@ -1,6 +1,6 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x TYPE PUBLIC - eAxoSmartFunctionKitStatusInformation_v_4_x_x : UINT + eAxoSmartFunctionKitStatusInformation : UINT ( ActiveProgramNumber := UINT#301, // The PROGRAM number active in the drive is read out. RemainingStorageSpaceOnIPC := UINT#302, // (PR21) The remaining storage space OF the IPC is transferred in MB. diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/AxoSmartFunctionKit_v_4_x_x.cs b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/AxoSmartFunctionKit.cs similarity index 99% rename from src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/AxoSmartFunctionKit_v_4_x_x.cs rename to src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/AxoSmartFunctionKit.cs index cfb2fee8e..a651706e1 100644 --- a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/AxoSmartFunctionKit_v_4_x_x.cs +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/AxoSmartFunctionKit.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using Newtonsoft.Json.Converters; using Newtonsoft.Json; @@ -10,14 +10,14 @@ using System.Text; using System.Text.RegularExpressions; using System.Threading.Tasks; -using AXOpen.Components.Rexroth.Press.RestApi; +using AXOpen.Components.Rexroth.Press.v_4_x_x.RestApi; using System.Security.Cryptography.Xml; using System.Security.Policy; -namespace AXOpen.Components.Rexroth.Press +namespace AXOpen.Components.Rexroth.Press.v_4_x_x { - public partial class AxoSmartFunctionKit_v_4_x_x : AXOpen.Core.AxoComponent + public partial class AxoSmartFunctionKit : AXOpen.Core.AxoComponent { partial void PostConstruct(ITwinObject parent, string readableTail, string symbolTail) @@ -266,7 +266,7 @@ private void InitializeTaskMessenger() } } - public partial class AxoSmartFunctionKit_ComponentStatus_v_4_x_x : AXOpen.Components.Abstractions.AxoComponent_Status + public partial class AxoSmartFunctionKit_ComponentStatus : AXOpen.Components.Abstractions.AxoComponent_Status { Dictionary errorDescriptionDict = new Dictionary(); Dictionary actionDescriptionDict = new Dictionary(); diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/CurveItem.cs b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/CurveItem.cs similarity index 97% rename from src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/CurveItem.cs rename to src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/CurveItem.cs index 65f4fecb2..e01e4ae39 100644 --- a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/CurveItem.cs +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/CurveItem.cs @@ -1,10 +1,10 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; -namespace AXOpen.Components.Rexroth.Press.RestApi +namespace AXOpen.Components.Rexroth.Press.v_4_x_x.RestApi { public class Function diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/Logger.cs b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/Logger.cs similarity index 90% rename from src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/Logger.cs rename to src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/Logger.cs index 26e7e4eff..8792392e2 100644 --- a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/Logger.cs +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/Logger.cs @@ -1,7 +1,7 @@ -using System; +using System; using System.Diagnostics; -namespace AXOpen.Components.Rexroth.Press.RestApi +namespace AXOpen.Components.Rexroth.Press.v_4_x_x.RestApi { class Logger { diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/RestClient.cs b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/RestClient.cs similarity index 96% rename from src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/RestClient.cs rename to src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/RestClient.cs index d3e2f1ab1..234c1f0de 100644 --- a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/RestClient.cs +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/RestClient.cs @@ -1,10 +1,10 @@ -using System; +using System; using Newtonsoft.Json; using System.Collections; using System.Collections.Generic; -namespace AXOpen.Components.Rexroth.Press.RestApi +namespace AXOpen.Components.Rexroth.Press.v_4_x_x.RestApi { public class Client { diff --git a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/RestRequest.cs b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/RestRequest.cs similarity index 99% rename from src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/RestRequest.cs rename to src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/RestRequest.cs index 413824fad..8379c4125 100644 --- a/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/RestApi/RestRequest.cs +++ b/src/components.rexroth.press/src/AXOpen.Components.Rexroth.Press/AxoSmartFunctionKit/v_4_x_x/RestApi/RestRequest.cs @@ -1,4 +1,4 @@ - + using System; using System.Diagnostics; using System.Globalization; @@ -7,7 +7,7 @@ using System.Text; // The http protocol being used to transport REST requests across the net -namespace AXOpen.Components.Rexroth.Press.RestApi +namespace AXOpen.Components.Rexroth.Press.v_4_x_x.RestApi { /// /// The class that all the REST resources inherit from, thereby implementing the four REST operations. diff --git a/src/components.rexroth.press/this.sln b/src/components.rexroth.press/this.sln index e56bc27e3..b4046b81a 100644 --- a/src/components.rexroth.press/this.sln +++ b/src/components.rexroth.press/this.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{FEBD8454-A4D4-4641-B2D7-7ACE4800FF75}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{EE585E90-583D-4115-9C89-D8C06490E049}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{83F8377B-613E-4A91-9666-8115197AA422}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{3C6078F1-6FCA-4DE2-8F62-556521CFAE20}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{D05807C9-4A3B-4ABD-A223-9FB166324711}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{000DDA84-D4B9-4403-9D4E-B319F00E2CF2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Press.blazorapp", "app\ix-blazor\AXOpen.Components.Rexroth.Press.blazorapp.csproj", "{8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_rexroth_press", "app\ix\app_axopen_components_rexroth_press.csproj", "{6F566E3F-0B88-435F-B1A3-63EB111A0B86}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Press.blazor", "src\AXOpen.Components.Rexroth.Press.blazor\AXOpen.Components.Rexroth.Press.blazor.csproj", "{8D62E4BE-989E-43C4-B310-BCB36EDFF141}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_rexroth_press", "src\AXOpen.Components.Rexroth.Press\inxton_axopen_components_rexroth_press.csproj", "{0BDAAA4C-91AF-4EF9-BA12-3B66C26E1233}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{723001DD-7D46-44E3-9166-E37BEEC1D8B5}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{F50457E5-9A5C-45E9-8CBD-E36F92893BFF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{D7F32D99-AA51-4816-9B27-873C2F17232A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{6CE5528D-3A09-456C-82F6-B8EC375A8161}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{E82B678E-1810-45A3-9FC2-AE92AC15093C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{565BEC50-C14D-45F9-9AA2-329319D44E81}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{2020C132-2D1F-4AEC-8703-60B5645D7141}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{ABF2A11C-1EFD-4F31-9388-61003F9E0721}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{4484F7FF-5C02-4271-A0A8-6DD75958BE9F}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{4D0D4C1B-85D3-40D5-BF1B-6F30BC763546}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{E3042E7C-9A47-4729-8FF7-BD9A8A7B55EC}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{46CF1AEF-6B14-4532-8995-62542A7BAE5A}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{028FCCE1-4B57-4552-B8E1-39F8CD47C569}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{0DCDD10A-252C-4A51-B88E-14A0BB6F113C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{E7443D8A-3FE2-4592-A2EE-34D242212678}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{1EBC051C-124F-4989-B7B6-9EBABE959A01}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Press.blazor", "src\AXOpen.Components.Rexroth.Press.blazor", "{F5F137EC-5E95-478D-854A-E20FFAB34D75}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Press", "src\AXOpen.Components.Rexroth.Press", "{2793681D-63FC-4ADF-B0A2-A374A8FD34A5}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{D246 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{4194535A-65DC-4D65-BDD5-61F37D0870BD}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{E400FA81-746B-41EA-A4FD-754E936DC0B3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{E3AA29D5-6CEC-4AB4-A6BF-4632699A8F09}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{0D3668E9-4EAD-4C29-8D69-68FCD142BDCC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{914605CE-853F-4A33-BA11-523649B91732}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{920CAF82-E23E-46AE-B104-5F47298EB26F}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{3D4794BD-1ED7-4C4A-8E26-A1B5CD869682}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{51268308-2987-46E1-B89D-CBDC948569C7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{CE1C10D7-5E57-410E-821F-4205745F57BC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{D3532E0D-606B-4FFB-A6BE-BAE0A0176176}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{2B284085-0D40-454D-BBEF-063859109AC1}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{74F4F0D7-A338-4ED9-A8E1-1916F680C74E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{CB367740-6993-4410-A756-3D5512ADFC47}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{F02587F4-2E14-4492-BE3D-EB33A0112811}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{B33D0B32-87E7-4E19-8D87-83BF58F95523}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{F356C6FC-EF36-4C46-A6A4-4A215E13540F}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{91EDA14B-0AEB-44AE-949E-123C595AEF81}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{6CBC198A-AF58-4717-814F-6DCB70FF6999}" EndProject @@ -157,10 +119,6 @@ Global {83F8377B-613E-4A91-9666-8115197AA422}.Debug|Any CPU.Build.0 = Debug|Any CPU {83F8377B-613E-4A91-9666-8115197AA422}.Release|Any CPU.ActiveCfg = Release|Any CPU {83F8377B-613E-4A91-9666-8115197AA422}.Release|Any CPU.Build.0 = Release|Any CPU - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20}.Release|Any CPU.Build.0 = Release|Any CPU {D05807C9-4A3B-4ABD-A223-9FB166324711}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D05807C9-4A3B-4ABD-A223-9FB166324711}.Debug|Any CPU.Build.0 = Debug|Any CPU {D05807C9-4A3B-4ABD-A223-9FB166324711}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {000DDA84-D4B9-4403-9D4E-B319F00E2CF2}.Debug|Any CPU.Build.0 = Debug|Any CPU {000DDA84-D4B9-4403-9D4E-B319F00E2CF2}.Release|Any CPU.ActiveCfg = Release|Any CPU {000DDA84-D4B9-4403-9D4E-B319F00E2CF2}.Release|Any CPU.Build.0 = Release|Any CPU - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33}.Release|Any CPU.Build.0 = Release|Any CPU - {6F566E3F-0B88-435F-B1A3-63EB111A0B86}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6F566E3F-0B88-435F-B1A3-63EB111A0B86}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6F566E3F-0B88-435F-B1A3-63EB111A0B86}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6F566E3F-0B88-435F-B1A3-63EB111A0B86}.Release|Any CPU.Build.0 = Release|Any CPU {8D62E4BE-989E-43C4-B310-BCB36EDFF141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D62E4BE-989E-43C4-B310-BCB36EDFF141}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D62E4BE-989E-43C4-B310-BCB36EDFF141}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {723001DD-7D46-44E3-9166-E37BEEC1D8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU {723001DD-7D46-44E3-9166-E37BEEC1D8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU {723001DD-7D46-44E3-9166-E37BEEC1D8B5}.Release|Any CPU.Build.0 = Release|Any CPU - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF}.Release|Any CPU.Build.0 = Release|Any CPU {D7F32D99-AA51-4816-9B27-873C2F17232A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {D7F32D99-AA51-4816-9B27-873C2F17232A}.Debug|Any CPU.Build.0 = Debug|Any CPU {D7F32D99-AA51-4816-9B27-873C2F17232A}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {E82B678E-1810-45A3-9FC2-AE92AC15093C}.Debug|Any CPU.Build.0 = Debug|Any CPU {E82B678E-1810-45A3-9FC2-AE92AC15093C}.Release|Any CPU.ActiveCfg = Release|Any CPU {E82B678E-1810-45A3-9FC2-AE92AC15093C}.Release|Any CPU.Build.0 = Release|Any CPU - {565BEC50-C14D-45F9-9AA2-329319D44E81}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {565BEC50-C14D-45F9-9AA2-329319D44E81}.Debug|Any CPU.Build.0 = Debug|Any CPU - {565BEC50-C14D-45F9-9AA2-329319D44E81}.Release|Any CPU.ActiveCfg = Release|Any CPU - {565BEC50-C14D-45F9-9AA2-329319D44E81}.Release|Any CPU.Build.0 = Release|Any CPU - {2020C132-2D1F-4AEC-8703-60B5645D7141}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2020C132-2D1F-4AEC-8703-60B5645D7141}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2020C132-2D1F-4AEC-8703-60B5645D7141}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2020C132-2D1F-4AEC-8703-60B5645D7141}.Release|Any CPU.Build.0 = Release|Any CPU - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5}.Release|Any CPU.Build.0 = Release|Any CPU + {ABF2A11C-1EFD-4F31-9388-61003F9E0721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ABF2A11C-1EFD-4F31-9388-61003F9E0721}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ABF2A11C-1EFD-4F31-9388-61003F9E0721}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ABF2A11C-1EFD-4F31-9388-61003F9E0721}.Release|Any CPU.Build.0 = Release|Any CPU {4484F7FF-5C02-4271-A0A8-6DD75958BE9F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4484F7FF-5C02-4271-A0A8-6DD75958BE9F}.Debug|Any CPU.Build.0 = Debug|Any CPU {4484F7FF-5C02-4271-A0A8-6DD75958BE9F}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {3FAE7BB2-FD1F-4F06-AA3C-3541EBC9ABA1} = {60BCAD8D-6226-4C50-AEB9-704E3CB84A95} {83F8377B-613E-4A91-9666-8115197AA422} = {4D0D4C1B-85D3-40D5-BF1B-6F30BC763546} {4D0D4C1B-85D3-40D5-BF1B-6F30BC763546} = {C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8} - {3C6078F1-6FCA-4DE2-8F62-556521CFAE20} = {E3042E7C-9A47-4729-8FF7-BD9A8A7B55EC} - {E3042E7C-9A47-4729-8FF7-BD9A8A7B55EC} = {C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8} {D05807C9-4A3B-4ABD-A223-9FB166324711} = {46CF1AEF-6B14-4532-8995-62542A7BAE5A} {46CF1AEF-6B14-4532-8995-62542A7BAE5A} = {C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8} {C6D9E31A-2E91-41DA-AB70-A8CFCFEABBF8} = {77B483C5-DDFE-4E21-A565-CA3DCC421665} {000DDA84-D4B9-4403-9D4E-B319F00E2CF2} = {6EF23F4D-CA51-4F3E-B5F0-46AA9339D71F} {6EF23F4D-CA51-4F3E-B5F0-46AA9339D71F} = {0569E334-8796-4639-99D1-27657C451208} {0569E334-8796-4639-99D1-27657C451208} = {028FCCE1-4B57-4552-B8E1-39F8CD47C569} - {8F7F45EC-1BA0-4828-A5E5-493DF9CA9B33} = {0DCDD10A-252C-4A51-B88E-14A0BB6F113C} - {0DCDD10A-252C-4A51-B88E-14A0BB6F113C} = {1EBC051C-124F-4989-B7B6-9EBABE959A01} - {6F566E3F-0B88-435F-B1A3-63EB111A0B86} = {E7443D8A-3FE2-4592-A2EE-34D242212678} - {E7443D8A-3FE2-4592-A2EE-34D242212678} = {1EBC051C-124F-4989-B7B6-9EBABE959A01} - {1EBC051C-124F-4989-B7B6-9EBABE959A01} = {B56D4CAC-B5D9-4939-9CCA-346722C9297B} {8D62E4BE-989E-43C4-B310-BCB36EDFF141} = {F5F137EC-5E95-478D-854A-E20FFAB34D75} {F5F137EC-5E95-478D-854A-E20FFAB34D75} = {66900B88-135E-4C5C-941C-D4F3D9ED304C} {0BDAAA4C-91AF-4EF9-BA12-3B66C26E1233} = {2793681D-63FC-4ADF-B0A2-A374A8FD34A5} @@ -269,10 +200,6 @@ Global {723001DD-7D46-44E3-9166-E37BEEC1D8B5} = {33CD077B-CAEF-4BE7-92A0-93F18162C6B2} {33CD077B-CAEF-4BE7-92A0-93F18162C6B2} = {D246D5A6-26EB-4EFB-AF12-2840F6697140} {D246D5A6-26EB-4EFB-AF12-2840F6697140} = {4194535A-65DC-4D65-BDD5-61F37D0870BD} - {F50457E5-9A5C-45E9-8CBD-E36F92893BFF} = {E400FA81-746B-41EA-A4FD-754E936DC0B3} - {E400FA81-746B-41EA-A4FD-754E936DC0B3} = {E3AA29D5-6CEC-4AB4-A6BF-4632699A8F09} - {E3AA29D5-6CEC-4AB4-A6BF-4632699A8F09} = {0D3668E9-4EAD-4C29-8D69-68FCD142BDCC} - {0D3668E9-4EAD-4C29-8D69-68FCD142BDCC} = {914605CE-853F-4A33-BA11-523649B91732} {D7F32D99-AA51-4816-9B27-873C2F17232A} = {920CAF82-E23E-46AE-B104-5F47298EB26F} {920CAF82-E23E-46AE-B104-5F47298EB26F} = {E50C3DC3-43B4-41EC-92D9-88E15B2A3268} {6CE5528D-3A09-456C-82F6-B8EC375A8161} = {3D4794BD-1ED7-4C4A-8E26-A1B5CD869682} @@ -281,14 +208,8 @@ Global {E82B678E-1810-45A3-9FC2-AE92AC15093C} = {8C0A6167-E27B-4873-BCA7-5E1E0D7B6609} {8C0A6167-E27B-4873-BCA7-5E1E0D7B6609} = {B7304C85-E289-470F-ADD7-63C6A5AE10E7} {B7304C85-E289-470F-ADD7-63C6A5AE10E7} = {51268308-2987-46E1-B89D-CBDC948569C7} - {565BEC50-C14D-45F9-9AA2-329319D44E81} = {CE1C10D7-5E57-410E-821F-4205745F57BC} - {CE1C10D7-5E57-410E-821F-4205745F57BC} = {2B284085-0D40-454D-BBEF-063859109AC1} - {2020C132-2D1F-4AEC-8703-60B5645D7141} = {D3532E0D-606B-4FFB-A6BE-BAE0A0176176} - {D3532E0D-606B-4FFB-A6BE-BAE0A0176176} = {2B284085-0D40-454D-BBEF-063859109AC1} - {2B284085-0D40-454D-BBEF-063859109AC1} = {74F4F0D7-A338-4ED9-A8E1-1916F680C74E} - {1EDB848D-A8CF-46D5-9CBF-9ECF3469B5E5} = {CB367740-6993-4410-A756-3D5512ADFC47} - {CB367740-6993-4410-A756-3D5512ADFC47} = {F02587F4-2E14-4492-BE3D-EB33A0112811} - {F02587F4-2E14-4492-BE3D-EB33A0112811} = {F356C6FC-EF36-4C46-A6A4-4A215E13540F} + {ABF2A11C-1EFD-4F31-9388-61003F9E0721} = {B33D0B32-87E7-4E19-8D87-83BF58F95523} + {B33D0B32-87E7-4E19-8D87-83BF58F95523} = {91EDA14B-0AEB-44AE-949E-123C595AEF81} {4484F7FF-5C02-4271-A0A8-6DD75958BE9F} = {6CBC198A-AF58-4717-814F-6DCB70FF6999} {6CBC198A-AF58-4717-814F-6DCB70FF6999} = {617605C5-ADA7-441A-AE60-756ECCD34CC5} {617605C5-ADA7-441A-AE60-756ECCD34CC5} = {56A64A4E-048C-4EC1-992B-88D884AF2F93} From f3c4edcb02d48ab1b4122b0cdce416ad55141adb Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 16:03:53 +0200 Subject: [PATCH 20/33] Refactor solution file by removing obsolete projects and updating project references - Removed projects: AXOpen.Logging.Serilog, AXOpen.Data.Json, AXOpen.Security.Blazor, AXOpen.Security, inxton_axopen_simatic1500, and others. - Added new project: AXOpen.Operon.Blazor. - Updated project references for better organization and clarity. --- ...mponents.rexroth.tightening.code-workspace | 3 - .../components.rexroth.tightening.sln | 99 ++----------------- src/components.rexroth.tightening/this.sln | 99 ++----------------- 3 files changed, 20 insertions(+), 181 deletions(-) diff --git a/src/components.rexroth.tightening/components.rexroth.tightening.code-workspace b/src/components.rexroth.tightening/components.rexroth.tightening.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.rexroth.tightening/components.rexroth.tightening.code-workspace +++ b/src/components.rexroth.tightening/components.rexroth.tightening.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.rexroth.tightening/components.rexroth.tightening.sln b/src/components.rexroth.tightening/components.rexroth.tightening.sln index 8810910b8..b15a74d27 100644 --- a/src/components.rexroth.tightening/components.rexroth.tightening.sln +++ b/src/components.rexroth.tightening/components.rexroth.tightening.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{488EC5FF-AC7A-4629-A7AC-3B5FA8ACD992}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{1605409A-DC49-4B5D-9D08-F206B1CBA234}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{940FE657-58EC-4D32-94E1-E70334AACB60}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{4302BD48-735D-46A0-A855-0B062F1DA77B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Tightening.blazorapp", "app\ix-blazor\AXOpen.Components.Rexroth.Tightening.blazorapp.csproj", "{39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_rexroth_tightening", "app\ix\app_axopen_components_rexroth_tightening.csproj", "{8C372483-5C92-4A1B-9FCA-625C19B702E1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Tightening.blazor", "src\AXOpen.Components.Rexroth.Tightening.blazor\AXOpen.Components.Rexroth.Tightening.blazor.csproj", "{89C1B0A7-7889-4445-9A33-DDCEF00408A6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_rexroth_tightening", "src\AXOpen.Components.Rexroth.Tightening\inxton_axopen_components_rexroth_tightening.csproj", "{43BC3602-C2E5-4623-A1E3-14109BFFF20D}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{1DDC5044-E822-4DE1-BEC4-2D91BC23D355}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{633674E5-D37B-49BF-AD9C-53E553FBD4F6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{F775C73A-446D-42A6-BA55-CF2C18E65DA7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{2D92EF99-DB14-43C7-A99E-0D80B97A1CE1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{B252961B-74E5-49D1-BD75-F28E5629FBDD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{028B9344-6142-4402-B01D-C0DAAD2D2A3F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{39CA356F-9F03-472C-9F1D-DC23A225DC85}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{4399034F-4DFE-4C4A-9BD7-02D15587F072}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{C255F877-5AF6-4C15-B88F-6DA37BEDC21D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{06105162-3383-4FC0-B3FD-360702BC93DF}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{15B7CF5A-9E13-4215-848F-D3AF6DA75414}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{81249B9B-31B2-472D-B7E1-01E5DD4EED3B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{30E6490F-6DDA-42EF-8609-2F6F81208C3C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{5B35A1F4-6C93-4960-AE41-307EF10F8CFD}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{9FE916A0-101C-4F44-9E97-3584EBCD6C64}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{10B64246-E152-4ADC-BF16-ED4CDFB689F4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{3F9E0ADF-FDBE-4819-90AB-68D285370990}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{76DCE8FA-F098-44AA-BD40-3BCC3B2C38DD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Tightening.blazor", "src\AXOpen.Components.Rexroth.Tightening.blazor", "{3BA1E4CA-A996-4584-9BE2-90BB0CEE1C94}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Tightening", "src\AXOpen.Components.Rexroth.Tightening", "{7AD0EFC2-E19B-4D5D-8C81-27359F0F7873}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{9341 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{3A998880-32C8-4E1B-8BCB-3629CEAFAE3F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{1A60DEA3-ABEB-4F36-9986-651C25318508}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{8F33BD52-3A21-499C-A446-D761CDB3A89B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{C57597CB-0067-44C2-9D90-FDE4B21C6CD2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{012CA924-5D48-4C2F-B0C1-5BEBC9372823}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{073048BC-15F1-4EED-8D43-A6083FE3AB05}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{643199B3-B569-4BE4-85EE-4C925AFDE122}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{3C7185B3-5BD2-4580-8CC5-05E07107242E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{A7517C38-9672-46DE-9143-E8922DBD9D7E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{A7664D7F-F0B4-47D6-9DAB-3AE1B642B845}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{3AC618D0-A46A-4013-831E-18ECBE1B16AC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{1F58A9E5-B428-4F2F-BBF8-D93FD8BCEA6F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{4D54EBEA-9DEE-4A03-ADB4-EDCDE4E2301B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{216C3B62-3DDC-4D64-8EA9-6C73F09A3311}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{8BE40A88-E8E0-47ED-8DAB-3DFA0BC7EC2F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{2E5E6090-4C82-4EB5-B38F-5CEA34DEC6AA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{BFF67D7B-CE34-43BF-B88A-FDA3115669A7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{244506E6-031E-4344-8A77-8DC607FB2E28}" EndProject @@ -157,10 +119,6 @@ Global {DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7}.Release|Any CPU.Build.0 = Release|Any CPU - {940FE657-58EC-4D32-94E1-E70334AACB60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {940FE657-58EC-4D32-94E1-E70334AACB60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {940FE657-58EC-4D32-94E1-E70334AACB60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {940FE657-58EC-4D32-94E1-E70334AACB60}.Release|Any CPU.Build.0 = Release|Any CPU {4302BD48-735D-46A0-A855-0B062F1DA77B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4302BD48-735D-46A0-A855-0B062F1DA77B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4302BD48-735D-46A0-A855-0B062F1DA77B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2}.Debug|Any CPU.Build.0 = Debug|Any CPU {B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2}.Release|Any CPU.ActiveCfg = Release|Any CPU {B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2}.Release|Any CPU.Build.0 = Release|Any CPU - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}.Release|Any CPU.Build.0 = Release|Any CPU - {8C372483-5C92-4A1B-9FCA-625C19B702E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C372483-5C92-4A1B-9FCA-625C19B702E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C372483-5C92-4A1B-9FCA-625C19B702E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C372483-5C92-4A1B-9FCA-625C19B702E1}.Release|Any CPU.Build.0 = Release|Any CPU {89C1B0A7-7889-4445-9A33-DDCEF00408A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89C1B0A7-7889-4445-9A33-DDCEF00408A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {89C1B0A7-7889-4445-9A33-DDCEF00408A6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {1DDC5044-E822-4DE1-BEC4-2D91BC23D355}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DDC5044-E822-4DE1-BEC4-2D91BC23D355}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DDC5044-E822-4DE1-BEC4-2D91BC23D355}.Release|Any CPU.Build.0 = Release|Any CPU - {633674E5-D37B-49BF-AD9C-53E553FBD4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {633674E5-D37B-49BF-AD9C-53E553FBD4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {633674E5-D37B-49BF-AD9C-53E553FBD4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {633674E5-D37B-49BF-AD9C-53E553FBD4F6}.Release|Any CPU.Build.0 = Release|Any CPU {F775C73A-446D-42A6-BA55-CF2C18E65DA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F775C73A-446D-42A6-BA55-CF2C18E65DA7}.Debug|Any CPU.Build.0 = Debug|Any CPU {F775C73A-446D-42A6-BA55-CF2C18E65DA7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {B252961B-74E5-49D1-BD75-F28E5629FBDD}.Debug|Any CPU.Build.0 = Debug|Any CPU {B252961B-74E5-49D1-BD75-F28E5629FBDD}.Release|Any CPU.ActiveCfg = Release|Any CPU {B252961B-74E5-49D1-BD75-F28E5629FBDD}.Release|Any CPU.Build.0 = Release|Any CPU - {028B9344-6142-4402-B01D-C0DAAD2D2A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {028B9344-6142-4402-B01D-C0DAAD2D2A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {028B9344-6142-4402-B01D-C0DAAD2D2A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {028B9344-6142-4402-B01D-C0DAAD2D2A3F}.Release|Any CPU.Build.0 = Release|Any CPU - {39CA356F-9F03-472C-9F1D-DC23A225DC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39CA356F-9F03-472C-9F1D-DC23A225DC85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39CA356F-9F03-472C-9F1D-DC23A225DC85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39CA356F-9F03-472C-9F1D-DC23A225DC85}.Release|Any CPU.Build.0 = Release|Any CPU - {4399034F-4DFE-4C4A-9BD7-02D15587F072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4399034F-4DFE-4C4A-9BD7-02D15587F072}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4399034F-4DFE-4C4A-9BD7-02D15587F072}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4399034F-4DFE-4C4A-9BD7-02D15587F072}.Release|Any CPU.Build.0 = Release|Any CPU + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D}.Release|Any CPU.Build.0 = Release|Any CPU {06105162-3383-4FC0-B3FD-360702BC93DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {06105162-3383-4FC0-B3FD-360702BC93DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {06105162-3383-4FC0-B3FD-360702BC93DF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {549AE1EF-F62B-4973-9DB5-30D0D4D38D18} = {C9D59905-7384-4008-9E8E-CC8FA8AC5466} {DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7} = {15B7CF5A-9E13-4215-848F-D3AF6DA75414} {15B7CF5A-9E13-4215-848F-D3AF6DA75414} = {5B35A1F4-6C93-4960-AE41-307EF10F8CFD} - {940FE657-58EC-4D32-94E1-E70334AACB60} = {81249B9B-31B2-472D-B7E1-01E5DD4EED3B} - {81249B9B-31B2-472D-B7E1-01E5DD4EED3B} = {5B35A1F4-6C93-4960-AE41-307EF10F8CFD} {4302BD48-735D-46A0-A855-0B062F1DA77B} = {30E6490F-6DDA-42EF-8609-2F6F81208C3C} {30E6490F-6DDA-42EF-8609-2F6F81208C3C} = {5B35A1F4-6C93-4960-AE41-307EF10F8CFD} {5B35A1F4-6C93-4960-AE41-307EF10F8CFD} = {696755DF-AF2C-4CAE-B613-76FB0AABCB04} {B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2} = {49636411-96FF-46BE-8F47-BB6FC08FA89B} {49636411-96FF-46BE-8F47-BB6FC08FA89B} = {7D7F9D7B-D1D2-40B6-8341-5AD967DBD41B} {7D7F9D7B-D1D2-40B6-8341-5AD967DBD41B} = {9FE916A0-101C-4F44-9E97-3584EBCD6C64} - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C} = {10B64246-E152-4ADC-BF16-ED4CDFB689F4} - {10B64246-E152-4ADC-BF16-ED4CDFB689F4} = {76DCE8FA-F098-44AA-BD40-3BCC3B2C38DD} - {8C372483-5C92-4A1B-9FCA-625C19B702E1} = {3F9E0ADF-FDBE-4819-90AB-68D285370990} - {3F9E0ADF-FDBE-4819-90AB-68D285370990} = {76DCE8FA-F098-44AA-BD40-3BCC3B2C38DD} - {76DCE8FA-F098-44AA-BD40-3BCC3B2C38DD} = {866F44D3-FF34-424B-BAE4-300CCFB51F64} {89C1B0A7-7889-4445-9A33-DDCEF00408A6} = {3BA1E4CA-A996-4584-9BE2-90BB0CEE1C94} {3BA1E4CA-A996-4584-9BE2-90BB0CEE1C94} = {7387BA48-A269-452C-9D0A-085494CE7390} {43BC3602-C2E5-4623-A1E3-14109BFFF20D} = {7AD0EFC2-E19B-4D5D-8C81-27359F0F7873} @@ -269,10 +200,6 @@ Global {1DDC5044-E822-4DE1-BEC4-2D91BC23D355} = {0F5F5A22-0F31-4265-8E94-7423A2D3708A} {0F5F5A22-0F31-4265-8E94-7423A2D3708A} = {934169FB-2945-4128-9310-53A69D1F5EF4} {934169FB-2945-4128-9310-53A69D1F5EF4} = {3A998880-32C8-4E1B-8BCB-3629CEAFAE3F} - {633674E5-D37B-49BF-AD9C-53E553FBD4F6} = {1A60DEA3-ABEB-4F36-9986-651C25318508} - {1A60DEA3-ABEB-4F36-9986-651C25318508} = {8F33BD52-3A21-499C-A446-D761CDB3A89B} - {8F33BD52-3A21-499C-A446-D761CDB3A89B} = {C57597CB-0067-44C2-9D90-FDE4B21C6CD2} - {C57597CB-0067-44C2-9D90-FDE4B21C6CD2} = {012CA924-5D48-4C2F-B0C1-5BEBC9372823} {F775C73A-446D-42A6-BA55-CF2C18E65DA7} = {073048BC-15F1-4EED-8D43-A6083FE3AB05} {073048BC-15F1-4EED-8D43-A6083FE3AB05} = {EF3E6E29-A4D3-4026-92FA-AD3069EC11C1} {2D92EF99-DB14-43C7-A99E-0D80B97A1CE1} = {643199B3-B569-4BE4-85EE-4C925AFDE122} @@ -281,14 +208,8 @@ Global {B252961B-74E5-49D1-BD75-F28E5629FBDD} = {386C0A25-A1C5-48FA-9EC2-9B47E1468AB0} {386C0A25-A1C5-48FA-9EC2-9B47E1468AB0} = {1873774A-3036-4ECB-992E-90A95464FCB8} {1873774A-3036-4ECB-992E-90A95464FCB8} = {3C7185B3-5BD2-4580-8CC5-05E07107242E} - {028B9344-6142-4402-B01D-C0DAAD2D2A3F} = {A7517C38-9672-46DE-9143-E8922DBD9D7E} - {A7517C38-9672-46DE-9143-E8922DBD9D7E} = {3AC618D0-A46A-4013-831E-18ECBE1B16AC} - {39CA356F-9F03-472C-9F1D-DC23A225DC85} = {A7664D7F-F0B4-47D6-9DAB-3AE1B642B845} - {A7664D7F-F0B4-47D6-9DAB-3AE1B642B845} = {3AC618D0-A46A-4013-831E-18ECBE1B16AC} - {3AC618D0-A46A-4013-831E-18ECBE1B16AC} = {1F58A9E5-B428-4F2F-BBF8-D93FD8BCEA6F} - {4399034F-4DFE-4C4A-9BD7-02D15587F072} = {4D54EBEA-9DEE-4A03-ADB4-EDCDE4E2301B} - {4D54EBEA-9DEE-4A03-ADB4-EDCDE4E2301B} = {216C3B62-3DDC-4D64-8EA9-6C73F09A3311} - {216C3B62-3DDC-4D64-8EA9-6C73F09A3311} = {2E5E6090-4C82-4EB5-B38F-5CEA34DEC6AA} + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D} = {8BE40A88-E8E0-47ED-8DAB-3DFA0BC7EC2F} + {8BE40A88-E8E0-47ED-8DAB-3DFA0BC7EC2F} = {BFF67D7B-CE34-43BF-B88A-FDA3115669A7} {06105162-3383-4FC0-B3FD-360702BC93DF} = {244506E6-031E-4344-8A77-8DC607FB2E28} {244506E6-031E-4344-8A77-8DC607FB2E28} = {95A481F1-9263-47B2-822D-14C1ECF643F3} {95A481F1-9263-47B2-822D-14C1ECF643F3} = {69F97E86-CFCC-4D50-AA48-5E91A31656D0} diff --git a/src/components.rexroth.tightening/this.sln b/src/components.rexroth.tightening/this.sln index 8810910b8..b15a74d27 100644 --- a/src/components.rexroth.tightening/this.sln +++ b/src/components.rexroth.tightening/this.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{488EC5FF-AC7A-4629-A7AC-3B5FA8ACD992}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{1605409A-DC49-4B5D-9D08-F206B1CBA234}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{940FE657-58EC-4D32-94E1-E70334AACB60}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{4302BD48-735D-46A0-A855-0B062F1DA77B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Tightening.blazorapp", "app\ix-blazor\AXOpen.Components.Rexroth.Tightening.blazorapp.csproj", "{39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_rexroth_tightening", "app\ix\app_axopen_components_rexroth_tightening.csproj", "{8C372483-5C92-4A1B-9FCA-625C19B702E1}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Rexroth.Tightening.blazor", "src\AXOpen.Components.Rexroth.Tightening.blazor\AXOpen.Components.Rexroth.Tightening.blazor.csproj", "{89C1B0A7-7889-4445-9A33-DDCEF00408A6}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_rexroth_tightening", "src\AXOpen.Components.Rexroth.Tightening\inxton_axopen_components_rexroth_tightening.csproj", "{43BC3602-C2E5-4623-A1E3-14109BFFF20D}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{1DDC5044-E822-4DE1-BEC4-2D91BC23D355}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{633674E5-D37B-49BF-AD9C-53E553FBD4F6}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{F775C73A-446D-42A6-BA55-CF2C18E65DA7}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{2D92EF99-DB14-43C7-A99E-0D80B97A1CE1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{B252961B-74E5-49D1-BD75-F28E5629FBDD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{028B9344-6142-4402-B01D-C0DAAD2D2A3F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{39CA356F-9F03-472C-9F1D-DC23A225DC85}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{4399034F-4DFE-4C4A-9BD7-02D15587F072}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{C255F877-5AF6-4C15-B88F-6DA37BEDC21D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{06105162-3383-4FC0-B3FD-360702BC93DF}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{15B7CF5A-9E13-4215-848F-D3AF6DA75414}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{81249B9B-31B2-472D-B7E1-01E5DD4EED3B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{30E6490F-6DDA-42EF-8609-2F6F81208C3C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{5B35A1F4-6C93-4960-AE41-307EF10F8CFD}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{9FE916A0-101C-4F44-9E97-3584EBCD6C64}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{10B64246-E152-4ADC-BF16-ED4CDFB689F4}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{3F9E0ADF-FDBE-4819-90AB-68D285370990}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{76DCE8FA-F098-44AA-BD40-3BCC3B2C38DD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Tightening.blazor", "src\AXOpen.Components.Rexroth.Tightening.blazor", "{3BA1E4CA-A996-4584-9BE2-90BB0CEE1C94}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Rexroth.Tightening", "src\AXOpen.Components.Rexroth.Tightening", "{7AD0EFC2-E19B-4D5D-8C81-27359F0F7873}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{9341 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{3A998880-32C8-4E1B-8BCB-3629CEAFAE3F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{1A60DEA3-ABEB-4F36-9986-651C25318508}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{8F33BD52-3A21-499C-A446-D761CDB3A89B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{C57597CB-0067-44C2-9D90-FDE4B21C6CD2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{012CA924-5D48-4C2F-B0C1-5BEBC9372823}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{073048BC-15F1-4EED-8D43-A6083FE3AB05}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{643199B3-B569-4BE4-85EE-4C925AFDE122}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{3C7185B3-5BD2-4580-8CC5-05E07107242E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{A7517C38-9672-46DE-9143-E8922DBD9D7E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{A7664D7F-F0B4-47D6-9DAB-3AE1B642B845}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{3AC618D0-A46A-4013-831E-18ECBE1B16AC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{1F58A9E5-B428-4F2F-BBF8-D93FD8BCEA6F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{4D54EBEA-9DEE-4A03-ADB4-EDCDE4E2301B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{216C3B62-3DDC-4D64-8EA9-6C73F09A3311}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{8BE40A88-E8E0-47ED-8DAB-3DFA0BC7EC2F}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{2E5E6090-4C82-4EB5-B38F-5CEA34DEC6AA}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{BFF67D7B-CE34-43BF-B88A-FDA3115669A7}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{244506E6-031E-4344-8A77-8DC607FB2E28}" EndProject @@ -157,10 +119,6 @@ Global {DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7}.Debug|Any CPU.Build.0 = Debug|Any CPU {DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7}.Release|Any CPU.ActiveCfg = Release|Any CPU {DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7}.Release|Any CPU.Build.0 = Release|Any CPU - {940FE657-58EC-4D32-94E1-E70334AACB60}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {940FE657-58EC-4D32-94E1-E70334AACB60}.Debug|Any CPU.Build.0 = Debug|Any CPU - {940FE657-58EC-4D32-94E1-E70334AACB60}.Release|Any CPU.ActiveCfg = Release|Any CPU - {940FE657-58EC-4D32-94E1-E70334AACB60}.Release|Any CPU.Build.0 = Release|Any CPU {4302BD48-735D-46A0-A855-0B062F1DA77B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4302BD48-735D-46A0-A855-0B062F1DA77B}.Debug|Any CPU.Build.0 = Debug|Any CPU {4302BD48-735D-46A0-A855-0B062F1DA77B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2}.Debug|Any CPU.Build.0 = Debug|Any CPU {B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2}.Release|Any CPU.ActiveCfg = Release|Any CPU {B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2}.Release|Any CPU.Build.0 = Release|Any CPU - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C}.Release|Any CPU.Build.0 = Release|Any CPU - {8C372483-5C92-4A1B-9FCA-625C19B702E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8C372483-5C92-4A1B-9FCA-625C19B702E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8C372483-5C92-4A1B-9FCA-625C19B702E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8C372483-5C92-4A1B-9FCA-625C19B702E1}.Release|Any CPU.Build.0 = Release|Any CPU {89C1B0A7-7889-4445-9A33-DDCEF00408A6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {89C1B0A7-7889-4445-9A33-DDCEF00408A6}.Debug|Any CPU.Build.0 = Debug|Any CPU {89C1B0A7-7889-4445-9A33-DDCEF00408A6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {1DDC5044-E822-4DE1-BEC4-2D91BC23D355}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DDC5044-E822-4DE1-BEC4-2D91BC23D355}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DDC5044-E822-4DE1-BEC4-2D91BC23D355}.Release|Any CPU.Build.0 = Release|Any CPU - {633674E5-D37B-49BF-AD9C-53E553FBD4F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {633674E5-D37B-49BF-AD9C-53E553FBD4F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {633674E5-D37B-49BF-AD9C-53E553FBD4F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {633674E5-D37B-49BF-AD9C-53E553FBD4F6}.Release|Any CPU.Build.0 = Release|Any CPU {F775C73A-446D-42A6-BA55-CF2C18E65DA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F775C73A-446D-42A6-BA55-CF2C18E65DA7}.Debug|Any CPU.Build.0 = Debug|Any CPU {F775C73A-446D-42A6-BA55-CF2C18E65DA7}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {B252961B-74E5-49D1-BD75-F28E5629FBDD}.Debug|Any CPU.Build.0 = Debug|Any CPU {B252961B-74E5-49D1-BD75-F28E5629FBDD}.Release|Any CPU.ActiveCfg = Release|Any CPU {B252961B-74E5-49D1-BD75-F28E5629FBDD}.Release|Any CPU.Build.0 = Release|Any CPU - {028B9344-6142-4402-B01D-C0DAAD2D2A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {028B9344-6142-4402-B01D-C0DAAD2D2A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU - {028B9344-6142-4402-B01D-C0DAAD2D2A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU - {028B9344-6142-4402-B01D-C0DAAD2D2A3F}.Release|Any CPU.Build.0 = Release|Any CPU - {39CA356F-9F03-472C-9F1D-DC23A225DC85}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {39CA356F-9F03-472C-9F1D-DC23A225DC85}.Debug|Any CPU.Build.0 = Debug|Any CPU - {39CA356F-9F03-472C-9F1D-DC23A225DC85}.Release|Any CPU.ActiveCfg = Release|Any CPU - {39CA356F-9F03-472C-9F1D-DC23A225DC85}.Release|Any CPU.Build.0 = Release|Any CPU - {4399034F-4DFE-4C4A-9BD7-02D15587F072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4399034F-4DFE-4C4A-9BD7-02D15587F072}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4399034F-4DFE-4C4A-9BD7-02D15587F072}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4399034F-4DFE-4C4A-9BD7-02D15587F072}.Release|Any CPU.Build.0 = Release|Any CPU + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D}.Release|Any CPU.Build.0 = Release|Any CPU {06105162-3383-4FC0-B3FD-360702BC93DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {06105162-3383-4FC0-B3FD-360702BC93DF}.Debug|Any CPU.Build.0 = Debug|Any CPU {06105162-3383-4FC0-B3FD-360702BC93DF}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {549AE1EF-F62B-4973-9DB5-30D0D4D38D18} = {C9D59905-7384-4008-9E8E-CC8FA8AC5466} {DEFB4D8D-4B53-41CD-A6F0-39BFA0075BF7} = {15B7CF5A-9E13-4215-848F-D3AF6DA75414} {15B7CF5A-9E13-4215-848F-D3AF6DA75414} = {5B35A1F4-6C93-4960-AE41-307EF10F8CFD} - {940FE657-58EC-4D32-94E1-E70334AACB60} = {81249B9B-31B2-472D-B7E1-01E5DD4EED3B} - {81249B9B-31B2-472D-B7E1-01E5DD4EED3B} = {5B35A1F4-6C93-4960-AE41-307EF10F8CFD} {4302BD48-735D-46A0-A855-0B062F1DA77B} = {30E6490F-6DDA-42EF-8609-2F6F81208C3C} {30E6490F-6DDA-42EF-8609-2F6F81208C3C} = {5B35A1F4-6C93-4960-AE41-307EF10F8CFD} {5B35A1F4-6C93-4960-AE41-307EF10F8CFD} = {696755DF-AF2C-4CAE-B613-76FB0AABCB04} {B20FA31C-E0EC-4DE5-9FE7-DC0870F49EC2} = {49636411-96FF-46BE-8F47-BB6FC08FA89B} {49636411-96FF-46BE-8F47-BB6FC08FA89B} = {7D7F9D7B-D1D2-40B6-8341-5AD967DBD41B} {7D7F9D7B-D1D2-40B6-8341-5AD967DBD41B} = {9FE916A0-101C-4F44-9E97-3584EBCD6C64} - {39E264D9-6FB5-4EC2-9BA4-3E3040AD653C} = {10B64246-E152-4ADC-BF16-ED4CDFB689F4} - {10B64246-E152-4ADC-BF16-ED4CDFB689F4} = {76DCE8FA-F098-44AA-BD40-3BCC3B2C38DD} - {8C372483-5C92-4A1B-9FCA-625C19B702E1} = {3F9E0ADF-FDBE-4819-90AB-68D285370990} - {3F9E0ADF-FDBE-4819-90AB-68D285370990} = {76DCE8FA-F098-44AA-BD40-3BCC3B2C38DD} - {76DCE8FA-F098-44AA-BD40-3BCC3B2C38DD} = {866F44D3-FF34-424B-BAE4-300CCFB51F64} {89C1B0A7-7889-4445-9A33-DDCEF00408A6} = {3BA1E4CA-A996-4584-9BE2-90BB0CEE1C94} {3BA1E4CA-A996-4584-9BE2-90BB0CEE1C94} = {7387BA48-A269-452C-9D0A-085494CE7390} {43BC3602-C2E5-4623-A1E3-14109BFFF20D} = {7AD0EFC2-E19B-4D5D-8C81-27359F0F7873} @@ -269,10 +200,6 @@ Global {1DDC5044-E822-4DE1-BEC4-2D91BC23D355} = {0F5F5A22-0F31-4265-8E94-7423A2D3708A} {0F5F5A22-0F31-4265-8E94-7423A2D3708A} = {934169FB-2945-4128-9310-53A69D1F5EF4} {934169FB-2945-4128-9310-53A69D1F5EF4} = {3A998880-32C8-4E1B-8BCB-3629CEAFAE3F} - {633674E5-D37B-49BF-AD9C-53E553FBD4F6} = {1A60DEA3-ABEB-4F36-9986-651C25318508} - {1A60DEA3-ABEB-4F36-9986-651C25318508} = {8F33BD52-3A21-499C-A446-D761CDB3A89B} - {8F33BD52-3A21-499C-A446-D761CDB3A89B} = {C57597CB-0067-44C2-9D90-FDE4B21C6CD2} - {C57597CB-0067-44C2-9D90-FDE4B21C6CD2} = {012CA924-5D48-4C2F-B0C1-5BEBC9372823} {F775C73A-446D-42A6-BA55-CF2C18E65DA7} = {073048BC-15F1-4EED-8D43-A6083FE3AB05} {073048BC-15F1-4EED-8D43-A6083FE3AB05} = {EF3E6E29-A4D3-4026-92FA-AD3069EC11C1} {2D92EF99-DB14-43C7-A99E-0D80B97A1CE1} = {643199B3-B569-4BE4-85EE-4C925AFDE122} @@ -281,14 +208,8 @@ Global {B252961B-74E5-49D1-BD75-F28E5629FBDD} = {386C0A25-A1C5-48FA-9EC2-9B47E1468AB0} {386C0A25-A1C5-48FA-9EC2-9B47E1468AB0} = {1873774A-3036-4ECB-992E-90A95464FCB8} {1873774A-3036-4ECB-992E-90A95464FCB8} = {3C7185B3-5BD2-4580-8CC5-05E07107242E} - {028B9344-6142-4402-B01D-C0DAAD2D2A3F} = {A7517C38-9672-46DE-9143-E8922DBD9D7E} - {A7517C38-9672-46DE-9143-E8922DBD9D7E} = {3AC618D0-A46A-4013-831E-18ECBE1B16AC} - {39CA356F-9F03-472C-9F1D-DC23A225DC85} = {A7664D7F-F0B4-47D6-9DAB-3AE1B642B845} - {A7664D7F-F0B4-47D6-9DAB-3AE1B642B845} = {3AC618D0-A46A-4013-831E-18ECBE1B16AC} - {3AC618D0-A46A-4013-831E-18ECBE1B16AC} = {1F58A9E5-B428-4F2F-BBF8-D93FD8BCEA6F} - {4399034F-4DFE-4C4A-9BD7-02D15587F072} = {4D54EBEA-9DEE-4A03-ADB4-EDCDE4E2301B} - {4D54EBEA-9DEE-4A03-ADB4-EDCDE4E2301B} = {216C3B62-3DDC-4D64-8EA9-6C73F09A3311} - {216C3B62-3DDC-4D64-8EA9-6C73F09A3311} = {2E5E6090-4C82-4EB5-B38F-5CEA34DEC6AA} + {C255F877-5AF6-4C15-B88F-6DA37BEDC21D} = {8BE40A88-E8E0-47ED-8DAB-3DFA0BC7EC2F} + {8BE40A88-E8E0-47ED-8DAB-3DFA0BC7EC2F} = {BFF67D7B-CE34-43BF-B88A-FDA3115669A7} {06105162-3383-4FC0-B3FD-360702BC93DF} = {244506E6-031E-4344-8A77-8DC607FB2E28} {244506E6-031E-4344-8A77-8DC607FB2E28} = {95A481F1-9263-47B2-822D-14C1ECF643F3} {95A481F1-9263-47B2-822D-14C1ECF643F3} = {69F97E86-CFCC-4D50-AA48-5E91A31656D0} From e7c32663517eb93bac1d1c96359fe7a4e6c4e0c1 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 16:16:17 +0200 Subject: [PATCH 21/33] Add new structures and enums for identification components - Introduced Axo_IID_IN_EXT_UHF structure for external UHF identification parameters. - Added Axo_IID_IN_PN_CONFIGRECORD and Axo_IID_IN_PN_RECORDDATA structures for Profinet configuration and record data. - Created Axo_IID_IN_SYNC class to manage synchronization status and control for identification processes. - Defined Axo_IdentDevice_Component_Status class to extend component status with identification profile status. - Added Axo_IdentDevice_Config class for device configuration parameters including timing and hardware settings. - Introduced eAxo_IID_COMMANDS enumeration for command definitions related to identification operations. - Updated solution file to remove obsolete projects and include new components. --- .../components.robotics.code-workspace | 3 - ...ponents.siem.identification.code-workspace | 3 - .../components.siem.identification.sln | 99 ++---------------- .../ctrl/research/RdRecIndexes.xlsx | Bin 53617 -> 0 bytes .../ctrl/research/ads_profinet_acyclic.xlsx | Bin 11385 -> 0 bytes .../AxoByteArray16.st | 0 .../AxoByteArray256.st | 0 .../Axo_IID_CMD_STRUCT.st | 0 .../Axo_IID_HW_CONNECT.st | 0 .../Axo_IID_IN_EXT_UHF.st | 0 .../Axo_IID_IN_PN_CONFIGRECORD.st | 0 .../Axo_IID_IN_PN_RECORDDATA.st | 0 .../Axo_IID_IN_SYNC.st | 0 .../Axo_IdentDevice_Component_Status.st | 0 .../Axo_IdentDevice_Config.st | 0 .../eAxo_IID_COMMANDS.st | 0 src/components.siem.identification/this.sln | 99 ++---------------- 17 files changed, 20 insertions(+), 184 deletions(-) delete mode 100644 src/components.siem.identification/ctrl/research/RdRecIndexes.xlsx delete mode 100644 src/components.siem.identification/ctrl/research/ads_profinet_acyclic.xlsx rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/AxoByteArray16.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/AxoByteArray256.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/Axo_IID_CMD_STRUCT.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/Axo_IID_HW_CONNECT.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/Axo_IID_IN_EXT_UHF.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/Axo_IID_IN_PN_CONFIGRECORD.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/Axo_IID_IN_PN_RECORDDATA.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/Axo_IID_IN_SYNC.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/Axo_IdentDevice_Component_Status.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/Axo_IdentDevice_Config.st (100%) rename src/components.siem.identification/ctrl/src/IdentProfile/{AxoIdentificationDataTypes => TypesStructuresAndEnums}/eAxo_IID_COMMANDS.st (100%) diff --git a/src/components.robotics/components.robotics.code-workspace b/src/components.robotics/components.robotics.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.robotics/components.robotics.code-workspace +++ b/src/components.robotics/components.robotics.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.siem.identification/components.siem.identification.code-workspace b/src/components.siem.identification/components.siem.identification.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.siem.identification/components.siem.identification.code-workspace +++ b/src/components.siem.identification/components.siem.identification.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.siem.identification/components.siem.identification.sln b/src/components.siem.identification/components.siem.identification.sln index 99e391f64..8a2a5fa04 100644 --- a/src/components.siem.identification/components.siem.identification.sln +++ b/src/components.siem.identification/components.siem.identification.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{8ED86BFD-77BE-4837-BF7E-E401094BE9E8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{CB134ECD-E395-409B-922F-82A7BF3F146C}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{1DBB29D4-C9BC-4A74-ADF5-FA9973016C21}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{0E83B54E-8DA0-4759-B02A-0055ECA72D22}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{441EDFF3-366F-4ACC-AFF6-58EBA061B947}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{D52FE44C-9967-45AA-92E6-3305C0B71795}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Siem.Identification.blazorapp", "app\ix-blazor\AXOpen.Components.Siem.Identification.blazorapp.csproj", "{58133D39-E3C3-4D39-B473-DC4B073890AF}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_siem_identification", "app\ix\app_axopen_components_siem_identification.csproj", "{7C66DB86-1240-423F-9AB4-13DEA5B6DCB3}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Siem.Identification.blazor", "src\AXOpen.Components.Siem.Identification.blazor\AXOpen.Components.Siem.Identification.blazor.csproj", "{BCCEA162-4ABA-438A-998E-9F65CC6C57CC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_siem_identification", "src\AXOpen.Components.Siem.Identification\inxton_axopen_components_siem_identification.csproj", "{B2FBAFE8-F84C-442A-9666-BFE79EBFEAFD}" @@ -25,19 +19,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{CA92BA10-081C-4E6D-AD06-214E7FC5EFA6}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{C86D9EDC-B452-436D-A1BA-CDFD35AA0B9A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{CCBDDD15-08CC-4808-B115-816A2C430191}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{CBDD086E-7C18-40D7-A97D-50BC77B3B48E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{89BB634F-8F72-45B2-A099-1208B6DC52EA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{09E46019-B0AB-43B1-B52B-A45E001FB8E6}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{8DA002BE-B8B6-4A6A-BF0C-0EC5D1D2AFBB}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{E02300A2-BBA0-4FC0-9688-54824F060455}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{3AC2284D-52F4-40C0-B3D6-F3C4819E64AC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{75ED9E3D-30E2-4178-A1F2-CEB45E136E94}" EndProject @@ -51,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{C4BE1F3B-7B69-4A69-BCFB-25BD35FC6769}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{820A4237-5CBA-4D17-AEE5-7CEBDEDFEE71}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{8798FEC3-E789-437B-8815-C94B7E313635}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{DEA8FD54-548D-44B0-9E52-6DF49BDA55B7}" @@ -65,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{40CDBF36-4807-414F-AD1E-D6025B2ED8CC}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{3FB6797F-95B7-4307-A4BF-2555C37977B8}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{25FA925A-3106-487A-9066-BBA269FDD8A5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{AC27E67E-27FB-4EB4-A4E2-201066D3F190}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Siem.Identification.blazor", "src\AXOpen.Components.Siem.Identification.blazor", "{977C2EDA-E53D-40C4-A4BA-A37A0E6F2FBA}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Siem.Identification", "src\AXOpen.Components.Siem.Identification", "{A3C8377F-2342-4C97-83D8-9BA7972D56CC}" @@ -91,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{6481 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{A4416DB5-65AE-4E9F-9D5B-77293C9E4A6C}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{073E80CE-CCB7-48B2-81B2-A9B0E89FBAC5}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{09DE6D0D-9795-4273-B9B3-B49C3CFAA6E9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{8A713602-5A61-4C37-9CB1-EA0AB0CF98AC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{46D8E5D2-C565-4580-8FC5-1C7C1A841EB3}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{57E34A90-3F46-48EE-B052-48367000A0D0}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{5C667AE3-2E2E-499D-A705-B83AE61FCEF5}" @@ -113,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{03BF9408-CF6D-409D-9E04-87538C27920E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{35859C79-B63F-4E3D-80E6-0B3E2FA1D428}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{F831AB21-D8DF-458E-A858-0E728C6D7335}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{FD32279F-9536-45CE-B781-D7D9FEEE72D9}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{4FC1C7A1-9656-479B-89F8-A60374735234}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{A543B4A5-292F-4AE7-90F7-BA7C883DFB9D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{BE7DD69A-0B44-4E29-B621-5744DDCEE203}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{B7812128-2728-4582-93DA-6FDE29597F61}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{0743518F-CA19-4BA3-A6DD-7105DA11CC69}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{4496DAAA-DDEA-4571-8EB7-50E84F694BA8}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{B293E845-F121-4435-8B57-46FD10135D2F}" EndProject @@ -157,10 +119,6 @@ Global {1DBB29D4-C9BC-4A74-ADF5-FA9973016C21}.Debug|Any CPU.Build.0 = Debug|Any CPU {1DBB29D4-C9BC-4A74-ADF5-FA9973016C21}.Release|Any CPU.ActiveCfg = Release|Any CPU {1DBB29D4-C9BC-4A74-ADF5-FA9973016C21}.Release|Any CPU.Build.0 = Release|Any CPU - {0E83B54E-8DA0-4759-B02A-0055ECA72D22}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0E83B54E-8DA0-4759-B02A-0055ECA72D22}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0E83B54E-8DA0-4759-B02A-0055ECA72D22}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0E83B54E-8DA0-4759-B02A-0055ECA72D22}.Release|Any CPU.Build.0 = Release|Any CPU {441EDFF3-366F-4ACC-AFF6-58EBA061B947}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {441EDFF3-366F-4ACC-AFF6-58EBA061B947}.Debug|Any CPU.Build.0 = Debug|Any CPU {441EDFF3-366F-4ACC-AFF6-58EBA061B947}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -169,14 +127,6 @@ Global {D52FE44C-9967-45AA-92E6-3305C0B71795}.Debug|Any CPU.Build.0 = Debug|Any CPU {D52FE44C-9967-45AA-92E6-3305C0B71795}.Release|Any CPU.ActiveCfg = Release|Any CPU {D52FE44C-9967-45AA-92E6-3305C0B71795}.Release|Any CPU.Build.0 = Release|Any CPU - {58133D39-E3C3-4D39-B473-DC4B073890AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58133D39-E3C3-4D39-B473-DC4B073890AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58133D39-E3C3-4D39-B473-DC4B073890AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58133D39-E3C3-4D39-B473-DC4B073890AF}.Release|Any CPU.Build.0 = Release|Any CPU - {7C66DB86-1240-423F-9AB4-13DEA5B6DCB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7C66DB86-1240-423F-9AB4-13DEA5B6DCB3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7C66DB86-1240-423F-9AB4-13DEA5B6DCB3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7C66DB86-1240-423F-9AB4-13DEA5B6DCB3}.Release|Any CPU.Build.0 = Release|Any CPU {BCCEA162-4ABA-438A-998E-9F65CC6C57CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BCCEA162-4ABA-438A-998E-9F65CC6C57CC}.Debug|Any CPU.Build.0 = Debug|Any CPU {BCCEA162-4ABA-438A-998E-9F65CC6C57CC}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -197,10 +147,6 @@ Global {CA92BA10-081C-4E6D-AD06-214E7FC5EFA6}.Debug|Any CPU.Build.0 = Debug|Any CPU {CA92BA10-081C-4E6D-AD06-214E7FC5EFA6}.Release|Any CPU.ActiveCfg = Release|Any CPU {CA92BA10-081C-4E6D-AD06-214E7FC5EFA6}.Release|Any CPU.Build.0 = Release|Any CPU - {C86D9EDC-B452-436D-A1BA-CDFD35AA0B9A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C86D9EDC-B452-436D-A1BA-CDFD35AA0B9A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C86D9EDC-B452-436D-A1BA-CDFD35AA0B9A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C86D9EDC-B452-436D-A1BA-CDFD35AA0B9A}.Release|Any CPU.Build.0 = Release|Any CPU {CCBDDD15-08CC-4808-B115-816A2C430191}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {CCBDDD15-08CC-4808-B115-816A2C430191}.Debug|Any CPU.Build.0 = Debug|Any CPU {CCBDDD15-08CC-4808-B115-816A2C430191}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -213,18 +159,10 @@ Global {89BB634F-8F72-45B2-A099-1208B6DC52EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {89BB634F-8F72-45B2-A099-1208B6DC52EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {89BB634F-8F72-45B2-A099-1208B6DC52EA}.Release|Any CPU.Build.0 = Release|Any CPU - {09E46019-B0AB-43B1-B52B-A45E001FB8E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {09E46019-B0AB-43B1-B52B-A45E001FB8E6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {09E46019-B0AB-43B1-B52B-A45E001FB8E6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {09E46019-B0AB-43B1-B52B-A45E001FB8E6}.Release|Any CPU.Build.0 = Release|Any CPU - {8DA002BE-B8B6-4A6A-BF0C-0EC5D1D2AFBB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8DA002BE-B8B6-4A6A-BF0C-0EC5D1D2AFBB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8DA002BE-B8B6-4A6A-BF0C-0EC5D1D2AFBB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8DA002BE-B8B6-4A6A-BF0C-0EC5D1D2AFBB}.Release|Any CPU.Build.0 = Release|Any CPU - {E02300A2-BBA0-4FC0-9688-54824F060455}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E02300A2-BBA0-4FC0-9688-54824F060455}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E02300A2-BBA0-4FC0-9688-54824F060455}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E02300A2-BBA0-4FC0-9688-54824F060455}.Release|Any CPU.Build.0 = Release|Any CPU + {3AC2284D-52F4-40C0-B3D6-F3C4819E64AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3AC2284D-52F4-40C0-B3D6-F3C4819E64AC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3AC2284D-52F4-40C0-B3D6-F3C4819E64AC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3AC2284D-52F4-40C0-B3D6-F3C4819E64AC}.Release|Any CPU.Build.0 = Release|Any CPU {75ED9E3D-30E2-4178-A1F2-CEB45E136E94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {75ED9E3D-30E2-4178-A1F2-CEB45E136E94}.Debug|Any CPU.Build.0 = Debug|Any CPU {75ED9E3D-30E2-4178-A1F2-CEB45E136E94}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -243,19 +181,12 @@ Global {DAA272A6-E87B-4009-9EE3-13178DF1DA45} = {B03D73C3-F091-4C16-BF09-75F639CD5E57} {1DBB29D4-C9BC-4A74-ADF5-FA9973016C21} = {C4BE1F3B-7B69-4A69-BCFB-25BD35FC6769} {C4BE1F3B-7B69-4A69-BCFB-25BD35FC6769} = {DEA8FD54-548D-44B0-9E52-6DF49BDA55B7} - {0E83B54E-8DA0-4759-B02A-0055ECA72D22} = {820A4237-5CBA-4D17-AEE5-7CEBDEDFEE71} - {820A4237-5CBA-4D17-AEE5-7CEBDEDFEE71} = {DEA8FD54-548D-44B0-9E52-6DF49BDA55B7} {441EDFF3-366F-4ACC-AFF6-58EBA061B947} = {8798FEC3-E789-437B-8815-C94B7E313635} {8798FEC3-E789-437B-8815-C94B7E313635} = {DEA8FD54-548D-44B0-9E52-6DF49BDA55B7} {DEA8FD54-548D-44B0-9E52-6DF49BDA55B7} = {73FFC131-6D9F-4488-A24F-4F58E1A6F4FE} {D52FE44C-9967-45AA-92E6-3305C0B71795} = {15CA39F9-5FB8-4367-8AF3-0A444D4A0B19} {15CA39F9-5FB8-4367-8AF3-0A444D4A0B19} = {A93E6F4C-0741-4164-AA19-F6957F163CA4} {A93E6F4C-0741-4164-AA19-F6957F163CA4} = {40CDBF36-4807-414F-AD1E-D6025B2ED8CC} - {58133D39-E3C3-4D39-B473-DC4B073890AF} = {3FB6797F-95B7-4307-A4BF-2555C37977B8} - {3FB6797F-95B7-4307-A4BF-2555C37977B8} = {AC27E67E-27FB-4EB4-A4E2-201066D3F190} - {7C66DB86-1240-423F-9AB4-13DEA5B6DCB3} = {25FA925A-3106-487A-9066-BBA269FDD8A5} - {25FA925A-3106-487A-9066-BBA269FDD8A5} = {AC27E67E-27FB-4EB4-A4E2-201066D3F190} - {AC27E67E-27FB-4EB4-A4E2-201066D3F190} = {982EAA2F-0330-4A61-98C2-723CEC54A774} {BCCEA162-4ABA-438A-998E-9F65CC6C57CC} = {977C2EDA-E53D-40C4-A4BA-A37A0E6F2FBA} {977C2EDA-E53D-40C4-A4BA-A37A0E6F2FBA} = {DE4E9DCB-3AD4-42A8-AE77-619B68E96584} {B2FBAFE8-F84C-442A-9666-BFE79EBFEAFD} = {A3C8377F-2342-4C97-83D8-9BA7972D56CC} @@ -269,10 +200,6 @@ Global {CA92BA10-081C-4E6D-AD06-214E7FC5EFA6} = {45D9F948-F1AD-4AFA-B47C-6EA859C2F26B} {45D9F948-F1AD-4AFA-B47C-6EA859C2F26B} = {6481121D-4119-44A2-8EEF-FE40AA626FF1} {6481121D-4119-44A2-8EEF-FE40AA626FF1} = {A4416DB5-65AE-4E9F-9D5B-77293C9E4A6C} - {C86D9EDC-B452-436D-A1BA-CDFD35AA0B9A} = {073E80CE-CCB7-48B2-81B2-A9B0E89FBAC5} - {073E80CE-CCB7-48B2-81B2-A9B0E89FBAC5} = {09DE6D0D-9795-4273-B9B3-B49C3CFAA6E9} - {09DE6D0D-9795-4273-B9B3-B49C3CFAA6E9} = {8A713602-5A61-4C37-9CB1-EA0AB0CF98AC} - {8A713602-5A61-4C37-9CB1-EA0AB0CF98AC} = {46D8E5D2-C565-4580-8FC5-1C7C1A841EB3} {CCBDDD15-08CC-4808-B115-816A2C430191} = {57E34A90-3F46-48EE-B052-48367000A0D0} {57E34A90-3F46-48EE-B052-48367000A0D0} = {022D5252-F5DF-4ED2-92F1-D766DF0FFF08} {CBDD086E-7C18-40D7-A97D-50BC77B3B48E} = {5C667AE3-2E2E-499D-A705-B83AE61FCEF5} @@ -281,14 +208,8 @@ Global {89BB634F-8F72-45B2-A099-1208B6DC52EA} = {125B9B6B-8698-477A-9FEB-5338AD2D7376} {125B9B6B-8698-477A-9FEB-5338AD2D7376} = {2E23D717-9D4A-4061-8461-37A87159230B} {2E23D717-9D4A-4061-8461-37A87159230B} = {03BF9408-CF6D-409D-9E04-87538C27920E} - {09E46019-B0AB-43B1-B52B-A45E001FB8E6} = {35859C79-B63F-4E3D-80E6-0B3E2FA1D428} - {35859C79-B63F-4E3D-80E6-0B3E2FA1D428} = {FD32279F-9536-45CE-B781-D7D9FEEE72D9} - {8DA002BE-B8B6-4A6A-BF0C-0EC5D1D2AFBB} = {F831AB21-D8DF-458E-A858-0E728C6D7335} - {F831AB21-D8DF-458E-A858-0E728C6D7335} = {FD32279F-9536-45CE-B781-D7D9FEEE72D9} - {FD32279F-9536-45CE-B781-D7D9FEEE72D9} = {4FC1C7A1-9656-479B-89F8-A60374735234} - {E02300A2-BBA0-4FC0-9688-54824F060455} = {A543B4A5-292F-4AE7-90F7-BA7C883DFB9D} - {A543B4A5-292F-4AE7-90F7-BA7C883DFB9D} = {BE7DD69A-0B44-4E29-B621-5744DDCEE203} - {BE7DD69A-0B44-4E29-B621-5744DDCEE203} = {0743518F-CA19-4BA3-A6DD-7105DA11CC69} + {3AC2284D-52F4-40C0-B3D6-F3C4819E64AC} = {B7812128-2728-4582-93DA-6FDE29597F61} + {B7812128-2728-4582-93DA-6FDE29597F61} = {4496DAAA-DDEA-4571-8EB7-50E84F694BA8} {75ED9E3D-30E2-4178-A1F2-CEB45E136E94} = {B293E845-F121-4435-8B57-46FD10135D2F} {B293E845-F121-4435-8B57-46FD10135D2F} = {4E8CBA9B-6555-4D86-A167-64E1DF0C87A5} {4E8CBA9B-6555-4D86-A167-64E1DF0C87A5} = {B18E93F8-DB5E-4E09-8C72-85CC48BEE41E} diff --git a/src/components.siem.identification/ctrl/research/RdRecIndexes.xlsx b/src/components.siem.identification/ctrl/research/RdRecIndexes.xlsx deleted file mode 100644 index 3e82b30fd64dfaa04ed1e5149eceb64d6fd852b0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 53617 zcmeFXWmH|kvM!1S2`<6iCAfQVcemi~5HvU}G`MTf;I6^l-CctOcM|MP*!R41_K`8( z8~f+EjK%EgufD48uC~dd6lEZxFu>k{!GeK-k$~}>kCaA$gMs10fPtZd!9wVW*xR|7 z+PQpI^>8qC)?;wDwIR-hf}s8m1_AK@@6Z3@2#l(YNkcNDw7+lfi7R!PQAdrn<5%S` zG4S?Fk!{IYA~z{qZf~ot{t)}DNPl3OEXT4jVPj_IP-~%k@ea=RJnps1XWFuL}rC@2XEpVBH14IbvS_la@o zHZfvP`M!@Rl8lW`9mo#GUJ*IOV(j^jlmjGew=27O&NQ7^8b?;kRA$@D+Rz@Hv$k|< zg?TsFL8b-S7cYJN9ru<2OTImX%?r^`{q!9-8#}j{X%cebNlP!oYuP0eFgZOu*yj}sH&0k`|tRPbl-)f!b3#CP;S}d z=~T=?XCw2aim!t)l@9FEvt;OoOnn*KAYHdUWul6pg(>6D4#K?Ov;9K&oUt~ zK=J*?SG$hwVkFa}mlLk1bntvAAcCl99k|Z^>n0&ssJ+aF1OtWYgq~_rtc=wxp(V54A`S&36MlIWK5haR+d(&psXNzD?`FnV5{*B&0m zrB<)|zFkkImdJ8ru7J7Yt|qjovrDam^cl-%(69g4EubL2TsqBZzN)?n%*vbUFS(D& z0W3j*fmd4KRfS&QpTtBVtu^|%TK3n z^J)%yzWoJ!#lmXvtD)q10Ve)D0VFFid2s9VN;2;?*(C~tRiCV?u0Cq8)b!hud@$I} zBD4b?c@~nz8bns11Zil-z?DMXI}k0Lc~4UM8=tH%vNflGapeEZ5tJLxykt z)p1s!NEh znv8d@HUH-U8$RG2HAW4%)vzqS@EJJ?k5J$}xa|`L;#WvcN!&?S^HP1!@Cc04v}2w& zLKayC(m{1y&fKG}J=MZNj_%m4rLlCR>!Vdb|ZGJo~89KG4FM9nd!o9!J-1C09egQut{u_`1 zm$jY^m+`e-Yc(URP5#43$YJy5Ic0dy)y39V!siyr_FJ6;LAis|PSceo)iYbC8-o9C zFWWq5$>IXLd=Cl?3>OR*9N5eMxbyzwj{dj%4;*-R1-Spae_9hJtb&+O`p<&f14rA$ z*G^n%@a`s+7p+^o{ZJ&xO2bU11>3y?70avgu`bY3a4x+C%~-hcJ60(Fiptba;ZJk< z!`8EjmD3@e?I*YJi|z(7h#Ipw9mH;?Y^>w!SEG)9CRKC8@W7PAPjFr%GbYDu2r!z- zxlNp2ROcdE4*w#oFB(iQ6Gu?%%TAnaDgGlMkRNmXWz}u{kFTvtQhl#EnV|OUX*hIz zZmfdz>~aLWPRC7L=)|K6?6PF93@8K$=vBr5pc$r!=nss zFrDDRE-pap?JU;j{izYDx+9YN#73c`h_%qDuy!|+m#0blllsOQljFOEQW ze{;S#3jz|sw3h;SfZMMNPjc&asw-lGoAh=9Qv#`7Y;8;##BfD*S*^o zzc+2TsbS)?u~o2RhNhJ2&w2V(kJ!(Jb~TaDn|-a@=b(_X7^5#y$@;gC*!hcEqXY1N zyO#7je&^*7Ybe`+{IOC7p+#zwrgGR&{LKckG*|ZSoiRj|UT~Lkkn>qnD<7~r@FVUc zgfUBp8rVPodQQFgV!RmvcY+d!S3*`A1wDf?j7HfQ=wDC+4H+fraNlZx1H~PAlBH4T zKLE*#&^Gz)5l5V^P;LkYgY4&=czE`H%lN#MKd%JzaxL15(lrMe4_=m++E?DF9byEd zru;F-B2Vgo7pU!K^!R)grmpl<3?Ck2@%9J%J&t$gx=S5z>*wu}ptll*#~t^CnV03t z+^I=3H&=zYtM+B4K)U28eakiP&eYWqua?zUFg7l3hzr#t&eO_GEQ`1=68)3-yP=7W z=f4*_ZZ{`)jg{HH&u1^b_kVto^Zq$MdTD>!Nq#(Z7;o<;~UI?N*`p-;p8J=a=lyRM~>hS4aEN8^|>tj1O1Vw~dq!j~5fS%zx}3 z7r$ID!c09MRoV;sK001*?MDlCWaye_hs!;5zDU+m<(jTrrdoaEgw($6jJ9oI{nkVv zkzv)l#G0}+> z4khUM&Q+28eu}j!kQ6ZSe=|XNGcmV-p>b9K+7k2x0c}Z4Odz!Fqkq z_b*Im%Z8IYDQ^4*46nrrlLf(Oiz{|jRGh~G66CxR3!v}hk>1neMbMNOYPAjl=cP^s zXa+D8R}}>Bj=!4#Zu|%mMq3D(lK%<(PVnX%>CGw3tJ6BjS2xSxuZAanfd4?(PQc?Q zUW4@;zh+^e0D44FrDX*`z_>Kt#s&X6F8!R>anZd6A^0^2m7Pc>KtP~f6)EngY#>02 z6kO9b5J`#@?m$tfNYMlo4S)_P`T^aH4a7X41ByLB2Nbt}ZpJ3yUF@b}Eu6M!fW#Qn zm?lNjEWJpC7F$idpvdNuo!0I)MD+x6EdJ; zziI)8a#en+@d4G-i|H5EI%nBD(Ses;fuMoXa7C`DG1u7qAlCCh2 zz2H8)>XQvn|4#*(P+b7wxTI;X%Nx`IwSoPNhX46q=GF2;~_Kmhc&E5$_qT2-*PlzOrqGe z_;*-PjpR+3vE{s4Y_6U2Fc7}vHHe3&Nt;=)r`$<~>%W4*KI5Fr!QG5_Qt^)=k1noY zeu&1m*uvHGsj?;VsB$LKszqX#<+>Y?;07%zMdg%tueCru?$LT`vuK-7CIyY%HX|DH zQFh(JBi17?yOwVy%jRhi@GY{>Y}X1ZK{hloSFnJLp@8H z;7zZ6?BYjVb*5*XrR>yr_fIwK&Ghb&)YqkUeAtZ!h`` z%lMKAwxJq?i(4rTOIDM`uuq)05~t3v`;VW#*wIy}mI=zKN8KJEgPJNigf!V|}b?$O&Q>NctxF{+4eOp~^x5`~yG z?LOhM8T|oadU_v4tJp0YFiv zu)giW9#b!flcuA!rC}=5itVi9{h`?hNv}46i5_Vt23@;G5<|jbwd#{A>ECzb@x9OI zso2}O0^1)C(Mb%hR!`Eg+s0ukpK0ZD0^%kJQSN<8<8B(3P@^t7WMc!ASySFcuBT~3 zRS$F?b^1a%G*(Ov7IaEgoe@#eu@>hAz}z~&-oUf^{T$^L>(_Z&&{7m=BI>q zx_H|{HH!E{{}iH0%eO7;qOjjyrMUbXMvt+-?#W6oB<6Rb`62}`xt<5j9%E1L$rONk zwBRMn^Wf1vnf*?5YqVh8KHNlID^6O_UO^sM{GeLdCK^}VLex710>q>4RV6LF^GPo))H9_StY0YFP*bUYM`^^5j#56ZLqDE+Kdo+q!Hb= zwuIFVJ=(yG%m=xGqY;<*{S@)N7Ufi(xKu?jg{&g>B~-E}@{Mt3-`J3@8w zr%}A+nlZYat5YsUg@<&s%49r?!>|`tK@TOpE<>h4a0qpRze-OeHDv8-7FPxfzhhyj zJDbR%7y~}~7~?9-UN1f0XpZV5OI|EWxioJ1aFCW!u_oxD5iLLsr)aM^RT-MjK(cr- zxCL)GNK?%!%0HS;t*pC0)8l)NxNv8QMQ6z@28s+lofzFJzXk_yQ^d( zNP&lGFrn#H46IL-$AD8C(uj|1NEFVz2J5~wdZRn#JnuYOqyUxCHa8}%N-d+Ww2lc+zZlH?G-l| z7R`}s)BVxYyno~C{^SMD-bO3Sfz4RTfkUYv?Iu8Rn|`XW^xN=eN0$A;j*cQ*9HYXp zn}$%BAF4$0!zCuqB5Z0nr#3S|^*%ur+B7%=ACEJd$cvh8mrb)9p8HPCvi~p182n?@ z4=sPzSm7B6FS$J7PnJrPO^S-@7zvorredG8NX!#zVhg8ozUNc3(ToaNt8eP$mQlMz zb|#Bzkw}Eb5z&VPqm2(%e@BoxB$n`I8B0KN`uby|A`7g6YW)Y}CJT37!xPd+bRl|J z6s2h>lw=2(L|2H#?7lNy9<=vkv=t}Ailgmt!W`hLzYV#6)b&(0zXozr7EJ1ghV04z z7|5Jdu(;|(I0O26bRp2kCE_8d7(?rDTWVMN>ILcFvS3<`c9uPEswHC^@?db~mlS7p zg?^b}HQAz4#DKvZTNQdI_K_@@aWw#fXs}Em2CLE#7f*S6hM{6ClHd%e3ebfL18RgR z{Y(aT12Uq$KKOfa;ggqcSg&6#d_Fs;fjnw{L=3ZY%oUbSUO%uTA35W_pNfr~**gJbgS$0!b2j~Hvx&Cwthk_FW&6`|WWLW^t~ zL~@uxHWkuc5!p$BCVs75SfW50hEdYjcX)81-su=VGFFHr3> zo&xf&X~S=pKBDnk=UK+b1ik<1(X)x(QoWi$F|)fG~E1LaCIIIv>AOtNaW#dA2w9%WezuQ8Fb=Ap#rcIsf&lLkii5&%B)i{27c2 z$DkWgA&xNODd~($Q+K}q9;Dq?VzBRO-6s|C!C}F7JDCJE*BbIj;yUxs93Q@yCdq6X z5x6fm?t-bJGjTZ8rwjKiN`4^Dfk`8GH)>d&+&k#Z)J~&s3TwV5g-@DJPGfb4b%R5N z_O((-qh{Df)Irg7U`?Wo#(`t3*(??)pp32hOCeoBjXEdpA}_!It#-< zL~WOnqni07M|E|@mgx{i+89dX+}9G$mVLfIG-nV=>jamAwnIoXPTss2!7NpA9^Tiq zqr`BeY~=M3>jbw7rcwV;F_7w1gKd8BM9XnzGnW?EidGJ*cUn;eP-wnZ&P)%DlHx7B)JCk8#`VA$@3^!a* z;_yJmuOw)m9U#b_N*HO5!DFAN#R*q%gtL>W$9E%enFj01V3fY29eEPD*0a*yRG&(d z@3I<>(7uB3W%(s0=b@ycKkM>ISw(+vjjtDM7mbjzpf1Mx3;oBc1ks8qL&V81VY-n$ zRSB3*bKj!pJbG@67RfF_4?F%7=H`2~+LUSiSD<7Ldv`9!#XZC!xW=o7`u49YyNGbt zltNnTF_|CBR^~kdy(og*>kS4A(3V>b7xIc0DD4mUj4wgstd#Z^+0`B*6466={dpEw zplS@?vszrlbk4|X4*P@av0cPWbJ_JtkN!Qx%n+OPNrBy6#JTA1Ah}=5p7>g{Iq zNz#rhUR3sj%Nty@8LcEL7oxyYPaeZ#8LL#i!b@ytE#5_xYKh}CnU0h8`hD*qQkWVi zb_qgQiSM)4sD*O2X_T&w=QKeCmbZsUzu*ua%Ul{hhy7p`Kj&jBNzZNm`4tF3W{LP_ zn|a>kSwCTM2v50=GAN#t{3)r`kp9ahsCv=lr>8uE?{;jfVOh@*UJ0emx?+y)dKG#+ zp+y`Q5R;HGyb>RS_VEa6`SqBnLQ2HK{NXG%Hv6KVmRBI@NQoei*uEjW>DWnnr%TZF z7i&Up50T}UEJ=Xj>Bp!&Gc<%p%T}nsmM!~EHUt|OY!Ru42*;&bd2dQwVk?Pp+%BSV zbv&o4Q95V7-b~KBeO|SRtTl60Re9rYyNEl5w(BucUy6X)0nOzA@yAh*?**PoAY5Ry zWl?O4<~$d1K;M`4-XaxQz+sOq14LP+T*?uyfh@U#wQ4U&%6O_d*#sfgisvpalBCB< zVDa_I13U?=hGB-VT{j2Yw*9QNQ)duSh-jha+mM_GACu@9|E~b_CZ$Sr|5K0^v`0 zP^IjBf6$pM^$NjH3s^va?NsBNQa{2?NwEF1>x_e%u!Zm0z9%z71vwK1DGQ^P1c~#W4`-=6vT2ep&oegWCn-{1Le!4t$;* zV#r$q@X2Z^zGGvef;cnljc zZ*1`F^pzK6#iR<-TmVb%{p8jfSFa=wP29lzUG{kd71X7JVf^3>7nW1%@GSM%g6%M0 z{^s0}a~q#%qx(&Xn$J1B(*-KlDTmpUWn8oe$^);?5MjTA^z&nEA*@@-sZ&AV}7MUTPN|GEI zOyc1dsR{D;`9T~x9@0F;-%ZD?rwtLSk&LJdY6Xf@Oi!jgJ{ME@bZ#i4!<%Ci;FX`_ z1!9$-w`WhML#6HUh3DkOOfNY~kU-a6gy!T?-?UC%i%8J9U{IjIALw}ob@!wf__?ks zsS=h?DoHYz=fN?0om#RVQHN#?gLj`{%8S23QToCJoN{B;gHESY5XoET)Px$j z5_bY~5RpCgVSY+7yMi;G^5{sFOCLpFD}s!MZd|;EdbzU>fMJtK{Q;sQ);2D}^d&ZT z-BDu79YaKdB-K*_ohw{?0%1x?vOnwDh5!f;n-KMPw;hJQP9?TeWd!!-C8WVO314i- zly?%HElp4Sc#pe^gkT2Xu4hbPumC-C!9X;LxR~6U)Zj;92&SvO=C6g}#$X6?UHfMLu@h4rdfpk1#3;z#j|MTy z-VcM$EASLT=lFbdP%4$ zqDg}I>{Q1WvEc-DU3Lyg6u|{nNffs9QX&COw5F9v)pp3(@sx-9wKz1s{ zzvJTC;kCe(vPDU$YN2eC$=eed|+6tyWJ05_CZz{$VGZ3Xi0C zngIpLSU#J$Bz&47J04Rsa0k&?6l&Fi*OsLrrVJF=#Hiqfstr3LmT3U>iXS#HtE|?^ zHJ_9xfTNUn$gGbXUm6#WyrT@aANZF09X>LT9xV+XdHJXhvuR*{{19&fA4|Lyhrx6V zVAG#Jp{zW%3^DOmEelpK54x|3A%DZF^;3{d1V^(b>lDyJCI;O(NkBPvbK zJYjc~py$2QU}zYTe3{Oq|P;xT%i zbYp@hDXCiyw{1xn^-{|k1KZCNNs`dF_2zQdUKcr8d`}{*_{~|OO3s>?3-L6bun}{f z@;As^NisAPwU9w890j@bgeI#Y)O5C`kepQ`0qH3j^i8RCxyo`Zx=XkC5g>Rh7w^e1 z5Pb3z&wYwYDEp4X_kv#f=inw&IqA`3>?}j>WC{KmWP%7LYeugEHNh(3VY19rlXm1RR2+f*kzF7xS6@SmHJlqm)CdN9%;dT9=@zNyp*P%$)veXty> z5zy!fey=V~M1!eQEFz$~A)Cv4i?Ua@_RoffwqEW6p;?&PJ+ zvtY*B9-=+J`<=GV;2hzkr_my|p-DxyAqU3_DUk9Qv+kHh)K;U`lB^uh$D?OW_%q4* zr(XL(d8@)yhOm6LNW()mMXPS?q>2!ewX+w}dg06ljhli>MYm{Q?xoNDZeO_5H+k6k znA)|+7{(ImP5pfNzS38yM(nlU1iJXfzF(Zyg&Q*+L-5SYF`#SIhQ}*NInQGMX)s73 zQjy|75HuwUK5=IRPY4_rJZ+|fRG_cw!p`8lf$ho%=}FxL$7LNJb2Z(;rH*W#jy~YO$LFthQOGM^vE5unRdg>b(URp5dpfKUz{G` zl^A~u3kL035W4NBOU}~`Wx~s;8w#gE(*BT;k5Ts8c#IQir)x2yZuF@Pq6xkByN+Kb zQ*UOVPyClzC8E!T9%KTS32~9h)0FupF*v~`=WyML*LrRp0?9nxxw3%&9&dd(Gomf& zZ%N@q9RCL0#4GdTrRCJT%!JI{Rb+czlAG|3KA}kpGQ;b^?F6eRaGgzOd;&(TZ)qLhYxt) zr=4~vo6a0k_{dO;CQbG&h?pWzk6j8gA zByf3uDzkk3IIQ?njeT8gAAUG+`T$;s4&I@#*Rw78$4T5RA(a(+Hj zj_x>TMh`B@Xv5>?d*zt5r(qYT@|hWmejyo(_Yo~-e3DNYF=%NSD1qx1)D<}O7*4{n z?i09rOuKO;8nR7D!Zl_l|GZdh%}gdW;Js&*HCbz(_qeUu&*(QMjuJ3*rd+LQZHrt4 zCV^FY@o2jWgI{R>@xk#ghfHdFee1wsI+(Xle8PRJtt}T-etru2v|^9_rN^ec2nkj1 ze`v7Zo+T<;_5t+86Szzf{*(nJZR|p~zU~gvjv*%44yn>^d(cOkhTO$8X*^nJBq8~O zoyrcM$9p~Rho_UHf8^A>w@oQLJ{?)IEK*_6OAc!L(X~(NVJI;8v~t$cG%PH z0)JqRMt-YZU96p_Xf+Yfe>#=zVo%O8JlV*i=0m7*`$3w~%gLjhGB#fd8k@$QfqB#;rb6CP2wDF3oZXi}3~B~Q>HM$RJYl4zp4kRqV29F>|5G*(%Ud>2 zyw+`)UdGwJSA4^<+Rs35AlM+S=ITaVTuH$lm0l@Oiz!NH7cIA+WloP zLF1}L^$m>79CfB~DMB}8fmGk7<20LQ>1;g5B>7v(p`&`32I9_<2;d6ZLvqqUDh-M* zWLoCYC}U97n;UhloK$J~cbnu>M{;K>6kbB~&6~GOLa|hqe_DShP|AQipXDVe+E*Gz z7%IrK^gQ8F3>B-3vvYv42za&=_(l$-OtK!jKDRI_g|n|XHTq$xJ~GQFxtjH1XC;XWL?C*9Z5PdqIdGe=)>y}z0|K$N3m55aU*@knFG zOcVQcB%@Bumx%!PcW7x`cW#}iV3$)G%F8hp9c2%t``GBGs@2JI_9p?T8p8l3EbQn` z%aJ`3x0(5!{RC7N_mOs~P)Pih+ywzG5BP+GvPg}-x4>GWtdTTO? zkdzS1vAS$*j9K+*xh zmmtwCIP@P_vX>nxT>OU9sIcuV&HbyMojrUn|DL*2<~Vfiaf92b#&zv{<7SV^6(K08@yeEzY{Chw6E9wWf>ju8vYG&Ow%@LN) z5V|cJdoPm({ODkA0z+$fhvk0EYjb>YCql&6HbB_r?8`O_f&4tQ38C=3v1i*bK=I9-P>m=q79ev;HPhzG|jD(tBAnvN9;DYDxtgpX~s z553)q!q12T13LHc=VI!ec%}NiQcCDKNd(7hc!wD5?E}nBV&>i{x;F!j zH-kzPn51SZz@r2p0qo#ckJdorQTk*^fE_N-&%6boar`!Me82VgZQNFVf~1^)esEWr8im1qIKs06WvJml|Wrc*Zu zkOz`lF8qJNc$8ml`~u%po5XJ_u79YI02Q)8<3H&FxeNf~|Ig1&=a7FhsGZG2ejV=F z+i*i(hs*mq+;x)I;Uc{b*Uc|*6d-`Xq>@C5?}G)6qDbaB3kjQr=1*}8k+23$AK+KT z;22rDAQ=oIbg}Wku$h1?a5EwCSwy(Lje{enl4ObR!@`OPeH%wb1%=`orZKYy%~A`C zVjEdukdPvLV(&IFHVZ9L3JPTkntR2!-*A8Sa1>O~Ag)*_tcb-oQqdri2JsZnQG_n` zG-6VOski4AdzwKcQ}2QWMCc$QI7b>7sgq1lAC!q*SXGMu=ttBKDlrdzV?w9T#FMCd z#8)}6Ejp}WH|?u$DLwMEe}S(I@8{uE;<+PQ;-7M9x>rrcx9yIgxQ4V=Z8O2B0Jt1| zJE(7M9?r4*RS`>O?%4PxU@*3}X@%$0?%*qp*lCyklrWP?D)m2rD5&(O4f3I|AKY}P zM4?{YkOsWELG1$E1ce#^UW7%f04F4*nydUghCgdwAqY{7S2MrRH!h0OD*>Doo}(7% z3@UW`(yOW)&9D*-HJGB?Xt}0JRC844LlSI6*a!eKJ8Nl@(ibwk2STuFY6yg&m7X3I z$m)3|=f06u0kRh&b8eOBqIKw-lNtbD#EV1)@IYq3i9M6JCh0L^KdekpTNgIqgcF5K z8j$_5m9znzIJXX<3yE3+-W%vYqTYT$dBs1z;W}@4qhIJW;0GMFfTDYyl$0LepaOmx zLtkBri2_}uWRd|y5kNd9Abst4h!&FA;#!Gx+1(6*hlv^m?~4igdZC`0p;fJku zN%yMR&}-nh3||A6@fJ9FO(6IvR6y)AC{s4*U#H@=2E-^n{59015`Aw|mS^-fWlGg= z!K8hi5h2kxRcO(x3oum7h!zQ|QG4}&#Qx3rznv$bf&XS&$84hIQ#Q&FP+bH5j18k0 zQvDAVV4NLVTBP)QoOHkhJ(}49A>1ef)+lRgJupF(wGE=0t7cj{r1Yn?uP~?fJTSAo zAFTm)c@jX`)*o3$Gjyyq1uUCZY5@AE$-He)Vw+$~Anq4Dft8NB>gp#My!+*jI;Cy#Rw*zGu_r%L)J~0T5$A?PBpVZPfN8^L`fq zqyY+w&CB$5DF9>v01Lo~2DC4!J|9EAETi+rGgG;4KWSycZPUjpr_FE*dMDNL34R^D zbW#3QDHuT|DA+1A^xm72oF5}-aRdqaBnrwf{JZ7vNk-RPQCC>2+fY{Ms@qUkc&qyYc0V!oA!dZce0c8?@(s}khTqwY zKBd}39CVff&SwT2jniukx=8WoGoy~i88rr7rGWFBNk-$$8iQ_9{Q1o+qH$J@L3b(O z0%oBK*xTr!`ydhl!+%XoAQ3PPRlwO+0p0&A;so|KE9gFwM8G)oUlKD&1k6K|DSn@; z@|%ZF;A}gC?%$yQ|6%}1yFn-;_V#~LK*)RF`T5`D6|rLn+|mU zFNrwY)}Z?|l6JGu%Kt2Sf?fPJ&C+c$@9<%?W7v*QKcVDodf|?B`dWF#5LJ0)H{p1t z^^+0dj@cw6&Xs+OW3RAYVP(Pw?KL^OZU^)UJfcuhR}_;`|?m*@4Az$ zZl7a=vsqA+eb|XV+gKvnD2X6Nl7$0~C@&x2;JhLEgp!aTsPRPpga4L2;pjy7Je8ET8IB$H-}+amc21-ph4Mkh;)mV_@*5z;a>J|FwxRj$h>lM} z@ZRJNRO$z;j$f7dgF;@U@i$bz{bg>8H;gb=w#Z=0>r6iWYea^!KU#0l@AO?)>?mES zu6+spS`Wsq7XrzJtsF7gKy>Gw6m;M_;|R8Pba>~-d&v=mS^^G={ z^Xr#`IxPwf2H~;yF7H>qFYZSAjua9sJEqBaB-|&!TWi=jS>08`UF8racC#z|-odCN zx8?rj^`SUK&OJr&CKNMkO+iNE-npNeQJ3h@mMR#ey?R$&=mS}-SU ze)#8c3+!3i0;@z^v#??#ob_=#l+wC_G{(_<=`uf(Vk4~elUUq3+By6l&H?GtDyIp) z$sEw9Di&JJ)HH}~=;PULSn5f~`-a zSFhQFsp_;g0m`(kC)!G|9mfecL9{c%!HHg6L16{5&ah{4ob**JJ@9m_^wlgqxIj_E z(nAXrwN5=Oba!yrK|8BJ^5Dk(J*eZNy!o8-9nMI7B)FMVcH|aj4gE z51Dq#pF8{y&E`|Vm10gJ-DI35d`^KWzd#uhc9NdEpfU+N1JnQfnQRrdCbVl-O$$k( zN!Z(3fO;RehpBy4<%;}pPMIoPU3vFQG?A|j5BOc7QaB^s7x7gdAKJD2efnh$D^v$3 zyiiT#jQxSbT#(MOERoDkLs5LOLdeEhc`M-lW7r1p;v#{!v@E{b*n2CK_8|F~^_OFH zxzL7~gz1s(r^oeb^yq!9* zQ82BjXW3q`EnE)I{-#mCjkWzC4)!|$v&Cdgk9p@OI~q$ZM8oKPC+^cAUv>g2PWd-U zOZ7v#((7+(f5-WL;qC8s4KIui#V4L6v2H~E-J8``wB}Z9FK6iufXvQttxNi#Xqh)^U(9p5aol;La;B16jp67iLZ^_?^ zW;A4fo+^RcWYbmw%cOxZk`73zA)aUJZ0t^hk^P6~E z$S-{D`;^Ds2E@gtTn2*5&mi1{R0YHjl zU)qO7i&t9BzK|9Py3n3XA4$${Ait4AJq;rZju?;rO&Lz}ns^8}CdQ!$QVu`ACLY!R z5j24~sMJsZOXvM4E(><2F`z4vJf7MsDb16*!N`Zx=^dMlq7zZrx`pulXE+T@QnOO%fK-#|i|4DdLkY)!Z9FV*rs*}BJ<(s~=3 zUK?5p6mXJ^xjF4LH)BQi^5qE-aZo0<6&6E65GjIIXiXA`7JUgY)sztOKd8}-$8W+M|(g!PSGGG^=!ybMw0IFffeWO9A>jm$%TU|m%< z9Z=LY@;2QrQ>@o;y-FS2b5+#*(8Gt+n1H}FN*uS4~h^|(x}w@>fRAg`X@eaO<8 zuy;^c46MW-9N{Y=TV zmNRdsJ=aa!!||!nHuCnRzvwvt@(mXlzUZzHz<1TjO4RDDLV&NhYe(xK@zM*}AT|8hN~D4YIa$=zl3oJj)s7h@w? zaAi*dV$HERMd0iv4yzo@BZg=0A3vC{rdu18%NK=_F^Rq#I34D6GQOC*V4rGk-4fy4 z8Vb{J7f{S7V7{05RZFpRpW8&5fFpdIByaBDv2Q=bU3ZDMs@X){pZ!7IG$k;X(cCo! zB?dku!#nLV<42c*TtH0kt|}8hfCHCZ!$p=OwHp~^HieiKGQ;+>YoOdC$Zez`O;Y}W zm-Ge%tMmPEmrZeI=rF4gok59Z?1we>i|iF#OS0v+PbDUul}FRcD@?VRou>U1RxueeO)JUoNMK z*1}-!PGd0GzcZ#u7F>ir%fXlz(GWRp{Pqn%R+;H8{&dxi!woVN>9S7~O?W~R(&bY!vTn8MEhJggJBtt#UtSMqO#*}?! zoVDH@FFL07Gwlb@J#r-eUjXlp({6iGB`TilI663;>sY6{W5SAUwbyWCK@Q(@`IXh- zh!&Ey(G(^!5xv@*^FXGst@s6=l_Pck&=W1hPAsdJq^qbE!{~Ks13e&YB}aPL8w8Bs zjmY8Oj+_HkGllJ#8^?lWw-ZVvwX4kDoE1+1nS0s9F$PM^3sE8V<~)PdpTI3tvVgF5bshd$3;%w;)*ErHc>>% zRyKCNFcG!a!Kd?w_2i}23B9&(o#1~+DfdBPd-7vXJXd~Ru~Z;8jTF9T+94&F1bkN5e>?-=EsPh z>ea7+Ia7JbSWnJg?4asE9$+b4g^X&Ig{29fJhwcGYt{mS(uDK3MZc0i_T)JiVLZH1 z7o7|?1iMX#lv_uCm*Es#xglprnHHZ88BMB`2NmT>?KN2b-GJgyeDBySTB8b?J8S=l02jx{f{CA-H@-?{+8P1a?VA+ANk{;)Y9yH!GH<1Djmat z?#Hh_5-jM6F0d*`z-0+q2#!M$3;=!h?O^=hKk-aVU$V=aC_K%fh3P06u`^TlLA#{S z+l1`x?0Gg(7NkW>qG|dLV$~G;de54k@MO=%(R*vH1fyKI?W88{O=c2RRHG*@y$8@n z3J=e4{?bd-eXHk5bw6DCTPt+@S%l5C%AY8(ykCpWQ%hSMjz%?CQIMSqVtO7O$}3RvB04T{n;z#kt#=Zm`a4y0DC>;u}cS)}cB z8BCg0N=|Q{5X#dve4E~knu~IN^Qtd5tl-!FJeQHbt)a#eBQO={bcS*a$4NvR7p2)o zDw-W*(2yAe=_huk?&uT9;%**ZQAG9US}YtB2BFzBs83op<$es0b|(%Shju5XqR0=8 z)_kU7U-|(YnY7}V9eq}}> zp`tmEt(HAWhyUxfgX-NbL1|IGJm+DxPwIE8If`ISz8U#Lb>+B28Pv8~X=qy0jLHOYUAj&L5H zXwX~)8FVss`vM2RinF?ZfeSReJIqAEN&(=)Ajr0O40ndr7j8y~-JN_0?Z*#n6bfxd zKyHWd${>fmhZ#RHuFG1A0|bUVdB&yQ5xIGS;FOtX6f`(__8kj&AXG(wWfgLAbDGAcB2(IK-yf+}JGU^S zk*qoxY%~!~wlmlcLg}b158i=k@%*~TEQ03j)knB{PhRW;4COM`1TbMM+?Krs(r0Px zrr9xA!kh6scPRsU(HWKv8n21B}j$n)1 zx+lYi2(rPtdx0xtu2o&UrX(vq!FBNo^b@;!%Zwva89dwc?qF4sdCPLqD+6`K9Wpx@ z>%hP*$uxQMhPkhr%Dxd2LUPj}4BQ9Ns1dRVDF~2cb_a4qq^S6cM~kqYKD9)2n#N9{ zhB(~lUt5uF!{C`ZUuL*JnRZSXHJEeWp}}bHlz#5|vGodxO56Q%xx71hN&l8h=kTDR zwEoNeF|2vMq9#eiKZaEUnuoM6>UEwx(7w9hAt`dB+)xgznLPcrxW{_{b^rPg zyDk*9pZVbP+%{qWHIvRY*i3sW+<2c#vFR8r_vsi(2p}-+0MMR_ znLOoVNy!vy2f;ez5dRZX5n&X^`U{VA0_f}!ETdTifYwydA*ZvOH>rS27FhV+DTo3@ ziJJik{^M9OnUO2O>M&LSBQM0%zH; z3(RB8>r63FsOMmYSjxg2F*^W|?Ql6W1;AR->EZGLP!1)U!8n1>b^piNa4e1ua0{xS zF!^yBKYrzO^1hEF9{_2m@ZrVCddy-GuyWGr3G!B?8wJ4~0BlE{Iqri@%IBY!O4)&e6x%W8$*Yt^2pf04~MLfv@HQEdiFyV*?ovbr^@gmIk$M1cP1 z?J)d>(I%6ACUzm#ZA#*fPkT@05h4?~f>*{~7Q5{Y{e~1>I&QV+LjC0ywHNuMz*%Hh zoXj1}q*~`P`!3A*ozgtavk4eY(+@@SSy0;A5sH(lw#*!H%Mxu(9DbCY5JMY zT91mS%HXDd*A&7TUQuP0^F=vSA+10c4*7fR@ipFrbvC+`AKv2n%*GZyPeDiNOXnK? zXj(3(R6Cb$f-m1zzo!%+p#wc1!JV@2Dh~sm4f$Md>AM@?s8blt;W6VPbUBBr*SbT% zUR0$U3{h7!Y&#;y6S`6zc_wRrl$}Qo9PW;2ojG?hESMiBK2sJE>xQQ@Ij4Sin^ebX z$#mK1uZsHKHi~VRGX1opa~Ic1=h672xxexohfV>*D%R5p_m5;7eNk1hH$-)V^8aAif|Ke1AG zU(p2yzb&f?lNilYLDdgW9e6`q6)?~&CG`>P=MgiPnHwc8Lt4fsN4tzibDXA+eIq_? z*$=&68w}G&hAD)&Nk><98BSff=5UZWgpg0%vymwIIpoc>SJsCZ&j-|Saskc%K1BKX zzd`%~_1|+6lwQplaK0v-^qOi4-uC<~u^ED41Z`E2&QS9rVhM3|h73zLOdK+7!7hgS z!pk8_6>5KnJx)gi*p!;K12Jk#!XCfK4cgJ~mCK9ePip%~|j#5F%7M zyb~7$pOiX^7WS=eJAwu3Tj4x=qe^?A~Xn{TVHFFc+U7s9#7szGtnA3{Mf z7nm;t_e(a~na9x6!*M~cPI3C$Bsi7*a z2WGOV?@O;pF^Zu@CWuBr&n%b_E#ii$UjV;@R812D$wKN!^y?dhiCFnGQn$LrZUO}n z{20}ro3gDh>X0E|;0=3dg}T;EVvBDrX3FOo;PoBzL}ID)*^(l0y3TN5i?SiR=)8$mX)l{ zs@s1%A0Z12w{H%pISwLoy75SSC_4!uyn9%OSSQ6!IrQ5&T*0#j^8P;6_q zhVlc%&v+|-Li((hg}_TWs9{y=zFXg!R@!f9h20H*s$PZ`_BvWimg9vkt;evcj41>+mQjCn5OT^x@6q5DciG)AQWHs)y` zcyVpbzP<%_zLGMsRU=)z958$W*KAP>&r7!MuGH;{hW|gf-eSs z>rS5mbJ`un9eQI(e+Ev2( z5SQFIPFJzV(aKu16vR8mJo?qeMCp3Lc{tsDAbrib%g!2NQz*4rE6VsM@BQTgj!&;U zN0I%{y&J`e^ujvaR3Y?gYf+&c(Z>To8B|KM!8h^6V5-jk+?>!P`07Qf0U_3lL6m8C2v zVCc8G+8ZOCPa;rQemLtxJU*Vt@uNDwB!IeLBCZf6QC;C9q;iubF$||+&&4IoV|dcF zPOF1^Ruw0g|7W1Z*90Ol$OU6l_aNMvh+FA?5inmR%jm-guxp)#8VJX2!s31TqTd-tlrM9dWTLo%QcRkCzpjm#{HJ~|$~V&{SZA;3Ro>*Xzegmaw+Wj>qjSpe zQHHKIhqnv7$;TzIEH;t+SKq0dL3&IsD0@%dJ4BQr+uphP@UMXI^gDbKuz=VDXTw;ubRI5~0TExla)eUed)wX-gLQs0YbXrUuei9aM4 zH5B>ojVr5&$Gh|=q8&~%th}61_r57~?T0o#b}XQhZQk;5DV8~7Hf zW~@Z`yV`{s@U0R>e)t(MfbRs!Q@1LGxDp1@Hwc^rzr`Z&7-q}T2(kJ@f#02i2r{zv zB?;qy$Um)j2)yog4ZWEqV7@GxQv@6G3jy5uO0E{N`r?nXe6DX%BWZ7RFIGQ%I|~MC zFRnsQwC5{l+)m2bP}T}YBe2=$M|mvz@!7{y9J?aq0s3s)|N9&P@HFrL1n>m(;{rS_ z`nds~mQp%wn1Ox#*{D82F;8c{f(L18>;Ag(-wFn!>256AMx_G$g$oa&>0Zpj-jgxN z3Xy)%L7NWyCC8B!GRAPS63Pw-Bx8^lD*U3uHXRNMbP~mB%$KgMw$S`w$aC~%XmQQy zMsy{cV^o-_fQazBVq*U${ma#tto{+#Dp^pg{X3m(M17uqI0)!OUZ5YNL0`fRLXz~? z|AupPAGF2?l%d1@@}Vg@pH;2_M6BI1ZwDgM?fNq^>kNGmVsg!7WwM$qyZ+@gq4rWA z%$|HRS@{2fF{;dirf~@h|0M*m=0HUJT`{TV|5tJch{y}7B5r7Af)3YdI4IqTyhwlW z{|A|qtxrpfi!dDI@AN++<%WaeoO1H@Y3XqPM`W&kF)c1=&xMDU6qi}(`JtjZ*z0f7;sE0;%%#EX)dKQ@8sy=dOb5sI$n6;hq@i*Gv`V8 zON)EMv8`#viqH47MFwN7ccxikVx3NRDCki!#N?33PKx?B3+>l3*8AIEd+*}N8H(Ct z%dGbyla4+}W$#~YUI+hJdVm|f-m$ztwn=oH3wiN8-|mCFtDjy7;XfH24qRgJkyV*M zUg7YOotxZ_@V{biVwlEa%I&muVAc#ki7&~M{`Jquwi?5m^B1UwmCWw=rK)_bbS(Og zZ`EdhV-vV`-Z8v(AZYU@PhfFlpZRyFXz@ILq^#}daDS1V+KjEekgvx>{-hM<>SJe4 zZ5#GJvjH~jpj2_e?+HP zb9BJHo$$)%@;8m-=bsYS#5Jh?<6PyNs5#qjc$)7si%$kM+>i^jcYYFX$b>P!C&ArO z%Zz%39Ka+_0??RDLG5R(hIY^PK|km)`c4w?_17XdDIXsB-Lw6sp@Q8+Mqe9{3PE$zV!ykir@1n%1A@d!0s-2|o zb3O}gM#1y#2qj))Q$G<9(`q86p;w}q$iP{Jp^&n4b@d}!c}2X}6mHY30_4LBspRXs zu4O_fGUj?}1lIe&`zn{d?+rKU)8Eg`hF7vB2F@8pSFG#sM=*9q5}ObwhcvTvuO#KP z83o}~qa1evY+jXK@Kk*~w{5B$^N4fxl6Pe62&L+=!tZhqUIF z!Sr~mkxfIPzR|1F@LKsg68`#iWTeb_zi!c#uj0s2b%VcKJa)lN=2m-6X|79~Ln`xp zw{*?5sMJo5LEU7mB!NH6d?Q3ms)@^*IQkE4i3emMHryGJ!6-X?-pYq?ZYV$1w3 z+=8^*Id?aBR~lM1WfoscEax^qsH8AFUqy^b z9yQ!06Y2F^3ISI4EXj?CP_uHQi*$fmx-}}W-oZQPFgo!dpUZL}um$zy8!9s%Z z80hh zYR#W|p?iVfDTfY-UixH-Z(D`;>2d}w`^4x+2HXN95ZG6pGZ%6g4yhWig2bB!+}e0~em^b$ zbvou^beY_{rNT)=t6;jBWjjDqgLhOb%Y-s+m!$ZUZPFs%kjVONwIe{<;!8x1QW}+6 z^$g7vkK4keO}rJ6=R4a&s)SkgNG%nLZzE&K=^CPTL>kui;>kPGI87hkQJpMXFp0CN zt`X56P>z|Wt&L~I3(k^0m89eB0UL}6KjyTXt;G``crTJXT)YNU*#%5F&WB`Wg#I_E z@Rt*z(2=RvERhk#t}*ZY1t9{P5`i)$BVRpv16b;8Ux2?UAiRvQ)hG>?uj>- zoFUPMW!@~bgdpK3<|f@SsnGD5OVzC{7f;}yPB|LF0%o5FBZBiKT1UqxK{*;kI^Z?nT!$n5oS=_$f3O8v+hcVL70};E>&y zC9DRQ3x&nkxE}GZ8iyugek*zh|FOLS)fb-yQh5Q@m&gUFz#>J5sN@!=I$Yb@3zlLS z5tnp^=+^q|5~h0OkKT?~z^nus+mXt1Hi_mQn~mOQ$P~Jht7{$pxtZl1=6>7w)T(?hmSB_1Ay507>u^r=^3C>^(}AzU3vxVZP1?S+6Z)E;1S`K5oX*CQX! z2Lx87=;HNbN?u^^w20&{)?;`Zp(du9Fd^sC3C@0Z(V39&AcSuSF+%E9BitB8AA+xC zU~AuVO}>-6-H<}+U2wEOk3;KH%2lssV++t$`2}3z2+*GUF~ywz%!w7{I?X`Z;t&}= zY}w#4&#@g8M`V@3CxwnJ3BWnBFSDk$XO1JN*?g_la9Z?E(wC9Np&syH>6@t9Q5=C_ zE;?*QWq7p6+X)$|r$|w=qK+PK0P_DfI@AA3S)f9*`$@Mseo7o3@{3R{R5UOokrkCF zDCmkbb@E24>#*l@HFTNC`)x7_&lhiu11$07&PHLV=r=QC#7wE*oe56-!I57`RjfwLm`)jEj#$Y+Zf>RM7^la|fOLb_ zmgc6wyq=*T;P)@X&J($wMmrVGl!`O8V07oLsPc~*l)E8%zbRAHeSy+Nn!BF}>4HAf z2~Q1Y07>PNkGZX84C<5%%u(7QVOOPQ&zMXq|859=7JKf%TZKj18tKF-hj?A^drK2} zx6OVRXAL6(jWgE4JJG>A#=$#5#OCiQ>W#Q9!D`gpzh>g#hV7q9iE$7m8^n85(?6PR z-(#rMWXG^VfY} zwNPz_rGx$KpwTO$bR6yah$w%_Q7drWv3B2hF1Eahu3SJlrc=y$J=PRNePV_i(5)_f zzUES#cHu7+*LtDp3I5o-e9aO>Zqmo-N!$4VC&poCUT?Pn_!kVC7p*vYlCX}dTw zlr$hATcw*{_NWsdB=`;2TUWWZTKA8qj`oPS@Jiz0NOvZQjmsQBfKz};x0A6R3}nrx zp7w!HI*aH52g*C&kol(&jBvP`pmDJCl)EX+>cPUJrXXy@?%s9y>qund@}oK^FNrl7 zqQJZCEHvi7{|F@>9Q-9vT3cG%@>FaGpFeL?g;PJk$}Tpt3?@c)*$Kfwg~9{@-vue= zizfC<{Al{3`**Ukzht4M<>I;^<6C0m1Ulesb75j^rMqG|0h-0eO2{gPEuds02w8~^ z1^{6HmYQHos0I$pUPo#OUDV)aVm3z0UCJvZb{2%3IIc2!6cCn|JO{fKgzVi**2h&C z*-#&bn|KaAk4R`h&w$M2kyvM_ZC_A}c!|$HO2pj;3AdMI_8DRc!)gX$b}aE)kHRQXI?aqc#aF$Ds#; ztL{58B@YwQ$3NAkC!x4^uTwnAtF);wZPj&Rj3=7Ac;0Rq8TFiqZYHf;uZD}#`|*}( zak?yw0Q-z+rQko+0SQuXR67)GfE84HINas8#oU?C(t1%XO&;tFw04Uz0I{iGW9ZACeiMmmITiwafW&#PH0 z&FcCg6uv1J_QkqPNM%I5A~JY_oM|YC{*S#-;g$yl4N>3y$qcN=kd1HI1-HHj#|ex2 zUwxV%+p%5`48-L1cW@oA9!#Fc7;l73FTJZ)Zc`f>(mhoN(^)^wJ04D8b)R&yTQfb( z-*GWu{#?LyOeVCuMq&;!Urx`>`4r20@17p1BFh6$s@viP)Kr_>-<5Aa4c`4#1#iO8 z6(b|+MimasCDd9LAE0Jk%t4($V%GcS{9|SBDlut%H}k1C+f3n(!VlF0F2U!08tVw$ zk9JLE2XwP8Ul{7rz4Sftlxs?u|8k6&{$M>z|EIdZ3;L|jZrOWQ01tGw!K)8(Ag4#z z@=}IX^FA%usk$ezToKr;?UR6caCgiXKdRV3hX8)CR%BY7Q}q|ddcWW)aKUW%@4gVo z1&~-)ti;(OGlyW%sVcCvlfWy67`Tu{vN*VqYzX8MNFmXHBT$kCEG-!$jWdlL&8;yd z#$Jp8Byt|)-_D>sBmWp52!LSxLtQZ7daIm+EuYBw{EO6;Gfr zgvqe}(bAZ_DX;Vpsn`&(p`PKxn$(!QKPsK1X18xtssXQ zi;`?F(OQTSc!7&|GSE3CT`sU8}PUB)Yr{iR@bK`@Ko(?YZp0 zhB#ean3I;zSHO}P06!NTAw3b8#G7}bW(ux&9OSX+j8!KvRt4pZs5cTIQgOXYqOS2OGax}EPYwyOhdqX z?o-dkcNRg$JMJs@1B`)l8r$I3!K5oQmC(NZ(r2F!*MaT-$%f6E$*Bgut;7Bg;TO)n z>ut=4UxpGVGhRc2b^6%fmvIu^9(-AmlC_aL@ujL4d0UHJ-W46LGByV2)KiI8_r1Re zKyU2%tq?+y^4)2^>6dysv?5R*+45SO!L&z5NLEq^F<1W^&-15*_d8M(0tXls`%_*_ z+R$w(WBsptXc67Tj`+O05ikT`GVVlsq0^E_0j_0v&d zxY48+XTU9YrSDzA^^(g{Vln7C+kwkEm;wSYsv489qcA;-%w1RF+m#54n$Zx%n-7b) zo3w1cwt?G2bW-%1pK`zQbYC(?JFJv4O7JvlAWHDK^gUA&k^V-HIxRcZ9(F!SN0H<~ z(fk6`MUR4PP?$Rkb@&cD2o(APFIuPidnz?fiG}CIa`KwdbD#4SA;DR0%y$m;SHkj47qYSZw;0BBd zSKR-SMLQrRzC|o{CL0vzs2fr#K(pj>Hbv9B;cHyb7mH93nXS^IM~Onu6#Mg)W{1)* z{$;x}Tp*u=Bxl~nKgT)NR+m%M`>)pc%JPF@Gg<6InXV+)kLGmuW3?8|QlRU^Lk zv!zBq!NCAy5~@c|eW!tScPvazfu2@5ihnG;y@^Z%vMH+a$Bg(-H5h`3I@4*-e;N}}V_Xgt z#MoS9YWri&h0S^wULvy00y}F={0e2;Mx+AS@4~k1dtIWF@<`Rqwip|6Yw8X4zZc*? zE73tSVhJ^Z+H6h~RPC|oKh~w|X5#`9jF-w*Tv+P_niXF$zwKN`cClCrd;^@blW?l} z0b+gF;vb~WA9_ZXsM^^UBhvfK#>7MIk&yFf6R6s!RNs2;>mK@z5uIpMzI6$7vuXdt zk^ zF+!(A5XL4C8af$zR8NI@!BITiKsE%7J^&fd;g(hfJ!+d$D=_a*d$(3=bexW?evnLl|($s6)@kjd7!l@gl5j9sy<5$szDsMqr;3Pi``h|?KF*~j_NnJS? zYOd@}w~mt^Y!zN)6<(NW-e#wMRQn3^H<`E5MtX+Fy_~lrw+i`5<`aa|n5y!1g;}TL6m*b`on$lQ-H53vtDEUp@l7N)AL3q#6WmFv9e2!L=QhEF)cR)EtBKV zD{Na*`vqK5Ph~=It*nKH4>qs^Vb}Zf8r(K(So4x&$IvegNaOb;m@ z=2$xTCTzscLN9)dH{!do0*5_JKKHTL9c+*kO3oIo+Gg%JI$1ssJ@QTVGX`WtWKZ`IbF?P%#j%!7QEU8G@GfsG;w8}(uNaKSL=*N+?e^Pz#nTg!qW#B%k&CHsf?)#|l0#DnO^ofp#S3d?Mi63GBjt zjw2}ucpd2_zL4s!ROy{|?!zYZC1B$UyfUXaY=b5rAYwC6PX;}ZBvnp&G1m}Lxasu*76)(deg(2~-;=jV!k~n}tB2^X3_Rd9Bh4*BK@qeC2o%rvAax z2iR6TB0r`l0ET|SdFtE&OlK$r<66HzY`~FT$1K}(mc8luqczvWb<)A+FQZL)BTaS#uByA@*)Sol7T4 zK}epVl<$i8u!3>tU__7l7x45H$C$rkfD43C9!NUb?K9(kd>Q_)AXXoY{tN}cjL>yv zyyvgd$e-K{7TC5YhWa7A@zpZk6GwG}1_<4NHGz1nHVAfMpO|O%am3$gpF3ai|78Sx z(7hOt z!>i0JX17bwyb=sCBY<*L+q*0?yX5->7Ca%@7G-=LxGKp9?# z+5H_b{{q{2(#7wJYV2@0vw;Utr3)BKN=lUsFtx`tm#gS$EAbazMzED&YDpoWTcT%J_ndI9oS$1fS4yW<%h8q zVBRk;1tj`_X)vsm#^wyxeSieX1@X>Gj*Kl>AXLASuEt!qau(MDgpQ8o7>K_Po1n+i3BYe7;$Z&y#l(Xi&~ z5gEA(@$Xxd1-gXDOBoBer8n&cZgFS4Qryc{)o*1R_eRjWRRLGrqK`jR-neKxh+FQ+ zTN1WjnYG{4Cg4W<&+Cj2Cswyfhn~92Oackc0@g34)dI3+tk23WUXr$*2O!iV%wo5% z7YQf^_Sg8ZD&Y}*q_#_-7rmXdw5yRh%3%_n2BALv4hkZ4z<&iB%dKrTt&ni~PGTcA zmg`63`9RD=GEYSi*B@TR5dxDBIzU(DI7H^;biWhka|XiXld~;IU|NYhI5X;Ahb;MJ zn|z*vBT%`-(Hn;*`(v&V)lQ7LzsXW7-y<;XlV(7$7vudbOjc3D&SClnmTxfW{+va2 z+C8oukg@?WzU%{eNNc_0#@{$Rxapz-I{Ne}wx(NnEOVNs}t6e4)ZpMH%fUBci+g!-@Ff+Ap$%@2l1MEI1Dzea(tVCIHtb0DY55T~w zq=L&?>0K(Mj_^T2lc>r7#M@n!zvSr!<}}HG$Za~aw`2qu&mUjE-91kg62*NXCfTU< z;th8hPetFuPjNDr!+x-6(^TU9Ouaerj+f8Nahm@QmCwsX{Z*l4>|uR0%96;T5F$!- z9^+|S7>21kcBCM#E?%FWxAiOc);mgjY+ahmw6WJ9lWElBmG3mOl*P2FfTExqy*M`^ z8;O1_y&&4Q`fy5P(SmXBpkJe_Wh}8-3!H12bUBfw>&U&m{0>3w0R_vz($uQP7{1}x zEo^Qpr+i`?`2HnJrWU9CQ+(MDWWmGS)t(OD`f!&NP;|p3whTSR8Cwqub1u{_+LvA; zZ-;du74aVZ8_<9{c}-zC-z7Rg#F-Mn{LOZ5)G=NM61fsGF`Kq^2dCDU#p(<31$?T! zH?$L`&I#rYS8X;#Kde<`zz%b@vVkHrf#mKaR5S2o$Fn`-vcl37DHFaKXhX&$T1i7_ zS5mW?6|+3#kHAyMIG5wLpQW#YQx56;*`g6*pe%oDbN#lKMGMGQe!>NwX*Vor(M4lC z%25Z8$3CXs2_=_|kSqhQ1`f&k-=n2FHMUNZRF9;5vUm!6dkcN7z-fBToCX`@y=jlg z=r@_>icz)_Qg0&`cqdhz@3Jw+!>027E7~~ftew@7BjYwbv>7||wHu$B4uFcV&CQG} zk?G`f#3OiDEJ?|{-@y03I)$c)<3;uEps^*Z9oZ~m0@URAXTp9a6BFXgI=%|Mv!(!7f9)(6pk&C*;HVj zVF<**MH_q`VEKB=Xt$aaaX+Ho>DHkDt$J*R-yoF89A=z+G945;KygJ%Gy08#cy+9b8N?`2S?H4!W*!)7lf`rc2PC;}k&X``Uba^k8!ddmkDvcW#nQ=U zDi|;@Agv>$1oVDReFv(e5&`L45|bziLE`=;W0HY?-584po9^u*aIDsMuk*(OC6Ht)WE{KT(I&tDg87q(1hD-2vo$}o(*Wc(F>E9 ze|9dmn=4(bHTS))Qe)!S(i>BZDL^aaruZ9AT6ew3wfvf(-89 zz3WDVz)P$2@8A`p6GnvmtT8oJ3(J$8y{rx7@9Mou?db7%7S@x`7~BtEe)4DN&Ag%~ zpOvNMxIJTI?xfo>GTNDFD#U;;!%SjIeCurE!a~liy(@XZsJ}M#ee28l1n+}_3tqu< zcS8RLS|fxB8Y=I{vJN-*^QB4c^!b z5(ucH^-XDDNo%PR88kbnzvw*;_vLRPCuuQ%?(#X-8qJAbie%=(RyL^QxgI1MPmeV( z{q^NYSFQBrykrizkUj)d{}UwqSjn44Co2vZv>w-$>qcx7Y~Cv`FlgIsZ?_)T|10~> z4jfyOmwnp27fEGLj=RwkO$MQh_g88eY0>Y*&{LddyeZoWHR+&<4`(1v{+&2z@&}gK z0*GPv=B)#L1{o66Id^0FUt$NTp#rSdXq<7Cc~W0KpN2%ew?g%h7Tdvq)n8K9vt+E> z6?q>^^FRuBkC_ifJM@6QF)u~bi7Z{3zhzjJ#!XZb=ioT;qX+NH9xQ7xu*8=wUjaIT z+=AX1iB1i?hvmOV*F>PYxzE9xLx}8ZPJ~a|x&y3SA;Ot@Ng0HXc83WbfQ!mfh8p|4 zE37j`WiPA~ZS(~!*cfyK{*QQ8USiKx&ig5g6Es@ja~gg=EENVepijFsgeyAO)bEuS ztGhc~Rq|5O!}q{%r`F}fv8J_t>a@8^|yH#*XXby3rnW7^8| zfd=gJ@g=@BnV{z1n$!P^`;dYzdya?H(Li6s9?tv$6g;N&m{+|k$KTJGL;UUdv?6ty ztGD-S=mic0)X^Fu?D7()D#9ftug~Ts^K<22=liG~O4g;A^7NQVa_b_8&YqQE-eS0O z^0wfVf7!vJrf|Il-Zfl*dNx8J2@u}ALwLWPKrrRGTfF$R@|g%U2me3EIxGPblpFpiFq(tOIMCnda85NTE?H~I1_Iq&2k0UbXG#Ei$| zd4z$$z`PEqQR>;U+eZ8JV=0hWDuCF(x42*M`1#0{O-|5)>x^YT5T(sO$mfzOs74%b zyn_K(?+U9Qv=iBv{74vA!{ZOU#sW1*;3M5dZHS1JhfIa?PfWL4_KN|+_N99pro}S-~G~)2P!U%c>9zI4|Kux zDQOsH+xV$lg98sXE~82B5)ubq@#AuC?EzaRb93>NOsUEFHzOI&6P23z-gxz%F4T<` zhgC_)&`%}7dH)C|CjamnQ?a7(BBsPy@jSpsh>w^1Nlk#;Zgiubf!&htmz>9_)%w?m zq!&e#bV=IIX>%ZxI7LN8r7pFmLrgd9^hJ{(UlzBfCXYR>n;{_!7Rg>hnam za$_N=uM=db6St7K6M5_KdbU|;)@V6YjoHzFB~U}Mrjy|PO;$(^b<^g#*&9yqxtsoG zjsB)UlSr2+dZQmlA zL1{>y%`jab&u&BrL)j#Q0qx74t?ZgM>cTmRuG+X&#HYkN{<3LhrXkBC6RzDBY`*cr z^r`-P%^a2rF(aM0&$|&~pAzW!IW4T!8ribOM~kjAoo<01D=AKS>?V8nQriopnLe-F z$J|+-4}1J#lX+F?gI``ZlZ4*>CRv)fw*?)!oCcS$*=Mz<#YD5sMgK&|Xz{$S&LgRu z?@&Pyc`hjM(wL0uISO;zPj%Z5cC%Fc<1GK@I?!!D%59(Sa-4lDW51W5<(KPOsH-8y z`5%h4*pfEFhUc7+0C9kut5wfNLenpQgdL{}_4KZl*y3P+6m2}}pIxQ>-futJp$0#Z z!x>E=f7RzOG~L??OaaDkl?TQQ40-D|uKx%YY|4r~-DdN4 z`TBV))AUPvq;~Y{cgA@$Va)K`Mdj|hOEVcl9=dVi@-A-(9P8>Vk2Hc#0)Zvv*2vYM zQ|)v|Jnxn)#{vTN=jM5QA*)sFBBFZfhAbyyMeVfLUWR!oiaMF&mCzm-Eh|BN_8P z64;^gt{$NXl}D!QVo+C-4!NUEaj{-k zdx8Ec4(g{~lzq#ohkr#knv#<7sF3Mhx|-m-aqx&N{1g!wkBuub&x?xSdDJCa4>xbB z%Be5*q-PI?T}SnrFDTbmf6biu+??t1JW&2P11-s16DeuOM5_8( z(_m#H(b2{c!Pf$GCedOFfRnNiYe#Bb8Hw-GF%}L$YSu6|EyKl{XwD71T-3NkN^c~NGJ>d3;+(i zPYT$risy8L0swdj0sm@J1J?UV4F;t_smv&VxyxtQ$Wgm`I-QTH)1JLmaMjGKa&_uL z$<>RS=#kF3-sM4|%!`y(f&c2&!oljS&P${!f1;Q0v?|R8NAZEiNAV3=DbM=h#$dG7 zN-Jm3)5s&JP<}?@ItHXxD{a_0_=gi8O2Bhb;@G7?wrHEe^i>St;E)=!yh(J)--?U9WV$c8C&OfxvC0t>i7~=Cc!6T^Tb zhpK3lW{FGd0##a1(VU#Og49i=tAgHg$0(O+$v_@SG&Q;hb#R7R7?v$I(X9lATlc-j zp?Ymyvo()7>S95BcW}U@)7HnB|%6E zm+Bl;4@Cx&ve7N%-7FRNcQtZc(+W=r#cw`Oot~sGWHF9eX+X6USv34$Nxjwf-E<~A zR$^?-#j=aYMYfOxBCAPk_x|eq9&PpLwBzBy=ILUp-)E)}7rrsJO8z0AWHzwOnoE7MKVxO}#+cC>t0T8E1b;z&n2e_3 z#jl_71;d=)H$(yML*IiVc-Goq`weLdOpsAhgothuJ9_Y5XP|Brx&@d(<$!27Amf@`n621j?)ot4|5|tx(v7 zNmYa&_3i3sEUTDv{YWiCrcx)VrLXX3U#w5^AI-QvXdvm6V+d200Nk5oI(={_odVm<+U4B@Y0A2IzlTV?F&o z4U6>sG%TkdE{N%O8zIop!1J*5Iy$Nnvs$!i`C#HJPrk~Ez16{w?2;T8C5I?tI&s=* z3|Jq0@z5R$SYiHvIp8fp z@)PL%JfNL0LXMCUdNvl`X@-)9(q@K>giMZi)bwK-NnV^ZQKgx=#PCfCoa}7Q*B=aE z;X}4b@t{icJ(Ukfw9MY|`Mg)zMFuuRS`r#`LYGG)1w|O0ALc8@TKOHihx$h*7dt-R z+F7C<9NvwjFwwwO9q)^fnmw$&4mR>F!e5`c75Qi?`IMkiputJysxm62KLoSB`JH^z z0DhMzV*;`Bi#gBK7V}Div=?7`MmF_6W=Mq_zm-MFjO%c#(+Q4VTte*4pmd_z(k4Yz z^VXDQ+42T*n&K-sX_Tgj zdP@E!Pgh(48?vR00~WO9{oUY6fDjt? zpVPboSZH%N7(wg1hATZv%%C?W27w%(knrUO2&3IxF^ajgd~`{wX8*?7XGnnzkD2s_MYS64T~%nJ@&)a~ zM25Wz%-yI{89M@k6ZNkv@xFa}J_lMIY`Z7P1>@#$URy&^awgSDFwohE$#zLHGM30unIsGMk+*jP*D@N3 zpkrY)^hsF&iKG{lI(hUJ4kUZgIB}tvqqJ=3XJ^YWY&mAuhTzzXZ1r4Pk6cEb`g02X zwMaOrR}=8rqqGoY>%Q`4+`CZ7ZK+Chf=cuDLAdf#RO+a>Q#Jeh5~KTxK~lmf?U}a7 zPCn{cEjpF-RLsH4Y;`0wZXAnbjSq=hYIrfv5RM+_YUQZlEkg}H6{L|9+^!uDmV?Vy z&2~`n@hru|vp8-HITjUx3CnutqSy2_BGG>lbxhI=Y%(szAAsy(L zB>w3>Ox!{(S5V9Nqn*x7*aqeSxs)6%0+m{f%zRlfTrF45tY$dk`l;3ZAb<>T(Z5^Y zaBOUi6~G(Qkj<*8mC&sr&{c>DF((EK z62#@7Xp*RP1kG)5d_tHVYvQ1r78mOEY@=5&z30bp?CD)h8754>GlytkczS zRX6sY-}2b9Rn!RF+yWrKCID0mkpVTVdVOS%1B^ zkx8s`bDg7Gf8Cl|OSe~uNId8(X&)V*49n{c?XpGHw$M${`XnP1DpaUk;#i>tX>aEt zD{;Pr7B)Xx11JAn-m+oaNUAzL=5d!Bl^nqw>1uA9-zbFBkycbdTc`a_k`_I13Nl#U z-R{(81IoEV3$U$}^vy$tfOVHOo|c!2Mp4qUO&)GPcSrddVLj16;M}`jjEl$=q70qr z;Pt}yl74;svLuXjN!}>tZ5#n%3Sq3X*|1APVohZYU4~a5ncG6j_mt+pX4(d$zvQ_B zoKm2Da}>`U>aR?e4t`tYb*v#&4~ejdd`YTF$*4r_vM~6{i>o{W(qkaZ zrf6?MW^k<4gG`=8>`7Jc2V{@-X~L8wQY6l4+#QKX&Up_$R9-0CQdwFwQO{zGMD-c6 zsp&8}_U5l`EZPyATN9W=afG$YQ&QWI!Z`fR%EEok^1N6_XHEOB^pCc2)QywQ&^Fl} z?NkLaMbV7RK-XNDPhZTF@2aZe2n$8>os&$iJo#0p-%qowcd zC;ktbCCW(_eCtvASF=$yU6x<&WH2-Vz+czgrFiNN+_%f$3cL|84y*U7^z~^gIMaTX zpdDG{ncpz(cL^EA23aGsi_R%k#9G6FlP8=z19U$dg9TTe8SCS<&YdeUi^>yzFh?lFPvOydMKL18o z)eU12x+E|=qmV1Qa-&l85o5Bek-zNbhxkFDi$dp8xO_2^X=!$KLJSY3T8lH~M6gKP zGvhV!;|ziUm8anh)o)bN$2PWm=m^y z&^46Es>~hZH%hxwy=lrVMhM}e9?s;Jd-47ip*CT>bjT5-2@4P8rzss1LDcoKGKbZJ zqm3e!YQZ!@@?3knkS_zw{?QA(Jlkql#;sM_zC%yss|{-LAF{^gouXREQmH7FC=&VDt?+$k){*1*z3U?oXq_}Z72 z3?)^Hs;_g_2vQm`0B16rjl>suq=LQgTfj>KsA)u&nC^Dbas6`flFVWWy|ZAtnpwR4 za##zgI$vwzmO)nguBZhFe~h=Ws@n}TAFKlvx@)-7twqX6i^y(!2xYjoC!VW34k)te z!g|spj}h0!T0z<$!nIDOlG-cWa#b$OAh;o3viz0hT^E(U%iW^wln zs4-TxdBd${JOrF6Fm80%W*Zesagh%kjjzJyM4=xH>L3^_X_O6NC_G?w^(?C%E*mfMq;|izU5a1LjoskAlIc59^K}^??HKrfN zGJ=Y>0CgT+Cfo!qMBUPX-ZS9YKKBnTpVyz>0aw>(-6?p%4I7$ z)(ZG+B9wh&I`2Lk5%VmnE39Onmx_sddsXygO6%yk1$OnC1P0t%u{dxjzuYxMsd|R+ zLz7T}s`)8??ZBsg5R&+7k0JB0M3}W9uV$-SVs`&LrPPVt=q7P7ru1P(wq}hyeD>-* z{W160=%;gj!Ov{#y>dcAIBvjA?q6sBBYceJN(X-8ngSn1{N5Pb*}t+hw!3SF(^P?= zL1vVj(663fuJ}4TV+YivP=MI*W-^laXu1hsr5LWzxOOB1&UWJ$OS*9k47ZvMlH7a2 zp9R^8t=WZ^I8||y>A(oUh7ebY$~GvH+K;ZD($pKmC8KNlkVeDbhg9D?Qzyl3H+SSH zktGBmt;X05HhW$-`+`G=z){>>jCTXJXoTI24$4}bz+|eYyDCNivuRO4J zR~^kwlONQ+kWPv;p%C;SRKmFwI$GPV^`IQ+8a+yUac&*eUfb@su8?&y;1y4WZc9Z> z$J}Fr!==ie{UFf?aQR{(tnP&p9hV;f#=C8pBde}+iik_gl}@?})?S`dUHGjcZT?f1 zPXY}{SW-|99PGZu!mO@&kA3!Evr3FGM|L^OgMZeRY!}-Lux|*o@o*WV%iPxYhuL_OVC8^Q7MwinPZ97{nEL_DhOk>Icc#N2l->Jsl2z- zr|AJ+DI7<}y!k<6sbqWTJkAfjF-5+E6JFIXyL&uB%;!CmgS~CL-vvd8OEm$#Qrjv3 zWAAJ|EGCaFuHmW+sEi>(Krv;Q2GN2O752_nhWnYONUjeo{LY=!heoNcu$?7vWZ!eY zA|EKb(v#NDt&>nUoEA9!I@@P;lJbe0*#D!L!xMh%5lNviKA80FGSkebt^hose5AFU zHqGg=B!L23|6&9ll}-dO7GrkoBY}T+J0k5#F#hA)Pf&Vl*DofMlR^l6UT zC|X_FvH!Smc!8cbrUR&6%0y3p2wc9W$DgE zHtWcFaAxv$y5fg(A_Oox9=N_UmU37#1|GPsuL#5^&n?|CSNADS&ptr%>^1j=c*MEY zu*fL%EGg!s3M~V( zmyOmJFE4g#qlyoVYn=dtJR#2Z&=7dALNw!G42k6-xgFzxX@_fhb8ofT4cI*(20zG>F>%IW@pzFc=G-pg+;g1n_G;*XJA`?_P6>O? zg~y|4>YlI&c&HqX5jnfu15sBiM@MxeVr5$VZ*e5~Qvz{LMKK{X>2<5^l2X!=e`3c(h7ZOeHzj z+;Xy*pTCH&8mGWY~y7M$dS9rVBC93fyg+oI^{ncR0_g4cy-*z4#i*zIS zb_;`VJ^A6H+xHD?3~FM=5Icpu5pi~XKjMcV zqRc^7p}Goba4`Wh86AF#aqU`6VBE00Y~8!e9(T!`h5r&Mf_|v#f!~rLw&|BW*9nGt zp+e4$DGYc9-f;av#=2NYIk{(nZQ<&ej|%-1DXwvvJ-&_?hQeos^RJ9c1-@eLIDd=Z zmz!-4JkW(LVUjD|rC)M?{+gRl>BY@fs5>#QRcd{YWsv`IZ1qT2?_5BK1gLAySv8}SPz5QL*XZmUX38R6T z)s}|*8;a++w=dbpjf&AmP)2ZGBM6B`iM|}MaVn-Sx&~!ftgTyBXBS(*1+!@vRMRPI ztE#EWzhqZDK@k%&2q)o!+aZ19OCY-PB|vYFNEnU?3cB$%tUQ+=fzQRIj;cd#;`+`u zWq!5ku!8FDX`R6CW!-75z_CmAP#Ps|gapzKU>Pq41ySp3Hr4Y|c@>KMS2nUkh$(_AA_rMmUxy;xcoGM~IPXilfjj zv1R-GVJ5sjGTZ?ZCZ@O!Sk#1j?!~ zsJ2-v4l)u7E!$jzLjE`}|%@8aqh!n6^XX^Eom+`J`B&@M?|6AS^Mj1R+o5bAQHq zit_sjoV63d154*gi_mS3dArHX{B>WlO_`xwh1zZG+6FWs$q*}SF0!VfA(jKyof@on zl(a6Wr+Ng4LLuB&TY*t+W>vQOxZ~uV@sg%dW{4wikDh9GBIGJI=N+d6g{@g@lJzRy1$b#hV)0vV2qV%DnyMar>h_7R_*s@f?I?6%N>UJ)o?osRz#C zOC<_;WZn_OxQ{N3v5_`YSP`I*vk+u0vx-atloF4hp$J!|C~!E54I(sS_diN|pcZ{G zNw2D9hi?Z}LomFbO9mS;9_ZNb{pKp;+y`5aF}A~y-0`7&>5C`L*A)`r0fe;%64%Z~ za7H9BuGws5>87XOUK-i*Q<&MNi5HG|75c+1L#daEIEr_`jZag8=E$$dkhv&e+RuAF z_g8ejWy>4lm?nDMnqo+I!G`UQZ8PH6E{d71hD|s)-G3=8`k^*-@0DPIf}(wdWNHw2 zcIB_*<7l>5v>V8aDu>S3q$y6%h3w2q6W2Ed?XLgxAA5D>ZsND zsbK?ktDQ?j4ly0hXOou@a7Zm*h(hnz*LxE+pcRH^DXB_8oyu&|^Lz^zs2LuSqb>7StkcTZ=cP>XZV$E!1Z0jF zYGyBHkaZC~52fa(qdkr{lX&+=1-6oJ1`S0|y&bRndSW*PqmFaK_6;j^8xs}^Qmzc4 z4?S)&AC@V2AacZhBBm%A#k_#{7AE{6dv|vVM)2D$=QnxkiZ=&Lm{TU){5VSI&tvlE zW+7(*a>wpaR~bI?saKdN$`@jD91u$GScCJ7xJnL__{Cmm|Z=lYA&`jR@S(mJ@ zAi=>~g0u35tU6>xPK7<2H4VPRekK4h#mA5d;|oaKYnVmY;**>9tA`#?RiFo%+ofK! zihE&RO!{F710WW@#;KV$8BgjARvjOPXt|f$+Apsv5$XYMFBU+y$lj+ISMqbwm{$&8H@KNMbz$<5uY!aa?M7x$1;7H$t%5;n1Foj=zPNPj#-Du;hI z<^5R>c#uUcPeK2}$`GyBj#LwnN!Qdc@r%#jE6XL`P4U&>}ge>nlCKjM5Uj}p>>u= zceB9GFnwTGW~!D1-$E>>0KwPB$ZO06nGI9V?#?V1_JXbor}B5-c;mac#yiiB7*ZaJ z`y(e6W_j21Idf0XPQK^bI^UKe4rz2dSnU5uX?JOp)kk!o-R?Y&)6K~(RI>1So)_9# z&6O<}FVVe~>wN0H1bSV^YUr&S%iw}Q($UdbZ&VV&trSb~qJWga&6)hWo&^xefOpri z>B3l|?DIwLxWhgAmg}xV{sN>;+sCq_WIC`epE)96MaKMhPZZhrsxVi_Fr`+9ElBtp zuu*0pt)DM%u!rOX+Bqd=`7JGLSh{F>7*DmXL9C)#)|Gj=?U>#R|1Knnm2Yk% zd;G0Jj@^cD{i$Q;%1|#~ooS{L`g*H56Ayhj96Ner&LZ-P?Zs<)3HvheyfsL1W9&~% zbmZO<^tK|7)$rlbP^?-KiL8&!!4f2<61lAhrD zQG{1C@p64fHy+~Z`jZatOw{}Ow}H22v$7MDQ#4F&V}&BvsG!8K1->OuRs*w3=<#SG zm*?$7TkV#0hfzz{C~aWRgMH4WMSa}j2fOLT?!D6=qjyGXtU)2L+KCYM%mPj}htUO9 z*tJwxmA6mGcS;>diD7w(mlsKhH(x;=z)fAl#rwfuT{|M(BEHwXO+uYJM6VlpSAXQ1 zxOp&z(+eL8d&^pV|An4blgW@3KT=^lA?kX?2R z0{6N8`jD?@%k7<7AlvOOw4>v^-jI68ZMRo<(+ zP=CIg*_<#{aaJ2iML28scRHfnA3qfV#p~H{qNUa96i{; zQ$$r&q}vd!HAM+Ykt#vU6T^=v;{iHN?37HKRS!C5Zp%$3{1GVF)|sp=a|NDG?37Mh zRF69TJ>Yd2ED(8usD#hdweRH9w$S9?1HvYVO8LxPhfY3kD^8}CNdW&QVCFh-lC~{1 z`M!(_C_j-{!uR)pXOncmf|A;SlYbs4tsObhn6v;E{NsT5Bt8&SQrmy>&jY2k!zXH! znn2J$4#-XN0C!7j2T%TaptN@ML}$_!xciR-LX)sS;u811lYbs4bssuWoRk0(|Kotv zBo#2J#C_o8SAon&y$xl%i}T|GM9H--N-z^~+;2it-mjeu$k*u9y}5Sn6SBuh5G_yP z>91WAI-+(#<9n+kxNm87zB`7gh*_E!pE_2Qu3w`B6)46NQMNcv01Ca^(g53v zxs)bCP3+Q22zyr~&3F>K8I<=ek(ou|70oE{>RI- zc{TVOINNHId1acw@(HWb{{d{^`^EInsd6F&5M;wKjS$BLuU=1w27Bfn$~)X7_XrH0 zOH}cAjPNZ%9KgNu;T6##DWs;KT~o&pR2>T9R%F5xtqKwI#!jAA$B6D9js6bgXH1I)9sbXGKh)JT3={#s zj?d5doB7zwF@v+FZUU=TU1vx6m8L;H7VHa8ma^NZTgO|qTlQP5+moA-o3fiiO!`|j zNlR!F&D+n&lH(T=?t;%s6^X-@tcGCIEU#1fNsKp%k0EH1_C?(VznSpf9kK%-!XN~L zs(04oip2EFg_vF?cL?wfnFJdRID(D-E~MGWf_V%f`Hy+uBm5%Mq6YX^@iAU?N1yIu z_lioiL%k3h2}d+~G%j=!4!H!!C1geF6zep6kClI~s{3{9Q3%DT z`t#Q0?3r9p_<|BedsDC#a-BLksxW@5+e-*H37Lc^3unL;a;_8j_G}V@t92J}?fpxL zLAh|o``;P;Z&K4Nn45%>zZU=Bc=xF)muYc<{afk$S5loSxlSa1K0iiFv*zk^j;bC{ zLbeH>J_?P%k(3Zqx{1J(l-Fz2+<{hNPARVadppQGb)Pzho|Rw$MK$~7O0Wq8jAD-x7(2rBL-3uR&u}?;eDNPGhTx<$Xp!CIhzZbjlAoZqqF=lOb6eE4|CbH6jc#54z76d6uCCC1IAUTaa1|fM1CG5d0o)uf%7GhZ8>;l}vx@fvj&4&@W?-{U6}Ks&KUvkuAnrzi ze~kRMwNUKur3)Evh9PMoEF8YbCzlkz9joZ|7Ab5ys;$qI@D9moIBYxl68r(eD{tTN zW&G*ivft~g0Y?!#Av*y(K06*eE;|l8Hak|kC*arX40d#OGBHq;|xQiY+B} z3_~u}7x_mj!q|2U6MH>yFSWOx7tVh5K)vMK8vQcc~QkmdoG$k;;l_YL~Gel|}qs^@5?rwPEJNn9e?<$mq6B;3N z35JHFFJaljRtE425|PS>o3uZo=wh5*V}6vKqBa!h5@DYDZIz0)yx%HyM!Y`62Op7x z*2;d0y0YIkbw#{4Bn4lVBiqV;n!38*ap-v`2lobDc-h^zmW7<3JPeyTg;Oxi22Ig3qgWHy=A#gvWB1`Dmq>b`xa8AsC0q03s zL~sPZ8AfGQWI_B5yMHOz%7V$k2JYkh(};f(ER<=HMGXH#0@o$(5c%#7TDgO`!BF-cRAeZnn_(aYYgTQ_6J>uBFmVT#-Pvt}?aaWK z(ge}W{-`P`x)JmX5%zEfBiL~fq;T>js7k*np&e4>aEW&GCESAtfz3we;%)j5e$N8| zamMqk!jIb@7WrF}XtpC21rU%(w8PszTBocL@*s0p-x3igmOEEyX1Qvbt=xYA{&n@D z={68hpWmY!x~Lnx3yR9y0pR}Ic+Gx)(vAhH@J#ImBmUc~72Z9)M)rF$5kH)2RWD(` z&^l9fi+_skF)2Vb;#cpr0)n4YocF7C)4^P>3K;cejLhB+%&Ms>1Lx8XK0 zpgQo|jJnv{g9dxt0>;H-EUNXDMe{=eRw_dH1FOU#h`jip61y!(j@@5eoDX3i1&O))5Mk5enrI3d0c! zyAg`lBNXpPC{jl#ibp7#M<@nIC>BR34%ObhqU)&nU^MfL1wo^e=)bs%uz>!Ht04>Mzql&1 zfd0)o5)hyC@upZlvA$9#qIl30$#ammclO0zvGUnC&D9o$hhx>!p%d19=%E0QUs6I- zuiU&z<{n6OQ((5ec+q$#*Ez7)Kl+Rw{Ldr$%q^aN|NQBTg+u+KudBsIfxQwPXi4(# zDEWygq}})>qBwCY4{3^Is34=eG+C@VO1cqm4ouiPO4xp0?Yj~A3j|^cDjTViWX7iE z-pjwVwA$;SQfB8kTYAqGhwpaKkp{LoHyT-iNpfQW+P#+Nk14Ng)LmJHAx`X?yrZlD z??Owzu@pNZ_RXn!t2u_ZnILzm&A^v0NE@SnbVs z{N3~UJ!#`Nt$so~k6fVb_dDqyMMGE8IoEZZ_rBA+fo3V_C{MbIb-U~b2jYUj8{!-A z-g<#l4gS6-#YwDNb=Fx>Jjk~0@$3#Qcr%kb>O1PzY*9DQHoF%Ka_;7+Svd^pdoFP8 zMt;OL&z1!8t?Su~?d1^GHF54<#ZN9^ty!_qIXo9%+jK&}lx_%HAzao4Fx4Q=GN#-t zI@DYr?YGGvUxo>|oe$oE-7)_9Qv8`XU|#}!!~{I(0u=xUVFWT%umxG$F&Tnvjql!y zlcYdFP=5k|P5$5h3x207-OP;9G7DWV(%~9c7N;RR>HST|oI?NP_Hn&nOSSBJ}! zjBPcZmDgdFt4q;#j2+mn{ZKs2Woku&QW&WK3gw!pxCgbWoy;QM4l1@2)bP;UUSe+# zE@(|+nT_XKs1aL-^&sWnMKNoC%Cn2rvmD2QDvfZGWXk`5I&_{ot|vQ=Jq?gsJi~fq z9jPo~1B-AhDJnr>LayW)mjP?-p9}#p@FHFm{^ppQx#{Lr^7F@Xiq)@A5<+bW z?012Dc#~xz6EBFHSLOHGHqJ{6@J5OzF(Fk};!$6EaT|YocFq8vMN#5KDAl1=0Ai`t z@@Q?o_bhQwUUX6B2_?+ay@ob2k-+x{{I1TqQJ-ZN?TK2=KF+903BRO?F-e-~Dn{6fQonB6Mg6M^m%2Yy%6~3U8RKLU4{mRaX?2Vv@ z#z2pi`}n}3M{%@|R!ekTJl!@~6(elEL0c6UkwdP&L@&_9EY^+_Z4B+3v;b~Vzs+?2 zZETd>soU8Xfpa+emeSLZ{vdoORHxCS+JiIYc z!xvdFLVM-D6_CToz#JJt8g31zPaS?x-MgG+!Ibh3liO(2Gkp}J$kcS%iTo?}C58B_ z_JY{}$#aEzGD!0^jzn=Ev=E`6a58NniicCjlkXt1dDUm?wh~XcE!s7U3bgh#s>H<#~y903OKuTYU=gfC22^ z`1_z+?!C^Ox8OWY0QP#k8`$&bKTQ!3*bmIgUKjj%6JtB=yG*Vi{bzwvRc7)dFiQqp zB|rKT`zyGZeD|Nb_nP~eNH|)2kOVf72D_f!rS8YyI?Vk5qdPY|0}#mKSFu`NzL3EK zCwm1vUKsBO6C5gicu)Qw@gF6AnTUjnw4je*x4+$k?<4qrNFjqgtHGn3{@@Gv!wc}| zQwb!?aY@nx0M?&D-j7`Vp)$?&EUKUCym?p1ys{q?iJ&pzru1SUV-3;gg{|C#!;Bkm9CleF*DpWSkQR`}Vc z^M?X;#?RN_mmZ!!3;ygP`9qL4^Iq^L2gzSLO#UqT^Dq2AL>s=`i~i~N{-4=@?h5_j v0szBp0Ki{5MnBX4+?M^3uKeu}^xs-G1!-t-nY?TDPyp=UB1hSMxA%VlL&qW& diff --git a/src/components.siem.identification/ctrl/research/ads_profinet_acyclic.xlsx b/src/components.siem.identification/ctrl/research/ads_profinet_acyclic.xlsx deleted file mode 100644 index 9ba821650c11b4bab8b065137a1361fa3c8cf39f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11385 zcmeHtWmFv7wsqs~ZXq}XYb3Z6+!}Wc9o*dmB#npQt|1Vd;7)K0PSD`)7CgY~s@iid*=vCm;NbBAhyY{&06+!k^-g;01_J;*Mg#!x0LZZV zk`DH+V0%|%4KGKqiy@n*o$cdXcv!}404((X|2_T>zk$#3h6^PgJgec^(=j8 zU!$R7%VgjgQrEgGt3uq{xS@k3pH#ocYP>zD-V>v=TYg!-EuANgQ~jtyT2t#KS?4;i z(t4UHUc-wPBRj$hK;(C?Y7w1lVa(UY&c8U;I=w{EB>SvO66CW?4o0c@^jQGNt)^of zA=c(UobeWo14(52{II^7{w0c)CHIWw74mDH-M2!eg+2?Q#W2v#3 zj7iQr=@$6SHAuEhbora9(0lYLQe&1d+}+BnpSG&KReX)bo=cD3I`w_xraPo2V!vJ% z?LBL_d{Cvc?gXa!wh;1bIro0xx^Z$t zdP47h&n;E}C7H!F-WWKPZJ%)bVET#*L%}Oef~=V2FnDEAEe{5cIj2S`-ls;*jeEs8BGXHkeIB4!&3!VM;nl^9(plVh z+#eJ{`C$YCywLp45X?+0KCbPzt1Oym_^v@H=!%-L%d7+g}XPOqGBag8LO zu{RY>W)@nKlv@Z0RJle?k&Nix@l8A!yoZ$Al+wB>%NtFk+)L=+4R#;3WjHi=>bczK z!H6vkf0G!X2M+NtTT0DwEsm19^B8D6>(CHNwWDF|pAS;gO`xx387V<7K8K;gE-*PB zf`GXu^lsI+Q{G!pR+~oYEJ5Rm`unnkyac&n+98V@ z_cBYUOw?Va!8H^DkdTStg`>AC%v$ z>)bwwzok_-N?qO*0~0@Na{_VO85?bwxQW?U6_CGUctNGEz=+-N8Z*1_J9sn+T^ZQ*XD_q$5zAWywsQF_=D&2+J;w1do5jx+Sfm7eL1+ETLMU9~chHTav)ijB#s zqE==|WKzqfkrmVmik}EMP4HF@+zm0X^DgZ#{-#o4=I=r83bQVKe^_4WO~n? zE!m+tKR8Jac0T!`%)e{*+c}aT9#qx3@BjcQ02v0V-9KX7pB4P?cn1T`N}>P#zkM{v zk61(fea}&FOYoSVQ>?uqiJSKf@wY}dEE8KgOr?DjuYl7FE`D0H_SOUcS+ z(eKq5w-PEfRj`$`2oNoP!+H5ny*uajNRdI+dOX9qFCU>`b{`DgV~~-o(s8=UuoUUw znn-MC@-cub65{JI?MmW@>o~hcwVUI1S(w+oQtcZaieb7H<0xtX0h44V1+5Xo4>nDe zB?PT}=d-yOL@ZZzXBM2HRN?Z*rr5yzP^<(c+^|4nh?fDLbicGPneIHw3q@A(b?rmh zR`@tW5_1iEA)fvB{z|vlmn00ARO_Am z!@(mWuU3iviBf)`Fc?W_I5>qCJj770{3{%|Sc1W>F6=)q96#bhdYn>p8W0&&-owd-lHQp#@I0l6eES^i_9qOjb&gm#~kJHNk$n zfYn@V7Y+?fb%#dfLj3ylh$bIh;8}BNJtu4YI{X`$4)Dz+nDRVkQ!uAJ{#$niUh@{@wtB)LC3~JXE8TWT$o=2Go|S%2-;9r7-qCt6Oy+w}cu`5YEcoQwK*7l!Om|c<#$dX}T=HO8JJVl8 z8<0fPL#W%+(a&cL*?Gm<={r#An9fdUi`&**p?VSh*&?9}<+2DC%}p+Ib=4{XTObPq z@rHF}S)@z+sJDh=UgRX)jhLF85xa#8_D#94P_P=^HDvs27ECx5>`uZJN9(9|aB$mv zc2Me3d;rg`l2$8|94Xz2Yix|dW(dD8LW7l%Q69Ivs*6Kvt^jL0iYqe@K~%+Z0CWi- z9)6x8VV~_`5|8_g=nv6uWp!HH0;b!E96Cu zlAcqA(&}TR0~8FqIie!lRMaS20qnWj9nf}zl8gkqtpK67)kN4RbDHvNqj^_EwAeJb zxCPkcZ;7AQJ>V3B>OPr!A}NMnep;`GrSC^Fsr1D!={rS9X2}ZdKSfApF@|0+l3AV( z@S<`&n;5H(V&X5&XrbZ@_2vITc$`0l zH=$s&2E+y|-*((18hy~`xuL2H&p^Z* z4u$K6+dR^ry^hH57Ea%^Z`z|abqndzdqScNCm%+*vDc&1JB_+0l8->NzI{C4xSj;; zJWG?+L$zqJlZfOL-161Gk5?ig(%z}PZ%VE# zF_2NheB+@f#9G;3A8K^k&-f%+kLStV8{ITpF%Ij%*@0*8?;L8%$h#aWPdIr&lkq zB;uc(8NZko>k{!2l!l%(#Z$ONqU9_XRZMCmnFrESLo4^*N|AO+^^mJPgGA(N*y-3BZQD%G{J0vtLGg z;+aKmX5{k#F6@$l?6c)$gyZTvsOh}GrZ$kk6 zesz|csG`$OQ}&Fy(v zLQtY?3V}@Px@N-4(`2qTL5$>}m($G6nM+@I3?&1`7`G6FH7<$;{5H+B_1c5l1m`IU6w zNx;+Q9MM*A$ILCgJvr9+WuxB}(*II4KHd;B2#EcvT*4dh5#fZPCJfmVGl*8CFbDqp zqO7MPLrHNN<0^k5V}Wpw-EN-9%~)`L;gM>cww~0zk+HDw!PFD)-D-RHE$y+J{FV!! z8Uxya*-e@uIR#^(7A$3UJ0U(YUQti<6+&GYw5J`oCP5Xj$<#tHpQVY_t2we#GLOXO zII?iSn^cozI3llt2sY>0X~N4tsc`SZCpZ>R>2lJLSn;Q{ubyF-NmabB;g<& zKQ0D`(ef=Cg|>Q!a*SbUhNg6bHqBOE&mAK|=Dww%;4;(S`^@!Zyd~LNCK;_GHqp2h zbSj)4Ig?B~kr-gZ$H?ugA{!rx14gmGMq~M|FrVe`jAPf2+&cqz{meEeky4I-{t00> zG9;${(+j@9CHlx-*$$d4!d`NU;KgJ@=J#r)#5A#2MnPsEA3shinthA}`2e57W|b9= z7zvC>#wG2dk90X7*E%aDLSJvI9a2!uotkEH2tHc%8NX!2#r3zmrn}oBs$(Y{)1rU2 zfv78KpZ&nuplIT&Gv;!-({4Tf7&%za=e;r92ZP@8y*s_O+VKJyOYWeA{Ms3Ty#)KW zrWl}`FF8%xN1B6#i=)PdRSgtH(XXeoH3BLil<1AiQfTGkOdmh8fYpgvQ<_OF?w%_0_q6dq?SjzQrisS5sHiq2}Gti#+5M z0lb7&qm^6j??zV{MXs!mVB}x!nx~sU#&v+;(wo$4Fk#4RUX_ak-sjVV*8(~75)4hk zbjZ{$Jk7fL6>GmUXMf>+%$_OibAP;Z7Sbjh@NN6L)3~ys=81wm5}msG;g@LRhr2tX zMdP;nfcMgEi8ByxZYcanLbOuG53iEYxN*+emrR zK>H@8T>2xz*XNP$#2y06MX7_w$Bvnb3vp)+VNGG9F*b*6@+E-FEv{_sRkhiu3h*XI zIBr-zU;DUv+egVrisB~8(2Z$f&Q-;Vuy2Rh<-ws7bdt^{bZTtXl4hZU9pJ~W=1zwe z?aDhp*nAQ8HK#F!-UrY>v~Z(m(2`AcUyc76$5V>d2=jGL=YVz@`Z9LfXWrpVXE)DT zUMXw}gq)L#x1pl1VctG6?Ba=4aNZtoh#=;Q5q6)60tvayDaQ77`O{-kNyT^s%MtlT z&k8;hmLvyNa(t~rsqMIXL0ylqZk-y>5PAb1ruf(#nbJZ@ScB35^e>>>846LHZQHRT%IY8ca|Hc6n^moH)N8`eBeH-Q1i7THWOIVT}AgD+3w z?J6uBoPsXS~5wT7C+g2;KpG=>>seqG$|WU>jkjgy*H4bI zB`#B5nl46Pt{!fSUQ8H?l!J$DQqJ^x&M(fzty7wP0|)4jPPa2vnm=xEQNbz&RH^imoRKUig$Au6VBD$wi<2 zJTJtJnILPl^j7)IGdgNQ*`lGOF|`m4A@}OC1`(LV~t$*gofMZ8gHApbJ`QJ zfo4*lC|AASokT9v{>sBNk%Xu+62q2KN|wt{t=XOKcIn zwNx=?$}}fzSHV6{&UP9r$O5ryrZQ#Vih7yjeNp!kMG5UJc}ELnRCEiRz!on~o{kPX zGt!%|ml46vyF(m-X%z%98`mDICIgn!&Eezx@o#7ZB0%oB$>y0IPs7SSkEt+I606Ln zw&(1z2_+Z7U9_ky@KSyma6z=%w8-y%vODP-w-X|`j!}FnIa&GSz5Sgst8yX+GhTG6vDUjL&**Vk~>| z8CN$0Uz@+YK=KF_@^%d1D^S}8NjN0YFy4%l^~Lj;M0}0YjY3{(=4W7i@Mp3`T9BV% zjVCp2!`28^%fYEFe(g@IHF#HHuSzo6koW~irH3QkYcJ9`%U(^UQ!nY{D8{MB0cx_awe}v(^P%%a> zblgINfjRfZ9<;}cTH{=&k8Di`_J61Q0VzRV@IxKhUH08$=I16GOn&CAfJ^J9+J~P} z{r85GAf;bV1GI+AhUVrNe}rEbS1((z%a7DJPjlXW9*FKoSrLH!?Qp<-jRnP)NI@MA zp*BZM(4;(^l|jO-pO)W+XMag%R(UnIlkGs^+1TU?71sMa?NWTpk;n}_Fkd4whgs1i zfp!{tfInjpiS(4JrfLqs;Bla?Z$g`2oSp~vzW-pdBp}BYQa5}+_-e*^khX@%yBFWL zuqI}*eabd;fkc{l4@*vb6_}1I*U%x{A(8k1OI_$?>n>in@kXF^GpI>2;sBkw|($jn;6k8t*`0ve;yu$;pRryqZ@ki?cEtg?Dc*G+r`v(5fh~R*Pfi z1rNJDlA_zADJxvI>Gac4q9Y1fr0|g`xWH!M|F$R?w#C6hi0MS7Tw-vPRF+1PO#-S+&uIW>xBSTsy`JbCy!^0|R%)EF*nXrZ zh_t(9)x9Il{KS_@xUc`EvpjuQOV&O6Io^J)bWzM}*E&te%A;#~awSG{pii^^+DWga z@CEV|@7{x{s(#k7u@kAEUG;Mh$d_h{7rD>TzDp~4jt8l8^r@&oM6UTi^;U+UIuK_EsdTkOu$yXu77Hr>{9$d`^c$tzWNF`CUWCrrC;x z9BJ3PZ11S(2q*32`o8w!+P<}sY1M>~&7yrhmabh$w=Brqxy7I~+>1D5T2yAFpZQVT z;W=E`yZ#PTPv_5|ebDONY|_eDe!-HG(C8zVtlo)ZKit>iP9)Op=JFQpw%#f5Qn=m4 zJLX<-`2C?iryVj3w5pS$#+kmAjs~3VUsQ|VNjzr{g`XG27k?xF_RLt}{vVsFG5LJj z^HBCjApijQ|Khl%sWaGI-PPI3-r^_KOElVlRDmtpyP}c4+pH16RHphS3ATyW@3j)N zO1<-!X=U5 z^<^VOfqAc>n#925Dednpb$B{muJ)eWqzpvDZ@tih0jo*jrC&rg>lB#TvOll3W)Xm_ zF@094B{S^igDN4fEw0ZKBu0mn!__ebk2vN_d3A^U3Z-BD%X;DPnjPu35XR@}P|)t< zoM4u%zN!9j)TETgk=XGdd(=I#c_HP+*=#9X&bHp9Ge&EFBj33rg6Xr8vCGyZNnQ_O zQz|0LdcN&<#g7AN;dmaQ`hjp;sz;Q3Xz@pu*yD$uvM^75&VIBSh)Ujwn6&DU5#&N$t>q#g?`9BZ!j3Dvb+K znVn7WK+{d!%}>LKlwZRP@4@>MAfVuy9lF$i-?VyG+hU#o{iP84!Ty5`&rNNgOIn&* z+5hl)LT|)TJAl|ymq8xLRdt1ip|Y{mK@6jC=sPp;v2y+JWAkYVX;{%%M*&;`&T0-t zxM=!(m^6%L#)*B!uea9x`GR91%_dJ230rA_O?ShdiuZ)T%3VZ4w49oQ+?p#f5-=l~ zlY`Ow7q%38Md0FB5%9T*ahW|Qc`igRxr{W?rcpGiN4d@!vNOgWa4wLX`PW>%7`Y%XAuSuf0$`>4aUi5lsZgH;X`&@Gn(qop9Y78}Aoo+Vlz6xUn{ zd#sXQXyV4P&{eHh`P{Ag6S)wFszU;Bw`g_WdWukG!hqkDw@P3CBlo5ldZgo_+>?R+ ziv4HqnL0ZDmwHgn{p(1NQ*nT%PTfav7Zm6VWc>Xg^uUr_S;21=rZBO!7E1Zgb1Kb4 zOJepXqH9&BXR`+F@s~O~Rr2!em7_)kWVg*2yPRVp(1W7hqxDJ%J!&=ZBP5AMd4Iwo zMm79$RXX5%wmVbp+dh~V@aP2Un+7Si=6Q1PvU{g-0_7pi29_ISlJ$`Gj zab5EYPn%L>f^{&_U=-z)d;>pu)if)xG=@YiXre;fX|mOQCeU&`|#!=l8zpFQirU|GkO7by0su`MnAB3q>CqUjLyN`?DqV zJIe2y^}kTAasLtJ=hpr2D8KI|{zAzn{E71W&f@O?zgI)Q04N{*1o%}O{cieulKION zj_ME7-&4-t5q{51ej#Af{6zRmp7Oi(Uz37gwgA8c)cS8J!tdsP_3M8&SE2ut`M Date: Thu, 7 May 2026 16:34:52 +0200 Subject: [PATCH 22/33] Refactor solution file: Remove obsolete projects and update project paths - Removed references to "AXOpen.Logging.Serilog", "AXOpen.Data.Json", "AXOpen.Security.Blazor", "AXOpen.Security", and "inxton_axopen_simatic1500". - Updated project paths for "AXOpen.Components.Robotics.blazor" and "inxton_axopen_components_robotics". - Adjusted project configurations and GUIDs accordingly. --- .../components.ur.robotics.code-workspace | 3 - .../components.ur.robotics.sln | 109 ++++-------------- .../AxoUrCb3.st} | 12 +- .../AxoUrRoboticsInputData.st} | 22 ++-- .../AxoUrRoboticsOutputData.st} | 12 +- .../AxoUrRoboticsT2OBitRegs.st} | 4 +- .../AxoUrRoboticsT2OFloatRegs.st} | 4 +- .../AxoUrRoboticsT2OIntRegs.st} | 4 +- .../AxoUrRoboticsT2OIo.st} | 4 +- .../AxoUrRoboticsT2OJoints.st} | 4 +- .../AxoUrRoboticsT2ORobot.st} | 4 +- .../AxoUrRoboticsT2OSafety.st} | 4 +- .../AxoUrRoboticsT2OTcp.st} | 4 +- .../AxoUrRoboticsT2OTool.st} | 4 +- .../AxoUrRobotics_Component_Status.st | 13 +++ .../AxoUrRobotics_Config.st} | 6 +- .../AxoUrRobotics_Control.st} | 6 +- .../AxoUrRobotics_HWIDs.st} | 4 +- .../AxoUrRobotics_O2TIo.st} | 4 +- .../AxoUrRobotics_O2TReg.st} | 4 +- .../AxoUrRobotics_O2TRobot.st} | 4 +- .../AxoUrRobotics_State.st} | 6 +- .../eAxoUrRoboticsRobotMode.st | 0 .../AxoUrRobotics_Component_Status_v_1_x_x.st | 13 --- .../v_3_x_x/AxoUrCb3.cs} | 8 +- src/components.ur.robotics/this.sln | 109 ++++-------------- 26 files changed, 115 insertions(+), 256 deletions(-) rename src/components.ur.robotics/ctrl/src/AxoUrCb3/{AxoUrCb3_v_3_x_x.st => v_3_x_x/AxoUrCb3.st} (99%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsInputData_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsInputData.st} (73%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsOutputData_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsOutputData.st} (70%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OBitRegs_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OBitRegs.st} (98%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OFloatRegs_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OFloatRegs.st} (96%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OIntRegs_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OIntRegs.st} (96%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OIo_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OIo.st} (99%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OJoints_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OJoints.st} (97%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2ORobot_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2ORobot.st} (95%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OSafety_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OSafety.st} (94%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OTcp_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OTcp.st} (90%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OTool_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OTool.st} (91%) create mode 100644 src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Component_Status.st rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Config_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Config.st} (85%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Control_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Control.st} (95%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_HWIDs_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_HWIDs.st} (95%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TIo_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TIo.st} (93%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TReg_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TReg.st} (98%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TRobot_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TRobot.st} (80%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_State_v_1_x_x.st => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_State.st} (96%) rename src/components.ur.robotics/ctrl/src/{AxoUrRoboticsDataTypes_v_1_x_x => AxoUrCb3/v_3_x_x/TypeStructuresAndEnums}/eAxoUrRoboticsRobotMode.st (100%) delete mode 100644 src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Component_Status_v_1_x_x.st rename src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/{AxoUrCb3_v_3_x_x/AxoUrCb3_v_3_x_x.cs => AxoUrCb3/v_3_x_x/AxoUrCb3.cs} (99%) diff --git a/src/components.ur.robotics/components.ur.robotics.code-workspace b/src/components.ur.robotics/components.ur.robotics.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.ur.robotics/components.ur.robotics.code-workspace +++ b/src/components.ur.robotics/components.ur.robotics.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.ur.robotics/components.ur.robotics.sln b/src/components.ur.robotics/components.ur.robotics.sln index d5d7a6ef1..eabfd0799 100644 --- a/src/components.ur.robotics/components.ur.robotics.sln +++ b/src/components.ur.robotics/components.ur.robotics.sln @@ -1,21 +1,17 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{BC0069FF-C225-4D50-8017-47E0590CE569}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{749A6C97-B5F0-416F-8E77-D0AF7DD83E7F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{47233B2C-8070-4604-9E96-75C96887F4AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{CE55787C-C49F-4A8C-BAAA-52858E96EA13}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{1F6705BD-7E42-4B6C-89B7-C24AFC5D973D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{FCABB5B7-F673-4424-99BB-5C5493ACB278}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{2C3D5504-1753-4A63-8BEA-89E328A4D1D9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Ur.Robotics.blazorapp", "app\ix-blazor\AXOpen.Components.Ur.Robotics.blazorapp.csproj", "{55B84509-76F3-4976-B658-DD73E2000539}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor\AXOpen.Components.Robotics.blazor.csproj", "{3CCF3132-4F06-42D7-92A4-2BA9802984C3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_ur_robotics", "app\ix\app_axopen_components_ur_robotics.csproj", "{17038833-C16B-4A76-A625-84C992CA21EB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{2C3D5504-1753-4A63-8BEA-89E328A4D1D9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Ur.Robotics.blazor", "src\AXOpen.Components.Ur.Robotics.blazor\AXOpen.Components.Ur.Robotics.blazor.csproj", "{4C205053-25BF-4D6D-95A1-9C725ACD82D6}" EndProject @@ -27,19 +23,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{DD99C184-DA2C-4E6B-989D-637294C443EA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{396C3582-44CB-4AC8-B933-307B5480E45B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{E2141DF0-2378-4E94-BCC8-B315FC6AE355}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{2AC8DBD7-1292-406E-A7DA-54B4B445AF6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{F23B3398-B893-40AC-A584-131CF1FCEFC3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{4E48056F-27B8-487F-83C8-8EFB4170B638}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{526C9C35-E213-453B-8A92-39138359319A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{A65C180D-C54B-4F93-AC65-E8854BE0FE1D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{94C278E0-3CAC-4EE6-8476-F44923D5668D}" EndProject @@ -53,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{F6F7FC25-5AEC-4255-8C61-FBCA8A611493}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{C67F3930-8413-4401-A6D7-9726F79F495A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{0069A7C0-91FB-4BA9-A522-132C49A41EA4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{72B6B158-117A-4A1A-AFCD-22A218989F55}" @@ -67,18 +55,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{6E1303CA-50D6-42B4-9F44-EC553BC6CB48}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor", "{811A699E-2B1F-4BCD-B3CD-9B924088E190}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics", "..\components.robotics\src\AXOpen.Components.Robotics", "{9756BFD9-E39E-4957-AE2C-87203647C4EF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.robotics\src", "{16D45A0B-D494-4C33-9A9B-A216C0F40F95}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.robotics", "..\components.robotics", "{A80F70FB-B8AC-4BCB-BA58-8EDFD11A8055}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{46E1364B-0AE2-4CA4-A1B3-C029B1D597A3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{33069D7B-65D5-4AE9-8299-06468852CABB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{08BEB905-7CB0-43FA-BEBA-1DE531E71382}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Ur.Robotics.blazor", "src\AXOpen.Components.Ur.Robotics.blazor", "{2C0CA3CF-4C50-4533-B2C4-F3355C221EF4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Ur.Robotics", "src\AXOpen.Components.Ur.Robotics", "{E6D7B1F2-C0BE-44C3-81A3-1A179A324496}" @@ -99,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{297C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{C998E956-0449-4B83-B83D-25A9FF90CAC6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{95BC5BAB-A8B9-4A91-BEF2-93BA61D8946C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{77E59461-B25C-477F-BC8B-3EEC4B3AAF69}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{38C2732E-6FD3-4B5C-B85D-5A51E8CDF614}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{18ADFA14-14E6-48E4-966F-9AD07B5D099D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{20922125-2DF6-460D-BBFC-8DD9F0F61F1B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{88B13D35-91E5-48D5-B0C4-1CB4ECF1DFB0}" @@ -121,19 +97,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{88D9C793-2A60-4F96-8C19-33B8D40A97AB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{15ABEE86-4ECB-401B-8E2A-F054B4F2738F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{E61A0813-3A37-442D-9AC5-BF0F9EE0527B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{86D3D8F4-2445-4A91-9D4A-41CD3C2FC232}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{99112B0D-4A6F-4A5F-B0F4-A4275CF1765C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{B796AB31-20E6-4476-8A6E-D14C6A9FF50C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{101285E4-74F9-4E60-BDFA-560991D48EAC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{A41B7FEF-F0E6-4DC9-8805-85D13B224D3D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{16BB134C-4669-4F34-94BE-772FC2D2C443}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{626CBC55-0885-45FA-AAED-31F9BAC5411C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{B973D310-138C-416C-9F8B-ED81FC8E7D91}" EndProject @@ -165,10 +131,6 @@ Global {47233B2C-8070-4604-9E96-75C96887F4AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {47233B2C-8070-4604-9E96-75C96887F4AC}.Release|Any CPU.ActiveCfg = Release|Any CPU {47233B2C-8070-4604-9E96-75C96887F4AC}.Release|Any CPU.Build.0 = Release|Any CPU - {CE55787C-C49F-4A8C-BAAA-52858E96EA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE55787C-C49F-4A8C-BAAA-52858E96EA13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE55787C-C49F-4A8C-BAAA-52858E96EA13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE55787C-C49F-4A8C-BAAA-52858E96EA13}.Release|Any CPU.Build.0 = Release|Any CPU {1F6705BD-7E42-4B6C-89B7-C24AFC5D973D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F6705BD-7E42-4B6C-89B7-C24AFC5D973D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F6705BD-7E42-4B6C-89B7-C24AFC5D973D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -177,18 +139,14 @@ Global {FCABB5B7-F673-4424-99BB-5C5493ACB278}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCABB5B7-F673-4424-99BB-5C5493ACB278}.Release|Any CPU.ActiveCfg = Release|Any CPU {FCABB5B7-F673-4424-99BB-5C5493ACB278}.Release|Any CPU.Build.0 = Release|Any CPU + {3CCF3132-4F06-42D7-92A4-2BA9802984C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3CCF3132-4F06-42D7-92A4-2BA9802984C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3CCF3132-4F06-42D7-92A4-2BA9802984C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3CCF3132-4F06-42D7-92A4-2BA9802984C3}.Release|Any CPU.Build.0 = Release|Any CPU {2C3D5504-1753-4A63-8BEA-89E328A4D1D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C3D5504-1753-4A63-8BEA-89E328A4D1D9}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C3D5504-1753-4A63-8BEA-89E328A4D1D9}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C3D5504-1753-4A63-8BEA-89E328A4D1D9}.Release|Any CPU.Build.0 = Release|Any CPU - {55B84509-76F3-4976-B658-DD73E2000539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55B84509-76F3-4976-B658-DD73E2000539}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55B84509-76F3-4976-B658-DD73E2000539}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55B84509-76F3-4976-B658-DD73E2000539}.Release|Any CPU.Build.0 = Release|Any CPU - {17038833-C16B-4A76-A625-84C992CA21EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17038833-C16B-4A76-A625-84C992CA21EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17038833-C16B-4A76-A625-84C992CA21EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17038833-C16B-4A76-A625-84C992CA21EB}.Release|Any CPU.Build.0 = Release|Any CPU {4C205053-25BF-4D6D-95A1-9C725ACD82D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C205053-25BF-4D6D-95A1-9C725ACD82D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C205053-25BF-4D6D-95A1-9C725ACD82D6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,10 +167,6 @@ Global {DD99C184-DA2C-4E6B-989D-637294C443EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD99C184-DA2C-4E6B-989D-637294C443EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {DD99C184-DA2C-4E6B-989D-637294C443EA}.Release|Any CPU.Build.0 = Release|Any CPU - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}.Release|Any CPU.Build.0 = Release|Any CPU {396C3582-44CB-4AC8-B933-307B5480E45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {396C3582-44CB-4AC8-B933-307B5480E45B}.Debug|Any CPU.Build.0 = Debug|Any CPU {396C3582-44CB-4AC8-B933-307B5480E45B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,18 +179,10 @@ Global {2AC8DBD7-1292-406E-A7DA-54B4B445AF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AC8DBD7-1292-406E-A7DA-54B4B445AF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AC8DBD7-1292-406E-A7DA-54B4B445AF6D}.Release|Any CPU.Build.0 = Release|Any CPU - {F23B3398-B893-40AC-A584-131CF1FCEFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F23B3398-B893-40AC-A584-131CF1FCEFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F23B3398-B893-40AC-A584-131CF1FCEFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F23B3398-B893-40AC-A584-131CF1FCEFC3}.Release|Any CPU.Build.0 = Release|Any CPU - {4E48056F-27B8-487F-83C8-8EFB4170B638}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E48056F-27B8-487F-83C8-8EFB4170B638}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E48056F-27B8-487F-83C8-8EFB4170B638}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E48056F-27B8-487F-83C8-8EFB4170B638}.Release|Any CPU.Build.0 = Release|Any CPU - {526C9C35-E213-453B-8A92-39138359319A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {526C9C35-E213-453B-8A92-39138359319A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {526C9C35-E213-453B-8A92-39138359319A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {526C9C35-E213-453B-8A92-39138359319A}.Release|Any CPU.Build.0 = Release|Any CPU + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D}.Release|Any CPU.Build.0 = Release|Any CPU {94C278E0-3CAC-4EE6-8476-F44923D5668D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94C278E0-3CAC-4EE6-8476-F44923D5668D}.Debug|Any CPU.Build.0 = Debug|Any CPU {94C278E0-3CAC-4EE6-8476-F44923D5668D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -255,22 +201,17 @@ Global {F7D0D333-9863-4696-BBA7-FD690A73B146} = {0BE995FC-61F6-4777-9951-F28F13718776} {47233B2C-8070-4604-9E96-75C96887F4AC} = {F6F7FC25-5AEC-4255-8C61-FBCA8A611493} {F6F7FC25-5AEC-4255-8C61-FBCA8A611493} = {72B6B158-117A-4A1A-AFCD-22A218989F55} - {CE55787C-C49F-4A8C-BAAA-52858E96EA13} = {C67F3930-8413-4401-A6D7-9726F79F495A} - {C67F3930-8413-4401-A6D7-9726F79F495A} = {72B6B158-117A-4A1A-AFCD-22A218989F55} {1F6705BD-7E42-4B6C-89B7-C24AFC5D973D} = {0069A7C0-91FB-4BA9-A522-132C49A41EA4} {0069A7C0-91FB-4BA9-A522-132C49A41EA4} = {72B6B158-117A-4A1A-AFCD-22A218989F55} {72B6B158-117A-4A1A-AFCD-22A218989F55} = {55295A4F-1186-4699-9E6E-C87243905A61} {FCABB5B7-F673-4424-99BB-5C5493ACB278} = {97117323-0919-40E1-A6A0-BB6C6726F777} {97117323-0919-40E1-A6A0-BB6C6726F777} = {B6187853-7BBB-458C-8FFA-08171EDC442E} {B6187853-7BBB-458C-8FFA-08171EDC442E} = {6E1303CA-50D6-42B4-9F44-EC553BC6CB48} + {3CCF3132-4F06-42D7-92A4-2BA9802984C3} = {811A699E-2B1F-4BCD-B3CD-9B924088E190} + {811A699E-2B1F-4BCD-B3CD-9B924088E190} = {16D45A0B-D494-4C33-9A9B-A216C0F40F95} {2C3D5504-1753-4A63-8BEA-89E328A4D1D9} = {9756BFD9-E39E-4957-AE2C-87203647C4EF} {9756BFD9-E39E-4957-AE2C-87203647C4EF} = {16D45A0B-D494-4C33-9A9B-A216C0F40F95} {16D45A0B-D494-4C33-9A9B-A216C0F40F95} = {A80F70FB-B8AC-4BCB-BA58-8EDFD11A8055} - {55B84509-76F3-4976-B658-DD73E2000539} = {46E1364B-0AE2-4CA4-A1B3-C029B1D597A3} - {46E1364B-0AE2-4CA4-A1B3-C029B1D597A3} = {08BEB905-7CB0-43FA-BEBA-1DE531E71382} - {17038833-C16B-4A76-A625-84C992CA21EB} = {33069D7B-65D5-4AE9-8299-06468852CABB} - {33069D7B-65D5-4AE9-8299-06468852CABB} = {08BEB905-7CB0-43FA-BEBA-1DE531E71382} - {08BEB905-7CB0-43FA-BEBA-1DE531E71382} = {EBEC1CF0-9ADE-460D-8177-149CC1D5F173} {4C205053-25BF-4D6D-95A1-9C725ACD82D6} = {2C0CA3CF-4C50-4533-B2C4-F3355C221EF4} {2C0CA3CF-4C50-4533-B2C4-F3355C221EF4} = {5773F579-7E27-4F19-8227-95A6A21F03AF} {9A3C5E2A-A1F8-46E1-A1DF-013E66D5173E} = {E6D7B1F2-C0BE-44C3-81A3-1A179A324496} @@ -284,10 +225,6 @@ Global {DD99C184-DA2C-4E6B-989D-637294C443EA} = {EE75B914-458D-4D57-867B-E8B23633D30E} {EE75B914-458D-4D57-867B-E8B23633D30E} = {297C23B2-6287-4D8A-8FEE-75152EBD512D} {297C23B2-6287-4D8A-8FEE-75152EBD512D} = {C998E956-0449-4B83-B83D-25A9FF90CAC6} - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC} = {95BC5BAB-A8B9-4A91-BEF2-93BA61D8946C} - {95BC5BAB-A8B9-4A91-BEF2-93BA61D8946C} = {77E59461-B25C-477F-BC8B-3EEC4B3AAF69} - {77E59461-B25C-477F-BC8B-3EEC4B3AAF69} = {38C2732E-6FD3-4B5C-B85D-5A51E8CDF614} - {38C2732E-6FD3-4B5C-B85D-5A51E8CDF614} = {18ADFA14-14E6-48E4-966F-9AD07B5D099D} {396C3582-44CB-4AC8-B933-307B5480E45B} = {20922125-2DF6-460D-BBFC-8DD9F0F61F1B} {20922125-2DF6-460D-BBFC-8DD9F0F61F1B} = {18DE6FD5-3582-4E06-BB2A-DDB25B9D24E9} {E2141DF0-2378-4E94-BCC8-B315FC6AE355} = {88B13D35-91E5-48D5-B0C4-1CB4ECF1DFB0} @@ -296,14 +233,8 @@ Global {2AC8DBD7-1292-406E-A7DA-54B4B445AF6D} = {F82071D2-A989-4BE2-B77E-8A72DD516196} {F82071D2-A989-4BE2-B77E-8A72DD516196} = {48110E09-581E-4DFC-A48F-FE081B160B99} {48110E09-581E-4DFC-A48F-FE081B160B99} = {88D9C793-2A60-4F96-8C19-33B8D40A97AB} - {F23B3398-B893-40AC-A584-131CF1FCEFC3} = {15ABEE86-4ECB-401B-8E2A-F054B4F2738F} - {15ABEE86-4ECB-401B-8E2A-F054B4F2738F} = {86D3D8F4-2445-4A91-9D4A-41CD3C2FC232} - {4E48056F-27B8-487F-83C8-8EFB4170B638} = {E61A0813-3A37-442D-9AC5-BF0F9EE0527B} - {E61A0813-3A37-442D-9AC5-BF0F9EE0527B} = {86D3D8F4-2445-4A91-9D4A-41CD3C2FC232} - {86D3D8F4-2445-4A91-9D4A-41CD3C2FC232} = {99112B0D-4A6F-4A5F-B0F4-A4275CF1765C} - {526C9C35-E213-453B-8A92-39138359319A} = {B796AB31-20E6-4476-8A6E-D14C6A9FF50C} - {B796AB31-20E6-4476-8A6E-D14C6A9FF50C} = {101285E4-74F9-4E60-BDFA-560991D48EAC} - {101285E4-74F9-4E60-BDFA-560991D48EAC} = {16BB134C-4669-4F34-94BE-772FC2D2C443} + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D} = {A41B7FEF-F0E6-4DC9-8805-85D13B224D3D} + {A41B7FEF-F0E6-4DC9-8805-85D13B224D3D} = {626CBC55-0885-45FA-AAED-31F9BAC5411C} {94C278E0-3CAC-4EE6-8476-F44923D5668D} = {B973D310-138C-416C-9F8B-ED81FC8E7D91} {B973D310-138C-416C-9F8B-ED81FC8E7D91} = {3569E9C9-2F14-49B2-AD29-0030BFAE3573} {3569E9C9-2F14-49B2-AD29-0030BFAE3573} = {CE4F6B7C-3203-48F7-A96F-C37D8DA5D079} diff --git a/src/components.ur.robotics/ctrl/src/AxoUrCb3/AxoUrCb3_v_3_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/AxoUrCb3.st similarity index 99% rename from src/components.ur.robotics/ctrl/src/AxoUrCb3/AxoUrCb3_v_3_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/AxoUrCb3.st index 4b747f9ce..23d5119e6 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrCb3/AxoUrCb3_v_3_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/AxoUrCb3.st @@ -5,9 +5,9 @@ USING AXOpen.Components.Robotics; USING AXOpen.Components.Abstractions.Robotics; USING Siemens.Simatic.Hardware.Utilities; -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {S7.extern=ReadWrite} - CLASS AxoUrCb3_v_3_x_x EXTENDS AXOpen.Core.AxoComponent IMPLEMENTS AXOpen.Components.Abstractions.Robotics.IAxoRobotics + CLASS AxoUrCb3 EXTENDS AXOpen.Core.AxoComponent IMPLEMENTS AXOpen.Components.Abstractions.Robotics.IAxoRobotics VAR PRIVATE _infoTimer : AXOpen.Timers.OnDelayTimer; _errorTimer : AXOpen.Timers.OnDelayTimer; @@ -71,14 +71,14 @@ NAMESPACE AXOpen.Components.Ur.Robotics {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Config")]} {#ix-attr:[ReadOnly()]} - Config : AxoUrRobotics_Config_v_1_x_x; + Config : AxoUrRobotics_Config; END_VAR VAR PUBLIC //STATUS {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} - Status : AxoUrRobotics_Component_Status_v_1_x_x; + Status : AxoUrRobotics_Component_Status; {#ix-attr:[ComponentDetails("Status")]} {#ix-attr:[ReadOnly()]} {#ix-set:AttributeName = "<#Power progress#>"} @@ -97,13 +97,13 @@ NAMESPACE AXOpen.Components.Ur.Robotics {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Inputs#>"} {#ix-attr:[ReadOnly()]} - Inputs : AxoUrRobotics_State_v_1_x_x; + Inputs : AxoUrRobotics_State; {#ix-attr:[ComponentDetails("Hardware signals")]} {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Outputs#>"} {#ix-attr:[ReadOnly()]} - Outputs : AxoUrRobotics_Control_v_1_x_x; + Outputs : AxoUrRobotics_Control; END_VAR VAR PUBLIC //HardwareDiagnostics diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsInputData_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsInputData.st similarity index 73% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsInputData_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsInputData.st index a6e4e544a..3b680e750 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsInputData_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsInputData.st @@ -1,44 +1,44 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Wrap)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsInputData_v_1_x_x + CLASS PUBLIC AxoUrRoboticsInputData VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Robot#>"} - Robot : AxoUrRoboticsT2ORobot_v_1_x_x; + Robot : AxoUrRoboticsT2ORobot; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#State#>"} - Safety : AxoUrRoboticsT2OSafety_v_1_x_x; + Safety : AxoUrRoboticsT2OSafety; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#IO state#>"} - IO : AxoUrRoboticsT2OIo_v_1_x_x; + IO : AxoUrRoboticsT2OIo; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Tool state#>"} - Tool : AxoUrRoboticsT2OTool_v_1_x_x; + Tool : AxoUrRoboticsT2OTool; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Joints#>"} - Joints : AxoUrRoboticsT2OJoints_v_1_x_x; + Joints : AxoUrRoboticsT2OJoints; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#TCP#>"} - TCP : AxoUrRoboticsT2OTcp_v_1_x_x; + TCP : AxoUrRoboticsT2OTcp; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Bits#>"} - Bits : AxoUrRoboticsT2OBitRegs_v_1_x_x; + Bits : AxoUrRoboticsT2OBitRegs; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Ints#>"} - Ints : AxoUrRoboticsT2OIntRegs_v_1_x_x; + Ints : AxoUrRoboticsT2OIntRegs; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Floats#>"} - Floats : AxoUrRoboticsT2OFloatRegs_v_1_x_x; + Floats : AxoUrRoboticsT2OFloatRegs; END_VAR END_CLASS END_NAMESPACE \ No newline at end of file diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsOutputData_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsOutputData.st similarity index 70% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsOutputData_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsOutputData.st index 6ca48fc02..01eb00928 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsOutputData_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsOutputData.st @@ -1,24 +1,24 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Wrap)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsOutputData_v_1_x_x + CLASS PUBLIC AxoUrRoboticsOutputData VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Speed#>"} - Speed : AxoUrRobotics_O2TRobot_v_1_x_x; + Speed : AxoUrRobotics_O2TRobot; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#IO#>"} - IO : AxoUrRobotics_O2TIo_v_1_x_x; + IO : AxoUrRobotics_O2TIo; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Reg 1#>"} - Reg1 : AxoUrRobotics_O2TReg_v_1_x_x; + Reg1 : AxoUrRobotics_O2TReg; {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#Reg 2#>"} - Reg2 : AxoUrRobotics_O2TReg_v_1_x_x; + Reg2 : AxoUrRobotics_O2TReg; END_VAR END_CLASS END_NAMESPACE \ No newline at end of file diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OBitRegs_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OBitRegs.st similarity index 98% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OBitRegs_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OBitRegs.st index fc7a175c7..14ebdfddb 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OBitRegs_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OBitRegs.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2OBitRegs_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2OBitRegs VAR PUBLIC {#ix-set:AttributeName = "<#Bit register 0#>"} Register_0 : BOOL; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OFloatRegs_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OFloatRegs.st similarity index 96% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OFloatRegs_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OFloatRegs.st index 987fbd992..7f21d0b53 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OFloatRegs_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OFloatRegs.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2OFloatRegs_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2OFloatRegs VAR PUBLIC {#ix-set:AttributeName = "<#Float register 0#>"} Register_0 : REAL; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OIntRegs_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OIntRegs.st similarity index 96% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OIntRegs_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OIntRegs.st index a13987260..c17d02fbe 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OIntRegs_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OIntRegs.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2OIntRegs_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2OIntRegs VAR PUBLIC {#ix-set:AttributeName = "<#Int register 0#>"} Register_0 : DINT; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OIo_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OIo.st similarity index 99% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OIo_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OIo.st index 66c6e6d59..f9cb57790 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OIo_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OIo.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2OIo_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2OIo VAR PUBLIC {#ix-set:AttributeName = "<#Standard digital inputs#>"} StandardDigitalInputs : USINT; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OJoints_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OJoints.st similarity index 97% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OJoints_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OJoints.st index 32ef63fdb..2f53f3aa9 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OJoints_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OJoints.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2OJoints_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2OJoints VAR PUBLIC {#ix-set:AttributeName = "<#Joint position 0 [rad]#>"} JointPosition_0 : REAL; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2ORobot_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2ORobot.st similarity index 95% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2ORobot_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2ORobot.st index 28bf5037f..9efd6ecb0 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2ORobot_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2ORobot.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2ORobot_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2ORobot VAR PUBLIC {#ix-set:AttributeName = "<#Controller major version#>"} ControllerMajorVersion : USINT; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OSafety_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OSafety.st similarity index 94% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OSafety_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OSafety.st index 849b2d737..5ff86bb82 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OSafety_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OSafety.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2OSafety_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2OSafety VAR PUBLIC {#ix-set:AttributeName = "<#Safety mode#>"} SafetyMode : USINT; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OTcp_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OTcp.st similarity index 90% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OTcp_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OTcp.st index ffb34a960..e661c50ce 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OTcp_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OTcp.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2OTcp_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2OTcp VAR PUBLIC {#ix-set:AttributeName = "<#Actual TCP Position#>"} Postition : AXOpen.Components.Abstractions.Robotics.AxoRoboticsCoordinates; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OTool_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OTool.st similarity index 91% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OTool_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OTool.st index b9ea03863..25e3a5eac 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRoboticsT2OTool_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRoboticsT2OTool.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRoboticsT2OTool_v_1_x_x + CLASS PUBLIC AxoUrRoboticsT2OTool VAR PUBLIC {#ix-set:AttributeName = "<#Tool mode#>"} ToolMode : USINT; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Component_Status.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Component_Status.st new file mode 100644 index 000000000..1c5f2298d --- /dev/null +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Component_Status.st @@ -0,0 +1,13 @@ +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Stack)]} + CLASS PUBLIC AxoUrRobotics_Component_Status EXTENDS AXOpen.Components.Robotics.AxoRobot_Status + VAR PUBLIC + END_VAR + END_CLASS +END_NAMESPACE + + + + + diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Config_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Config.st similarity index 85% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Config_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Config.st index e3ac32f00..d5941a4f8 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Config_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Config.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRobotics_Config_v_1_x_x + CLASS PUBLIC AxoUrRobotics_Config VAR PUBLIC {#ix-set:AttributeName = "<#Info time#>"} InfoTime : LTIME := LT#2S; @@ -10,7 +10,7 @@ NAMESPACE AXOpen.Components.Ur.Robotics {#ix-set:AttributeName = "<#Task timeout#>"} TaskTimeout : LTIME := LT#60S; {#ix-set:AttributeName = "<#Hardware IDs#>"} - HWIDs : AxoUrRobotics_HWIDs_v_1_x_x; + HWIDs : AxoUrRobotics_HWIDs; {#ix-set:AttributeName = "<#Remote power on enabled#>"} RemotePowerOnEnabled:BOOL :=FALSE; {#ix-set:AttributeName = "<#Remote power on pulse time#>"} diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Control_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Control.st similarity index 95% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Control_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Control.st index ef82751b2..fe5df047d 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Control_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_Control.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoUrRobotics_Control_v_1_x_x + CLASS AxoUrRobotics_Control VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} @@ -69,7 +69,7 @@ NAMESPACE AXOpen.Components.Ur.Robotics {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#UR Specific#>"} - Outputs : AxoUrRoboticsOutputData_v_1_x_x; + Outputs : AxoUrRoboticsOutputData; END_VAR END_CLASS END_NAMESPACE diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_HWIDs_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_HWIDs.st similarity index 95% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_HWIDs_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_HWIDs.st index 3670b0e30..eb15aca14 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_HWIDs_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_HWIDs.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRobotics_HWIDs_v_1_x_x + CLASS PUBLIC AxoUrRobotics_HWIDs VAR PUBLIC {#ix-set:AttributeName = "<#Hardware ID of the Device#>"} diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TIo_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TIo.st similarity index 93% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TIo_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TIo.st index e2e94029f..45bfb436d 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TIo_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TIo.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRobotics_O2TIo_v_1_x_x + CLASS PUBLIC AxoUrRobotics_O2TIo VAR PUBLIC {#ix-set:AttributeName = "<#Standard digital output mask#>"} StandardDigitalOutputMask : USINT; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TReg_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TReg.st similarity index 98% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TReg_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TReg.st index 0ca6ddcb2..b293f1669 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TReg_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TReg.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRobotics_O2TReg_v_1_x_x + CLASS PUBLIC AxoUrRobotics_O2TReg VAR PUBLIC {#ix-set:AttributeName = "<#Bit register 0#>"} Bit_0 : BOOL; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TRobot_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TRobot.st similarity index 80% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TRobot_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TRobot.st index b2a3e8eea..99375b127 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_O2TRobot_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_O2TRobot.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {#ix-attr:[Container(Layout.Stack)]} {S7.extern=ReadWrite} - CLASS PUBLIC AxoUrRobotics_O2TRobot_v_1_x_x + CLASS PUBLIC AxoUrRobotics_O2TRobot VAR PUBLIC {#ix-set:AttributeName = "<#SSM: Speed slider fraction mask#>"} SSM_SpeedSliderFractionMask : BOOL; diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_State_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_State.st similarity index 96% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_State_v_1_x_x.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_State.st index 2fe28d0f2..292f460d8 100644 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_State_v_1_x_x.st +++ b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/AxoUrRobotics_State.st @@ -1,7 +1,7 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} - CLASS AxoUrRobotics_State_v_1_x_x + CLASS AxoUrRobotics_State VAR PUBLIC {#ix-attr:[Container(Layout.Stack)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} @@ -78,7 +78,7 @@ NAMESPACE AXOpen.Components.Ur.Robotics {#ix-attr:[Container(Layout.Wrap)]} {#ix-attr:[Group(GroupLayout.GroupBox)]} {#ix-set:AttributeName = "<#UR Specific#>"} - Inputs:AxoUrRoboticsInputData_v_1_x_x ; + Inputs:AxoUrRoboticsInputData; END_VAR END_CLASS END_NAMESPACE diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/eAxoUrRoboticsRobotMode.st b/src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/eAxoUrRoboticsRobotMode.st similarity index 100% rename from src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/eAxoUrRoboticsRobotMode.st rename to src/components.ur.robotics/ctrl/src/AxoUrCb3/v_3_x_x/TypeStructuresAndEnums/eAxoUrRoboticsRobotMode.st diff --git a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Component_Status_v_1_x_x.st b/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Component_Status_v_1_x_x.st deleted file mode 100644 index 83c2cf956..000000000 --- a/src/components.ur.robotics/ctrl/src/AxoUrRoboticsDataTypes_v_1_x_x/AxoUrRobotics_Component_Status_v_1_x_x.st +++ /dev/null @@ -1,13 +0,0 @@ -NAMESPACE AXOpen.Components.Ur.Robotics - {S7.extern=ReadWrite} - {#ix-attr:[Container(Layout.Stack)]} - CLASS PUBLIC AxoUrRobotics_Component_Status_v_1_x_x EXTENDS AXOpen.Components.Robotics.AxoRobot_Status - VAR PUBLIC - END_VAR - END_CLASS -END_NAMESPACE - - - - - diff --git a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/AxoUrCb3_v_3_x_x/AxoUrCb3_v_3_x_x.cs b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/AxoUrCb3/v_3_x_x/AxoUrCb3.cs similarity index 99% rename from src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/AxoUrCb3_v_3_x_x/AxoUrCb3_v_3_x_x.cs rename to src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/AxoUrCb3/v_3_x_x/AxoUrCb3.cs index 1a390ed81..24e96f82e 100644 --- a/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/AxoUrCb3_v_3_x_x/AxoUrCb3_v_3_x_x.cs +++ b/src/components.ur.robotics/src/AXOpen.Components.Ur.Robotics/AxoUrCb3/v_3_x_x/AxoUrCb3.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using AXSharp.Connector.ValueTypes; using Renci.SshNet; @@ -9,9 +9,9 @@ using System.Text; using System.Threading.Tasks; -namespace AXOpen.Components.Ur.Robotics +namespace AXOpen.Components.Ur.Robotics.v_3_x_x { - public partial class AxoUrCb3_v_3_x_x : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics + public partial class AxoUrCb3 : AXOpen.Core.AxoComponent, AXOpen.Components.Abstractions.Robotics.IAxoRobotics { partial void PostConstruct(ITwinObject parent, string readableTail, string symbolTail) @@ -319,7 +319,7 @@ private async Task RebootController() } } - public partial class AxoUrRobotics_Component_Status_v_1_x_x : AXOpen.Components.Robotics.AxoRobot_Status + public partial class AxoUrRobotics_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status { Dictionary errorDescriptionDict = new Dictionary(); Dictionary actionDescriptionDict = new Dictionary(); diff --git a/src/components.ur.robotics/this.sln b/src/components.ur.robotics/this.sln index d5d7a6ef1..eabfd0799 100644 --- a/src/components.ur.robotics/this.sln +++ b/src/components.ur.robotics/this.sln @@ -1,21 +1,17 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{BC0069FF-C225-4D50-8017-47E0590CE569}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{749A6C97-B5F0-416F-8E77-D0AF7DD83E7F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{47233B2C-8070-4604-9E96-75C96887F4AC}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{CE55787C-C49F-4A8C-BAAA-52858E96EA13}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{1F6705BD-7E42-4B6C-89B7-C24AFC5D973D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{FCABB5B7-F673-4424-99BB-5C5493ACB278}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{2C3D5504-1753-4A63-8BEA-89E328A4D1D9}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Ur.Robotics.blazorapp", "app\ix-blazor\AXOpen.Components.Ur.Robotics.blazorapp.csproj", "{55B84509-76F3-4976-B658-DD73E2000539}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor\AXOpen.Components.Robotics.blazor.csproj", "{3CCF3132-4F06-42D7-92A4-2BA9802984C3}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_ur_robotics", "app\ix\app_axopen_components_ur_robotics.csproj", "{17038833-C16B-4A76-A625-84C992CA21EB}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_robotics", "..\components.robotics\src\AXOpen.Components.Robotics\inxton_axopen_components_robotics.csproj", "{2C3D5504-1753-4A63-8BEA-89E328A4D1D9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Ur.Robotics.blazor", "src\AXOpen.Components.Ur.Robotics.blazor\AXOpen.Components.Ur.Robotics.blazor.csproj", "{4C205053-25BF-4D6D-95A1-9C725ACD82D6}" EndProject @@ -27,19 +23,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{DD99C184-DA2C-4E6B-989D-637294C443EA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{396C3582-44CB-4AC8-B933-307B5480E45B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{E2141DF0-2378-4E94-BCC8-B315FC6AE355}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{2AC8DBD7-1292-406E-A7DA-54B4B445AF6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{F23B3398-B893-40AC-A584-131CF1FCEFC3}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{4E48056F-27B8-487F-83C8-8EFB4170B638}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{526C9C35-E213-453B-8A92-39138359319A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{A65C180D-C54B-4F93-AC65-E8854BE0FE1D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{94C278E0-3CAC-4EE6-8476-F44923D5668D}" EndProject @@ -53,8 +43,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{F6F7FC25-5AEC-4255-8C61-FBCA8A611493}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{C67F3930-8413-4401-A6D7-9726F79F495A}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{0069A7C0-91FB-4BA9-A522-132C49A41EA4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{72B6B158-117A-4A1A-AFCD-22A218989F55}" @@ -67,18 +55,14 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{6E1303CA-50D6-42B4-9F44-EC553BC6CB48}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics.blazor", "..\components.robotics\src\AXOpen.Components.Robotics.blazor", "{811A699E-2B1F-4BCD-B3CD-9B924088E190}" +EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Robotics", "..\components.robotics\src\AXOpen.Components.Robotics", "{9756BFD9-E39E-4957-AE2C-87203647C4EF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.robotics\src", "{16D45A0B-D494-4C33-9A9B-A216C0F40F95}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.robotics", "..\components.robotics", "{A80F70FB-B8AC-4BCB-BA58-8EDFD11A8055}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{46E1364B-0AE2-4CA4-A1B3-C029B1D597A3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{33069D7B-65D5-4AE9-8299-06468852CABB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{08BEB905-7CB0-43FA-BEBA-1DE531E71382}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Ur.Robotics.blazor", "src\AXOpen.Components.Ur.Robotics.blazor", "{2C0CA3CF-4C50-4533-B2C4-F3355C221EF4}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Ur.Robotics", "src\AXOpen.Components.Ur.Robotics", "{E6D7B1F2-C0BE-44C3-81A3-1A179A324496}" @@ -99,14 +83,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{297C EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{C998E956-0449-4B83-B83D-25A9FF90CAC6}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{95BC5BAB-A8B9-4A91-BEF2-93BA61D8946C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{77E59461-B25C-477F-BC8B-3EEC4B3AAF69}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{38C2732E-6FD3-4B5C-B85D-5A51E8CDF614}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{18ADFA14-14E6-48E4-966F-9AD07B5D099D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{20922125-2DF6-460D-BBFC-8DD9F0F61F1B}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{88B13D35-91E5-48D5-B0C4-1CB4ECF1DFB0}" @@ -121,19 +97,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{88D9C793-2A60-4F96-8C19-33B8D40A97AB}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{15ABEE86-4ECB-401B-8E2A-F054B4F2738F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{E61A0813-3A37-442D-9AC5-BF0F9EE0527B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{86D3D8F4-2445-4A91-9D4A-41CD3C2FC232}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{99112B0D-4A6F-4A5F-B0F4-A4275CF1765C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{B796AB31-20E6-4476-8A6E-D14C6A9FF50C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{101285E4-74F9-4E60-BDFA-560991D48EAC}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{A41B7FEF-F0E6-4DC9-8805-85D13B224D3D}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{16BB134C-4669-4F34-94BE-772FC2D2C443}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{626CBC55-0885-45FA-AAED-31F9BAC5411C}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{B973D310-138C-416C-9F8B-ED81FC8E7D91}" EndProject @@ -165,10 +131,6 @@ Global {47233B2C-8070-4604-9E96-75C96887F4AC}.Debug|Any CPU.Build.0 = Debug|Any CPU {47233B2C-8070-4604-9E96-75C96887F4AC}.Release|Any CPU.ActiveCfg = Release|Any CPU {47233B2C-8070-4604-9E96-75C96887F4AC}.Release|Any CPU.Build.0 = Release|Any CPU - {CE55787C-C49F-4A8C-BAAA-52858E96EA13}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {CE55787C-C49F-4A8C-BAAA-52858E96EA13}.Debug|Any CPU.Build.0 = Debug|Any CPU - {CE55787C-C49F-4A8C-BAAA-52858E96EA13}.Release|Any CPU.ActiveCfg = Release|Any CPU - {CE55787C-C49F-4A8C-BAAA-52858E96EA13}.Release|Any CPU.Build.0 = Release|Any CPU {1F6705BD-7E42-4B6C-89B7-C24AFC5D973D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1F6705BD-7E42-4B6C-89B7-C24AFC5D973D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1F6705BD-7E42-4B6C-89B7-C24AFC5D973D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -177,18 +139,14 @@ Global {FCABB5B7-F673-4424-99BB-5C5493ACB278}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCABB5B7-F673-4424-99BB-5C5493ACB278}.Release|Any CPU.ActiveCfg = Release|Any CPU {FCABB5B7-F673-4424-99BB-5C5493ACB278}.Release|Any CPU.Build.0 = Release|Any CPU + {3CCF3132-4F06-42D7-92A4-2BA9802984C3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3CCF3132-4F06-42D7-92A4-2BA9802984C3}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3CCF3132-4F06-42D7-92A4-2BA9802984C3}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3CCF3132-4F06-42D7-92A4-2BA9802984C3}.Release|Any CPU.Build.0 = Release|Any CPU {2C3D5504-1753-4A63-8BEA-89E328A4D1D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {2C3D5504-1753-4A63-8BEA-89E328A4D1D9}.Debug|Any CPU.Build.0 = Debug|Any CPU {2C3D5504-1753-4A63-8BEA-89E328A4D1D9}.Release|Any CPU.ActiveCfg = Release|Any CPU {2C3D5504-1753-4A63-8BEA-89E328A4D1D9}.Release|Any CPU.Build.0 = Release|Any CPU - {55B84509-76F3-4976-B658-DD73E2000539}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {55B84509-76F3-4976-B658-DD73E2000539}.Debug|Any CPU.Build.0 = Debug|Any CPU - {55B84509-76F3-4976-B658-DD73E2000539}.Release|Any CPU.ActiveCfg = Release|Any CPU - {55B84509-76F3-4976-B658-DD73E2000539}.Release|Any CPU.Build.0 = Release|Any CPU - {17038833-C16B-4A76-A625-84C992CA21EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {17038833-C16B-4A76-A625-84C992CA21EB}.Debug|Any CPU.Build.0 = Debug|Any CPU - {17038833-C16B-4A76-A625-84C992CA21EB}.Release|Any CPU.ActiveCfg = Release|Any CPU - {17038833-C16B-4A76-A625-84C992CA21EB}.Release|Any CPU.Build.0 = Release|Any CPU {4C205053-25BF-4D6D-95A1-9C725ACD82D6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4C205053-25BF-4D6D-95A1-9C725ACD82D6}.Debug|Any CPU.Build.0 = Debug|Any CPU {4C205053-25BF-4D6D-95A1-9C725ACD82D6}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,10 +167,6 @@ Global {DD99C184-DA2C-4E6B-989D-637294C443EA}.Debug|Any CPU.Build.0 = Debug|Any CPU {DD99C184-DA2C-4E6B-989D-637294C443EA}.Release|Any CPU.ActiveCfg = Release|Any CPU {DD99C184-DA2C-4E6B-989D-637294C443EA}.Release|Any CPU.Build.0 = Release|Any CPU - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}.Debug|Any CPU.Build.0 = Debug|Any CPU - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}.Release|Any CPU.ActiveCfg = Release|Any CPU - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC}.Release|Any CPU.Build.0 = Release|Any CPU {396C3582-44CB-4AC8-B933-307B5480E45B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {396C3582-44CB-4AC8-B933-307B5480E45B}.Debug|Any CPU.Build.0 = Debug|Any CPU {396C3582-44CB-4AC8-B933-307B5480E45B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,18 +179,10 @@ Global {2AC8DBD7-1292-406E-A7DA-54B4B445AF6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {2AC8DBD7-1292-406E-A7DA-54B4B445AF6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {2AC8DBD7-1292-406E-A7DA-54B4B445AF6D}.Release|Any CPU.Build.0 = Release|Any CPU - {F23B3398-B893-40AC-A584-131CF1FCEFC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F23B3398-B893-40AC-A584-131CF1FCEFC3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F23B3398-B893-40AC-A584-131CF1FCEFC3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F23B3398-B893-40AC-A584-131CF1FCEFC3}.Release|Any CPU.Build.0 = Release|Any CPU - {4E48056F-27B8-487F-83C8-8EFB4170B638}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4E48056F-27B8-487F-83C8-8EFB4170B638}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4E48056F-27B8-487F-83C8-8EFB4170B638}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4E48056F-27B8-487F-83C8-8EFB4170B638}.Release|Any CPU.Build.0 = Release|Any CPU - {526C9C35-E213-453B-8A92-39138359319A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {526C9C35-E213-453B-8A92-39138359319A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {526C9C35-E213-453B-8A92-39138359319A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {526C9C35-E213-453B-8A92-39138359319A}.Release|Any CPU.Build.0 = Release|Any CPU + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D}.Release|Any CPU.Build.0 = Release|Any CPU {94C278E0-3CAC-4EE6-8476-F44923D5668D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {94C278E0-3CAC-4EE6-8476-F44923D5668D}.Debug|Any CPU.Build.0 = Debug|Any CPU {94C278E0-3CAC-4EE6-8476-F44923D5668D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -255,22 +201,17 @@ Global {F7D0D333-9863-4696-BBA7-FD690A73B146} = {0BE995FC-61F6-4777-9951-F28F13718776} {47233B2C-8070-4604-9E96-75C96887F4AC} = {F6F7FC25-5AEC-4255-8C61-FBCA8A611493} {F6F7FC25-5AEC-4255-8C61-FBCA8A611493} = {72B6B158-117A-4A1A-AFCD-22A218989F55} - {CE55787C-C49F-4A8C-BAAA-52858E96EA13} = {C67F3930-8413-4401-A6D7-9726F79F495A} - {C67F3930-8413-4401-A6D7-9726F79F495A} = {72B6B158-117A-4A1A-AFCD-22A218989F55} {1F6705BD-7E42-4B6C-89B7-C24AFC5D973D} = {0069A7C0-91FB-4BA9-A522-132C49A41EA4} {0069A7C0-91FB-4BA9-A522-132C49A41EA4} = {72B6B158-117A-4A1A-AFCD-22A218989F55} {72B6B158-117A-4A1A-AFCD-22A218989F55} = {55295A4F-1186-4699-9E6E-C87243905A61} {FCABB5B7-F673-4424-99BB-5C5493ACB278} = {97117323-0919-40E1-A6A0-BB6C6726F777} {97117323-0919-40E1-A6A0-BB6C6726F777} = {B6187853-7BBB-458C-8FFA-08171EDC442E} {B6187853-7BBB-458C-8FFA-08171EDC442E} = {6E1303CA-50D6-42B4-9F44-EC553BC6CB48} + {3CCF3132-4F06-42D7-92A4-2BA9802984C3} = {811A699E-2B1F-4BCD-B3CD-9B924088E190} + {811A699E-2B1F-4BCD-B3CD-9B924088E190} = {16D45A0B-D494-4C33-9A9B-A216C0F40F95} {2C3D5504-1753-4A63-8BEA-89E328A4D1D9} = {9756BFD9-E39E-4957-AE2C-87203647C4EF} {9756BFD9-E39E-4957-AE2C-87203647C4EF} = {16D45A0B-D494-4C33-9A9B-A216C0F40F95} {16D45A0B-D494-4C33-9A9B-A216C0F40F95} = {A80F70FB-B8AC-4BCB-BA58-8EDFD11A8055} - {55B84509-76F3-4976-B658-DD73E2000539} = {46E1364B-0AE2-4CA4-A1B3-C029B1D597A3} - {46E1364B-0AE2-4CA4-A1B3-C029B1D597A3} = {08BEB905-7CB0-43FA-BEBA-1DE531E71382} - {17038833-C16B-4A76-A625-84C992CA21EB} = {33069D7B-65D5-4AE9-8299-06468852CABB} - {33069D7B-65D5-4AE9-8299-06468852CABB} = {08BEB905-7CB0-43FA-BEBA-1DE531E71382} - {08BEB905-7CB0-43FA-BEBA-1DE531E71382} = {EBEC1CF0-9ADE-460D-8177-149CC1D5F173} {4C205053-25BF-4D6D-95A1-9C725ACD82D6} = {2C0CA3CF-4C50-4533-B2C4-F3355C221EF4} {2C0CA3CF-4C50-4533-B2C4-F3355C221EF4} = {5773F579-7E27-4F19-8227-95A6A21F03AF} {9A3C5E2A-A1F8-46E1-A1DF-013E66D5173E} = {E6D7B1F2-C0BE-44C3-81A3-1A179A324496} @@ -284,10 +225,6 @@ Global {DD99C184-DA2C-4E6B-989D-637294C443EA} = {EE75B914-458D-4D57-867B-E8B23633D30E} {EE75B914-458D-4D57-867B-E8B23633D30E} = {297C23B2-6287-4D8A-8FEE-75152EBD512D} {297C23B2-6287-4D8A-8FEE-75152EBD512D} = {C998E956-0449-4B83-B83D-25A9FF90CAC6} - {BCBC5B03-1E53-4186-B7D0-2290E11B1CFC} = {95BC5BAB-A8B9-4A91-BEF2-93BA61D8946C} - {95BC5BAB-A8B9-4A91-BEF2-93BA61D8946C} = {77E59461-B25C-477F-BC8B-3EEC4B3AAF69} - {77E59461-B25C-477F-BC8B-3EEC4B3AAF69} = {38C2732E-6FD3-4B5C-B85D-5A51E8CDF614} - {38C2732E-6FD3-4B5C-B85D-5A51E8CDF614} = {18ADFA14-14E6-48E4-966F-9AD07B5D099D} {396C3582-44CB-4AC8-B933-307B5480E45B} = {20922125-2DF6-460D-BBFC-8DD9F0F61F1B} {20922125-2DF6-460D-BBFC-8DD9F0F61F1B} = {18DE6FD5-3582-4E06-BB2A-DDB25B9D24E9} {E2141DF0-2378-4E94-BCC8-B315FC6AE355} = {88B13D35-91E5-48D5-B0C4-1CB4ECF1DFB0} @@ -296,14 +233,8 @@ Global {2AC8DBD7-1292-406E-A7DA-54B4B445AF6D} = {F82071D2-A989-4BE2-B77E-8A72DD516196} {F82071D2-A989-4BE2-B77E-8A72DD516196} = {48110E09-581E-4DFC-A48F-FE081B160B99} {48110E09-581E-4DFC-A48F-FE081B160B99} = {88D9C793-2A60-4F96-8C19-33B8D40A97AB} - {F23B3398-B893-40AC-A584-131CF1FCEFC3} = {15ABEE86-4ECB-401B-8E2A-F054B4F2738F} - {15ABEE86-4ECB-401B-8E2A-F054B4F2738F} = {86D3D8F4-2445-4A91-9D4A-41CD3C2FC232} - {4E48056F-27B8-487F-83C8-8EFB4170B638} = {E61A0813-3A37-442D-9AC5-BF0F9EE0527B} - {E61A0813-3A37-442D-9AC5-BF0F9EE0527B} = {86D3D8F4-2445-4A91-9D4A-41CD3C2FC232} - {86D3D8F4-2445-4A91-9D4A-41CD3C2FC232} = {99112B0D-4A6F-4A5F-B0F4-A4275CF1765C} - {526C9C35-E213-453B-8A92-39138359319A} = {B796AB31-20E6-4476-8A6E-D14C6A9FF50C} - {B796AB31-20E6-4476-8A6E-D14C6A9FF50C} = {101285E4-74F9-4E60-BDFA-560991D48EAC} - {101285E4-74F9-4E60-BDFA-560991D48EAC} = {16BB134C-4669-4F34-94BE-772FC2D2C443} + {A65C180D-C54B-4F93-AC65-E8854BE0FE1D} = {A41B7FEF-F0E6-4DC9-8805-85D13B224D3D} + {A41B7FEF-F0E6-4DC9-8805-85D13B224D3D} = {626CBC55-0885-45FA-AAED-31F9BAC5411C} {94C278E0-3CAC-4EE6-8476-F44923D5668D} = {B973D310-138C-416C-9F8B-ED81FC8E7D91} {B973D310-138C-416C-9F8B-ED81FC8E7D91} = {3569E9C9-2F14-49B2-AD29-0030BFAE3573} {3569E9C9-2F14-49B2-AD29-0030BFAE3573} = {CE4F6B7C-3203-48F7-A96F-C37D8DA5D079} From db793a40540bbbecfcd465055a70f1831a0a6286 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 16:38:57 +0200 Subject: [PATCH 23/33] Refactor solution and project files: remove unused projects and clean up references - Removed references to AXOpen.Logging.Serilog, AXOpen.Components.Zebra.Vision.blazorapp, app_axopen_components_zebra_vision, AXOpen.Data.Json, AXOpen.Security.Blazor, AXOpen.Security, and inxton_axopen_simatic1500 from the solution file. - Added new project reference for AXOpen.Operon.Blazor and updated paths for existing projects. - Cleaned up solution configurations by removing unnecessary build configurations. --- .../components.zebra.vision.code-workspace | 3 - .../components.zebra.vision.sln | 131 ++---------------- src/components.zebra.vision/this.proj | 2 +- src/components.zebra.vision/this.sln | 131 ++---------------- 4 files changed, 21 insertions(+), 246 deletions(-) diff --git a/src/components.zebra.vision/components.zebra.vision.code-workspace b/src/components.zebra.vision/components.zebra.vision.code-workspace index ac22bd760..4b1f40479 100644 --- a/src/components.zebra.vision/components.zebra.vision.code-workspace +++ b/src/components.zebra.vision/components.zebra.vision.code-workspace @@ -2,9 +2,6 @@ "folders": [ { "path": "ctrl" - }, - { - "path": "app" } ], "settings": {} diff --git a/src/components.zebra.vision/components.zebra.vision.sln b/src/components.zebra.vision/components.zebra.vision.sln index 609aeaf3a..df7f803f9 100644 --- a/src/components.zebra.vision/components.zebra.vision.sln +++ b/src/components.zebra.vision/components.zebra.vision.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{AAC64469-C31F-4FFC-AC33-0F0AB43708C1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{B6D9D13B-73FF-4118-B2C0-840F336D1A04}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{3C453065-D2BB-4D8C-9349-A3BC8DAF2B36}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{1673F58B-A6D4-46E5-B018-9D78C364577D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{B974D35D-6AD7-41C8-8C9B-65966D6FFE7C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Zebra.Vision.blazorapp", "app\ix-blazor\AXOpen.Components.Zebra.Vision.blazorapp.csproj", "{E1746D94-B230-4D3C-8FE7-DC85705BC49D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_zebra_vision", "app\ix\app_axopen_components_zebra_vision.csproj", "{9154A552-4CF7-42B9-87BC-34B70815DC91}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Zebra.Vision.blazor", "src\AXOpen.Components.Zebra.Vision.blazor\AXOpen.Components.Zebra.Vision.blazor.csproj", "{82E3F6F4-55CA-413B-BF27-BC15C4DAA16B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_zebra_vision", "src\AXOpen.Components.Zebra.Vision\inxton_axopen_components_zebra_vision.csproj", "{64D18AA7-1064-41A2-AA6B-0F80BD095981}" @@ -25,26 +19,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{1D683CF1-8B17-4A2F-A6C8-11B421796D0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{700F3606-BD6E-4C35-B841-8EB58D80EB71}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{581FB3E1-7834-4064-A601-0F24DF635C76}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{69E7B132-27A9-4178-BA84-CD8F6B2614A5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{FF0139B3-6232-47DE-90A2-3A5D4BCB5D88}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{79A2F7B0-8623-4E8E-99BD-EA17413B5D71}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{EA1AC20A-14F2-4011-A0C4-4395431D3A63}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{3DB8E089-BBC0-4D13-85BD-0A49327D9F21}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{4F5ECE0C-2127-401A-8362-C9AB6F8A01F0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.ToolBox", "..\toolbox\src\AXOpen.ToolBox\AXOpen.ToolBox.csproj", "{02C1776D-7B46-4809-9F7B-74718B244A6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Operon", "..\..\..\operon\src\Operon\Operon.csproj", "{24BA4A94-87AE-4171-BC56-756E7ACEA69D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Abstractions", "..\abstractions\src\AXOpen.Abstractions", "{BF2A984B-43FF-4776-BDB8-5893E3DAE312}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\abstractions\src", "{4ABFAAE5-D905-4C94-B516-DD9F6C5F701B}" @@ -53,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{3A5085E0-0CA1-4204-92F0-47A06BC2C3E1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{3E68B2BF-5E17-4D0B-8D4C-13C643D4FA5B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{A62B0D46-F7CF-409C-80E0-EB0DF1748DAF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4}" @@ -67,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{61BE9F60-C812-4A2B-9EA4-5673FAA1D694}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{F4544106-4789-4CD9-8C9E-BA7FF82FF96B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{A2ACD3B2-765F-4AAB-9333-DD8299F4DF1E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{A901D89D-A6FE-42FE-BA59-CCCCFDF9121B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Zebra.Vision.blazor", "src\AXOpen.Components.Zebra.Vision.blazor", "{1014367C-B113-46F8-96BE-39130424E186}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Zebra.Vision", "src\AXOpen.Components.Zebra.Vision", "{FCFCEA60-440F-474A-968C-7127571E001C}" @@ -93,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{BEC4 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{B603BEB0-C5F4-4CAF-8643-782FDE8EAF02}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{65757385-6261-4A1C-A68D-07E364EFDF6B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{85A508A8-29C0-46C4-A1BA-8AEDAE006F38}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{78A82FA5-03B0-4E47-80C9-ED6463C40223}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{45299A8F-640B-4C87-B737-6B2B8A19D61C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{D3C029DE-B97F-451C-AE4C-A03A99103A3D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{7218DD91-0140-4DAB-BE19-7AEBB9107DE0}" @@ -115,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{9B2DC4A3-1B2D-4476-80DB-E9D6FB2640C7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{266476A0-ABEC-49D1-B133-AA14959C0208}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{DB77A61D-B0B9-4EDE-86EB-ADF7D5033668}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{4F49C455-3411-4071-8862-8CBB094BADED}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{D86C3932-2647-4BCD-BF98-552FB71619FE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{58D763DA-9C2F-4235-B37D-F552E396E13D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{D4A13738-1C2E-401B-ABBF-48925517B8CF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{B018B2C4-8DB3-4FB4-A944-5F4A926EC06B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{336B7211-1528-4FDE-8F94-045ED5D5E08E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{B53CDA70-40DC-4583-8E8A-6B6A0EF34851}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{A6EA2E3F-9B72-4B80-BABB-1AB56EEEBA57}" EndProject @@ -141,16 +101,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\toolbox\src", "{A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "toolbox", "..\toolbox", "{B0072C8C-BE37-4E47-A29D-DC2074C8E3CE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\..\src", "{AD10C699-32BD-42DF-9437-348174B9D8C3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "axopen", "..\..\..\axopen", "{78EEAA6F-DA6F-4B9F-8C53-FFE210ED1B18}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Operon", "..\..\..\operon\src\Operon", "{C0D85867-6121-4E86-8256-97042D95FBD3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\..\..\operon\src", "{F2E2E594-5A4A-4943-9CEE-51E3DF6C86D2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "operon", "..\..\..\operon", "{D1E1FADF-8019-4D55-B915-10DD16D9547A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -169,10 +119,6 @@ Global {3C453065-D2BB-4D8C-9349-A3BC8DAF2B36}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C453065-D2BB-4D8C-9349-A3BC8DAF2B36}.Release|Any CPU.ActiveCfg = Release|Any CPU {3C453065-D2BB-4D8C-9349-A3BC8DAF2B36}.Release|Any CPU.Build.0 = Release|Any CPU - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}.Release|Any CPU.Build.0 = Release|Any CPU {1673F58B-A6D4-46E5-B018-9D78C364577D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1673F58B-A6D4-46E5-B018-9D78C364577D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1673F58B-A6D4-46E5-B018-9D78C364577D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -181,14 +127,6 @@ Global {B974D35D-6AD7-41C8-8C9B-65966D6FFE7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {B974D35D-6AD7-41C8-8C9B-65966D6FFE7C}.Release|Any CPU.ActiveCfg = Release|Any CPU {B974D35D-6AD7-41C8-8C9B-65966D6FFE7C}.Release|Any CPU.Build.0 = Release|Any CPU - {E1746D94-B230-4D3C-8FE7-DC85705BC49D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1746D94-B230-4D3C-8FE7-DC85705BC49D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1746D94-B230-4D3C-8FE7-DC85705BC49D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1746D94-B230-4D3C-8FE7-DC85705BC49D}.Release|Any CPU.Build.0 = Release|Any CPU - {9154A552-4CF7-42B9-87BC-34B70815DC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9154A552-4CF7-42B9-87BC-34B70815DC91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9154A552-4CF7-42B9-87BC-34B70815DC91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9154A552-4CF7-42B9-87BC-34B70815DC91}.Release|Any CPU.Build.0 = Release|Any CPU {82E3F6F4-55CA-413B-BF27-BC15C4DAA16B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82E3F6F4-55CA-413B-BF27-BC15C4DAA16B}.Debug|Any CPU.Build.0 = Debug|Any CPU {82E3F6F4-55CA-413B-BF27-BC15C4DAA16B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,10 +147,6 @@ Global {1D683CF1-8B17-4A2F-A6C8-11B421796D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D683CF1-8B17-4A2F-A6C8-11B421796D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU {1D683CF1-8B17-4A2F-A6C8-11B421796D0B}.Release|Any CPU.Build.0 = Release|Any CPU - {700F3606-BD6E-4C35-B841-8EB58D80EB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {700F3606-BD6E-4C35-B841-8EB58D80EB71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {700F3606-BD6E-4C35-B841-8EB58D80EB71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {700F3606-BD6E-4C35-B841-8EB58D80EB71}.Release|Any CPU.Build.0 = Release|Any CPU {581FB3E1-7834-4064-A601-0F24DF635C76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {581FB3E1-7834-4064-A601-0F24DF635C76}.Debug|Any CPU.Build.0 = Debug|Any CPU {581FB3E1-7834-4064-A601-0F24DF635C76}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,18 +159,10 @@ Global {FF0139B3-6232-47DE-90A2-3A5D4BCB5D88}.Debug|Any CPU.Build.0 = Debug|Any CPU {FF0139B3-6232-47DE-90A2-3A5D4BCB5D88}.Release|Any CPU.ActiveCfg = Release|Any CPU {FF0139B3-6232-47DE-90A2-3A5D4BCB5D88}.Release|Any CPU.Build.0 = Release|Any CPU - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}.Release|Any CPU.Build.0 = Release|Any CPU - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71}.Release|Any CPU.Build.0 = Release|Any CPU - {EA1AC20A-14F2-4011-A0C4-4395431D3A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA1AC20A-14F2-4011-A0C4-4395431D3A63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA1AC20A-14F2-4011-A0C4-4395431D3A63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA1AC20A-14F2-4011-A0C4-4395431D3A63}.Release|Any CPU.Build.0 = Release|Any CPU + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21}.Release|Any CPU.Build.0 = Release|Any CPU {4F5ECE0C-2127-401A-8362-C9AB6F8A01F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4F5ECE0C-2127-401A-8362-C9AB6F8A01F0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4F5ECE0C-2127-401A-8362-C9AB6F8A01F0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -245,10 +171,6 @@ Global {02C1776D-7B46-4809-9F7B-74718B244A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {02C1776D-7B46-4809-9F7B-74718B244A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {02C1776D-7B46-4809-9F7B-74718B244A6D}.Release|Any CPU.Build.0 = Release|Any CPU - {24BA4A94-87AE-4171-BC56-756E7ACEA69D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24BA4A94-87AE-4171-BC56-756E7ACEA69D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24BA4A94-87AE-4171-BC56-756E7ACEA69D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24BA4A94-87AE-4171-BC56-756E7ACEA69D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -257,24 +179,14 @@ Global {B6D9D13B-73FF-4118-B2C0-840F336D1A04} = {BF2A984B-43FF-4776-BDB8-5893E3DAE312} {BF2A984B-43FF-4776-BDB8-5893E3DAE312} = {4ABFAAE5-D905-4C94-B516-DD9F6C5F701B} {4ABFAAE5-D905-4C94-B516-DD9F6C5F701B} = {A75069B5-7F96-4EC3-952F-8570452B8EF0} - {A75069B5-7F96-4EC3-952F-8570452B8EF0} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {3C453065-D2BB-4D8C-9349-A3BC8DAF2B36} = {3A5085E0-0CA1-4204-92F0-47A06BC2C3E1} {3A5085E0-0CA1-4204-92F0-47A06BC2C3E1} = {8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4} - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303} = {3E68B2BF-5E17-4D0B-8D4C-13C643D4FA5B} - {3E68B2BF-5E17-4D0B-8D4C-13C643D4FA5B} = {8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4} {1673F58B-A6D4-46E5-B018-9D78C364577D} = {A62B0D46-F7CF-409C-80E0-EB0DF1748DAF} {A62B0D46-F7CF-409C-80E0-EB0DF1748DAF} = {8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4} {8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4} = {377C9DEC-B8C2-440A-B99C-7C28E4CB30CE} - {377C9DEC-B8C2-440A-B99C-7C28E4CB30CE} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {B974D35D-6AD7-41C8-8C9B-65966D6FFE7C} = {F4472607-2549-464E-9F94-D0A0A0EA892C} {F4472607-2549-464E-9F94-D0A0A0EA892C} = {D9101385-088D-4583-90AE-7E995D6FFA8E} {D9101385-088D-4583-90AE-7E995D6FFA8E} = {61BE9F60-C812-4A2B-9EA4-5673FAA1D694} - {61BE9F60-C812-4A2B-9EA4-5673FAA1D694} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {E1746D94-B230-4D3C-8FE7-DC85705BC49D} = {F4544106-4789-4CD9-8C9E-BA7FF82FF96B} - {F4544106-4789-4CD9-8C9E-BA7FF82FF96B} = {A901D89D-A6FE-42FE-BA59-CCCCFDF9121B} - {9154A552-4CF7-42B9-87BC-34B70815DC91} = {A2ACD3B2-765F-4AAB-9333-DD8299F4DF1E} - {A2ACD3B2-765F-4AAB-9333-DD8299F4DF1E} = {A901D89D-A6FE-42FE-BA59-CCCCFDF9121B} - {A901D89D-A6FE-42FE-BA59-CCCCFDF9121B} = {2546ADEE-7510-4BFD-9B06-F3DA0C43CBAB} {82E3F6F4-55CA-413B-BF27-BC15C4DAA16B} = {1014367C-B113-46F8-96BE-39130424E186} {1014367C-B113-46F8-96BE-39130424E186} = {0BDE3E18-8D3E-4EDA-B469-20293F653BDA} {64D18AA7-1064-41A2-AA6B-0F80BD095981} = {FCFCEA60-440F-474A-968C-7127571E001C} @@ -283,50 +195,27 @@ Global {CA4F2DA5-DC45-4184-A142-7529F4C705AF} = {31959F65-7D9F-4E5A-BD3B-02152745AA15} {31959F65-7D9F-4E5A-BD3B-02152745AA15} = {B5F52EB7-915B-4B4F-805E-57D3ACFE8FEA} {B5F52EB7-915B-4B4F-805E-57D3ACFE8FEA} = {2546ADEE-7510-4BFD-9B06-F3DA0C43CBAB} - {2546ADEE-7510-4BFD-9B06-F3DA0C43CBAB} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {8CCC24E4-B862-4375-ACDD-AA95B4FC8F5E} = {A79E91EA-30DB-4B3C-ABB4-672BCD82F6D6} {A79E91EA-30DB-4B3C-ABB4-672BCD82F6D6} = {BEC41A99-0D3D-4716-B21F-541814CB19DD} {1D683CF1-8B17-4A2F-A6C8-11B421796D0B} = {226AE571-D7B8-438C-A232-810D303B5171} {226AE571-D7B8-438C-A232-810D303B5171} = {BEC41A99-0D3D-4716-B21F-541814CB19DD} {BEC41A99-0D3D-4716-B21F-541814CB19DD} = {B603BEB0-C5F4-4CAF-8643-782FDE8EAF02} - {B603BEB0-C5F4-4CAF-8643-782FDE8EAF02} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {700F3606-BD6E-4C35-B841-8EB58D80EB71} = {65757385-6261-4A1C-A68D-07E364EFDF6B} - {65757385-6261-4A1C-A68D-07E364EFDF6B} = {85A508A8-29C0-46C4-A1BA-8AEDAE006F38} - {85A508A8-29C0-46C4-A1BA-8AEDAE006F38} = {78A82FA5-03B0-4E47-80C9-ED6463C40223} - {78A82FA5-03B0-4E47-80C9-ED6463C40223} = {45299A8F-640B-4C87-B737-6B2B8A19D61C} - {45299A8F-640B-4C87-B737-6B2B8A19D61C} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {581FB3E1-7834-4064-A601-0F24DF635C76} = {D3C029DE-B97F-451C-AE4C-A03A99103A3D} {D3C029DE-B97F-451C-AE4C-A03A99103A3D} = {E4FABC1A-D9A4-4E26-ACAB-49E7793DBC25} {69E7B132-27A9-4178-BA84-CD8F6B2614A5} = {7218DD91-0140-4DAB-BE19-7AEBB9107DE0} {7218DD91-0140-4DAB-BE19-7AEBB9107DE0} = {E4FABC1A-D9A4-4E26-ACAB-49E7793DBC25} {E4FABC1A-D9A4-4E26-ACAB-49E7793DBC25} = {045FF585-5AB9-4E3C-A0C9-526728CCAA7D} - {045FF585-5AB9-4E3C-A0C9-526728CCAA7D} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {FF0139B3-6232-47DE-90A2-3A5D4BCB5D88} = {1791A34A-1E60-4AEB-BBF4-CFACFB37BA7B} {1791A34A-1E60-4AEB-BBF4-CFACFB37BA7B} = {0B023928-34C5-4DFC-ADE9-5F354BC08391} {0B023928-34C5-4DFC-ADE9-5F354BC08391} = {9B2DC4A3-1B2D-4476-80DB-E9D6FB2640C7} - {9B2DC4A3-1B2D-4476-80DB-E9D6FB2640C7} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA} = {266476A0-ABEC-49D1-B133-AA14959C0208} - {266476A0-ABEC-49D1-B133-AA14959C0208} = {4F49C455-3411-4071-8862-8CBB094BADED} - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71} = {DB77A61D-B0B9-4EDE-86EB-ADF7D5033668} - {DB77A61D-B0B9-4EDE-86EB-ADF7D5033668} = {4F49C455-3411-4071-8862-8CBB094BADED} - {4F49C455-3411-4071-8862-8CBB094BADED} = {D86C3932-2647-4BCD-BF98-552FB71619FE} - {D86C3932-2647-4BCD-BF98-552FB71619FE} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {EA1AC20A-14F2-4011-A0C4-4395431D3A63} = {58D763DA-9C2F-4235-B37D-F552E396E13D} - {58D763DA-9C2F-4235-B37D-F552E396E13D} = {B018B2C4-8DB3-4FB4-A944-5F4A926EC06B} - {B018B2C4-8DB3-4FB4-A944-5F4A926EC06B} = {336B7211-1528-4FDE-8F94-045ED5D5E08E} - {336B7211-1528-4FDE-8F94-045ED5D5E08E} = {AD10C699-32BD-42DF-9437-348174B9D8C3} + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21} = {D4A13738-1C2E-401B-ABBF-48925517B8CF} + {D4A13738-1C2E-401B-ABBF-48925517B8CF} = {B53CDA70-40DC-4583-8E8A-6B6A0EF34851} {4F5ECE0C-2127-401A-8362-C9AB6F8A01F0} = {A6EA2E3F-9B72-4B80-BABB-1AB56EEEBA57} {A6EA2E3F-9B72-4B80-BABB-1AB56EEEBA57} = {4CC4A73A-A8A3-4FB8-94FE-618A61F675EC} {4CC4A73A-A8A3-4FB8-94FE-618A61F675EC} = {B7193D75-8F51-473E-AE86-8071C36BE4FC} - {B7193D75-8F51-473E-AE86-8071C36BE4FC} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {02C1776D-7B46-4809-9F7B-74718B244A6D} = {E6D7B36A-4935-41B4-B990-D4AD0EEE9A9F} {E6D7B36A-4935-41B4-B990-D4AD0EEE9A9F} = {A48FF5E2-F392-4E0B-827D-15D5F3A6C495} {A48FF5E2-F392-4E0B-827D-15D5F3A6C495} = {B0072C8C-BE37-4E47-A29D-DC2074C8E3CE} - {B0072C8C-BE37-4E47-A29D-DC2074C8E3CE} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {AD10C699-32BD-42DF-9437-348174B9D8C3} = {78EEAA6F-DA6F-4B9F-8C53-FFE210ED1B18} - {24BA4A94-87AE-4171-BC56-756E7ACEA69D} = {C0D85867-6121-4E86-8256-97042D95FBD3} - {C0D85867-6121-4E86-8256-97042D95FBD3} = {F2E2E594-5A4A-4943-9CEE-51E3DF6C86D2} - {F2E2E594-5A4A-4943-9CEE-51E3DF6C86D2} = {D1E1FADF-8019-4D55-B915-10DD16D9547A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {51A6767F-6A78-48F1-9012-CB794574DD4B} diff --git a/src/components.zebra.vision/this.proj b/src/components.zebra.vision/this.proj index 54f45100d..fb302073b 100644 --- a/src/components.zebra.vision/this.proj +++ b/src/components.zebra.vision/this.proj @@ -1,4 +1,4 @@ - + diff --git a/src/components.zebra.vision/this.sln b/src/components.zebra.vision/this.sln index 609aeaf3a..df7f803f9 100644 --- a/src/components.zebra.vision/this.sln +++ b/src/components.zebra.vision/this.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{AAC64469-C31F-4FFC-AC33-0F0AB43708C1}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{B6D9D13B-73FF-4118-B2C0-840F336D1A04}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{3C453065-D2BB-4D8C-9349-A3BC8DAF2B36}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{1673F58B-A6D4-46E5-B018-9D78C364577D}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{B974D35D-6AD7-41C8-8C9B-65966D6FFE7C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Zebra.Vision.blazorapp", "app\ix-blazor\AXOpen.Components.Zebra.Vision.blazorapp.csproj", "{E1746D94-B230-4D3C-8FE7-DC85705BC49D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "app_axopen_components_zebra_vision", "app\ix\app_axopen_components_zebra_vision.csproj", "{9154A552-4CF7-42B9-87BC-34B70815DC91}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Zebra.Vision.blazor", "src\AXOpen.Components.Zebra.Vision.blazor\AXOpen.Components.Zebra.Vision.blazor.csproj", "{82E3F6F4-55CA-413B-BF27-BC15C4DAA16B}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_zebra_vision", "src\AXOpen.Components.Zebra.Vision\inxton_axopen_components_zebra_vision.csproj", "{64D18AA7-1064-41A2-AA6B-0F80BD095981}" @@ -25,26 +19,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{1D683CF1-8B17-4A2F-A6C8-11B421796D0B}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{700F3606-BD6E-4C35-B841-8EB58D80EB71}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor\AXOpen.Io.blazor.csproj", "{581FB3E1-7834-4064-A601-0F24DF635C76}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_io", "..\io\src\AXOpen.Io\inxton_axopen_io.csproj", "{69E7B132-27A9-4178-BA84-CD8F6B2614A5}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{FF0139B3-6232-47DE-90A2-3A5D4BCB5D88}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{79A2F7B0-8623-4E8E-99BD-EA17413B5D71}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{EA1AC20A-14F2-4011-A0C4-4395431D3A63}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{3DB8E089-BBC0-4D13-85BD-0A49327D9F21}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{4F5ECE0C-2127-401A-8362-C9AB6F8A01F0}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.ToolBox", "..\toolbox\src\AXOpen.ToolBox\AXOpen.ToolBox.csproj", "{02C1776D-7B46-4809-9F7B-74718B244A6D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Operon", "..\..\..\operon\src\Operon\Operon.csproj", "{24BA4A94-87AE-4171-BC56-756E7ACEA69D}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Abstractions", "..\abstractions\src\AXOpen.Abstractions", "{BF2A984B-43FF-4776-BDB8-5893E3DAE312}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\abstractions\src", "{4ABFAAE5-D905-4C94-B516-DD9F6C5F701B}" @@ -53,8 +39,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{3A5085E0-0CA1-4204-92F0-47A06BC2C3E1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{3E68B2BF-5E17-4D0B-8D4C-13C643D4FA5B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{A62B0D46-F7CF-409C-80E0-EB0DF1748DAF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4}" @@ -67,12 +51,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{61BE9F60-C812-4A2B-9EA4-5673FAA1D694}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{F4544106-4789-4CD9-8C9E-BA7FF82FF96B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{A2ACD3B2-765F-4AAB-9333-DD8299F4DF1E}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{A901D89D-A6FE-42FE-BA59-CCCCFDF9121B}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Zebra.Vision.blazor", "src\AXOpen.Components.Zebra.Vision.blazor", "{1014367C-B113-46F8-96BE-39130424E186}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Zebra.Vision", "src\AXOpen.Components.Zebra.Vision", "{FCFCEA60-440F-474A-968C-7127571E001C}" @@ -93,14 +71,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{BEC4 EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{B603BEB0-C5F4-4CAF-8643-782FDE8EAF02}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{65757385-6261-4A1C-A68D-07E364EFDF6B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{85A508A8-29C0-46C4-A1BA-8AEDAE006F38}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{78A82FA5-03B0-4E47-80C9-ED6463C40223}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{45299A8F-640B-4C87-B737-6B2B8A19D61C}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io.blazor", "..\io\src\AXOpen.Io.blazor", "{D3C029DE-B97F-451C-AE4C-A03A99103A3D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Io", "..\io\src\AXOpen.Io", "{7218DD91-0140-4DAB-BE19-7AEBB9107DE0}" @@ -115,19 +85,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{9B2DC4A3-1B2D-4476-80DB-E9D6FB2640C7}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{266476A0-ABEC-49D1-B133-AA14959C0208}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{DB77A61D-B0B9-4EDE-86EB-ADF7D5033668}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{4F49C455-3411-4071-8862-8CBB094BADED}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{D86C3932-2647-4BCD-BF98-552FB71619FE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{58D763DA-9C2F-4235-B37D-F552E396E13D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{D4A13738-1C2E-401B-ABBF-48925517B8CF}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{B018B2C4-8DB3-4FB4-A944-5F4A926EC06B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{336B7211-1528-4FDE-8F94-045ED5D5E08E}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{B53CDA70-40DC-4583-8E8A-6B6A0EF34851}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{A6EA2E3F-9B72-4B80-BABB-1AB56EEEBA57}" EndProject @@ -141,16 +101,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\toolbox\src", "{A EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "toolbox", "..\toolbox", "{B0072C8C-BE37-4E47-A29D-DC2074C8E3CE}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\..\src", "{AD10C699-32BD-42DF-9437-348174B9D8C3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "axopen", "..\..\..\axopen", "{78EEAA6F-DA6F-4B9F-8C53-FFE210ED1B18}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Operon", "..\..\..\operon\src\Operon", "{C0D85867-6121-4E86-8256-97042D95FBD3}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\..\..\operon\src", "{F2E2E594-5A4A-4943-9CEE-51E3DF6C86D2}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "operon", "..\..\..\operon", "{D1E1FADF-8019-4D55-B915-10DD16D9547A}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -169,10 +119,6 @@ Global {3C453065-D2BB-4D8C-9349-A3BC8DAF2B36}.Debug|Any CPU.Build.0 = Debug|Any CPU {3C453065-D2BB-4D8C-9349-A3BC8DAF2B36}.Release|Any CPU.ActiveCfg = Release|Any CPU {3C453065-D2BB-4D8C-9349-A3BC8DAF2B36}.Release|Any CPU.Build.0 = Release|Any CPU - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303}.Release|Any CPU.Build.0 = Release|Any CPU {1673F58B-A6D4-46E5-B018-9D78C364577D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {1673F58B-A6D4-46E5-B018-9D78C364577D}.Debug|Any CPU.Build.0 = Debug|Any CPU {1673F58B-A6D4-46E5-B018-9D78C364577D}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -181,14 +127,6 @@ Global {B974D35D-6AD7-41C8-8C9B-65966D6FFE7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {B974D35D-6AD7-41C8-8C9B-65966D6FFE7C}.Release|Any CPU.ActiveCfg = Release|Any CPU {B974D35D-6AD7-41C8-8C9B-65966D6FFE7C}.Release|Any CPU.Build.0 = Release|Any CPU - {E1746D94-B230-4D3C-8FE7-DC85705BC49D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E1746D94-B230-4D3C-8FE7-DC85705BC49D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E1746D94-B230-4D3C-8FE7-DC85705BC49D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E1746D94-B230-4D3C-8FE7-DC85705BC49D}.Release|Any CPU.Build.0 = Release|Any CPU - {9154A552-4CF7-42B9-87BC-34B70815DC91}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9154A552-4CF7-42B9-87BC-34B70815DC91}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9154A552-4CF7-42B9-87BC-34B70815DC91}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9154A552-4CF7-42B9-87BC-34B70815DC91}.Release|Any CPU.Build.0 = Release|Any CPU {82E3F6F4-55CA-413B-BF27-BC15C4DAA16B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {82E3F6F4-55CA-413B-BF27-BC15C4DAA16B}.Debug|Any CPU.Build.0 = Debug|Any CPU {82E3F6F4-55CA-413B-BF27-BC15C4DAA16B}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -209,10 +147,6 @@ Global {1D683CF1-8B17-4A2F-A6C8-11B421796D0B}.Debug|Any CPU.Build.0 = Debug|Any CPU {1D683CF1-8B17-4A2F-A6C8-11B421796D0B}.Release|Any CPU.ActiveCfg = Release|Any CPU {1D683CF1-8B17-4A2F-A6C8-11B421796D0B}.Release|Any CPU.Build.0 = Release|Any CPU - {700F3606-BD6E-4C35-B841-8EB58D80EB71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {700F3606-BD6E-4C35-B841-8EB58D80EB71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {700F3606-BD6E-4C35-B841-8EB58D80EB71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {700F3606-BD6E-4C35-B841-8EB58D80EB71}.Release|Any CPU.Build.0 = Release|Any CPU {581FB3E1-7834-4064-A601-0F24DF635C76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {581FB3E1-7834-4064-A601-0F24DF635C76}.Debug|Any CPU.Build.0 = Debug|Any CPU {581FB3E1-7834-4064-A601-0F24DF635C76}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,18 +159,10 @@ Global {FF0139B3-6232-47DE-90A2-3A5D4BCB5D88}.Debug|Any CPU.Build.0 = Debug|Any CPU {FF0139B3-6232-47DE-90A2-3A5D4BCB5D88}.Release|Any CPU.ActiveCfg = Release|Any CPU {FF0139B3-6232-47DE-90A2-3A5D4BCB5D88}.Release|Any CPU.Build.0 = Release|Any CPU - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA}.Release|Any CPU.Build.0 = Release|Any CPU - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71}.Debug|Any CPU.Build.0 = Debug|Any CPU - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71}.Release|Any CPU.ActiveCfg = Release|Any CPU - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71}.Release|Any CPU.Build.0 = Release|Any CPU - {EA1AC20A-14F2-4011-A0C4-4395431D3A63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EA1AC20A-14F2-4011-A0C4-4395431D3A63}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EA1AC20A-14F2-4011-A0C4-4395431D3A63}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EA1AC20A-14F2-4011-A0C4-4395431D3A63}.Release|Any CPU.Build.0 = Release|Any CPU + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21}.Release|Any CPU.Build.0 = Release|Any CPU {4F5ECE0C-2127-401A-8362-C9AB6F8A01F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4F5ECE0C-2127-401A-8362-C9AB6F8A01F0}.Debug|Any CPU.Build.0 = Debug|Any CPU {4F5ECE0C-2127-401A-8362-C9AB6F8A01F0}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -245,10 +171,6 @@ Global {02C1776D-7B46-4809-9F7B-74718B244A6D}.Debug|Any CPU.Build.0 = Debug|Any CPU {02C1776D-7B46-4809-9F7B-74718B244A6D}.Release|Any CPU.ActiveCfg = Release|Any CPU {02C1776D-7B46-4809-9F7B-74718B244A6D}.Release|Any CPU.Build.0 = Release|Any CPU - {24BA4A94-87AE-4171-BC56-756E7ACEA69D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24BA4A94-87AE-4171-BC56-756E7ACEA69D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24BA4A94-87AE-4171-BC56-756E7ACEA69D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24BA4A94-87AE-4171-BC56-756E7ACEA69D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -257,24 +179,14 @@ Global {B6D9D13B-73FF-4118-B2C0-840F336D1A04} = {BF2A984B-43FF-4776-BDB8-5893E3DAE312} {BF2A984B-43FF-4776-BDB8-5893E3DAE312} = {4ABFAAE5-D905-4C94-B516-DD9F6C5F701B} {4ABFAAE5-D905-4C94-B516-DD9F6C5F701B} = {A75069B5-7F96-4EC3-952F-8570452B8EF0} - {A75069B5-7F96-4EC3-952F-8570452B8EF0} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {3C453065-D2BB-4D8C-9349-A3BC8DAF2B36} = {3A5085E0-0CA1-4204-92F0-47A06BC2C3E1} {3A5085E0-0CA1-4204-92F0-47A06BC2C3E1} = {8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4} - {A61A56F8-D7F2-4DB6-B5B2-747F38EEA303} = {3E68B2BF-5E17-4D0B-8D4C-13C643D4FA5B} - {3E68B2BF-5E17-4D0B-8D4C-13C643D4FA5B} = {8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4} {1673F58B-A6D4-46E5-B018-9D78C364577D} = {A62B0D46-F7CF-409C-80E0-EB0DF1748DAF} {A62B0D46-F7CF-409C-80E0-EB0DF1748DAF} = {8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4} {8E63ECE4-F35C-49C4-B28D-5A9AE6F036F4} = {377C9DEC-B8C2-440A-B99C-7C28E4CB30CE} - {377C9DEC-B8C2-440A-B99C-7C28E4CB30CE} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {B974D35D-6AD7-41C8-8C9B-65966D6FFE7C} = {F4472607-2549-464E-9F94-D0A0A0EA892C} {F4472607-2549-464E-9F94-D0A0A0EA892C} = {D9101385-088D-4583-90AE-7E995D6FFA8E} {D9101385-088D-4583-90AE-7E995D6FFA8E} = {61BE9F60-C812-4A2B-9EA4-5673FAA1D694} - {61BE9F60-C812-4A2B-9EA4-5673FAA1D694} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {E1746D94-B230-4D3C-8FE7-DC85705BC49D} = {F4544106-4789-4CD9-8C9E-BA7FF82FF96B} - {F4544106-4789-4CD9-8C9E-BA7FF82FF96B} = {A901D89D-A6FE-42FE-BA59-CCCCFDF9121B} - {9154A552-4CF7-42B9-87BC-34B70815DC91} = {A2ACD3B2-765F-4AAB-9333-DD8299F4DF1E} - {A2ACD3B2-765F-4AAB-9333-DD8299F4DF1E} = {A901D89D-A6FE-42FE-BA59-CCCCFDF9121B} - {A901D89D-A6FE-42FE-BA59-CCCCFDF9121B} = {2546ADEE-7510-4BFD-9B06-F3DA0C43CBAB} {82E3F6F4-55CA-413B-BF27-BC15C4DAA16B} = {1014367C-B113-46F8-96BE-39130424E186} {1014367C-B113-46F8-96BE-39130424E186} = {0BDE3E18-8D3E-4EDA-B469-20293F653BDA} {64D18AA7-1064-41A2-AA6B-0F80BD095981} = {FCFCEA60-440F-474A-968C-7127571E001C} @@ -283,50 +195,27 @@ Global {CA4F2DA5-DC45-4184-A142-7529F4C705AF} = {31959F65-7D9F-4E5A-BD3B-02152745AA15} {31959F65-7D9F-4E5A-BD3B-02152745AA15} = {B5F52EB7-915B-4B4F-805E-57D3ACFE8FEA} {B5F52EB7-915B-4B4F-805E-57D3ACFE8FEA} = {2546ADEE-7510-4BFD-9B06-F3DA0C43CBAB} - {2546ADEE-7510-4BFD-9B06-F3DA0C43CBAB} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {8CCC24E4-B862-4375-ACDD-AA95B4FC8F5E} = {A79E91EA-30DB-4B3C-ABB4-672BCD82F6D6} {A79E91EA-30DB-4B3C-ABB4-672BCD82F6D6} = {BEC41A99-0D3D-4716-B21F-541814CB19DD} {1D683CF1-8B17-4A2F-A6C8-11B421796D0B} = {226AE571-D7B8-438C-A232-810D303B5171} {226AE571-D7B8-438C-A232-810D303B5171} = {BEC41A99-0D3D-4716-B21F-541814CB19DD} {BEC41A99-0D3D-4716-B21F-541814CB19DD} = {B603BEB0-C5F4-4CAF-8643-782FDE8EAF02} - {B603BEB0-C5F4-4CAF-8643-782FDE8EAF02} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {700F3606-BD6E-4C35-B841-8EB58D80EB71} = {65757385-6261-4A1C-A68D-07E364EFDF6B} - {65757385-6261-4A1C-A68D-07E364EFDF6B} = {85A508A8-29C0-46C4-A1BA-8AEDAE006F38} - {85A508A8-29C0-46C4-A1BA-8AEDAE006F38} = {78A82FA5-03B0-4E47-80C9-ED6463C40223} - {78A82FA5-03B0-4E47-80C9-ED6463C40223} = {45299A8F-640B-4C87-B737-6B2B8A19D61C} - {45299A8F-640B-4C87-B737-6B2B8A19D61C} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {581FB3E1-7834-4064-A601-0F24DF635C76} = {D3C029DE-B97F-451C-AE4C-A03A99103A3D} {D3C029DE-B97F-451C-AE4C-A03A99103A3D} = {E4FABC1A-D9A4-4E26-ACAB-49E7793DBC25} {69E7B132-27A9-4178-BA84-CD8F6B2614A5} = {7218DD91-0140-4DAB-BE19-7AEBB9107DE0} {7218DD91-0140-4DAB-BE19-7AEBB9107DE0} = {E4FABC1A-D9A4-4E26-ACAB-49E7793DBC25} {E4FABC1A-D9A4-4E26-ACAB-49E7793DBC25} = {045FF585-5AB9-4E3C-A0C9-526728CCAA7D} - {045FF585-5AB9-4E3C-A0C9-526728CCAA7D} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {FF0139B3-6232-47DE-90A2-3A5D4BCB5D88} = {1791A34A-1E60-4AEB-BBF4-CFACFB37BA7B} {1791A34A-1E60-4AEB-BBF4-CFACFB37BA7B} = {0B023928-34C5-4DFC-ADE9-5F354BC08391} {0B023928-34C5-4DFC-ADE9-5F354BC08391} = {9B2DC4A3-1B2D-4476-80DB-E9D6FB2640C7} - {9B2DC4A3-1B2D-4476-80DB-E9D6FB2640C7} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {5A0C4E12-B257-4FF5-9A1A-80FCAD8F2FEA} = {266476A0-ABEC-49D1-B133-AA14959C0208} - {266476A0-ABEC-49D1-B133-AA14959C0208} = {4F49C455-3411-4071-8862-8CBB094BADED} - {79A2F7B0-8623-4E8E-99BD-EA17413B5D71} = {DB77A61D-B0B9-4EDE-86EB-ADF7D5033668} - {DB77A61D-B0B9-4EDE-86EB-ADF7D5033668} = {4F49C455-3411-4071-8862-8CBB094BADED} - {4F49C455-3411-4071-8862-8CBB094BADED} = {D86C3932-2647-4BCD-BF98-552FB71619FE} - {D86C3932-2647-4BCD-BF98-552FB71619FE} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {EA1AC20A-14F2-4011-A0C4-4395431D3A63} = {58D763DA-9C2F-4235-B37D-F552E396E13D} - {58D763DA-9C2F-4235-B37D-F552E396E13D} = {B018B2C4-8DB3-4FB4-A944-5F4A926EC06B} - {B018B2C4-8DB3-4FB4-A944-5F4A926EC06B} = {336B7211-1528-4FDE-8F94-045ED5D5E08E} - {336B7211-1528-4FDE-8F94-045ED5D5E08E} = {AD10C699-32BD-42DF-9437-348174B9D8C3} + {3DB8E089-BBC0-4D13-85BD-0A49327D9F21} = {D4A13738-1C2E-401B-ABBF-48925517B8CF} + {D4A13738-1C2E-401B-ABBF-48925517B8CF} = {B53CDA70-40DC-4583-8E8A-6B6A0EF34851} {4F5ECE0C-2127-401A-8362-C9AB6F8A01F0} = {A6EA2E3F-9B72-4B80-BABB-1AB56EEEBA57} {A6EA2E3F-9B72-4B80-BABB-1AB56EEEBA57} = {4CC4A73A-A8A3-4FB8-94FE-618A61F675EC} {4CC4A73A-A8A3-4FB8-94FE-618A61F675EC} = {B7193D75-8F51-473E-AE86-8071C36BE4FC} - {B7193D75-8F51-473E-AE86-8071C36BE4FC} = {AD10C699-32BD-42DF-9437-348174B9D8C3} {02C1776D-7B46-4809-9F7B-74718B244A6D} = {E6D7B36A-4935-41B4-B990-D4AD0EEE9A9F} {E6D7B36A-4935-41B4-B990-D4AD0EEE9A9F} = {A48FF5E2-F392-4E0B-827D-15D5F3A6C495} {A48FF5E2-F392-4E0B-827D-15D5F3A6C495} = {B0072C8C-BE37-4E47-A29D-DC2074C8E3CE} - {B0072C8C-BE37-4E47-A29D-DC2074C8E3CE} = {AD10C699-32BD-42DF-9437-348174B9D8C3} - {AD10C699-32BD-42DF-9437-348174B9D8C3} = {78EEAA6F-DA6F-4B9F-8C53-FFE210ED1B18} - {24BA4A94-87AE-4171-BC56-756E7ACEA69D} = {C0D85867-6121-4E86-8256-97042D95FBD3} - {C0D85867-6121-4E86-8256-97042D95FBD3} = {F2E2E594-5A4A-4943-9CEE-51E3DF6C86D2} - {F2E2E594-5A4A-4943-9CEE-51E3DF6C86D2} = {D1E1FADF-8019-4D55-B915-10DD16D9547A} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {51A6767F-6A78-48F1-9012-CB794574DD4B} From 8dc5c504fc27ebd44be8b0d9bfbf91d976b35ad4 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 16:40:28 +0200 Subject: [PATCH 24/33] plcsim version --- .../PlcSimAdvancedStarterTool/Setup/Constants.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/src/PlcSimAdvancedStarter/PlcSimAdvancedStarterTool/Setup/Constants.cs b/src/tools/src/PlcSimAdvancedStarter/PlcSimAdvancedStarterTool/Setup/Constants.cs index 88409d484..a191e0118 100644 --- a/src/tools/src/PlcSimAdvancedStarter/PlcSimAdvancedStarterTool/Setup/Constants.cs +++ b/src/tools/src/PlcSimAdvancedStarter/PlcSimAdvancedStarterTool/Setup/Constants.cs @@ -8,8 +8,8 @@ namespace PlcSimAdvancedStarterTool.Setup { public static class Constants { - public static readonly Version PlcSimAdvancedMinVersion = new Version(7, 0, 0); - public static readonly Version PlcSimAdvancedMaxVersion = new Version(7, 9, 9); + public static readonly Version PlcSimAdvancedMinVersion = new Version(8, 0, 0); + public static readonly Version PlcSimAdvancedMaxVersion = new Version(8, 9, 9); public static readonly uint PlcSimAdvancedMaxSessionCount = 16; } From ba56f90a0a1a96d29a8c4e8c742e92494791f547 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 17:11:02 +0200 Subject: [PATCH 25/33] Add new structures and enums for AxoKrc5 component - Introduced AxoKrc5_Component_Status, AxoKrc5_Config, AxoKrc5_Control, AxoKrc5_HWIDs, and AxoKrc5_State classes to define the status, configuration, control parameters, hardware IDs, and state of the AxoKrc5 component. - Updated showcase documentation for AxoIrc5 and AxoOmnicore to reference the correct namespaces. - Adjusted AxoSmartFunctionKit showcase to align with the new namespace structure. --- .../src/AxoKrc4/{AxoKrc4_v_5_x_x.st => v_5_x_x/AxoKrc4.st} | 0 .../TypesStructuresAndEnums/AxoKrc4_Component_Status.st | 0 .../{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_Config.st | 0 .../{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_Control.st | 0 .../{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_HWIDs.st | 0 .../{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_State.st | 0 .../src/AxoKrc5/{AxoKrc5_v_5_x_x.st => v_5_x_x/AxoKrc5.st} | 0 .../TypesStructuresAndEnums/AxoKrc5_Component_Status.st | 0 .../{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_Config.st | 0 .../{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_Control.st | 0 .../{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_HWIDs.st | 0 .../{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_State.st | 0 .../Documentation/AxoIrc5_v_1_x_x_Showcase.st | 2 +- .../Documentation/AxoOmnicore_v_1_x_x_Showcase.st | 2 +- .../Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st | 4 ++-- 15 files changed, 4 insertions(+), 4 deletions(-) rename src/components.kuka.robotics/ctrl/src/AxoKrc4/{AxoKrc4_v_5_x_x.st => v_5_x_x/AxoKrc4.st} (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc4/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_Component_Status.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc4/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_Config.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc4/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_Control.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc4/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_HWIDs.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc4/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc4_State.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc5/{AxoKrc5_v_5_x_x.st => v_5_x_x/AxoKrc5.st} (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc5/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_Component_Status.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc5/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_Config.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc5/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_Control.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc5/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_HWIDs.st (100%) rename src/components.kuka.robotics/ctrl/src/AxoKrc5/{ => v_5_x_x}/TypesStructuresAndEnums/AxoKrc5_State.st (100%) diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc4/AxoKrc4_v_5_x_x.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/AxoKrc4.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc4/AxoKrc4_v_5_x_x.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/AxoKrc4.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Component_Status.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_Component_Status.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Component_Status.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_Component_Status.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Config.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_Config.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Config.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_Config.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Control.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_Control.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_Control.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_Control.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_HWIDs.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_HWIDs.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_HWIDs.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_HWIDs.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_State.st b/src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_State.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc4/TypesStructuresAndEnums/AxoKrc4_State.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc4/v_5_x_x/TypesStructuresAndEnums/AxoKrc4_State.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/AxoKrc5_v_5_x_x.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/AxoKrc5.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc5/AxoKrc5_v_5_x_x.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/AxoKrc5.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Component_Status.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_Component_Status.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Component_Status.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_Component_Status.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Config.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_Config.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Config.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_Config.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Control.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_Control.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_Control.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_Control.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_HWIDs.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_HWIDs.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_HWIDs.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_HWIDs.st diff --git a/src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_State.st b/src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_State.st similarity index 100% rename from src/components.kuka.robotics/ctrl/src/AxoKrc5/TypesStructuresAndEnums/AxoKrc5_State.st rename to src/components.kuka.robotics/ctrl/src/AxoKrc5/v_5_x_x/TypesStructuresAndEnums/AxoKrc5_State.st diff --git a/src/showcase/app/src/components.abb.robotics/Documentation/AxoIrc5_v_1_x_x_Showcase.st b/src/showcase/app/src/components.abb.robotics/Documentation/AxoIrc5_v_1_x_x_Showcase.st index 504404c43..21356598e 100644 --- a/src/showcase/app/src/components.abb.robotics/Documentation/AxoIrc5_v_1_x_x_Showcase.st +++ b/src/showcase/app/src/components.abb.robotics/Documentation/AxoIrc5_v_1_x_x_Showcase.st @@ -4,7 +4,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics CLASS AxoIrc5_v_1_x_x_Showcase EXTENDS AXOpen.Core.AxoObject // VAR PUBLIC - AxoIrc5_v_1_x_x : AXOpen.Components.Abb.Robotics.AxoIrc5_v_1_x_x; + AxoIrc5_v_1_x_x : AXOpen.Components.Abb.Robotics.v_1_x_x.AxoIrc5; END_VAR // diff --git a/src/showcase/app/src/components.abb.robotics/Documentation/AxoOmnicore_v_1_x_x_Showcase.st b/src/showcase/app/src/components.abb.robotics/Documentation/AxoOmnicore_v_1_x_x_Showcase.st index 3a4deef58..a7c11259b 100644 --- a/src/showcase/app/src/components.abb.robotics/Documentation/AxoOmnicore_v_1_x_x_Showcase.st +++ b/src/showcase/app/src/components.abb.robotics/Documentation/AxoOmnicore_v_1_x_x_Showcase.st @@ -4,7 +4,7 @@ NAMESPACE AXOpen.Components.Abb.Robotics CLASS AxoOmnicore_v_1_x_x_Showcase EXTENDS AXOpen.Core.AxoObject // VAR PUBLIC - AxoOmnicore_v_1_x_x : AXOpen.Components.Abb.Robotics.AxoOmnicore_v_1_x_x; + AxoOmnicore_v_1_x_x : AXOpen.Components.Abb.Robotics.v_1_x_x.AxoOmnicore; END_VAR // diff --git a/src/showcase/app/src/components.rexroth.press/Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st b/src/showcase/app/src/components.rexroth.press/Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st index 204645ce8..6c3e535c1 100644 --- a/src/showcase/app/src/components.rexroth.press/Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st +++ b/src/showcase/app/src/components.rexroth.press/Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st @@ -6,7 +6,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press CLASS AxoSmartFunctionKit_v_4_x_x_Showcase EXTENDS AXOpen.Core.AxoObject // VAR PUBLIC - AxoSmartFunctionKit : AXOpen.Components.Rexroth.Press.AxoSmartFunctionKit_v_4_x_x; + AxoSmartFunctionKit : AXOpen.Components.Rexroth.Press.v_4_x_x.AxoSmartFunctionKit; END_VAR // @@ -46,7 +46,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press Sequencer : AxoSequencer; Steps : ARRAY[0..10] OF AXOpen.Core.AxoStep; {#ix-attr:[CompilerOmits()]} - Request : AXOpen.Components.Rexroth.Press.AxoSmartFunctionKitRequest_v_4_x_x; + Request : AXOpen.Components.Rexroth.Press.v_4_x_x.AxoSmartFunctionKitRequest; END_VAR METHOD PRIVATE UseInSequencer From 763b56032d141f9be2699e71be1ffdf49b4b146c Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 17:17:17 +0200 Subject: [PATCH 26/33] Refactor code structure for improved readability and maintainability --- .../AxoKrc5_v_5_x_x.cs => AxoKrc4/v_5_x_x/AxoKrc4.cs} | 4 ++-- .../AxoKrc4_v_5_x_x.cs => AxoKrc5/v_5_x_x/AxoKrc5.cs} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/{AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs => AxoKrc4/v_5_x_x/AxoKrc4.cs} (99%) rename src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/{AxoKrc4_v_5_x_x/AxoKrc4_v_5_x_x.cs => AxoKrc5/v_5_x_x/AxoKrc5.cs} (100%) diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4/v_5_x_x/AxoKrc4.cs similarity index 99% rename from src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs rename to src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4/v_5_x_x/AxoKrc4.cs index 450fd722c..700921f36 100644 --- a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5_v_5_x_x/AxoKrc5_v_5_x_x.cs +++ b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4/v_5_x_x/AxoKrc4.cs @@ -1,4 +1,4 @@ -using AXOpen.Messaging.Static; +using AXOpen.Messaging.Static; using AXSharp.Connector; using System; using System.Collections.Generic; @@ -219,7 +219,7 @@ private void InitializeTaskMessenger() } } - public partial class AxoKukaRobotics_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status + public partial class AxoKrc4_Component_Status : AXOpen.Components.Robotics.AxoRobot_Status { Dictionary errorDescriptionDict = new Dictionary(); Dictionary actionDescriptionDict = new Dictionary(); diff --git a/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4_v_5_x_x/AxoKrc4_v_5_x_x.cs b/src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5/v_5_x_x/AxoKrc5.cs similarity index 100% rename from src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc4_v_5_x_x/AxoKrc4_v_5_x_x.cs rename to src/components.kuka.robotics/src/AXOpen.Components.Kuka.Robotics/AxoKrc5/v_5_x_x/AxoKrc5.cs From 436940a9523d4996636e57b888c7097782f1d4d0 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 17:40:35 +0200 Subject: [PATCH 27/33] Refactor Kuka robotics components: unify namespace and add AxoKrc5 showcase --- .../AxoKrc4_v_5_x_x_Krc5Showcase.st | 211 ------------------ .../Documentation/AxoKrc4_v_5_x_x_Showcase.st | 2 +- ...owcase2.st => AxoKrc5_v_5_x_x_Showcase.st} | 6 +- .../Documentation/KukaRobotics.st | 10 +- 4 files changed, 9 insertions(+), 220 deletions(-) delete mode 100644 src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Krc5Showcase.st rename src/showcase/app/src/components.kuka.robotics/Documentation/{AxoKrc4_v_5_x_x_Showcase2.st => AxoKrc5_v_5_x_x_Showcase.st} (98%) diff --git a/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Krc5Showcase.st b/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Krc5Showcase.st deleted file mode 100644 index 678e69b41..000000000 --- a/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Krc5Showcase.st +++ /dev/null @@ -1,211 +0,0 @@ -USING AXOpen.Core; - -NAMESPACE AXOpen.Components.Kuka.Robotics - {S7.extern=ReadWrite} - CLASS AxoKrc4_v_5_x_x_Krc5Showcase EXTENDS AXOpen.Core.AxoObject - // - VAR PUBLIC - // KRC5 controller driven by the same AxoKrc4 proxy — - // the slot-2 DIO512 layout is identical between KRC4 and KRC5. - ExampleRobot : AXOpen.Components.Kuka.Robotics.v_5_x_x.AxoKrc4; - END_VAR - // - - // - VAR PUBLIC - movementParams : AXOpen.Components.Abstractions.Robotics.AxoRoboticsMovementsParams; - {#ix-set:AttributeName = "<#Activate manual control#>"} - ActivateManualControl : BOOL; - END_VAR - // - - METHOD PUBLIC OVERRIDE Run - VAR_INPUT - inParent : IAxoObject; - END_VAR - - SUPER.Run(inParent); - - IF ActivateManualControl THEN - ExampleRobot.ActivateManualControl(); - END_IF; - - // - // kuka_rb2_HwID points at the KRC5 device (192.168.100.106) - // provisioned by the kuka_krc5_dio512 template in plc_line.hwl.yml. - ExampleRobot.Run(THIS, AXOpen.Showcase.HwIdentifiers#kuka_rb2_HwID); - // - - THIS.UseInSequencer(); - END_METHOD - - // - VAR PUBLIC - Sequencer : AxoSequencer; - Steps : ARRAY[0..19] OF AXOpen.Core.AxoStep; - END_VAR - - METHOD PRIVATE UseInSequencer - - Sequencer.Run(THIS); - Sequencer.Open(); - Sequencer.SequenceMode := eAxoSequenceMode#RunOnce; - - IF(Steps[0].Execute(Sequencer, 'Restore')) THEN - ActivateManualControl := FALSE; - ExampleRobot.Config.InfoTime := LTIME#2S; - ExampleRobot.Config.TaskTimeout := LTIME#0S; - ExampleRobot.Config.ErrorTime := LTIME#0S; - ExampleRobot.Restore(); - Sequencer.MoveNext(); - END_IF; - - IF(Steps[1].Execute(Sequencer, 'Start at main')) THEN - IF(ExampleRobot.StartAtMain().IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[2].Execute(Sequencer, 'Start motors and program')) THEN - IF(ExampleRobot.StartMotorsAndProgram().IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[3].Execute(Sequencer, 'Move to position 100')) THEN - movementParams.ActionNo := BYTE#100; - movementParams.GlobalSpeed := BYTE#5; - movementParams.ToolNo := BYTE#10; - movementParams.WorkobjectNo := BYTE#15; - movementParams.PointNo := BYTE#20; - movementParams.UserSpecSpeed1 := INT#25; - movementParams.UserSpecSpeed2 := INT#30; - movementParams.Coordinates.X := REAL#-1.2; - movementParams.Coordinates.Y := REAL#2.3; - movementParams.Coordinates.Z := REAL#3.4; - movementParams.Coordinates.Rx := REAL#4.5; - movementParams.Coordinates.Ry := REAL#5.6; - movementParams.Coordinates.Rz := REAL#6.7; - - IF(ExampleRobot.StartMovements(movementParams).IsDone()) THEN - ExampleRobot.StartMovementsTask.Restore(); - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[4].Execute(Sequencer, 'Move to position 1')) THEN - movementParams.ActionNo := BYTE#1; - - IF(ExampleRobot.StartMovements(movementParams).IsDone()) THEN - ExampleRobot.StartMovementsTask.Restore(); - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[5].Execute(Sequencer, 'Move to position 3')) THEN - movementParams.ActionNo := BYTE#3; - - IF(ExampleRobot.StartMovements(movementParams).IsBusy() AND Sequencer.CurrentStep.Duration >= T#500ms) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[6].Execute(Sequencer, 'Stop during movement')) THEN - ExampleRobot.StartMovements(movementParams); - IF(ExampleRobot.StopMovements().IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[7].Execute(Sequencer, '<#Unlocking and opening the robotic cell#>')) THEN - ExampleRobot.StartMovements(movementParams); - IF (Sequencer.CurrentStep.Duration >= T#1s) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF (Steps[8].Execute(Sequencer, '<#Closing and locking the robotic cell#>')) THEN - ExampleRobot.StartMovements(movementParams); - IF (Sequencer.CurrentStep.Duration >= T#1s) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[9].Execute(Sequencer, 'Start motors and program')) THEN - ExampleRobot.StartMovements(movementParams); - IF(ExampleRobot.StartMotorsAndProgram().IsDone() AND Sequencer.CurrentStep.Duration >= T#1s) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[10].Execute(Sequencer, 'Continue to position 3')) THEN - ExampleRobot.StartMovements(movementParams); - IF(ExampleRobot.StartMovementsTask.IsDone()) THEN - ExampleRobot.StartMovementsTask.Restore(); - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[11].Execute(Sequencer, 'Move to position 100')) THEN - movementParams.ActionNo := BYTE#100; - - IF(ExampleRobot.StartMovements(movementParams).IsDone()) THEN - ExampleRobot.StartMovementsTask.Restore(); - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[12].Execute(Sequencer, 'Move to position 1')) THEN - movementParams.ActionNo := BYTE#1; - - IF(ExampleRobot.StartMovements(movementParams).IsDone()) THEN - ExampleRobot.StartMovementsTask.Restore(); - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[13].Execute(Sequencer, 'Stop movement and program')) THEN - IF(ExampleRobot.StopMovementsAndProgram().IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[14].Execute(Sequencer, 'Stop motors')) THEN - IF(ExampleRobot.StopMotors().IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[15].Execute(Sequencer, 'Reset all outputs')) THEN - IF(ExampleRobot.ResetAllOutputs().IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[16].Execute(Sequencer, 'Start motors, program and movements combined')) THEN - IF(ExampleRobot.StartMotorsProgramAndMovements(movementParams).IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[17].Execute(Sequencer, 'Stop program')) THEN - IF(ExampleRobot.StopProgram().IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[18].Execute(Sequencer, 'Start program')) THEN - IF(ExampleRobot.StartProgram().IsDone()) THEN - Sequencer.MoveNext(); - END_IF; - END_IF; - - IF(Steps[19].Execute(Sequencer, 'Restore')) THEN - ExampleRobot.Restore(); - Sequencer.CompleteSequence(); - END_IF; - END_METHOD - - // - END_CLASS -END_NAMESPACE diff --git a/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Showcase.st b/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Showcase.st index dbc865449..008edf629 100644 --- a/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Showcase.st +++ b/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Showcase.st @@ -1,6 +1,6 @@ USING AXOpen.Core; -NAMESPACE AXOpen.Components.Kuka.Robotics +NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {S7.extern=ReadWrite} CLASS AxoKrc4_v_5_x_x_Showcase EXTENDS AXOpen.Core.AxoObject // diff --git a/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Showcase2.st b/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc5_v_5_x_x_Showcase.st similarity index 98% rename from src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Showcase2.st rename to src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc5_v_5_x_x_Showcase.st index 93daa431c..17782a11e 100644 --- a/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc4_v_5_x_x_Showcase2.st +++ b/src/showcase/app/src/components.kuka.robotics/Documentation/AxoKrc5_v_5_x_x_Showcase.st @@ -1,11 +1,11 @@ USING AXOpen.Core; -NAMESPACE AXOpen.Components.Kuka.Robotics +NAMESPACE AXOpen.Components.Kuka.Robotics.v_5_x_x {S7.extern=ReadWrite} - CLASS AxoKrc4_v_5_x_x_Showcase2 EXTENDS AXOpen.Core.AxoObject + CLASS AxoKrc5_v_5_x_x_Showcase EXTENDS AXOpen.Core.AxoObject // VAR PUBLIC - ExampleRobot : AXOpen.Components.Kuka.Robotics.v_5_x_x.AxoKrc4; + ExampleRobot : AXOpen.Components.Kuka.Robotics.v_5_x_x.AxoKrc5; END_VAR // diff --git a/src/showcase/app/src/components.kuka.robotics/Documentation/KukaRobotics.st b/src/showcase/app/src/components.kuka.robotics/Documentation/KukaRobotics.st index 4626dda6d..61f9203ab 100644 --- a/src/showcase/app/src/components.kuka.robotics/Documentation/KukaRobotics.st +++ b/src/showcase/app/src/components.kuka.robotics/Documentation/KukaRobotics.st @@ -1,18 +1,18 @@ +USING AXOpen.Components.Kuka.Robotics.v_5_x_x; + NAMESPACE AXOpen.Components.Kuka.Robotics {S7.extern=ReadWrite} CLASS KukaRobotics EXTENDS AXOpen.Core.AxoObject VAR PUBLIC _rootObject : AxoObject; - axoKrc4_v_5_x_x : AxoKrc4_v_5_x_x_Showcase; - axoKrc4_v_5_x_x_2 : AxoKrc4_v_5_x_x_Showcase2; - axoKrc4_v_5_x_x_krc5 : AxoKrc4_v_5_x_x_Krc5Showcase; + axoKrc4_v_5_x_x : AxoKrc4_v_5_x_x_Showcase; + axoKrc5_v_5_x_x : AxoKrc5_v_5_x_x_Showcase; END_VAR METHOD PUBLIC Execute _rootObject.Run(THIS); axoKrc4_v_5_x_x.Run(_rootObject); - axoKrc4_v_5_x_x_2.Run(_rootObject); - axoKrc4_v_5_x_x_krc5.Run(_rootObject); + axoKrc5_v_5_x_x.Run(_rootObject); END_METHOD END_CLASS END_NAMESPACE \ No newline at end of file From 1fea027eca3f2c1a290d89f7a7113aeac326f21e Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 17:44:22 +0200 Subject: [PATCH 28/33] Refactor namespace for AxoSmartFunctionKit and RexrothPress components to unify structure --- .../AxoSmartFunctionKit_v_4_x_x_Showcase.st | 12 ++++++------ .../Documentation/RexrothPress.st | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/showcase/app/src/components.rexroth.press/Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st b/src/showcase/app/src/components.rexroth.press/Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st index 6c3e535c1..87ace4815 100644 --- a/src/showcase/app/src/components.rexroth.press/Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st +++ b/src/showcase/app/src/components.rexroth.press/Documentation/AxoSmartFunctionKit_v_4_x_x_Showcase.st @@ -1,6 +1,6 @@ USING AXOpen.Core; -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {S7.extern=ReadWrite} CLASS AxoSmartFunctionKit_v_4_x_x_Showcase EXTENDS AXOpen.Core.AxoObject @@ -66,7 +66,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press IF(Steps[1].Execute(Sequencer, 'SFK RESET')) THEN //------------------------------------- - Request.Command := AXOpen.Components.Rexroth.Press.eAxoSmartFunctionKitCommand_v_4_x_x#ClearError; + Request.Command := eAxoSmartFunctionKitCommand#ClearError; IF AxoSmartFunctionKit.RunCommand(REF(Request)).IsDone() THEN AxoSmartFunctionKit.Restore(); @@ -77,7 +77,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press IF(Steps[2].Execute(Sequencer, 'SFK STOP MOVEMENT')) THEN //------------------------------------- - Request.Command := AXOpen.Components.Rexroth.Press.eAxoSmartFunctionKitCommand_v_4_x_x#StopMovement; + Request.Command := eAxoSmartFunctionKitCommand#StopMovement; IF AxoSmartFunctionKit.RunCommand(REF(Request)).IsDone() THEN AxoSmartFunctionKit.Restore(); @@ -88,7 +88,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press IF(Steps[3].Execute(Sequencer, 'SFK HOME')) THEN //------------------------------------- - Request.Command := AXOpen.Components.Rexroth.Press.eAxoSmartFunctionKitCommand_v_4_x_x#StartHoming; + Request.Command := eAxoSmartFunctionKitCommand#StartHoming; IF AxoSmartFunctionKit.RunCommand(REF(Request)).IsDone() THEN AxoSmartFunctionKit.Restore(); @@ -99,7 +99,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press IF(Steps[4].Execute(Sequencer, 'SFK SET PROGRAM')) THEN //------------------------------------- - Request.Command := AXOpen.Components.Rexroth.Press.eAxoSmartFunctionKitCommand_v_4_x_x#SetProgramActive; + Request.Command := eAxoSmartFunctionKitCommand#SetProgramActive; Request.ProgramId := 2; IF AxoSmartFunctionKit.RunCommand(REF(Request)).IsDone() THEN @@ -111,7 +111,7 @@ NAMESPACE AXOpen.Components.Rexroth.Press IF(Steps[5].Execute(Sequencer, 'SFK SET SERIAL ID')) THEN //------------------------------------- - Request.Command := AXOpen.Components.Rexroth.Press.eAxoSmartFunctionKitCommand_v_4_x_x#StartProgram; + Request.Command := eAxoSmartFunctionKitCommand#StartProgram; Request.SerialNumber := System.Strings.Concat('Test_',System.Strings.ToString(THIS.GetContext().OpenCycleCount())); Sequencer.MoveNext(); diff --git a/src/showcase/app/src/components.rexroth.press/Documentation/RexrothPress.st b/src/showcase/app/src/components.rexroth.press/Documentation/RexrothPress.st index 3e40bdb13..06c2c32c7 100644 --- a/src/showcase/app/src/components.rexroth.press/Documentation/RexrothPress.st +++ b/src/showcase/app/src/components.rexroth.press/Documentation/RexrothPress.st @@ -1,4 +1,4 @@ -NAMESPACE AXOpen.Components.Rexroth.Press +NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x {S7.extern=ReadWrite} CLASS RexrothPress EXTENDS AXOpen.Core.AxoObject From bf2a5b7ae043f28f56fae01f8c9cd663f835c67f Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 17:45:47 +0200 Subject: [PATCH 29/33] Refactor namespaces for AxoUrCb3 and UrRobotics components to unify structure --- .../Documentation/AxoUrCb3_v_3_x_x_Showcase.st | 4 ++-- .../src/components.ur.robotics/Documentation/UrRobotics.st | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/showcase/app/src/components.ur.robotics/Documentation/AxoUrCb3_v_3_x_x_Showcase.st b/src/showcase/app/src/components.ur.robotics/Documentation/AxoUrCb3_v_3_x_x_Showcase.st index f50b8fd77..f34214000 100644 --- a/src/showcase/app/src/components.ur.robotics/Documentation/AxoUrCb3_v_3_x_x_Showcase.st +++ b/src/showcase/app/src/components.ur.robotics/Documentation/AxoUrCb3_v_3_x_x_Showcase.st @@ -1,13 +1,13 @@ USING AXOpen.Core; -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {S7.extern=ReadWrite} CLASS AxoUrCb3_v_3_x_x_Showcase EXTENDS AXOpen.Core.AxoObject // VAR PUBLIC {#ix-set:AttributeName = "<#UR series CB3 example#>"} - ExampleRobot : AXOpen.Components.Ur.Robotics.AxoUrCb3_v_3_x_x; + ExampleRobot : AXOpen.Components.Ur.Robotics.v_3_x_x.AxoUrCb3; END_VAR // diff --git a/src/showcase/app/src/components.ur.robotics/Documentation/UrRobotics.st b/src/showcase/app/src/components.ur.robotics/Documentation/UrRobotics.st index 705e876b9..3f4d1bb8a 100644 --- a/src/showcase/app/src/components.ur.robotics/Documentation/UrRobotics.st +++ b/src/showcase/app/src/components.ur.robotics/Documentation/UrRobotics.st @@ -1,4 +1,4 @@ -NAMESPACE AXOpen.Components.Ur.Robotics +NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x {S7.extern=ReadWrite} CLASS UrRobotics EXTENDS AXOpen.Core.AxoObject From 750d6c87afcb6a8c3848048690634648acbc71b6 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 17:48:39 +0200 Subject: [PATCH 30/33] Refactor namespaces for RexrothPress and UrRobotics components to unify structure --- .../components.rexroth.press/Documentation/RexrothPress.st | 3 ++- .../src/components.ur.robotics/Documentation/UrRobotics.st | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/showcase/app/src/components.rexroth.press/Documentation/RexrothPress.st b/src/showcase/app/src/components.rexroth.press/Documentation/RexrothPress.st index 06c2c32c7..21c4234bb 100644 --- a/src/showcase/app/src/components.rexroth.press/Documentation/RexrothPress.st +++ b/src/showcase/app/src/components.rexroth.press/Documentation/RexrothPress.st @@ -1,4 +1,5 @@ -NAMESPACE AXOpen.Components.Rexroth.Press.v_4_x_x +USING AXOpen.Components.Rexroth.Press.v_4_x_x; +NAMESPACE AXOpen.Components.Rexroth.Press {S7.extern=ReadWrite} CLASS RexrothPress EXTENDS AXOpen.Core.AxoObject diff --git a/src/showcase/app/src/components.ur.robotics/Documentation/UrRobotics.st b/src/showcase/app/src/components.ur.robotics/Documentation/UrRobotics.st index 3f4d1bb8a..4a4d3c438 100644 --- a/src/showcase/app/src/components.ur.robotics/Documentation/UrRobotics.st +++ b/src/showcase/app/src/components.ur.robotics/Documentation/UrRobotics.st @@ -1,4 +1,6 @@ -NAMESPACE AXOpen.Components.Ur.Robotics.v_3_x_x +USING AXOpen.Components.Ur.Robotics.v_3_x_x; + +NAMESPACE AXOpen.Components.Ur.Robotics {S7.extern=ReadWrite} CLASS UrRobotics EXTENDS AXOpen.Core.AxoObject From 7663cd823bae561b77f4c8b7cd849b0ab42220f3 Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 18:09:34 +0200 Subject: [PATCH 31/33] Enhance valve driver configurations by expanding slot options to 64 for Aventics Pneumatics components. Removed deprecated project references from the solution file to streamline project structure. --- .../components.pneumatics.code-workspace | 4 - .../components.pneumatics.sln | 102 ++-------------- .../AventicsPneumaticsAESEmptySlot.hwl.yml | 48 ++++++++ ...icsPneumaticsAESValveDriver2Valves.hwl.yml | 112 ++++++++++++++++-- ...icsPneumaticsAESValveDriver3Valves.hwl.yml | 112 ++++++++++++++++-- ...icsPneumaticsAESValveDriver4Valves.hwl.yml | 112 ++++++++++++++++-- ...ticsAESValveDriverValvePowerSupply.hwl.yml | 112 ++++++++++++++++-- src/components.pneumatics/this.sln | 102 ++-------------- 8 files changed, 484 insertions(+), 220 deletions(-) diff --git a/src/components.pneumatics/components.pneumatics.code-workspace b/src/components.pneumatics/components.pneumatics.code-workspace index 0cae3806d..8c32f6273 100644 --- a/src/components.pneumatics/components.pneumatics.code-workspace +++ b/src/components.pneumatics/components.pneumatics.code-workspace @@ -3,10 +3,6 @@ { "name": "ctrl", "path": "ctrl" - }, - { - "name": "app", - "path": "app" } ], "settings": {} diff --git a/src/components.pneumatics/components.pneumatics.sln b/src/components.pneumatics/components.pneumatics.sln index 06d5c1ed6..706dccb61 100644 --- a/src/components.pneumatics/components.pneumatics.sln +++ b/src/components.pneumatics/components.pneumatics.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{B3202A58-14E6-49CB-8636-28C20A96BFFC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{554F387B-F761-4BD7-BACA-067D89EE88A9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{A521804A-2536-4823-A6F7-C4F48659A441}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{4820A634-9578-4F7C-9165-90EC45153CA8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{97C4792F-E3F1-4396-941D-8735F20B68B0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PneumaticComponents.blazor", "app\ix-blazor\PneumaticComponents.blazor\PneumaticComponents.blazor.csproj", "{89C44A1C-A627-436C-A4EA-F9BDB8A1A571}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PneumaticComponents", "app\ix\PneumaticComponents.csproj", "{B1FEBC05-037C-4489-928C-FFE702475CF7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Pneumatics.blazor", "src\AXOpen.Components.Pneumatics.blazor\AXOpen.Components.Pneumatics.blazor.csproj", "{18046554-D597-4D31-8C16-13D07ACEA0FA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_pneumatics", "src\AXOpen.Components.Pneumatics\inxton_axopen_components_pneumatics.csproj", "{9359A2AE-B7DE-4446-AA0C-4DBD1EE260E8}" @@ -25,15 +19,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{C85FA9D0-31E4-4870-B378-452F65A78A54}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{35AA1800-0489-4682-8A20-730657519EEA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{BFB20664-15D7-44D8-B21F-D2275CF34492}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{988C42D2-2FB1-4A31-A5A7-9A7716CACFA5}" EndProject @@ -47,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{D16C5DDD-A78A-4FC4-8025-3E19E425B067}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{B6A264DB-1F46-4E5D-86DC-FFF2A70A0F45}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{369F3E97-0CC5-4381-96DD-93468C050A41}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{0AD01C28-C747-43B5-A329-047B9F2AFF29}" @@ -61,14 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{363E7D96-00ED-48D5-A09A-CD0F15E914E9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PneumaticComponents.blazor", "app\ix-blazor\PneumaticComponents.blazor", "{5BE3957F-CEE3-4341-A6B7-D1C52FF37AAC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{DFDE4244-4F04-49D7-8413-2DFA1B08ADBB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{6526AAEB-D9B0-4920-B6E7-5CBD88129B7D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{BD3636D1-695C-41AC-96CD-92244854F364}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Pneumatics.blazor", "src\AXOpen.Components.Pneumatics.blazor", "{0B67E7F2-2D54-4DF9-9CB1-F58BB5300184}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Pneumatics", "src\AXOpen.Components.Pneumatics", "{1A732759-3155-4578-9BE6-E38DB43C37EC}" @@ -89,33 +67,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{134B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{62ABF555-5840-4AB4-A7FF-926886C14225}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{7260CB12-757A-4FC4-B832-C008B58C68A6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{5F91E71C-1CA0-41B9-8E5F-BEB35BF4A35A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{10116EAD-6DC9-492E-BFAD-FF1D4F6702AC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{0FD4A944-E1F5-451C-81B1-23E13FBEF7DD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\sdk-ax\ctrl\ix", "{A45D1840-14B4-4C57-8807-B6EC7F38F49D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{522539AD-B61B-426C-B8B8-5A760F94CB00}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{858B2BE6-B8AB-465D-B7CB-F52DCAE30F7E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{B099AB91-95B4-4B4C-8EC1-8D11487684AA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{85256843-07E0-4C94-8F44-F5840E63F41F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{9936EE8A-9173-4BB3-9DF7-2FF8232AE703}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{0B2F4EAF-9B72-4992-A3A6-4C03DCFA1613}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{CF091330-B978-4FF8-AC3A-1A09604CA8ED}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{0C1F6850-B1CE-4A6E-A539-1FCD7F664A2D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{AE8537E2-1BCE-43CD-A8CA-57B1D8C3789E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{151DBFB9-4227-4E93-AAB3-03BEA4B6BA7D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{D7292F93-9E8C-45B1-8381-E6BE6FB41411}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{C38C9EBA-4C87-4930-987C-6D409E05744B}" EndProject @@ -147,10 +107,6 @@ Global {A521804A-2536-4823-A6F7-C4F48659A441}.Debug|Any CPU.Build.0 = Debug|Any CPU {A521804A-2536-4823-A6F7-C4F48659A441}.Release|Any CPU.ActiveCfg = Release|Any CPU {A521804A-2536-4823-A6F7-C4F48659A441}.Release|Any CPU.Build.0 = Release|Any CPU - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}.Release|Any CPU.Build.0 = Release|Any CPU {4820A634-9578-4F7C-9165-90EC45153CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4820A634-9578-4F7C-9165-90EC45153CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU {4820A634-9578-4F7C-9165-90EC45153CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -159,14 +115,6 @@ Global {97C4792F-E3F1-4396-941D-8735F20B68B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {97C4792F-E3F1-4396-941D-8735F20B68B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {97C4792F-E3F1-4396-941D-8735F20B68B0}.Release|Any CPU.Build.0 = Release|Any CPU - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571}.Release|Any CPU.Build.0 = Release|Any CPU - {B1FEBC05-037C-4489-928C-FFE702475CF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1FEBC05-037C-4489-928C-FFE702475CF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1FEBC05-037C-4489-928C-FFE702475CF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1FEBC05-037C-4489-928C-FFE702475CF7}.Release|Any CPU.Build.0 = Release|Any CPU {18046554-D597-4D31-8C16-13D07ACEA0FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18046554-D597-4D31-8C16-13D07ACEA0FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {18046554-D597-4D31-8C16-13D07ACEA0FA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -187,26 +135,14 @@ Global {72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2}.Debug|Any CPU.Build.0 = Debug|Any CPU {72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2}.Release|Any CPU.ActiveCfg = Release|Any CPU {72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2}.Release|Any CPU.Build.0 = Release|Any CPU - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}.Release|Any CPU.Build.0 = Release|Any CPU {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}.Debug|Any CPU.Build.0 = Debug|Any CPU {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}.Release|Any CPU.ActiveCfg = Release|Any CPU {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}.Release|Any CPU.Build.0 = Release|Any CPU - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}.Release|Any CPU.Build.0 = Release|Any CPU - {C85FA9D0-31E4-4870-B378-452F65A78A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C85FA9D0-31E4-4870-B378-452F65A78A54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C85FA9D0-31E4-4870-B378-452F65A78A54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C85FA9D0-31E4-4870-B378-452F65A78A54}.Release|Any CPU.Build.0 = Release|Any CPU - {35AA1800-0489-4682-8A20-730657519EEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35AA1800-0489-4682-8A20-730657519EEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35AA1800-0489-4682-8A20-730657519EEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35AA1800-0489-4682-8A20-730657519EEA}.Release|Any CPU.Build.0 = Release|Any CPU + {BFB20664-15D7-44D8-B21F-D2275CF34492}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFB20664-15D7-44D8-B21F-D2275CF34492}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFB20664-15D7-44D8-B21F-D2275CF34492}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFB20664-15D7-44D8-B21F-D2275CF34492}.Release|Any CPU.Build.0 = Release|Any CPU {988C42D2-2FB1-4A31-A5A7-9A7716CACFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {988C42D2-2FB1-4A31-A5A7-9A7716CACFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {988C42D2-2FB1-4A31-A5A7-9A7716CACFA5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,20 +161,12 @@ Global {33D09CEB-4DD0-432F-8957-4B389046BD6F} = {4951159D-7CD9-45D7-8425-F688D8210840} {A521804A-2536-4823-A6F7-C4F48659A441} = {D16C5DDD-A78A-4FC4-8025-3E19E425B067} {D16C5DDD-A78A-4FC4-8025-3E19E425B067} = {0AD01C28-C747-43B5-A329-047B9F2AFF29} - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36} = {B6A264DB-1F46-4E5D-86DC-FFF2A70A0F45} - {B6A264DB-1F46-4E5D-86DC-FFF2A70A0F45} = {0AD01C28-C747-43B5-A329-047B9F2AFF29} {4820A634-9578-4F7C-9165-90EC45153CA8} = {369F3E97-0CC5-4381-96DD-93468C050A41} {369F3E97-0CC5-4381-96DD-93468C050A41} = {0AD01C28-C747-43B5-A329-047B9F2AFF29} {0AD01C28-C747-43B5-A329-047B9F2AFF29} = {B9E58D71-F7EC-4923-9CCE-6318BAF51F25} {97C4792F-E3F1-4396-941D-8735F20B68B0} = {7CA861E4-C0AB-4852-A524-B8DFFF361B00} {7CA861E4-C0AB-4852-A524-B8DFFF361B00} = {9B94E7D9-6CE8-456D-A022-D171FBDC9B3D} {9B94E7D9-6CE8-456D-A022-D171FBDC9B3D} = {363E7D96-00ED-48D5-A09A-CD0F15E914E9} - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571} = {5BE3957F-CEE3-4341-A6B7-D1C52FF37AAC} - {5BE3957F-CEE3-4341-A6B7-D1C52FF37AAC} = {DFDE4244-4F04-49D7-8413-2DFA1B08ADBB} - {DFDE4244-4F04-49D7-8413-2DFA1B08ADBB} = {BD3636D1-695C-41AC-96CD-92244854F364} - {B1FEBC05-037C-4489-928C-FFE702475CF7} = {6526AAEB-D9B0-4920-B6E7-5CBD88129B7D} - {6526AAEB-D9B0-4920-B6E7-5CBD88129B7D} = {BD3636D1-695C-41AC-96CD-92244854F364} - {BD3636D1-695C-41AC-96CD-92244854F364} = {2162B641-40E7-41C1-A995-98E92D8B9591} {18046554-D597-4D31-8C16-13D07ACEA0FA} = {0B67E7F2-2D54-4DF9-9CB1-F58BB5300184} {0B67E7F2-2D54-4DF9-9CB1-F58BB5300184} = {F2AFA1C5-5F2D-4690-8FD5-CC91C6974154} {9359A2AE-B7DE-4446-AA0C-4DBD1EE260E8} = {1A732759-3155-4578-9BE6-E38DB43C37EC} @@ -252,21 +180,11 @@ Global {72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2} = {682F0E21-5C5D-45D5-BC8A-7260B19EA0C1} {682F0E21-5C5D-45D5-BC8A-7260B19EA0C1} = {134B2989-1365-4383-ACAD-359CCB02799E} {134B2989-1365-4383-ACAD-359CCB02799E} = {62ABF555-5840-4AB4-A7FF-926886C14225} - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8} = {7260CB12-757A-4FC4-B832-C008B58C68A6} - {7260CB12-757A-4FC4-B832-C008B58C68A6} = {5F91E71C-1CA0-41B9-8E5F-BEB35BF4A35A} - {5F91E71C-1CA0-41B9-8E5F-BEB35BF4A35A} = {10116EAD-6DC9-492E-BFAD-FF1D4F6702AC} - {10116EAD-6DC9-492E-BFAD-FF1D4F6702AC} = {0FD4A944-E1F5-451C-81B1-23E13FBEF7DD} {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033} = {A45D1840-14B4-4C57-8807-B6EC7F38F49D} {A45D1840-14B4-4C57-8807-B6EC7F38F49D} = {522539AD-B61B-426C-B8B8-5A760F94CB00} {522539AD-B61B-426C-B8B8-5A760F94CB00} = {858B2BE6-B8AB-465D-B7CB-F52DCAE30F7E} - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5} = {B099AB91-95B4-4B4C-8EC1-8D11487684AA} - {B099AB91-95B4-4B4C-8EC1-8D11487684AA} = {9936EE8A-9173-4BB3-9DF7-2FF8232AE703} - {C85FA9D0-31E4-4870-B378-452F65A78A54} = {85256843-07E0-4C94-8F44-F5840E63F41F} - {85256843-07E0-4C94-8F44-F5840E63F41F} = {9936EE8A-9173-4BB3-9DF7-2FF8232AE703} - {9936EE8A-9173-4BB3-9DF7-2FF8232AE703} = {0B2F4EAF-9B72-4992-A3A6-4C03DCFA1613} - {35AA1800-0489-4682-8A20-730657519EEA} = {CF091330-B978-4FF8-AC3A-1A09604CA8ED} - {CF091330-B978-4FF8-AC3A-1A09604CA8ED} = {0C1F6850-B1CE-4A6E-A539-1FCD7F664A2D} - {0C1F6850-B1CE-4A6E-A539-1FCD7F664A2D} = {151DBFB9-4227-4E93-AAB3-03BEA4B6BA7D} + {BFB20664-15D7-44D8-B21F-D2275CF34492} = {AE8537E2-1BCE-43CD-A8CA-57B1D8C3789E} + {AE8537E2-1BCE-43CD-A8CA-57B1D8C3789E} = {D7292F93-9E8C-45B1-8381-E6BE6FB41411} {988C42D2-2FB1-4A31-A5A7-9A7716CACFA5} = {C38C9EBA-4C87-4930-987C-6D409E05744B} {C38C9EBA-4C87-4930-987C-6D409E05744B} = {16752EEE-3478-46B8-B49D-57C601A2AB43} {16752EEE-3478-46B8-B49D-57C601A2AB43} = {0386DCD8-8074-4437-9D47-D45C1FEF06D5} diff --git a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESEmptySlot.hwl.yml b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESEmptySlot.hwl.yml index 2c6a82518..93621e30b 100644 --- a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESEmptySlot.hwl.yml +++ b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESEmptySlot.hwl.yml @@ -23,6 +23,54 @@ Templates: - 14 - 15 - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 29 + - 30 + - 31 + - 32 + - 33 + - 34 + - 35 + - 36 + - 37 + - 38 + - 39 + - 40 + - 41 + - 42 + - 43 + - 44 + - 45 + - 46 + - 47 + - 48 + - 49 + - 50 + - 51 + - 52 + - 53 + - 54 + - 55 + - 56 + - 57 + - 58 + - 59 + - 60 + - 61 + - 62 + - 63 + - 64 Content: TypeIdentifier: NotAssigned Slot: ${SLOT} diff --git a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver2Valves.hwl.yml b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver2Valves.hwl.yml index ce236fc41..9eca516eb 100644 --- a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver2Valves.hwl.yml +++ b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver2Valves.hwl.yml @@ -7,20 +7,68 @@ Templates: AllowedValues: - 'Slot_1' - 'Slot_2' - - 'Slot_3' - - 'Slot_4' + - 'Slot_3' + - 'Slot_4' - 'Slot_5' - 'Slot_6' - - 'Slot_7' - - 'Slot_8' + - 'Slot_7' + - 'Slot_8' - 'Slot_9' - 'Slot_10' - - 'Slot_11' - - 'Slot_12' + - 'Slot_11' + - 'Slot_12' - 'Slot_13' - 'Slot_14' - - 'Slot_15' - - 'Slot_16' + - 'Slot_15' + - 'Slot_16' + - 'Slot_17' + - 'Slot_18' + - 'Slot_19' + - 'Slot_20' + - 'Slot_21' + - 'Slot_22' + - 'Slot_23' + - 'Slot_24' + - 'Slot_25' + - 'Slot_26' + - 'Slot_27' + - 'Slot_28' + - 'Slot_29' + - 'Slot_30' + - 'Slot_31' + - 'Slot_32' + - 'Slot_33' + - 'Slot_34' + - 'Slot_35' + - 'Slot_36' + - 'Slot_37' + - 'Slot_38' + - 'Slot_39' + - 'Slot_40' + - 'Slot_41' + - 'Slot_42' + - 'Slot_43' + - 'Slot_44' + - 'Slot_45' + - 'Slot_46' + - 'Slot_47' + - 'Slot_48' + - 'Slot_49' + - 'Slot_50' + - 'Slot_51' + - 'Slot_52' + - 'Slot_53' + - 'Slot_54' + - 'Slot_55' + - 'Slot_56' + - 'Slot_57' + - 'Slot_58' + - 'Slot_59' + - 'Slot_60' + - 'Slot_61' + - 'Slot_62' + - 'Slot_63' + - 'Slot_64' - Name: 'SLOT' Value: 1 AllowedValues: @@ -40,6 +88,54 @@ Templates: - 14 - 15 - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 29 + - 30 + - 31 + - 32 + - 33 + - 34 + - 35 + - 36 + - 37 + - 38 + - 39 + - 40 + - 41 + - 42 + - 43 + - 44 + - 45 + - 46 + - 47 + - 48 + - 49 + - 50 + - 51 + - 52 + - 53 + - 54 + - 55 + - 56 + - 57 + - 58 + - 59 + - 60 + - 61 + - 62 + - 63 + - 64 Content: Name: '${NAME}' TypeIdentifier: diff --git a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver3Valves.hwl.yml b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver3Valves.hwl.yml index d2e06c6f3..9df1d7b56 100644 --- a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver3Valves.hwl.yml +++ b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver3Valves.hwl.yml @@ -7,20 +7,68 @@ Templates: AllowedValues: - 'Slot_1' - 'Slot_2' - - 'Slot_3' - - 'Slot_4' + - 'Slot_3' + - 'Slot_4' - 'Slot_5' - 'Slot_6' - - 'Slot_7' - - 'Slot_8' + - 'Slot_7' + - 'Slot_8' - 'Slot_9' - 'Slot_10' - - 'Slot_11' - - 'Slot_12' + - 'Slot_11' + - 'Slot_12' - 'Slot_13' - 'Slot_14' - - 'Slot_15' - - 'Slot_16' + - 'Slot_15' + - 'Slot_16' + - 'Slot_17' + - 'Slot_18' + - 'Slot_19' + - 'Slot_20' + - 'Slot_21' + - 'Slot_22' + - 'Slot_23' + - 'Slot_24' + - 'Slot_25' + - 'Slot_26' + - 'Slot_27' + - 'Slot_28' + - 'Slot_29' + - 'Slot_30' + - 'Slot_31' + - 'Slot_32' + - 'Slot_33' + - 'Slot_34' + - 'Slot_35' + - 'Slot_36' + - 'Slot_37' + - 'Slot_38' + - 'Slot_39' + - 'Slot_40' + - 'Slot_41' + - 'Slot_42' + - 'Slot_43' + - 'Slot_44' + - 'Slot_45' + - 'Slot_46' + - 'Slot_47' + - 'Slot_48' + - 'Slot_49' + - 'Slot_50' + - 'Slot_51' + - 'Slot_52' + - 'Slot_53' + - 'Slot_54' + - 'Slot_55' + - 'Slot_56' + - 'Slot_57' + - 'Slot_58' + - 'Slot_59' + - 'Slot_60' + - 'Slot_61' + - 'Slot_62' + - 'Slot_63' + - 'Slot_64' - Name: 'SLOT' Value: 1 AllowedValues: @@ -40,6 +88,54 @@ Templates: - 14 - 15 - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 29 + - 30 + - 31 + - 32 + - 33 + - 34 + - 35 + - 36 + - 37 + - 38 + - 39 + - 40 + - 41 + - 42 + - 43 + - 44 + - 45 + - 46 + - 47 + - 48 + - 49 + - 50 + - 51 + - 52 + - 53 + - 54 + - 55 + - 56 + - 57 + - 58 + - 59 + - 60 + - 61 + - 62 + - 63 + - 64 Content: Name: '${NAME}' TypeIdentifier: diff --git a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver4Valves.hwl.yml b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver4Valves.hwl.yml index 78d6fb907..5b9bd82d6 100644 --- a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver4Valves.hwl.yml +++ b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriver4Valves.hwl.yml @@ -7,20 +7,68 @@ Templates: AllowedValues: - 'Slot_1' - 'Slot_2' - - 'Slot_3' - - 'Slot_4' + - 'Slot_3' + - 'Slot_4' - 'Slot_5' - 'Slot_6' - - 'Slot_7' - - 'Slot_8' + - 'Slot_7' + - 'Slot_8' - 'Slot_9' - 'Slot_10' - - 'Slot_11' - - 'Slot_12' + - 'Slot_11' + - 'Slot_12' - 'Slot_13' - 'Slot_14' - - 'Slot_15' - - 'Slot_16' + - 'Slot_15' + - 'Slot_16' + - 'Slot_17' + - 'Slot_18' + - 'Slot_19' + - 'Slot_20' + - 'Slot_21' + - 'Slot_22' + - 'Slot_23' + - 'Slot_24' + - 'Slot_25' + - 'Slot_26' + - 'Slot_27' + - 'Slot_28' + - 'Slot_29' + - 'Slot_30' + - 'Slot_31' + - 'Slot_32' + - 'Slot_33' + - 'Slot_34' + - 'Slot_35' + - 'Slot_36' + - 'Slot_37' + - 'Slot_38' + - 'Slot_39' + - 'Slot_40' + - 'Slot_41' + - 'Slot_42' + - 'Slot_43' + - 'Slot_44' + - 'Slot_45' + - 'Slot_46' + - 'Slot_47' + - 'Slot_48' + - 'Slot_49' + - 'Slot_50' + - 'Slot_51' + - 'Slot_52' + - 'Slot_53' + - 'Slot_54' + - 'Slot_55' + - 'Slot_56' + - 'Slot_57' + - 'Slot_58' + - 'Slot_59' + - 'Slot_60' + - 'Slot_61' + - 'Slot_62' + - 'Slot_63' + - 'Slot_64' - Name: 'SLOT' Value: 1 AllowedValues: @@ -40,6 +88,54 @@ Templates: - 14 - 15 - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 29 + - 30 + - 31 + - 32 + - 33 + - 34 + - 35 + - 36 + - 37 + - 38 + - 39 + - 40 + - 41 + - 42 + - 43 + - 44 + - 45 + - 46 + - 47 + - 48 + - 49 + - 50 + - 51 + - 52 + - 53 + - 54 + - 55 + - 56 + - 57 + - 58 + - 59 + - 60 + - 61 + - 62 + - 63 + - 64 Content: Name: '${NAME}' TypeIdentifier: diff --git a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriverValvePowerSupply.hwl.yml b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriverValvePowerSupply.hwl.yml index bfbd27bf5..1cb5e23b6 100644 --- a/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriverValvePowerSupply.hwl.yml +++ b/src/components.pneumatics/ctrl/assets/AventicsPneumatics/AventicsPneumaticsAESValveDriverValvePowerSupply.hwl.yml @@ -7,20 +7,68 @@ Templates: AllowedValues: - 'Slot_1' - 'Slot_2' - - 'Slot_3' - - 'Slot_4' + - 'Slot_3' + - 'Slot_4' - 'Slot_5' - 'Slot_6' - - 'Slot_7' - - 'Slot_8' + - 'Slot_7' + - 'Slot_8' - 'Slot_9' - 'Slot_10' - - 'Slot_11' - - 'Slot_12' + - 'Slot_11' + - 'Slot_12' - 'Slot_13' - 'Slot_14' - - 'Slot_15' - - 'Slot_16' + - 'Slot_15' + - 'Slot_16' + - 'Slot_17' + - 'Slot_18' + - 'Slot_19' + - 'Slot_20' + - 'Slot_21' + - 'Slot_22' + - 'Slot_23' + - 'Slot_24' + - 'Slot_25' + - 'Slot_26' + - 'Slot_27' + - 'Slot_28' + - 'Slot_29' + - 'Slot_30' + - 'Slot_31' + - 'Slot_32' + - 'Slot_33' + - 'Slot_34' + - 'Slot_35' + - 'Slot_36' + - 'Slot_37' + - 'Slot_38' + - 'Slot_39' + - 'Slot_40' + - 'Slot_41' + - 'Slot_42' + - 'Slot_43' + - 'Slot_44' + - 'Slot_45' + - 'Slot_46' + - 'Slot_47' + - 'Slot_48' + - 'Slot_49' + - 'Slot_50' + - 'Slot_51' + - 'Slot_52' + - 'Slot_53' + - 'Slot_54' + - 'Slot_55' + - 'Slot_56' + - 'Slot_57' + - 'Slot_58' + - 'Slot_59' + - 'Slot_60' + - 'Slot_61' + - 'Slot_62' + - 'Slot_63' + - 'Slot_64' - Name: 'SLOT' Value: 1 AllowedValues: @@ -40,6 +88,54 @@ Templates: - 14 - 15 - 16 + - 17 + - 18 + - 19 + - 20 + - 21 + - 22 + - 23 + - 24 + - 25 + - 26 + - 27 + - 28 + - 29 + - 30 + - 31 + - 32 + - 33 + - 34 + - 35 + - 36 + - 37 + - 38 + - 39 + - 40 + - 41 + - 42 + - 43 + - 44 + - 45 + - 46 + - 47 + - 48 + - 49 + - 50 + - 51 + - 52 + - 53 + - 54 + - 55 + - 56 + - 57 + - 58 + - 59 + - 60 + - 61 + - 62 + - 63 + - 64 Content: Name: '${NAME}' TypeIdentifier: diff --git a/src/components.pneumatics/this.sln b/src/components.pneumatics/this.sln index 06d5c1ed6..706dccb61 100644 --- a/src/components.pneumatics/this.sln +++ b/src/components.pneumatics/this.sln @@ -1,20 +1,14 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "this", "this.proj", "{B3202A58-14E6-49CB-8636-28C20A96BFFC}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{554F387B-F761-4BD7-BACA-067D89EE88A9}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions\AXOpen.Base.Abstractions.csproj", "{A521804A-2536-4823-A6F7-C4F48659A441}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Logging.Serilog", "..\base\src\AXOpen.Logging\AXOpen.Logging.Serilog.csproj", "{A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer\AXOpen.VisualComposer.csproj", "{4820A634-9578-4F7C-9165-90EC45153CA8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_abstractions", "..\components.abstractions\src\AXOpen.Components.Abstractions\inxton_axopen_components_abstractions.csproj", "{97C4792F-E3F1-4396-941D-8735F20B68B0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PneumaticComponents.blazor", "app\ix-blazor\PneumaticComponents.blazor\PneumaticComponents.blazor.csproj", "{89C44A1C-A627-436C-A4EA-F9BDB8A1A571}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PneumaticComponents", "app\ix\PneumaticComponents.csproj", "{B1FEBC05-037C-4489-928C-FFE702475CF7}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Components.Pneumatics.blazor", "src\AXOpen.Components.Pneumatics.blazor\AXOpen.Components.Pneumatics.blazor.csproj", "{18046554-D597-4D31-8C16-13D07ACEA0FA}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_components_pneumatics", "src\AXOpen.Components.Pneumatics\inxton_axopen_components_pneumatics.csproj", "{9359A2AE-B7DE-4446-AA0C-4DBD1EE260E8}" @@ -25,15 +19,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "axopen_core_blazor", "..\co EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_core", "..\core\src\AXOpen.Core\inxton_axopen_core.csproj", "{72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Data.Json", "..\data\src\repositories\Json\AXOpen.Data.Json.csproj", "{D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_ax_sdk", "..\sdk-ax\ctrl\ix\inxton_ax_sdk.csproj", "{66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor\AXOpen.Security.Blazor.csproj", "{C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Security", "..\Security\src\AXOpen.Security\AXOpen.Security.csproj", "{C85FA9D0-31E4-4870-B378-452F65A78A54}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_simatic1500", "..\simatic1500\ctrl\ix\inxton_axopen_simatic1500.csproj", "{35AA1800-0489-4682-8A20-730657519EEA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AXOpen.Operon.Blazor", "..\styling\src\AXOpen.Operon.Blazor.csproj", "{BFB20664-15D7-44D8-B21F-D2275CF34492}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_timers", "..\timers\src\AXOpen.Timers\inxton_axopen_timers.csproj", "{988C42D2-2FB1-4A31-A5A7-9A7716CACFA5}" EndProject @@ -47,8 +35,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "abstractions", "..\abstract EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Base.Abstractions", "..\base\src\AXOpen.Base.Abstractions", "{D16C5DDD-A78A-4FC4-8025-3E19E425B067}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Logging", "..\base\src\AXOpen.Logging", "{B6A264DB-1F46-4E5D-86DC-FFF2A70A0F45}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.VisualComposer", "..\base\src\AXOpen.VisualComposer", "{369F3E97-0CC5-4381-96DD-93468C050A41}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\base\src", "{0AD01C28-C747-43B5-A329-047B9F2AFF29}" @@ -61,14 +47,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\components.abstra EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "components.abstractions", "..\components.abstractions", "{363E7D96-00ED-48D5-A09A-CD0F15E914E9}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PneumaticComponents.blazor", "app\ix-blazor\PneumaticComponents.blazor", "{5BE3957F-CEE3-4341-A6B7-D1C52FF37AAC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix-blazor", "app\ix-blazor", "{DFDE4244-4F04-49D7-8413-2DFA1B08ADBB}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "app\ix", "{6526AAEB-D9B0-4920-B6E7-5CBD88129B7D}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "app", "app", "{BD3636D1-695C-41AC-96CD-92244854F364}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Pneumatics.blazor", "src\AXOpen.Components.Pneumatics.blazor", "{0B67E7F2-2D54-4DF9-9CB1-F58BB5300184}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Components.Pneumatics", "src\AXOpen.Components.Pneumatics", "{1A732759-3155-4578-9BE6-E38DB43C37EC}" @@ -89,33 +67,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\core\src", "{134B EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "core", "..\core", "{62ABF555-5840-4AB4-A7FF-926886C14225}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Json", "..\data\src\repositories\Json", "{7260CB12-757A-4FC4-B832-C008B58C68A6}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "repositories", "..\data\src\repositories", "{5F91E71C-1CA0-41B9-8E5F-BEB35BF4A35A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\data\src", "{10116EAD-6DC9-492E-BFAD-FF1D4F6702AC}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "data", "..\data", "{0FD4A944-E1F5-451C-81B1-23E13FBEF7DD}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\sdk-ax\ctrl\ix", "{A45D1840-14B4-4C57-8807-B6EC7F38F49D}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\sdk-ax\ctrl", "{522539AD-B61B-426C-B8B8-5A760F94CB00}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "sdk-ax", "..\sdk-ax", "{858B2BE6-B8AB-465D-B7CB-F52DCAE30F7E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security.Blazor", "..\Security\src\AXOpen.Security.Blazor", "{B099AB91-95B4-4B4C-8EC1-8D11487684AA}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Security", "..\Security\src\AXOpen.Security", "{85256843-07E0-4C94-8F44-F5840E63F41F}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\Security\src", "{9936EE8A-9173-4BB3-9DF7-2FF8232AE703}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "..\Security", "{0B2F4EAF-9B72-4992-A3A6-4C03DCFA1613}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ix", "..\simatic1500\ctrl\ix", "{CF091330-B978-4FF8-AC3A-1A09604CA8ED}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ctrl", "..\simatic1500\ctrl", "{0C1F6850-B1CE-4A6E-A539-1FCD7F664A2D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "..\styling\src", "{AE8537E2-1BCE-43CD-A8CA-57B1D8C3789E}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "simatic1500", "..\simatic1500", "{151DBFB9-4227-4E93-AAB3-03BEA4B6BA7D}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "styling", "..\styling", "{D7292F93-9E8C-45B1-8381-E6BE6FB41411}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "AXOpen.Timers", "..\timers\src\AXOpen.Timers", "{C38C9EBA-4C87-4930-987C-6D409E05744B}" EndProject @@ -147,10 +107,6 @@ Global {A521804A-2536-4823-A6F7-C4F48659A441}.Debug|Any CPU.Build.0 = Debug|Any CPU {A521804A-2536-4823-A6F7-C4F48659A441}.Release|Any CPU.ActiveCfg = Release|Any CPU {A521804A-2536-4823-A6F7-C4F48659A441}.Release|Any CPU.Build.0 = Release|Any CPU - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36}.Release|Any CPU.Build.0 = Release|Any CPU {4820A634-9578-4F7C-9165-90EC45153CA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {4820A634-9578-4F7C-9165-90EC45153CA8}.Debug|Any CPU.Build.0 = Debug|Any CPU {4820A634-9578-4F7C-9165-90EC45153CA8}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -159,14 +115,6 @@ Global {97C4792F-E3F1-4396-941D-8735F20B68B0}.Debug|Any CPU.Build.0 = Debug|Any CPU {97C4792F-E3F1-4396-941D-8735F20B68B0}.Release|Any CPU.ActiveCfg = Release|Any CPU {97C4792F-E3F1-4396-941D-8735F20B68B0}.Release|Any CPU.Build.0 = Release|Any CPU - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571}.Debug|Any CPU.Build.0 = Debug|Any CPU - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571}.Release|Any CPU.ActiveCfg = Release|Any CPU - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571}.Release|Any CPU.Build.0 = Release|Any CPU - {B1FEBC05-037C-4489-928C-FFE702475CF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B1FEBC05-037C-4489-928C-FFE702475CF7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B1FEBC05-037C-4489-928C-FFE702475CF7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B1FEBC05-037C-4489-928C-FFE702475CF7}.Release|Any CPU.Build.0 = Release|Any CPU {18046554-D597-4D31-8C16-13D07ACEA0FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18046554-D597-4D31-8C16-13D07ACEA0FA}.Debug|Any CPU.Build.0 = Debug|Any CPU {18046554-D597-4D31-8C16-13D07ACEA0FA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -187,26 +135,14 @@ Global {72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2}.Debug|Any CPU.Build.0 = Debug|Any CPU {72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2}.Release|Any CPU.ActiveCfg = Release|Any CPU {72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2}.Release|Any CPU.Build.0 = Release|Any CPU - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8}.Release|Any CPU.Build.0 = Release|Any CPU {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}.Debug|Any CPU.Build.0 = Debug|Any CPU {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}.Release|Any CPU.ActiveCfg = Release|Any CPU {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033}.Release|Any CPU.Build.0 = Release|Any CPU - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5}.Release|Any CPU.Build.0 = Release|Any CPU - {C85FA9D0-31E4-4870-B378-452F65A78A54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {C85FA9D0-31E4-4870-B378-452F65A78A54}.Debug|Any CPU.Build.0 = Debug|Any CPU - {C85FA9D0-31E4-4870-B378-452F65A78A54}.Release|Any CPU.ActiveCfg = Release|Any CPU - {C85FA9D0-31E4-4870-B378-452F65A78A54}.Release|Any CPU.Build.0 = Release|Any CPU - {35AA1800-0489-4682-8A20-730657519EEA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {35AA1800-0489-4682-8A20-730657519EEA}.Debug|Any CPU.Build.0 = Debug|Any CPU - {35AA1800-0489-4682-8A20-730657519EEA}.Release|Any CPU.ActiveCfg = Release|Any CPU - {35AA1800-0489-4682-8A20-730657519EEA}.Release|Any CPU.Build.0 = Release|Any CPU + {BFB20664-15D7-44D8-B21F-D2275CF34492}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BFB20664-15D7-44D8-B21F-D2275CF34492}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BFB20664-15D7-44D8-B21F-D2275CF34492}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BFB20664-15D7-44D8-B21F-D2275CF34492}.Release|Any CPU.Build.0 = Release|Any CPU {988C42D2-2FB1-4A31-A5A7-9A7716CACFA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {988C42D2-2FB1-4A31-A5A7-9A7716CACFA5}.Debug|Any CPU.Build.0 = Debug|Any CPU {988C42D2-2FB1-4A31-A5A7-9A7716CACFA5}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -225,20 +161,12 @@ Global {33D09CEB-4DD0-432F-8957-4B389046BD6F} = {4951159D-7CD9-45D7-8425-F688D8210840} {A521804A-2536-4823-A6F7-C4F48659A441} = {D16C5DDD-A78A-4FC4-8025-3E19E425B067} {D16C5DDD-A78A-4FC4-8025-3E19E425B067} = {0AD01C28-C747-43B5-A329-047B9F2AFF29} - {A7F04B35-6E6D-4004-BA4A-0B0D5FC40C36} = {B6A264DB-1F46-4E5D-86DC-FFF2A70A0F45} - {B6A264DB-1F46-4E5D-86DC-FFF2A70A0F45} = {0AD01C28-C747-43B5-A329-047B9F2AFF29} {4820A634-9578-4F7C-9165-90EC45153CA8} = {369F3E97-0CC5-4381-96DD-93468C050A41} {369F3E97-0CC5-4381-96DD-93468C050A41} = {0AD01C28-C747-43B5-A329-047B9F2AFF29} {0AD01C28-C747-43B5-A329-047B9F2AFF29} = {B9E58D71-F7EC-4923-9CCE-6318BAF51F25} {97C4792F-E3F1-4396-941D-8735F20B68B0} = {7CA861E4-C0AB-4852-A524-B8DFFF361B00} {7CA861E4-C0AB-4852-A524-B8DFFF361B00} = {9B94E7D9-6CE8-456D-A022-D171FBDC9B3D} {9B94E7D9-6CE8-456D-A022-D171FBDC9B3D} = {363E7D96-00ED-48D5-A09A-CD0F15E914E9} - {89C44A1C-A627-436C-A4EA-F9BDB8A1A571} = {5BE3957F-CEE3-4341-A6B7-D1C52FF37AAC} - {5BE3957F-CEE3-4341-A6B7-D1C52FF37AAC} = {DFDE4244-4F04-49D7-8413-2DFA1B08ADBB} - {DFDE4244-4F04-49D7-8413-2DFA1B08ADBB} = {BD3636D1-695C-41AC-96CD-92244854F364} - {B1FEBC05-037C-4489-928C-FFE702475CF7} = {6526AAEB-D9B0-4920-B6E7-5CBD88129B7D} - {6526AAEB-D9B0-4920-B6E7-5CBD88129B7D} = {BD3636D1-695C-41AC-96CD-92244854F364} - {BD3636D1-695C-41AC-96CD-92244854F364} = {2162B641-40E7-41C1-A995-98E92D8B9591} {18046554-D597-4D31-8C16-13D07ACEA0FA} = {0B67E7F2-2D54-4DF9-9CB1-F58BB5300184} {0B67E7F2-2D54-4DF9-9CB1-F58BB5300184} = {F2AFA1C5-5F2D-4690-8FD5-CC91C6974154} {9359A2AE-B7DE-4446-AA0C-4DBD1EE260E8} = {1A732759-3155-4578-9BE6-E38DB43C37EC} @@ -252,21 +180,11 @@ Global {72B2E911-5EDC-48F0-893E-A2A2F9A2F9C2} = {682F0E21-5C5D-45D5-BC8A-7260B19EA0C1} {682F0E21-5C5D-45D5-BC8A-7260B19EA0C1} = {134B2989-1365-4383-ACAD-359CCB02799E} {134B2989-1365-4383-ACAD-359CCB02799E} = {62ABF555-5840-4AB4-A7FF-926886C14225} - {D9AFECF7-76D8-4DE5-9D91-847E1E99AEA8} = {7260CB12-757A-4FC4-B832-C008B58C68A6} - {7260CB12-757A-4FC4-B832-C008B58C68A6} = {5F91E71C-1CA0-41B9-8E5F-BEB35BF4A35A} - {5F91E71C-1CA0-41B9-8E5F-BEB35BF4A35A} = {10116EAD-6DC9-492E-BFAD-FF1D4F6702AC} - {10116EAD-6DC9-492E-BFAD-FF1D4F6702AC} = {0FD4A944-E1F5-451C-81B1-23E13FBEF7DD} {66E6C9FB-3BA5-49CE-8E43-A4C00AB70033} = {A45D1840-14B4-4C57-8807-B6EC7F38F49D} {A45D1840-14B4-4C57-8807-B6EC7F38F49D} = {522539AD-B61B-426C-B8B8-5A760F94CB00} {522539AD-B61B-426C-B8B8-5A760F94CB00} = {858B2BE6-B8AB-465D-B7CB-F52DCAE30F7E} - {C2FB8C31-3947-4CCB-B5BE-DF7B23217CB5} = {B099AB91-95B4-4B4C-8EC1-8D11487684AA} - {B099AB91-95B4-4B4C-8EC1-8D11487684AA} = {9936EE8A-9173-4BB3-9DF7-2FF8232AE703} - {C85FA9D0-31E4-4870-B378-452F65A78A54} = {85256843-07E0-4C94-8F44-F5840E63F41F} - {85256843-07E0-4C94-8F44-F5840E63F41F} = {9936EE8A-9173-4BB3-9DF7-2FF8232AE703} - {9936EE8A-9173-4BB3-9DF7-2FF8232AE703} = {0B2F4EAF-9B72-4992-A3A6-4C03DCFA1613} - {35AA1800-0489-4682-8A20-730657519EEA} = {CF091330-B978-4FF8-AC3A-1A09604CA8ED} - {CF091330-B978-4FF8-AC3A-1A09604CA8ED} = {0C1F6850-B1CE-4A6E-A539-1FCD7F664A2D} - {0C1F6850-B1CE-4A6E-A539-1FCD7F664A2D} = {151DBFB9-4227-4E93-AAB3-03BEA4B6BA7D} + {BFB20664-15D7-44D8-B21F-D2275CF34492} = {AE8537E2-1BCE-43CD-A8CA-57B1D8C3789E} + {AE8537E2-1BCE-43CD-A8CA-57B1D8C3789E} = {D7292F93-9E8C-45B1-8381-E6BE6FB41411} {988C42D2-2FB1-4A31-A5A7-9A7716CACFA5} = {C38C9EBA-4C87-4930-987C-6D409E05744B} {C38C9EBA-4C87-4930-987C-6D409E05744B} = {16752EEE-3478-46B8-B49D-57C601A2AB43} {16752EEE-3478-46B8-B49D-57C601A2AB43} = {0386DCD8-8074-4437-9D47-D45C1FEF06D5} From cb30e5c99e900283994ce4eae2889d5a7ffe2feb Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 18:57:12 +0200 Subject: [PATCH 32/33] Add additional slots for Aventics Pneumatics and update hardware identifiers - Extended the plc_line.hwl.yml configuration to include additional slots (SLOT_17 to SLOT_64) for Aventics Pneumatics devices. - Renamed output identifiers in HwIdentifiers.st for clarity and consistency. - Introduced new output structures for smc_ex260_spn_16 and smc_ex260_spn_32 in IoStructures.st, defining their respective signal layouts. - Updated Outputs.st to include references to the new output structures for smc_ex260_spn_16 and smc_ex260_spn_32 modules. --- .../SystemConstants/plc_line_HwIdentifiers.st | 4 +- .../SystemConstants/plc_line_IoAddresses.st | 64 ++++ .../hwc.gen/plc_line.HardwareIdentifiers.json | 16 +- .../app/hwc/hwc.gen/plc_line.IoAddresses.json | 322 ++++++++++++++++++ .../plc_line.SecurityConfiguration.json | 6 +- src/showcase/app/hwc/plc_line.hwl.yml | 48 +++ src/showcase/app/src/IO/HwIdentifiers.st | 4 +- src/showcase/app/src/IO/IoStructures.st | 62 ++++ src/showcase/app/src/IO/Outputs.st | 6 + 9 files changed, 517 insertions(+), 15 deletions(-) diff --git a/src/showcase/app/SystemConstants/plc_line_HwIdentifiers.st b/src/showcase/app/SystemConstants/plc_line_HwIdentifiers.st index 03ffc90c0..05c8f02be 100644 --- a/src/showcase/app/SystemConstants/plc_line_HwIdentifiers.st +++ b/src/showcase/app/SystemConstants/plc_line_HwIdentifiers.st @@ -410,19 +410,19 @@ CONFIGURATION HardwareIDs smc_ex260_spn_16_HwID : UINT := UINT#266; smc_ex260_spn_16_Rack_HwID : UINT := UINT#269; smc_ex260_spn_16_smc_ex260_spn_16_HwID : UINT := UINT#270; - smc_ex260_spn_16_smc_ex260_spn_16_2_byte__Output_1_2_byte__Output_HwID : UINT := UINT#271; smc_ex260_spn_16_smc_ex260_spn_16_EX260_SPN_3_4_HwID : UINT := UINT#272; smc_ex260_spn_16_smc_ex260_spn_16_Interface_HwID : UINT := UINT#265; smc_ex260_spn_16_smc_ex260_spn_16_Interface_Port_1_HwID : UINT := UINT#267; smc_ex260_spn_16_smc_ex260_spn_16_Interface_Port_2_HwID : UINT := UINT#268; + smc_ex260_spn_16_smc_ex260_spn_16_Outputs16_2_byte__Output_HwID : UINT := UINT#271; smc_ex260_spn_32_HwID : UINT := UINT#258; smc_ex260_spn_32_Rack_HwID : UINT := UINT#261; smc_ex260_spn_32_smc_ex260_spn_32_HwID : UINT := UINT#262; - smc_ex260_spn_32_smc_ex260_spn_32_4_byte__Output_1_4_byte__Output_HwID : UINT := UINT#263; smc_ex260_spn_32_smc_ex260_spn_32_EX260_SPN_1_2_HwID : UINT := UINT#264; smc_ex260_spn_32_smc_ex260_spn_32_Interface_HwID : UINT := UINT#257; smc_ex260_spn_32_smc_ex260_spn_32_Interface_Port_1_HwID : UINT := UINT#259; smc_ex260_spn_32_smc_ex260_spn_32_Interface_Port_2_HwID : UINT := UINT#260; + smc_ex260_spn_32_smc_ex260_spn_32_Outputs32_4_byte__Output_HwID : UINT := UINT#263; ureol2l_HwID : UINT := UINT#653; ureol2l_10_O2T_General_Purpose_Registers_2_10_O2T_General_Purpose_Registers_2_HwID : UINT := UINT#657; ureol2l_1_T2O_State_1_T2O_State_HwID : UINT := UINT#666; diff --git a/src/showcase/app/SystemConstants/plc_line_IoAddresses.st b/src/showcase/app/SystemConstants/plc_line_IoAddresses.st index 439cc23a5..8129fb764 100644 --- a/src/showcase/app/SystemConstants/plc_line_IoAddresses.st +++ b/src/showcase/app/SystemConstants/plc_line_IoAddresses.st @@ -626,6 +626,12 @@ CONFIGURATION IoAddresses rf186c_Reader_1_Input AT %IB306 : rf186c_Reader_1_Input_Layout; rf186c_Reader_1_Output AT %QB297 : rf186c_Reader_1_Output_Layout; + // Module smc-ex260-spn-16/Outputs16 + smc_ex260_spn_16_Outputs16_Output AT %QB4 : smc_ex260_spn_16_Outputs16_Output_Layout; + + // Module smc-ex260-spn-32/Outputs32 + smc_ex260_spn_32_Outputs32_Output AT %QB0 : smc_ex260_spn_32_Outputs32_Output_Layout; + // Module ureol2l/1_T2O_State ureol2l_1_T2O_State_Input AT %IB5737 : ureol2l_1_T2O_State_Input_Layout; @@ -7782,6 +7788,64 @@ TYPE END_STRUCT; END_TYPE +TYPE + smc_ex260_spn_16_Outputs16_Output_Layout : STRUCT + Signals_0_0 AT %X0.0 : BOOL; + Signals_0_1 AT %X0.1 : BOOL; + Signals_0_2 AT %X0.2 : BOOL; + Signals_0_3 AT %X0.3 : BOOL; + Signals_0_4 AT %X0.4 : BOOL; + Signals_0_5 AT %X0.5 : BOOL; + Signals_0_6 AT %X0.6 : BOOL; + Signals_0_7 AT %X0.7 : BOOL; + Signals_1_0 AT %X1.0 : BOOL; + Signals_1_1 AT %X1.1 : BOOL; + Signals_1_2 AT %X1.2 : BOOL; + Signals_1_3 AT %X1.3 : BOOL; + Signals_1_4 AT %X1.4 : BOOL; + Signals_1_5 AT %X1.5 : BOOL; + Signals_1_6 AT %X1.6 : BOOL; + Signals_1_7 AT %X1.7 : BOOL; + END_STRUCT; +END_TYPE + +TYPE + smc_ex260_spn_32_Outputs32_Output_Layout : STRUCT + Signals_0_0 AT %X0.0 : BOOL; + Signals_0_1 AT %X0.1 : BOOL; + Signals_0_2 AT %X0.2 : BOOL; + Signals_0_3 AT %X0.3 : BOOL; + Signals_0_4 AT %X0.4 : BOOL; + Signals_0_5 AT %X0.5 : BOOL; + Signals_0_6 AT %X0.6 : BOOL; + Signals_0_7 AT %X0.7 : BOOL; + Signals_1_0 AT %X1.0 : BOOL; + Signals_1_1 AT %X1.1 : BOOL; + Signals_1_2 AT %X1.2 : BOOL; + Signals_1_3 AT %X1.3 : BOOL; + Signals_1_4 AT %X1.4 : BOOL; + Signals_1_5 AT %X1.5 : BOOL; + Signals_1_6 AT %X1.6 : BOOL; + Signals_1_7 AT %X1.7 : BOOL; + Signals_2_0 AT %X2.0 : BOOL; + Signals_2_1 AT %X2.1 : BOOL; + Signals_2_2 AT %X2.2 : BOOL; + Signals_2_3 AT %X2.3 : BOOL; + Signals_2_4 AT %X2.4 : BOOL; + Signals_2_5 AT %X2.5 : BOOL; + Signals_2_6 AT %X2.6 : BOOL; + Signals_2_7 AT %X2.7 : BOOL; + Signals_3_0 AT %X3.0 : BOOL; + Signals_3_1 AT %X3.1 : BOOL; + Signals_3_2 AT %X3.2 : BOOL; + Signals_3_3 AT %X3.3 : BOOL; + Signals_3_4 AT %X3.4 : BOOL; + Signals_3_5 AT %X3.5 : BOOL; + Signals_3_6 AT %X3.6 : BOOL; + Signals_3_7 AT %X3.7 : BOOL; + END_STRUCT; +END_TYPE + TYPE ureol2l_1_T2O_State_Input_Layout : STRUCT Signals_0_0 AT %X0.0 : BOOL; diff --git a/src/showcase/app/hwc/hwc.gen/plc_line.HardwareIdentifiers.json b/src/showcase/app/hwc/hwc.gen/plc_line.HardwareIdentifiers.json index 9c391d5d7..b9842ca0e 100644 --- a/src/showcase/app/hwc/hwc.gen/plc_line.HardwareIdentifiers.json +++ b/src/showcase/app/hwc/hwc.gen/plc_line.HardwareIdentifiers.json @@ -1641,10 +1641,6 @@ "Name": "smc-ex260-spn-16~smc-ex260-spn-16", "Value": 270 }, - { - "Name": "smc-ex260-spn-16~smc-ex260-spn-16~ 2 byte Output_1~ 2 byte Output", - "Value": 271 - }, { "Name": "smc-ex260-spn-16~smc-ex260-spn-16~EX260 SPN 3/4", "Value": 272 @@ -1661,6 +1657,10 @@ "Name": "smc-ex260-spn-16~smc-ex260-spn-16~Interface~Port_2", "Value": 268 }, + { + "Name": "smc-ex260-spn-16~smc-ex260-spn-16~Outputs16~ 2 byte Output", + "Value": 271 + }, { "Name": "smc-ex260-spn-32", "Value": 258 @@ -1673,10 +1673,6 @@ "Name": "smc-ex260-spn-32~smc-ex260-spn-32", "Value": 262 }, - { - "Name": "smc-ex260-spn-32~smc-ex260-spn-32~ 4 byte Output_1~ 4 byte Output", - "Value": 263 - }, { "Name": "smc-ex260-spn-32~smc-ex260-spn-32~EX260 SPN 1/2", "Value": 264 @@ -1693,6 +1689,10 @@ "Name": "smc-ex260-spn-32~smc-ex260-spn-32~Interface~Port_2", "Value": 260 }, + { + "Name": "smc-ex260-spn-32~smc-ex260-spn-32~Outputs32~ 4 byte Output", + "Value": 263 + }, { "Name": "ureol2l", "Value": 653 diff --git a/src/showcase/app/hwc/hwc.gen/plc_line.IoAddresses.json b/src/showcase/app/hwc/hwc.gen/plc_line.IoAddresses.json index b6bee9d0a..a2bb630f3 100644 --- a/src/showcase/app/hwc/hwc.gen/plc_line.IoAddresses.json +++ b/src/showcase/app/hwc/hwc.gen/plc_line.IoAddresses.json @@ -39115,6 +39115,328 @@ } ] }, + { + "Ref": "smc-ex260-spn-16/Outputs16", + "Submodules": [ + { + "Name": " 2 byte Output", + "HardwareIdentifier": 271, + "Outputs": { + "StartAddress": "4.0", + "EndAddress": "5.7", + "Length": 16, + "Source": "AutoAssigned", + "SignalLayout": [ + { + "Name": "Signals_0_0", + "Offset": 0, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_1", + "Offset": 1, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_2", + "Offset": 2, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_3", + "Offset": 3, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_4", + "Offset": 4, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_5", + "Offset": 5, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_6", + "Offset": 6, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_7", + "Offset": 7, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_0", + "Offset": 8, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_1", + "Offset": 9, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_2", + "Offset": 10, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_3", + "Offset": 11, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_4", + "Offset": 12, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_5", + "Offset": 13, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_6", + "Offset": 14, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_7", + "Offset": 15, + "Length": 1, + "DataType": "Boolean" + } + ] + } + } + ] + }, + { + "Ref": "smc-ex260-spn-32/Outputs32", + "Submodules": [ + { + "Name": " 4 byte Output", + "HardwareIdentifier": 263, + "Outputs": { + "StartAddress": "0.0", + "EndAddress": "3.7", + "Length": 32, + "Source": "AutoAssigned", + "SignalLayout": [ + { + "Name": "Signals_0_0", + "Offset": 0, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_1", + "Offset": 1, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_2", + "Offset": 2, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_3", + "Offset": 3, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_4", + "Offset": 4, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_5", + "Offset": 5, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_6", + "Offset": 6, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_0_7", + "Offset": 7, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_0", + "Offset": 8, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_1", + "Offset": 9, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_2", + "Offset": 10, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_3", + "Offset": 11, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_4", + "Offset": 12, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_5", + "Offset": 13, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_6", + "Offset": 14, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_1_7", + "Offset": 15, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_2_0", + "Offset": 16, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_2_1", + "Offset": 17, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_2_2", + "Offset": 18, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_2_3", + "Offset": 19, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_2_4", + "Offset": 20, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_2_5", + "Offset": 21, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_2_6", + "Offset": 22, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_2_7", + "Offset": 23, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_3_0", + "Offset": 24, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_3_1", + "Offset": 25, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_3_2", + "Offset": 26, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_3_3", + "Offset": 27, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_3_4", + "Offset": 28, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_3_5", + "Offset": 29, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_3_6", + "Offset": 30, + "Length": 1, + "DataType": "Boolean" + }, + { + "Name": "Signals_3_7", + "Offset": 31, + "Length": 1, + "DataType": "Boolean" + } + ] + } + } + ] + }, { "Ref": "ureol2l/10_O2T_General_Purpose_Registers_2", "Submodules": [ diff --git a/src/showcase/app/hwc/hwc.gen/plc_line.SecurityConfiguration.json b/src/showcase/app/hwc/hwc.gen/plc_line.SecurityConfiguration.json index 38e220ef3..84b17deb0 100644 --- a/src/showcase/app/hwc/hwc.gen/plc_line.SecurityConfiguration.json +++ b/src/showcase/app/hwc/hwc.gen/plc_line.SecurityConfiguration.json @@ -1,9 +1,9 @@ { - "PKIData": "AQAAAAAAAAAAAAAAAAAAAAEBAb4gAAACAAAAAAAAAAAAAwAAAN8ALS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUhvd0ZBWUhLb1pJemowQ0FRWUpLeVFEQXdJSUFRRUxBMklBQkFXYmM5TWZaQTU1SW9UMkZaaExpb24zUTdLbQozQ3FhSmR4VVRpVGNKNlNuRmpUUWJkUlFXb2hMYS9qR0VmSzBiMU1YTDZhYUdQeUQ5UUtQRWFKY0Y0akVhK1I5CnZVRU92ejA0N3FSNnRuRXFnMFFwMEt0bjFyMzhHS0IrTUJ4L0l3PT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCnsBAQACAAAnEAAg5O6o510ZSaHDLZgDE92ucac5GHyBBjJGYCmGy3ENkawBACAADAAQUQLJLSqk3WizJ0jgux5lZwEAAAE2m3gSE7Wtw40d5vxzEL2rkRB3AWjXfTRf0BUyWugfHaRCSiai19uyaHA74641Q6Ll5eiH/GgXlwsHEGulxClEOca9DWq2AoIM63xySTcjn+nMRbF6qkPDLf+p/bR2CIbv5I58gk6DsG3SEUUUsMTfkIf+SANyP97IlVHms1vG+DDeqteO4zz8gYvObt1hibr2WhLv9RU6TkGsBTXMB4h/hBvvVS2qXNWUt0Idc1jKwjG+l/wWZqpzlYgahsFCxRSmYzTkPbnIZnaXzAa0XrYr8DTZfYVl+zRKT1p9KjdQyAWZ80+zjR1zdLD2uLB2UXNqbqtt69HDNkSplW86IOgbsBb6fTGS6HaZwKvTkfJV8zJtIvuy0kD3jOhLqwvFwtuQRdarx5ir7aymxzo/GLkHqLA3l6KRYQIACWxvY2FsaG9zdAEAAAAAAAAAAQAAAAIAAAAAAAAAFAACSo8R0nqHO8kBL+d9GiuewYBg5rQGAQAGsC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQ0KTUlJRXN6Q0NBNXVnQXdJQkFnSVVib0w0WDNPYmdWV3lQTHZpOWVKNDFPdkxFZFF3RFFZSktvWklodmNOQVFFTEJRQXdlekVMTUFrRw0KQTFVRUJoTUNXRmd4RWpBUUJnTlZCQWdNQ1ZOMFlYUmxUbUZ0WlRFUk1BOEdBMVVFQnd3SVEybDBlVTVoYldVeEZEQVNCZ05WQkFvTQ0KQzBOdmJYQmhibmxPWVcxbE1Sc3dHUVlEVlFRTERCSkRiMjF3WVc1NVUyVmpkR2x2Yms1aGJXVXhFakFRQmdOVkJBTU1DV3h2WTJGcw0KYUc5emREQWVGdzB5TmpBMU1EVXhPRFV3TVRKYUZ3MHpOakExTURJeE9EVXdNVEphTUhzeEN6QUpCZ05WQkFZVEFsaFlNUkl3RUFZRA0KVlFRSURBbFRkR0YwWlU1aGJXVXhFVEFQQmdOVkJBY01DRU5wZEhsT1lXMWxNUlF3RWdZRFZRUUtEQXREYjIxd1lXNTVUbUZ0WlRFYg0KTUJrR0ExVUVDd3dTUTI5dGNHRnVlVk5sWTNScGIyNU9ZVzFsTVJJd0VBWURWUVFEREFsc2IyTmhiR2h2YzNRd2dnRWlNQTBHQ1NxRw0KU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQ1VmNVJETHA4VkdUOFVzdk5PUER5QUJxWDRYUmFCNFZoV1gzTG9adTNmYzJPdw0KTkpDU0d3K0JLZTlCV3J2R3JPcHc3WnNWcnY3RXh6ZXVYWE5SOHdDc2F4eXBkVEszZ0FkMGY1Zk9wWHI1WjdmcEtoT0JXV00vdE5OYQ0KWUVNWmJqbE40dGcwS1BIV0ZYeTBJZEpVZ2Z5RnBYdkJObFFHM29nTllnS1pPdHdHUDhjaWg5MGk0MmlQRFViMmZpME9RVEkyQ3duVg0KdDM2RzFYM2VITWJOb2hCYVVSSWVFaUxsUkdBSzloa2ZxSTR0Rm9HeStFeURITkU3T0FGWlBOMzd0K3BOclBvVGhRTmh5UWlobXpwSw0KbHJ2bEFoNkl2R2lITTZaU3JUenhmaCszV2tTZ3FsWkhDTlpaTW00ZkZ0SE1TV1pBVjNoeFRIbm9XMytsYm5lUVdjakpBZ01CQUFHag0KZ2dFdE1JSUJLVEFKQmdOVkhSTUVBakFBTUE0R0ExVWREd0VCL3dRRUF3SUM5REFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSQ0KS3dZQkJRVUhBd0l3RXdZRFZSMFJCQXd3Q29JQWh3VEFxR1FCaGdBd0hRWURWUjBPQkJZRUZEeVFIYTVhZWJXTGlGMEhPUzVWTnJJQw0KZ1Vaa01JRzRCZ05WSFNNRWdiQXdnYTJBRkR5UUhhNWFlYldMaUYwSE9TNVZOcklDZ1Vaa29YK2tmVEI3TVFzd0NRWURWUVFHRXdKWQ0KV0RFU01CQUdBMVVFQ0F3SlUzUmhkR1ZPWVcxbE1SRXdEd1lEVlFRSERBaERhWFI1VG1GdFpURVVNQklHQTFVRUNnd0xRMjl0Y0dGdQ0KZVU1aGJXVXhHekFaQmdOVkJBc01Fa052YlhCaGJubFRaV04wYVc5dVRtRnRaVEVTTUJBR0ExVUVBd3dKYkc5allXeG9iM04wZ2hSdQ0KZ3ZoZmM1dUJWYkk4dStMMTRualU2OHNSMURBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQUlzQUpOalc4QWVxeWZKM2ZjRzF3ZnJvUw0KNVVIL2N3cVZIOUsydlUyeGgzbXVwTXVNdFdMNlZVWDBiNnlLYzh6dUN1SjhEQmlmTnQ5TGdFYmFKd3dXd3BmTmNOcnREbFFUT3RySg0KMzJqSTJkeEkyeVY2NDA4NUozUGFRaUhReUtSeDh3RUd0TkRxUHdUVTZFdWd0dmcwZjFSWVkxS2dsc1hPZkQyL1VYVnlIWGFwczVOVQ0KY29aeUpVY1pvbTNibzR3N0NDNGl5K0gzbHVzWWxzbTZvM3VVdnZTeDRJQ0xmQlc0aXRlWG9SRXNvamd4anlENFhScVlpWlQ4SmR4ag0KUDkwQzBSSUxaQWk0SjE1eXgxUm5pcGZVQ3gwUlMwZXpCdDY3TVRVVmx1VmtPdjQreU9WVGlpUzk5VjZNOXcyc2d6L2MxdzdORXlBbw0KcWVGRWZGZld2cEcrNnc9PQ0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0KFwgBAACzAQACAHwwejAUBgcqhkjOPQIBBgkrJAMDAggBAQsDYgAEUyVCkWnzdgCrMj/QV7gNL3kVqagmuVZryaamiWdAqP+tDzjd9qTzw5vkGQ2KooRDTOAciuQ76kAPU6cp3POTVLouWb/Q62UXqTN+jj9xChO0fsncYRv2hw/3QSGmDyN2F5Jzbe9UyxpiKg5dG6wivwAgK1hDfDJtMRXxAAL0O3WvEy3IQuRM/qBrAE/AwvWo0IAHXi0tLS0tQkVHSU4gRU5DUllQVEVEIFBSSVZBVEUgS0VZLS0tLS0KTUlJRk5UQmZCZ2txaGtpRzl3MEJCUTB3VWpBeEJna3Foa2lHOXcwQkJRd3dKQVFRTlBjbTJ4OExLSWxjcHhXdAo2KzBmSlFJQ0NBQXdEQVlJS29aSWh2Y05BZ2tGQURBZEJnbGdoa2dCWlFNRUFTb0VFS3dES3JGd3J5ZXVtZFNBCjNSdHpuaUlFZ2dUUWFxK2h2V21iT1lXaU9sQUh6UlBobW1BWm9NOExnWjdCUDk5Z1dWK2RlSzNFKzlSSVdiYVIKUjNMcFp4OGc2Q2tBU2J4bS9sTXZmTjZPMHU5ME5YM2NWTjZ0U0pWb0t0OGw1Ym5WM2U3SU13THhpV3BVenhjNgp1Z0N6dkx5ZkpXd3VMOHN4U1JuNEtGQ3NTdWozc2lEVTU4WWF4VTVPZklCUjVKbFdNSVZWQ2JGNzZ4Yk5JdjhkCnk4R1NCVHhmQVNpNytETmg0VDR4NFd2S3N4ODFDcjRUeTA1OElVVzFUa2hLVnhSNHNyOWtqVGVkQXZsUTREczAKbEsrcnlMeGVDbTBjOW5HdUZ4SWdwYkxSeFVIcm11TTZLM2l1R2NwR0hQdUtIUS84VVNNOVd6SWYzM1kxSHd5dQpTMlFpcWtDKy9HRXU3RGtqMWR4Wnk4Y0FkRGFld2dESUNTOXJGbDZYRmNZSzc1WHkvUkZqSytBYzRtYnk1ZkwxClhJTnRRU2ZNZ3NBdGRGajJPaW1zS2J0c21iTXBncFM4Qkc4U1ZtMnhpWHE0RGVUeFlvUE1INnJkdHVKS1VVbW8KSmNCRkMxd0lvSXZsTkRQT2VIZ0dEYTU0cDZWWkk4TDl0NXk3VTlQK011UHRSVzhjN0xKaWxKNWRlRjI1VUZBVgpSWFNtZ1A3NndUTEVrQmc2OW5CRlErdDZsQTQ0b2Vwdjd0RE5vdGFITVNxMkEzcWhqOTlTUDBYQzN4Ri95WHRVCkdnSFZCZm9JYXdnUytxNFRaYkdobGZlbXpFMStsVm5SU2hveG1PeGYrT2RoajRNYzN1VHd0TnhTTU4wNTNZMm0KcGxjMVJjSTJBSzFBazVXQjEvV2N1UVIwSFZ2RHVxZW1SbE1kNndlSzRySVVOVHplWkdnVUt3SkQ0VW4vaUdMYgowVVE2bUw0U1VWVmRhQVpOUjJUeUpvUzR1akM2K1pFd2JGbHhsTnpCNzJydUxQNlIzSGE2WVJ6dTM3eGsvUWtECk12L0NtaW5YWWpMRThGTFpBTUkvekZSSk1ONHZSYTJTVS9wY0o4NFlqeVl5QzZEemUyaWZFUnNvcE1xOTgrQ1oKY3dmb1ZkZURFRGpiZzd5T0JKelhxcXF1TS9QRkxNTjV2Skp6U3AzUTlzV0kzTEp2M1Q5enJFSTd4UDQvNDArVwpaTkVGWnV6RWtRckszR2hKTkkrVmIxNVdCNi9xMmNOeFJXZ29iZ3Z0NTUxVGZPY0s5clpvVmdrakN4VlgyQTRkClNLTGZ2S0Z1V01oZVA1UGVBYmpiK0cyVVp5STVjSU4xRzNTSmxzT2RIWEUvQlhQeUl3NXBQOXU5RW02UFQxcFMKVzVMUUo3dHNZWEc2Zms1bFZIc1N6WnNvR0JhZmRCb3FqWStnM3JMcEQ2TmFzdXhONlJlZk1jbDQ1d0RMS2pXUQphakU0cFZHc3kxc3FuTk9SbmlId0NXRmxSbU9vUTQ5cVowMWpBRXhzNitiZVNUQUxrcnVkblNIajIxUk80TC9NClRScjdqOGFYUjZGellxaFFwa2dGODlYNzMzUlBRZ2NLQU1raFd4RHY4RVhVTDEvUVN6WjAwSzRmUW1SWDBlYnEKRTdkcDZiTDdDVjQ2UXNxYlJGZ0lSOXlKdCtOc3hKd2VWZDhUVTZBb3hnSVBZWThBTzYzY2pyRUZjaVJ0a1NaMwpLcW0vTGdrYm00c09rOU1LL0dGamtTd3AxNDZsMFJNek9Sa3BKNVdQbi9IZWFJeFBzZFc0cjF2N25CMEpTSmE2CmZxVE1lR01IL3VWT2s1VGdyMTVQNDRrM05WT094OWNCUzhHMjFTUFJiakk2SEx0TDU0eUFQQVk4R3NKalZQR1YKQU54VVM3RDRMRGlISG9DNllNSHNIb0NjMVpJMFFPZytSSzJ1cWN5dDB1VXRMWFFpTDBBWWVZUEdvbzVkWnJOZwpISHlwcG85WDBmSkw2V0prcm40KytvNW1PbGFNeGNWMFVaT2FIZW5uY0FFVytRNS96eWI3c1FyYUY5aGdpcGkyCkRMS1djMUZKL0pIQzZGTEd3UkNNTloxNmlKRm9nb1h2RlhiUGt2eTc5TzdXRkgyUUk2Qjc3VUE2elgxbVVJNWwKNzA1Q0dTTkNyMjlIdmpUK1R4NDlhb3NHaGxpRjRHWFJuRHE5cllINzl5cFE3QXRMazBlMDFKVT0KLS0tLS1FTkQgRU5DUllQVEVEIFBSSVZBVEUgS0VZLS0tLS0KJEROUzosIElQIEFkZHJlc3M6MTkyLjE2OC4xMDAuMSwgVVJJOglsb2NhbGhvc3QCAAAAAAAAAAEAAAACAAAAAAAAABQAAkqPEdJ6hzvJAS/nfRornsGAYOa0BgEABrAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0NCk1JSUVzekNDQTV1Z0F3SUJBZ0lVYm9MNFgzT2JnVld5UEx2aTllSjQxT3ZMRWRRd0RRWUpLb1pJaHZjTkFRRUxCUUF3ZXpFTE1Ba0cNCkExVUVCaE1DV0ZneEVqQVFCZ05WQkFnTUNWTjBZWFJsVG1GdFpURVJNQThHQTFVRUJ3d0lRMmwwZVU1aGJXVXhGREFTQmdOVkJBb00NCkMwTnZiWEJoYm5sT1lXMWxNUnN3R1FZRFZRUUxEQkpEYjIxd1lXNTVVMlZqZEdsdmJrNWhiV1V4RWpBUUJnTlZCQU1NQ1d4dlkyRnMNCmFHOXpkREFlRncweU5qQTFNRFV4T0RVd01USmFGdzB6TmpBMU1ESXhPRFV3TVRKYU1Ic3hDekFKQmdOVkJBWVRBbGhZTVJJd0VBWUQNClZRUUlEQWxUZEdGMFpVNWhiV1V4RVRBUEJnTlZCQWNNQ0VOcGRIbE9ZVzFsTVJRd0VnWURWUVFLREF0RGIyMXdZVzU1VG1GdFpURWINCk1Ca0dBMVVFQ3d3U1EyOXRjR0Z1ZVZObFkzUnBiMjVPWVcxbE1SSXdFQVlEVlFRRERBbHNiMk5oYkdodmMzUXdnZ0VpTUEwR0NTcUcNClNJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUNVZjVSRExwOFZHVDhVc3ZOT1BEeUFCcVg0WFJhQjRWaFdYM0xvWnUzZmMyT3cNCk5KQ1NHdytCS2U5QldydkdyT3B3N1pzVnJ2N0V4emV1WFhOUjh3Q3NheHlwZFRLM2dBZDBmNWZPcFhyNVo3ZnBLaE9CV1dNL3ROTmENCllFTVpiamxONHRnMEtQSFdGWHkwSWRKVWdmeUZwWHZCTmxRRzNvZ05ZZ0taT3R3R1A4Y2loOTBpNDJpUERVYjJmaTBPUVRJMkN3blYNCnQzNkcxWDNlSE1iTm9oQmFVUkllRWlMbFJHQUs5aGtmcUk0dEZvR3krRXlESE5FN09BRlpQTjM3dCtwTnJQb1RoUU5oeVFpaG16cEsNCmxydmxBaDZJdkdpSE02WlNyVHp4ZmgrM1drU2dxbFpIQ05aWk1tNGZGdEhNU1daQVYzaHhUSG5vVzMrbGJuZVFXY2pKQWdNQkFBR2oNCmdnRXRNSUlCS1RBSkJnTlZIUk1FQWpBQU1BNEdBMVVkRHdFQi93UUVBd0lDOURBZEJnTlZIU1VFRmpBVUJnZ3JCZ0VGQlFjREFRWUkNCkt3WUJCUVVIQXdJd0V3WURWUjBSQkF3d0NvSUFod1RBcUdRQmhnQXdIUVlEVlIwT0JCWUVGRHlRSGE1YWViV0xpRjBIT1M1Vk5ySUMNCmdVWmtNSUc0QmdOVkhTTUVnYkF3Z2EyQUZEeVFIYTVhZWJXTGlGMEhPUzVWTnJJQ2dVWmtvWCtrZlRCN01Rc3dDUVlEVlFRR0V3SlkNCldERVNNQkFHQTFVRUNBd0pVM1JoZEdWT1lXMWxNUkV3RHdZRFZRUUhEQWhEYVhSNVRtRnRaVEVVTUJJR0ExVUVDZ3dMUTI5dGNHRnUNCmVVNWhiV1V4R3pBWkJnTlZCQXNNRWtOdmJYQmhibmxUWldOMGFXOXVUbUZ0WlRFU01CQUdBMVVFQXd3SmJHOWpZV3hvYjNOMGdoUnUNCmd2aGZjNXVCVmJJOHUrTDE0bmpVNjhzUjFEQU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFJc0FKTmpXOEFlcXlmSjNmY0cxd2Zyb1MNCjVVSC9jd3FWSDlLMnZVMnhoM211cE11TXRXTDZWVVgwYjZ5S2M4enVDdUo4REJpZk50OUxnRWJhSnd3V3dwZk5jTnJ0RGxRVE90ckoNCjMyakkyZHhJMnlWNjQwODVKM1BhUWlIUXlLUng4d0VHdE5EcVB3VFU2RXVndHZnMGYxUllZMUtnbHNYT2ZEMi9VWFZ5SFhhcHM1TlUNCmNvWnlKVWNab20zYm80dzdDQzRpeStIM2x1c1lsc202bzN1VXZ2U3g0SUNMZkJXNGl0ZVhvUkVzb2pneGp5RDRYUnFZaVpUOEpkeGoNClA5MEMwUklMWkFpNEoxNXl4MVJuaXBmVUN4MFJTMGV6QnQ2N01UVVZsdVZrT3Y0K3lPVlRpaVM5OVY2TTl3MnNnei9jMXc3TkV5QW8NCnFlRkVmRmZXdnBHKzZ3PT0NCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0NChcIAQAAswEAAgB8MHowFAYHKoZIzj0CAQYJKyQDAwIIAQELA2IABA9BdVGE8JlIWVRjXYjeO3LN8zaTP3xby8h9pIWchU0jvzhUirmhkpd+LldYYWM6zgyQt/8pjWIXcRXeD/Z3orpCuh+pc8EAPOYKPDDDsVkkFOimU150GGdeRkdmVR2mblh+ITXENGw4GKuyMFZsG8YAIPPZZAENOeidHrXzrVW6GYbZIFqIRWpLGULzdCHOpKmAB14tLS0tLUJFR0lOIEVOQ1JZUFRFRCBQUklWQVRFIEtFWS0tLS0tCk1JSUZOVEJmQmdrcWhraUc5dzBCQlEwd1VqQXhCZ2txaGtpRzl3MEJCUXd3SkFRUUZIL3FVTUR1REdwRm5YdFAKRnV4NVRBSUNDQUF3REFZSUtvWklodmNOQWdrRkFEQWRCZ2xnaGtnQlpRTUVBU29FRUNSMHpMRVpmdXMrZlpGagpHb0srZmc4RWdnVFFObW53QXNzZUY4b3dxMm02UitWZGtsVE15UnNzQ3kvUVZsMkF1aVFuV1ZjYlV5TFN4VFZhClFWUlU4OE84SjRGSjZyZWtFdW5XZjZCRlN2TDBqZmZpUVo0a3RqU1NHU2Y1cVBCWFdBWFgzQ1ppZUdzSTYvbDkKR1VqZlZtL0pPNFpmZE5GQ0NoWFZKZVNvbkNHSDJpY1dUZDZjMEUySGhvR2hwTWNZQjU0T1B3NW80V3hJVm1NMQo4VWdZbFJPTURGazhKckxZUXRodG5RY0FZWnpHL05UWG1PeVdLRlBybFBXWFYzbG91bG5oQkhZeWNoQTRXUS9JClVwWVRZeGFrRjBsZTlyaFVJMFRYcnF0bE5QT2JyMHVHS0RsV3kySnBHdlhYTFdkTDlieUhlV05nUkFRWWt6dlgKSVh6d1RsaDBYcUJ0V1V2eUhPUzdHdUN4VnhBSDlOUGFEbnc0YU1hdmJ6UEVIZ0ZNQUxSSnRNbzJYZ09nTjdoMgpnT2FoSkZNVERxSFZjVzExWkJYeFI3S0tMZytsVFRTV01tK29hNkh4R3lNSkZRMGRNdTB3U3NhR1RpT05SUkxECitZOGx3M3ZEVnFmdnFvaGxvci9JMzA2TDRhQmR5Q3kyeFZwZEpuVHRVVUk4QWREWUVuVFB6Vmw1cHRrUStuZzgKT0FnMlhMRDBDTHlkeTNvWWcrNHFkbUpxTUtkN2lQcTdjVFYzNHBHN2ZzbFVlZXZ5LytGajRsWDdnc1ZoK3Q5MwpNdkZ3RVdtcnluN3ZTcTc1eWU2OTVRNFlpeGhKcEFSZGdWRFd4andrRnlnWndTWStFcVNMZVFDQUxZait6aHN6CmVRTjgxOWJoNE11R0ZMeTZYOVdPcEhsWHpLVmNpeEpoSkg5UFBaU1lCOGhwV3VSTUpEOGMxa0ZZYWdUSi9XTFcKWDRDbWNDNHdqR0pGUmtNWDVHTVc0VEZzZlNCc0JTd3ZtcUE2d0hUQ21xbFhKTk1zOGpRMUFRMThIeWg5UUwxZAptaG5iU05wQ3B1dzdJUFNhZ2RPSHM5WHYwUU5jSFNXNFVkR2krNXgyNlFtQlRCekVBMUNzL3pKS3lnVlErTTJGCi9WMnQ4OCtFcHVQRWRlN2RFN2JEYzIxaFdzUDBoaHpwb2FZWGRUMFdkWmhnd0dld1I1cjA5dFFmc2k1d2JtdGoKUWxVZ1ZtZUN0RW9XTXlUR3AvQ0dzd28wbDFrYUZEUi9MQWNId3dkL0xWTXFrNXdLSFh3cWl0NVlEQ0NORElqcAorQksrK3YxM0dkR2pYYkNlNTFiU1FJNE5uZ2ZqTHdQRkNVWTQ3UCtIczh6MGpPbHVHRnNsQTFUek5rQXo3WGtlCmdHREtXeWl0RGtCNlA3Y1hjMDZFUVBVVDdPeVlDcmtna3gwcHAvcXBRMUhTd2VTUENrYU1uVHJGTXpEQkJUbXAKYmVRSldiS0MrRmFIQ2tPRGcrUVZLTU1DMVZ1a0VSUys5UHVIOUZvZHM3KzBuRDV5SXJMVEdVLzAxaVB3K0dFMQp0UkpGckJwZmUrbDU5MEpiUHJBZmhuSnExbTZEdnd1VUZmbXFpV3NLeU4wTldwSTNYSDl5VW9RVjIvRVRpMFRKCmI4VHQyLzhCZmJZbmE0Z1BXNjdzSUF1cmtXZDg1ejFaY3Z0L3VCcFFVL1FTNE1UTENtM3NaUnVZTTBlRng0TXIKczBZd1l2TUdhTFFqNkNWMXBTd2JuYlhxRGJMTldZVC92ZDd6b0hOUlF0L0l3WkoxT2s4djhhYXNYTlpsWWN4RAo5cHM0Q0Rya2hjcGlPSFo3V0VMRmlmcWZYdERYR1Bhc2hnMnhJTWozVDcvcWp3MU83czVUUHRaRi91cWFoalhRCm1YbXIwNXVUbThVRHhFQ01UVFlVOERoc2NEbWxxb1ZheUNyMG4zRmwybmMrUTZFdjhnTHpYa2NlQlJQVUJwNWYKV1pyRUxsRFNPak1zcWgrZFc0eDVkcmpWYzhJbjk0R0I2Y3F5RmN0dFNiSWxFbE5EbjZueVdOS0RMWEY0OGMvdgpiek1vRVVGV1BYVjZPODhHT2tOTzZVSlFPclR1eURwV1ZCUHZYdnZFT0M1WGZxVmZ3d3pNMGtVQ0E3T3hjT1NKCm9Xd2lEWFBQek1uTFVkbmtaVkw1eVZDUnNsUmE3WHF6Qm4rRFVjS1Zndit0MC9QSGZwOStSbmc9Ci0tLS0tRU5EIEVOQ1JZUFRFRCBQUklWQVRFIEtFWS0tLS0tCiRETlM6LCBJUCBBZGRyZXNzOjE5Mi4xNjguMTAwLjEsIFVSSTo=", - "UserData": "AgAAAAAAAAAAAAAAAAAAAAEAAAAFAGFkbWludAAAAAEAAAEBAAEFAAAnEAAAACCfUltfqHqTEfmrHMhTn+KbZEnj7UaE08uXhywSlJXqHQAAAED8yqAG/2GtL6cnubPuOUQpU3w6+4LhH/vJThh4z0WNz/QPn4nJKzlCjqyE/Mttd/0Wi2a51NWeWnJMg6r31DpUAA==", + "PKIData": "AQAAAAAAAAAAAAAAAAAAAAEBAb4gAAACAAAAAAAAAAAAAwAAAN8ALS0tLS1CRUdJTiBQVUJMSUMgS0VZLS0tLS0KTUhvd0ZBWUhLb1pJemowQ0FRWUpLeVFEQXdJSUFRRUxBMklBQkFWS1hUL1dwYVRyL0RZYTlzclZnY2ZyMXNFZAplZnJpcVp2VWdQc2RickxsbDRIdi9LUmtPMjRPVStMajZxVGtyRlBteUM0QTJMblVpSXhRVUJzQnE0VWViYnlMClFSRlpOS0p0YzNlYjY0UmFIUUZPVG9MeDMwSlpqZUNJWThJOHhnPT0KLS0tLS1FTkQgUFVCTElDIEtFWS0tLS0tCnsBAQACAAAnEAAgyVCoR6tHA0ffOuqGvEjxBkMHkuse6z3ACntHuLETAnIBACAADAAQ67UWEIqk/AzEm2HR8pZBpQEAAAE2IfVwsz5EfDm6BmuufEMIXi+QAK+xDwBrlbFWDsUN/+9ZZhvKQnVANLsv0PdxuJifpfPbTO1VTz6gWp6vEH8hZEOhq6jC8jzbhvfiLxqOBEPIM2GpN9SowZRj/49myDHEfzRCSMZBK/Gor7qkrYI3U7AyZffVf+WuBmOyHkdAjdXgjBoSm4LkmtOB/GUZYVSal41uK1BcLQd7tHXZTWaN76Accyt0JP/pMKA/hVrWKvSXHDkTObPHwFUkdO9+s0q2nqRnRRqx6f/rivCnEYeus6+JReQFFFnfrmUpkLOYQBcC6O7283rj1G1y7RsHhN49YN1FCdISC7U2qnZtpwqlzbTDoAsNFSjlguNrVErf0WTAasY83zJjAetN0qXSAnOS6vURW8dwtU7Goed9EmMYzg0ypHyWMwIACWxvY2FsaG9zdAEAAAAAAAAAAQAAAAIAAAAAAAAAFAAHNtjsXDqOcYQqM74l70npuNB8frQGAQAGsC0tLS0tQkVHSU4gQ0VSVElGSUNBVEUtLS0tLQ0KTUlJRXN6Q0NBNXVnQXdJQkFnSVVXMHZGYXNDNE1haG5yNnlYSjlsRHFQd0ZTWk13RFFZSktvWklodmNOQVFFTEJRQXdlekVMTUFrRw0KQTFVRUJoTUNXRmd4RWpBUUJnTlZCQWdNQ1ZOMFlYUmxUbUZ0WlRFUk1BOEdBMVVFQnd3SVEybDBlVTVoYldVeEZEQVNCZ05WQkFvTQ0KQzBOdmJYQmhibmxPWVcxbE1Sc3dHUVlEVlFRTERCSkRiMjF3WVc1NVUyVmpkR2x2Yms1aGJXVXhFakFRQmdOVkJBTU1DV3h2WTJGcw0KYUc5emREQWVGdzB5TmpBMU1EY3hOakU1TURkYUZ3MHpOakExTURReE5qRTVNRGRhTUhzeEN6QUpCZ05WQkFZVEFsaFlNUkl3RUFZRA0KVlFRSURBbFRkR0YwWlU1aGJXVXhFVEFQQmdOVkJBY01DRU5wZEhsT1lXMWxNUlF3RWdZRFZRUUtEQXREYjIxd1lXNTVUbUZ0WlRFYg0KTUJrR0ExVUVDd3dTUTI5dGNHRnVlVk5sWTNScGIyNU9ZVzFsTVJJd0VBWURWUVFEREFsc2IyTmhiR2h2YzNRd2dnRWlNQTBHQ1NxRw0KU0liM0RRRUJBUVVBQTRJQkR3QXdnZ0VLQW9JQkFRQzBtVnRvUUdwSDgraGs0WmtiQXdSNjV6dlhqTEhVSzlyQk5BRy8xSzN5Z0dVYw0KVWs5SWxnWHlNTWRKMTA3L2VucUo5NVkxV0xqblNkaUN5NVJZcHljWmIxSzBUK2NSWGR0ZW4wU04wODJFbmdVa0Y5Sy8wU2JLMGpZSw0KZ2QwUlgrbnRRK1ZSUHNaQjhxeDhSYUpWb1I2NUl3Q2hiL2x0UDlLamlaTkFLQloyakhBT3BNNGlzbGgrYW91SExZVkVXbnYwRnlPMQ0KZkpDTEFWM0ZKK3FDUm5leTZyWWQyWUcrb2hJK215cExzd1NKT2NCOFlzWnNMN3dBb0lmVWVSMUFadnVoRjJUbnMwWWM0VWhOMFR4bw0KZFVtSEd4b2QrTWt6ZGpYYjRaSlpxWEVrbmdZZGZZUVFGcjJrWC9OeSthbVdrbEdpNUpWM21TYTdCMHhGT0ZHYVJLUXRBZ01CQUFHag0KZ2dFdE1JSUJLVEFKQmdOVkhSTUVBakFBTUE0R0ExVWREd0VCL3dRRUF3SUM5REFkQmdOVkhTVUVGakFVQmdnckJnRUZCUWNEQVFZSQ0KS3dZQkJRVUhBd0l3RXdZRFZSMFJCQXd3Q29JQWh3VEFxR1FCaGdBd0hRWURWUjBPQkJZRUZNZnIwOE9nK0ROU1h6TWNFRWhnTnlHRg0Kb1BSZ01JRzRCZ05WSFNNRWdiQXdnYTJBRk1mcjA4T2crRE5TWHpNY0VFaGdOeUdGb1BSZ29YK2tmVEI3TVFzd0NRWURWUVFHRXdKWQ0KV0RFU01CQUdBMVVFQ0F3SlUzUmhkR1ZPWVcxbE1SRXdEd1lEVlFRSERBaERhWFI1VG1GdFpURVVNQklHQTFVRUNnd0xRMjl0Y0dGdQ0KZVU1aGJXVXhHekFaQmdOVkJBc01Fa052YlhCaGJubFRaV04wYVc5dVRtRnRaVEVTTUJBR0ExVUVBd3dKYkc5allXeG9iM04wZ2hSYg0KUzhWcXdMZ3hxR2V2ckpjbjJVT28vQVZKa3pBTkJna3Foa2lHOXcwQkFRc0ZBQU9DQVFFQWRwNm9sMzJMWGtBY1NxZHhrTGhRUytlbg0KbjVsVVVCbFlwUUpxK2RHRENBWTlYSzF5ZGxmMXZURXBRL3VYZXJld05PMjFGQ1BLWmJhVTJnZXJ2UTBFMWJnZlg2Y1liaENaK3NzbA0KZ1VNUjlGanVUUjFxUVlCMlVTN3Z1d2x3czRaclNGL1c3NkNSYy9QSVM1T1E3ajhyRXNySlBveFo0OHNhN0JFUm8vWmVoS3ZreDNGVA0KT2JGbjJYR3M1MGc5dTlqTFdqeGV4ZWx1bmpmVkFBU0xUYzZtUzBBNEI0ZFBZZHMvU2htd1NleG5aR2lqSmRGZFJVb1BBTjIyb1R5Tg0KSzNZcitDY1FtQkxMbEZuWDZLdWNvVVlyWWNsTWtLZXNYbnhjM3VvSllaUGJCRnU0aEcvNmtrdDN5Z2pGRFNWZVdOSGF5MDdJaW5VYw0Ka1d3K0orclRwVCtGYUE9PQ0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQ0KFwgBAACzAQACAHwwejAUBgcqhkjOPQIBBgkrJAMDAggBAQsDYgAEO1iej5A8dokbjxZQeibKemFqfME7Np3/Qe1FwHbqf4nYA+kkjLLPIRw12x6D/DDkLD9ZpFMdhHbo0j/hiRPPZOrns+njkarZXOdzf4ps7yXPtR+Nm1uH1pZabP+5NkMd70lrjU2byDLH9JyR/y+t4gAgT361luWZUzj82FCL4vSbjikQxdKcxCQ38KlhO3J+ZjEHXi0tLS0tQkVHSU4gRU5DUllQVEVEIFBSSVZBVEUgS0VZLS0tLS0KTUlJRk5UQmZCZ2txaGtpRzl3MEJCUTB3VWpBeEJna3Foa2lHOXcwQkJRd3dKQVFRUHN3ZEc5THN3VDhoYitZMwpJRnJMa2dJQ0NBQXdEQVlJS29aSWh2Y05BZ2tGQURBZEJnbGdoa2dCWlFNRUFTb0VFTmd2YlBXajFlSkNla2ErCkpsSnNSaXdFZ2dUUVRTTEVjbExnanNwYU1Bd0VJUU54aDZJRm1rVWZlZjN1K2hVMTd4WExYUkplS281R2pqNEUKOFhZMnNYQzMwZkNxSGxCQUVqQkZqc1prcTJCUEpZemxrZ1hXeCtZaXZrcTA4Wm1odFhZSFJuQ2Fvakcwa005Qwo4TFZqZHA4NkpBaWQ4WmpLM3R0RUhndzNQWDlBU3ROOVJrK2RGT3oydFJhSDNxeGMrUFdibDFuMTVNUzVvWXFBCm1vY1VuUE1hMXkyMmdMWjlsMzdRK1ZDemFIQkdXM0UrT1kvU2ZvclEyY2NoMjdEOUNoS05DbWluVVlPVzB2bGUKS1N6YjZmaldlejRRa09tUW5WM2VCSlY4VEJYRkoxN25CZnJrYVdDa2Z1Q1d6M0xza0R5d0M2WTlYZHEraTB2bApONVlyS1RIU25OU1Y1VG4wYng5ZytWaXRwWEwvK2lwaGJFWHlKbVFKTzAwSG5SOXBaUDIxUWlRUTFyWExQdTViCmxmd2ptd2trSUN3QlNVNW5lL1JpYlFOdExVbzFFUVF1clBSUzRtVjJNVmZvekFFTTcxdStQUGw1R3JnUG9PRk4KWTgxbXd2dnZ0VlZxMlh4OFhBV2xpeXBoUzRyemhxQXY5VjJZaERtK2ZYc0EvRmtBNjh1bkNsU3pQam5yMk5rSQo2RmpNQXhiYngrZzR6cW1ialAyWkh5eXdEUFRuNFZMTlZVSDVJc0NMSm9PMHEwRUNydGdzbHBMY1dlMmlYQkxDCkM1M1hXMUs2Q3U4bGlNMDBFSVREYzZvWFdYcktVU05GMks1bnp3OHZjWFg2R1EzNUtmUGc4amkyYkJQZHdWNFAKamVLTG9FZjAwL1dnYXpQUmM4c0Q4SElVR3ZKM1RLb3BiRVFiQUtmaHk0dE9GWlZFaEdPT0U2bmRJRWJoMjRZVQpwbWhCalYyNmFDWkl4ekplRjNxR0lIMFF5eEhLcXdQaXh1UStUYVVncnFuZFcwWDlnblRoaWJkR0R0cVA0SWRUCnNDZDlpSGpKU0dUcjRmem1IZEFxcE92WGpRdUN2aWlOUXlTR3F1RHpjNWE2MkJhZDlVV1RFR1UxNGRFQkQxQm4KbVVuU0F1aDFyeDhYZDc5M0NvSS9sUkVTbXhST3djVjBrNWNDQ1dKNGUrNTFweTJrSi95c09uVGMrZVZDS25xRApYZ0RJNGdiYnYxcnpPR29wNTZZWE5vN3JBMUMrOC85amd3MlVFN21PR1JWcDIvTHdHYTVGdE52eXFEQlB6eXVkCmVtTk5RZ1FYR011R0phODVCN3dWQkljNG9JQmJ0cmhwK2t6OHc3OStVY1BmWlg0MllGek9HSEpsK29Wd3Z5WksKQ3hsVHZlMUc0czYrRVltcnlOcXlYZDJNaTZDbTRVVk9ZNEplUkhZdmFSRFR3UzlkdmNpdjQ5T0Q2bzR2cUR3MgpEUnh2bVR4aVErTU1OU0VLZDZnV2FsU3YxRDhlRldGL1BvQmhEV2FnYVFSeXZIWndUSEd0YzFIbzVCOTJON3d1CkMwMW5aN2Vhem1MUTA4Y3FqSkUxSkNvYjFqdGpYZ0FxeDVYMVp3OWErcVBaWG4wcnJuZ1c2MGZzQWJKRmM4V1oKdVl6YXVxcFdiVWdxbC9EUHkzSi96VzV3OC9aWG95YjdoNUo4WUtoc0ZQWGNROTlMV1Nkb1J3RFN4b3AzNUtZdAo3RERmYkdvYnF0Nm9pWlRrekl5dGRsbkxHZkVKKzFxSDcreWdYRVBsRGhNdUJ2c05Jem5OeFBKR1UzVm1EWEswCjdxVndwUGhyMml5UzZpUGY0cHVubTU5ZXE0dmd2a2JaZnRuVWdmS0Y0Rnk0Q1NHQUY0U09CNTgzOU8rNlFGYzYKT0ZSTGZPbGhLeDlVTG9JTWpzZzB5ZkxRL2RhQ3RMRVgyY1hVdmM2eGJOMzB5emdhM0JEUEQwdC9mNWhCNG9KWAp5YUxtNkUyRTdyNU5sRVFmSlFocXhYbFB5R05nWGJEZzZ2cFdYbEoxcklVRDNTQURHcnhDUC9iVC93U3oyRFdZCkdiL2RCeXYxbnVxc0dtZnAxQlNicy93NWpITDUvNGtSUGxlWVFwK1gyWWp1dnFsRlBGNjVDdFNnTUNUYjF5a0kKcDhJVVVaSjRuZForcWhTWEt0SGpCMlViMWNTcGxDSEx3bDFPM3A3MzdWMnI4ZWl1Sk9WdTA0ST0KLS0tLS1FTkQgRU5DUllQVEVEIFBSSVZBVEUgS0VZLS0tLS0KJEROUzosIElQIEFkZHJlc3M6MTkyLjE2OC4xMDAuMSwgVVJJOglsb2NhbGhvc3QCAAAAAAAAAAEAAAACAAAAAAAAABQABzbY7Fw6jnGEKjO+Je9J6bjQfH60BgEABrAtLS0tLUJFR0lOIENFUlRJRklDQVRFLS0tLS0NCk1JSUVzekNDQTV1Z0F3SUJBZ0lVVzB2RmFzQzRNYWhucjZ5WEo5bERxUHdGU1pNd0RRWUpLb1pJaHZjTkFRRUxCUUF3ZXpFTE1Ba0cNCkExVUVCaE1DV0ZneEVqQVFCZ05WQkFnTUNWTjBZWFJsVG1GdFpURVJNQThHQTFVRUJ3d0lRMmwwZVU1aGJXVXhGREFTQmdOVkJBb00NCkMwTnZiWEJoYm5sT1lXMWxNUnN3R1FZRFZRUUxEQkpEYjIxd1lXNTVVMlZqZEdsdmJrNWhiV1V4RWpBUUJnTlZCQU1NQ1d4dlkyRnMNCmFHOXpkREFlRncweU5qQTFNRGN4TmpFNU1EZGFGdzB6TmpBMU1EUXhOakU1TURkYU1Ic3hDekFKQmdOVkJBWVRBbGhZTVJJd0VBWUQNClZRUUlEQWxUZEdGMFpVNWhiV1V4RVRBUEJnTlZCQWNNQ0VOcGRIbE9ZVzFsTVJRd0VnWURWUVFLREF0RGIyMXdZVzU1VG1GdFpURWINCk1Ca0dBMVVFQ3d3U1EyOXRjR0Z1ZVZObFkzUnBiMjVPWVcxbE1SSXdFQVlEVlFRRERBbHNiMk5oYkdodmMzUXdnZ0VpTUEwR0NTcUcNClNJYjNEUUVCQVFVQUE0SUJEd0F3Z2dFS0FvSUJBUUMwbVZ0b1FHcEg4K2hrNFprYkF3UjY1enZYakxIVUs5ckJOQUcvMUszeWdHVWMNClVrOUlsZ1h5TU1kSjEwNy9lbnFKOTVZMVdMam5TZGlDeTVSWXB5Y1piMUswVCtjUlhkdGVuMFNOMDgyRW5nVWtGOUsvMFNiSzBqWUsNCmdkMFJYK250UStWUlBzWkI4cXg4UmFKVm9SNjVJd0NoYi9sdFA5S2ppWk5BS0JaMmpIQU9wTTRpc2xoK2FvdUhMWVZFV252MEZ5TzENCmZKQ0xBVjNGSitxQ1JuZXk2cllkMllHK29oSStteXBMc3dTSk9jQjhZc1pzTDd3QW9JZlVlUjFBWnZ1aEYyVG5zMFljNFVoTjBUeG8NCmRVbUhHeG9kK01remRqWGI0WkpacVhFa25nWWRmWVFRRnIya1gvTnkrYW1Xa2xHaTVKVjNtU2E3QjB4Rk9GR2FSS1F0QWdNQkFBR2oNCmdnRXRNSUlCS1RBSkJnTlZIUk1FQWpBQU1BNEdBMVVkRHdFQi93UUVBd0lDOURBZEJnTlZIU1VFRmpBVUJnZ3JCZ0VGQlFjREFRWUkNCkt3WUJCUVVIQXdJd0V3WURWUjBSQkF3d0NvSUFod1RBcUdRQmhnQXdIUVlEVlIwT0JCWUVGTWZyMDhPZytETlNYek1jRUVoZ055R0YNCm9QUmdNSUc0QmdOVkhTTUVnYkF3Z2EyQUZNZnIwOE9nK0ROU1h6TWNFRWhnTnlHRm9QUmdvWCtrZlRCN01Rc3dDUVlEVlFRR0V3SlkNCldERVNNQkFHQTFVRUNBd0pVM1JoZEdWT1lXMWxNUkV3RHdZRFZRUUhEQWhEYVhSNVRtRnRaVEVVTUJJR0ExVUVDZ3dMUTI5dGNHRnUNCmVVNWhiV1V4R3pBWkJnTlZCQXNNRWtOdmJYQmhibmxUWldOMGFXOXVUbUZ0WlRFU01CQUdBMVVFQXd3SmJHOWpZV3hvYjNOMGdoUmINClM4VnF3TGd4cUdldnJKY24yVU9vL0FWSmt6QU5CZ2txaGtpRzl3MEJBUXNGQUFPQ0FRRUFkcDZvbDMyTFhrQWNTcWR4a0xoUVMrZW4NCm41bFVVQmxZcFFKcStkR0RDQVk5WEsxeWRsZjF2VEVwUS91WGVyZXdOTzIxRkNQS1piYVUyZ2VydlEwRTFiZ2ZYNmNZYmhDWitzc2wNCmdVTVI5Rmp1VFIxcVFZQjJVUzd2dXdsd3M0WnJTRi9XNzZDUmMvUElTNU9RN2o4ckVzckpQb3haNDhzYTdCRVJvL1plaEt2a3gzRlQNCk9iRm4yWEdzNTBnOXU5akxXanhleGVsdW5qZlZBQVNMVGM2bVMwQTRCNGRQWWRzL1NobXdTZXhuWkdpakpkRmRSVW9QQU4yMm9UeU4NCkszWXIrQ2NRbUJMTGxGblg2S3Vjb1VZclljbE1rS2VzWG54YzN1b0pZWlBiQkZ1NGhHLzZra3QzeWdqRkRTVmVXTkhheTA3SWluVWMNCmtXdytKK3JUcFQrRmFBPT0NCi0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0NChcIAQAAswEAAgB8MHowFAYHKoZIzj0CAQYJKyQDAwIIAQELA2IABALplP8vt/+jhoWzzgkxynJMIcblkRKqmg5I3Gnb9mctJ0YhVoTsCpRQfWBIZpPtvQpniMPGGxlfLgUQxKlaUd9Y3FddWeds2AteQnMjlZR8mThjXkhEmDLB4ztVXnfaEqHhCQRzY0cwLgcRRgh6/2AAIJ0Jy+Nfc0tGeX19nI67xRHBbsGenx12PMv+FzwSeGpfB14tLS0tLUJFR0lOIEVOQ1JZUFRFRCBQUklWQVRFIEtFWS0tLS0tCk1JSUZOVEJmQmdrcWhraUc5dzBCQlEwd1VqQXhCZ2txaGtpRzl3MEJCUXd3SkFRUVVHc1owa0lPeXphQnZlMVIKRWU0bWZRSUNDQUF3REFZSUtvWklodmNOQWdrRkFEQWRCZ2xnaGtnQlpRTUVBU29FRU9hd2owWmtzS1k5aHFIRwpVc0VDZW5BRWdnVFFrQXdnS054MkFpck03cUFqaXJYRlEvaENQZzRIcWJxdE52dXcrRG44Wkh5aGYwTTJpVzJKCjAyZGk2bjlVZmg2dGRpVEkyMzFuV3B0Tk4ySVVmNk1PWnVnSmwwSzZzNll6YjJmQ0djcXhZdmhGY2JBVUhWWE8KWG5YUnk2aHZJN3lkZkd6cDFYWGxxTERwZkFsSUxDN1hiQlN0OGZOQ0krVlVBTDdQNk5Nc3lVdS9TREovYUk3MwpYSzNwU3crUG1scVZwWUliL09EZWxYNXhmVDhDWVFsUVZqSXZ2RjMzaUp4TTBIb3VJZDkyeEJxQzY4MTVBYlJMCkc3dXpib3JwZWR6OU42M2pZNFFCZU5oZTlZN1gweEhza0JIMlE0cTh2bGcrTmpBRHhDeTdJYUdXaStubE11bHAKNGR1Y3hhRGRDWHliZlhKTFV6SzJZMmZxWThkWE5yK2FCTXQ2cDVSdG8wS0hhQXBaTnhZQ2ZNMU1qeWlQY3BWNwpGWWtKbnhmYUFXMzNjMUhCZUEvQTJLSTd2SzVaamtESEdodzY5SEhhVlZGeXUwRCtmV0tIT3dFQmp3UldHOWF4CjBDSXdZU1lMY3FUdXI5Y3NRU2ptQnRISGlsWWR3d1crVTU1QmVyVmJrdHZMWVZaUnUyWTUxbGdKckZEcXNoOFgKR3lISjBCZThKT29tT0lNSXdlM28renRySkhFSC9iNGcwQVBSTjY2dTN3TmRTZUdwdGZ6TU9EL2xzS05MZ1NPWApiVWJKOTgxeWpKbXJERGQwdHpuNjI3RVRvRDNUNnB6NjMxVlcrMzlBUExmNXRYSnVWY3FNcUF4UmZUYjdDS3ZFCm1zNEQ0alFRdExNSUEzTVhJUVFvLzduVm14eUtKbStlQll6d29yc21JaXNCbjFEWmx3c2twMFlnbldnUnRlTkoKSmhpR01MR1h2T0RzdW4rUG5QR2loOFZVSFpwODlmUDFMelZRUGlFZVYrSzRWSGdnYjliZHMwTHgyN0l5dnRrVQpQWFdTcHdSV3JXdVZNWWRWOVRBS1lOOVY4UVRPZG5zdm92anJuMDQ3L0Y2Qnp1NllGU1dMMEx1bXpua3M5RWFKCmtFKzhxaVk3WGZJTG11dDYxcVBWQk9wbE5uMFIvRkpIRjNJWWxtSkZRT2Y4aUFWTjkrRVB6cFU5Z1hRbjZqMFIKZ21hQm5tUVp0L2o5M0lzbmFqSllqVDd6cUVydnp5YThvaVdYVDc2c05JbzI5WEErNFNDUXk5aThOaVpEYzFMagpvYWRJeCszM0xqcTRuc0JDUklxdjhaUy9iZVFqajNEZnQ1Rzl4dm93ZGFJN1cweFhQK2ZnQ2wzTnNFRys2VGRoCmR1QVZWdDB2dVF0aFgvQlhFWlE4K3N6KytFdkc3WUlBNFJVZWpHcXNZV1Q1WmUvVFZwMnZWUzFLanpaNGlsK0UKbGRJbUhIWGhpcmVvUDZyYUQ4bFExQUZadDcrZTd3YVV2MloyYTJRclN0TlZPSFB5WnN4dmVmYkRWT1J1cS9iUwpuMVpZMFg0YjMvcUNJazV6UWk5TUpidnFOZ3B6anhtME5kYzNjMzNteTdZM0ZVVXB4ZEx6WUl5VU1XTUg3NjZhCmY4NUhLWXZITk9RRHJ1bEgxNG0wNUd1ejhmemVNNTdKWHV5ZnlhcFB0ZVFDU2lud01nMEttUXhiWUlIZEZLaUsKQUJiR1V1cENQR0QrUWt5S3ZrcVRYbEYxTi9oUHNJY2Nyd05WcTdLU2ZzVHVpcGJLKzVibElTTWJMRzRidUp6TApva1RaNUxNTHNWRVloa1RoeDFhbU50L3VaSGJkUjZnbWRCVUZmeW9qbXR4a2VUMkU2enNweTQxWHpta094N3RVCkVnb0dHYmw0WGtUdDFhU24rZ0Jqd0ptU1RMeUlyV0hOSEJnNXZUM1R1enU2dUx2V0ZPcG9qYjVzTDZaZXBXUUIKOWRuOFQ0ODMvellTaFNYUTNHU1lQekVzc1NoZ3R3L1ZzNCtPZVFHWlN5WnRoTjlWc3F2RWpaUkpva0ovcWVmYgpOUEFYSkMvQmZZQkZrSnV6WDJNcXhBbWtRSVY1SUtGV1ZOZzFRdVhmSHNKRllBQ2w4am1LMlkyQlVIeHdONnEvCkxTN3JTeTBhaHJvUkw4WVl6NXg0amt2aDV2bUtFUnh1anFkWjVBbnhuUm1UWkFOdVZoOCtvL0k9Ci0tLS0tRU5EIEVOQ1JZUFRFRCBQUklWQVRFIEtFWS0tLS0tCiRETlM6LCBJUCBBZGRyZXNzOjE5Mi4xNjguMTAwLjEsIFVSSTo=", + "UserData": "AgAAAAAAAAAAAAAAAAAAAAEAAAAFAGFkbWludAAAAAEAAAEBAAEFAAAnEAAAACD3uJC2p8BdPuqSDeIrMRI+XQRlbd+u8Dwmf+TOXtwkowAAAECptg+dP2x1F/DH9Is7tu07rQZwqv4xc/k15u08JbLQf4HGSEOHeEgXA89SlHJs6BapMDuJpHDW/1Df+NA25C98AA==", "CertificateAssignments": { "TLS": 1, "WebServer": 2 }, - "AccessProtectionData": "AQAAAAAAAAAAAAAAAAAAAAABAABQAAAAAAEBAAAAAgDQBwAAIAAKmVkfm5wOpimHL6zX/wQWpXLaXc4N+kpcdT+hATcTOiAAKb32bGIPnRZUUcL3Fq3e2N66O6VOOXr247e2ZkSeSv5QAAAAAAEBAAAAAgDQBwAAIAAKmVkfm5wOpimHL6zX/wQWpXLaXc4N+kpcdT+hATcTOiAA6MkvDDpiYHrnPAHLGnnEgvBkLmAITgtJ+a7/lRsQ5uxQAAAAAAEBAAAAAgDQBwAAIAAKmVkfm5wOpimHL6zX/wQWpXLaXc4N+kpcdT+hATcTOiAAKb32bGIPnRZUUcL3Fq3e2N66O6VOOXr247e2ZkSeSv5QAAAAAAEBAAAAAgDQBwAAIAAKmVkfm5wOpimHL6zX/wQWpXLaXc4N+kpcdT+hATcTOiAAKb32bGIPnRZUUcL3Fq3e2N66O6VOOXr247e2ZkSeSv4gAAAACplZH5ucDqYphy+s1/8EFqVy2l3ODfpKXHU/oQE3Ezo=" + "AccessProtectionData": "AQAAAAAAAAAAAAAAAAAAAAABAABQAAAAAAEBAAAAAgDQBwAAIACP+BdpBsCH3af1seL8CLhwIlKZ+oFvY04ZDwhxXoKsbyAA+07n8xv1DlWyiGYe4wm+TCtVVLWnQtwCubQBI2iIFOlQAAAAAAEBAAAAAgDQBwAAIACP+BdpBsCH3af1seL8CLhwIlKZ+oFvY04ZDwhxXoKsbyAAtbCmDP/V92245HrBFkThFMUaYaFFKyNabkdXKbdtPTtQAAAAAAEBAAAAAgDQBwAAIACP+BdpBsCH3af1seL8CLhwIlKZ+oFvY04ZDwhxXoKsbyAA+07n8xv1DlWyiGYe4wm+TCtVVLWnQtwCubQBI2iIFOlQAAAAAAEBAAAAAgDQBwAAIACP+BdpBsCH3af1seL8CLhwIlKZ+oFvY04ZDwhxXoKsbyAA+07n8xv1DlWyiGYe4wm+TCtVVLWnQtwCubQBI2iIFOkgAAAAj/gXaQbAh92n9bHi/Ai4cCJSmfqBb2NOGQ8IcV6CrG8=" } \ No newline at end of file diff --git a/src/showcase/app/hwc/plc_line.hwl.yml b/src/showcase/app/hwc/plc_line.hwl.yml index a97f2549a..4ef706360 100644 --- a/src/showcase/app/hwc/plc_line.hwl.yml +++ b/src/showcase/app/hwc/plc_line.hwl.yml @@ -280,6 +280,54 @@ Devices: SLOT_14: AventicsPneumaticsAESEmptySlot SLOT_15: AventicsPneumaticsAESEmptySlot SLOT_16: AventicsPneumaticsAESEmptySlot + SLOT_17: AventicsPneumaticsAESEmptySlot + SLOT_18: AventicsPneumaticsAESEmptySlot + SLOT_19: AventicsPneumaticsAESEmptySlot + SLOT_20: AventicsPneumaticsAESEmptySlot + SLOT_21: AventicsPneumaticsAESEmptySlot + SLOT_22: AventicsPneumaticsAESEmptySlot + SLOT_23: AventicsPneumaticsAESEmptySlot + SLOT_24: AventicsPneumaticsAESEmptySlot + SLOT_25: AventicsPneumaticsAESEmptySlot + SLOT_26: AventicsPneumaticsAESEmptySlot + SLOT_27: AventicsPneumaticsAESEmptySlot + SLOT_28: AventicsPneumaticsAESEmptySlot + SLOT_29: AventicsPneumaticsAESEmptySlot + SLOT_30: AventicsPneumaticsAESEmptySlot + SLOT_31: AventicsPneumaticsAESEmptySlot + SLOT_32: AventicsPneumaticsAESEmptySlot + SLOT_33: AventicsPneumaticsAESEmptySlot + SLOT_34: AventicsPneumaticsAESEmptySlot + SLOT_35: AventicsPneumaticsAESEmptySlot + SLOT_36: AventicsPneumaticsAESEmptySlot + SLOT_37: AventicsPneumaticsAESEmptySlot + SLOT_38: AventicsPneumaticsAESEmptySlot + SLOT_39: AventicsPneumaticsAESEmptySlot + SLOT_40: AventicsPneumaticsAESEmptySlot + SLOT_41: AventicsPneumaticsAESEmptySlot + SLOT_42: AventicsPneumaticsAESEmptySlot + SLOT_43: AventicsPneumaticsAESEmptySlot + SLOT_44: AventicsPneumaticsAESEmptySlot + SLOT_45: AventicsPneumaticsAESEmptySlot + SLOT_46: AventicsPneumaticsAESEmptySlot + SLOT_47: AventicsPneumaticsAESEmptySlot + SLOT_48: AventicsPneumaticsAESEmptySlot + SLOT_49: AventicsPneumaticsAESEmptySlot + SLOT_50: AventicsPneumaticsAESEmptySlot + SLOT_51: AventicsPneumaticsAESEmptySlot + SLOT_52: AventicsPneumaticsAESEmptySlot + SLOT_53: AventicsPneumaticsAESEmptySlot + SLOT_54: AventicsPneumaticsAESEmptySlot + SLOT_55: AventicsPneumaticsAESEmptySlot + SLOT_56: AventicsPneumaticsAESEmptySlot + SLOT_57: AventicsPneumaticsAESEmptySlot + SLOT_58: AventicsPneumaticsAESEmptySlot + SLOT_59: AventicsPneumaticsAESEmptySlot + SLOT_60: AventicsPneumaticsAESEmptySlot + SLOT_61: AventicsPneumaticsAESEmptySlot + SLOT_62: AventicsPneumaticsAESEmptySlot + SLOT_63: AventicsPneumaticsAESEmptySlot + SLOT_64: AventicsPneumaticsAESEmptySlot # # diff --git a/src/showcase/app/src/IO/HwIdentifiers.st b/src/showcase/app/src/IO/HwIdentifiers.st index 686fa1527..0eb44cb67 100644 --- a/src/showcase/app/src/IO/HwIdentifiers.st +++ b/src/showcase/app/src/IO/HwIdentifiers.st @@ -23,7 +23,7 @@ NAMESPACE AXOpen.Showcase smc_ex260_spn_32_smc_ex260_spn_32_Interface_Port_2_HwID := UINT#260, smc_ex260_spn_32_Rack_HwID := UINT#261, smc_ex260_spn_32_smc_ex260_spn_32_HwID := UINT#262, - smc_ex260_spn_32_smc_ex260_spn_32_4_byte__Output_1_4_byte__Output_HwID := UINT#263, + smc_ex260_spn_32_smc_ex260_spn_32_Outputs32_4_byte__Output_HwID := UINT#263, smc_ex260_spn_32_smc_ex260_spn_32_EX260_SPN_1_2_HwID := UINT#264, smc_ex260_spn_16_smc_ex260_spn_16_Interface_HwID := UINT#265, smc_ex260_spn_16_HwID := UINT#266, @@ -31,7 +31,7 @@ NAMESPACE AXOpen.Showcase smc_ex260_spn_16_smc_ex260_spn_16_Interface_Port_2_HwID := UINT#268, smc_ex260_spn_16_Rack_HwID := UINT#269, smc_ex260_spn_16_smc_ex260_spn_16_HwID := UINT#270, - smc_ex260_spn_16_smc_ex260_spn_16_2_byte__Output_1_2_byte__Output_HwID := UINT#271, + smc_ex260_spn_16_smc_ex260_spn_16_Outputs16_2_byte__Output_HwID := UINT#271, smc_ex260_spn_16_smc_ex260_spn_16_EX260_SPN_3_4_HwID := UINT#272, aes_pnio_aes_pnio_PN_IO_HwID := UINT#273, aes_pnio_HwID := UINT#274, diff --git a/src/showcase/app/src/IO/IoStructures.st b/src/showcase/app/src/IO/IoStructures.st index 73c44e152..188c68bf9 100644 --- a/src/showcase/app/src/IO/IoStructures.st +++ b/src/showcase/app/src/IO/IoStructures.st @@ -7529,6 +7529,68 @@ NAMESPACE AXOpen.Showcase END_STRUCT; END_TYPE + TYPE + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Wrap)]} + smc_ex260_spn_16_Outputs16_Output_Layout : STRUCT + Signals_0_0 AT %X0.0 : BOOL; + Signals_0_1 AT %X0.1 : BOOL; + Signals_0_2 AT %X0.2 : BOOL; + Signals_0_3 AT %X0.3 : BOOL; + Signals_0_4 AT %X0.4 : BOOL; + Signals_0_5 AT %X0.5 : BOOL; + Signals_0_6 AT %X0.6 : BOOL; + Signals_0_7 AT %X0.7 : BOOL; + Signals_1_0 AT %X1.0 : BOOL; + Signals_1_1 AT %X1.1 : BOOL; + Signals_1_2 AT %X1.2 : BOOL; + Signals_1_3 AT %X1.3 : BOOL; + Signals_1_4 AT %X1.4 : BOOL; + Signals_1_5 AT %X1.5 : BOOL; + Signals_1_6 AT %X1.6 : BOOL; + Signals_1_7 AT %X1.7 : BOOL; + END_STRUCT; + END_TYPE + + TYPE + {S7.extern=ReadWrite} + {#ix-attr:[Container(Layout.Wrap)]} + smc_ex260_spn_32_Outputs32_Output_Layout : STRUCT + Signals_0_0 AT %X0.0 : BOOL; + Signals_0_1 AT %X0.1 : BOOL; + Signals_0_2 AT %X0.2 : BOOL; + Signals_0_3 AT %X0.3 : BOOL; + Signals_0_4 AT %X0.4 : BOOL; + Signals_0_5 AT %X0.5 : BOOL; + Signals_0_6 AT %X0.6 : BOOL; + Signals_0_7 AT %X0.7 : BOOL; + Signals_1_0 AT %X1.0 : BOOL; + Signals_1_1 AT %X1.1 : BOOL; + Signals_1_2 AT %X1.2 : BOOL; + Signals_1_3 AT %X1.3 : BOOL; + Signals_1_4 AT %X1.4 : BOOL; + Signals_1_5 AT %X1.5 : BOOL; + Signals_1_6 AT %X1.6 : BOOL; + Signals_1_7 AT %X1.7 : BOOL; + Signals_2_0 AT %X2.0 : BOOL; + Signals_2_1 AT %X2.1 : BOOL; + Signals_2_2 AT %X2.2 : BOOL; + Signals_2_3 AT %X2.3 : BOOL; + Signals_2_4 AT %X2.4 : BOOL; + Signals_2_5 AT %X2.5 : BOOL; + Signals_2_6 AT %X2.6 : BOOL; + Signals_2_7 AT %X2.7 : BOOL; + Signals_3_0 AT %X3.0 : BOOL; + Signals_3_1 AT %X3.1 : BOOL; + Signals_3_2 AT %X3.2 : BOOL; + Signals_3_3 AT %X3.3 : BOOL; + Signals_3_4 AT %X3.4 : BOOL; + Signals_3_5 AT %X3.5 : BOOL; + Signals_3_6 AT %X3.6 : BOOL; + Signals_3_7 AT %X3.7 : BOOL; + END_STRUCT; + END_TYPE + TYPE {S7.extern=ReadWrite} {#ix-attr:[Container(Layout.Wrap)]} diff --git a/src/showcase/app/src/IO/Outputs.st b/src/showcase/app/src/IO/Outputs.st index 23624bfa3..6c42dcfcc 100644 --- a/src/showcase/app/src/IO/Outputs.st +++ b/src/showcase/app/src/IO/Outputs.st @@ -190,6 +190,12 @@ NAMESPACE AXOpen.Showcase rf186c_Reader_1_Output AT %B297 : rf186c_Reader_1_Output_Layout; + // Module smc-ex260-spn-16/Outputs16 + smc_ex260_spn_16_Outputs16_Output AT %B4 : smc_ex260_spn_16_Outputs16_Output_Layout; + + // Module smc-ex260-spn-32/Outputs32 + smc_ex260_spn_32_Outputs32_Output AT %B0 : smc_ex260_spn_32_Outputs32_Output_Layout; + // Module ureol2l/10_O2T_General_Purpose_Registers_2 ureol2l_10_O2T_General_Purpose_Registers_2_Output AT %B3293 : ureol2l_10_O2T_General_Purpose_Registers_2_Output_Layout; From 7d2d2feeac3097fbfd563c342524cf9872763c7c Mon Sep 17 00:00:00 2001 From: TK <61820360+TomKovac@users.noreply.github.com> Date: Thu, 7 May 2026 19:52:26 +0200 Subject: [PATCH 33/33] Update KUKA Robotics documentation to reflect changes for KRC5 version and remove deprecated references --- .../Documentation/KukaRobotics.razor | 188 ++---------------- src/showcase/showcase.sln | 2 +- src/traversals/apax/apax.yml | 51 ----- 3 files changed, 19 insertions(+), 222 deletions(-) delete mode 100644 src/traversals/apax/apax.yml diff --git a/src/showcase/app/ix-blazor/showcase.blazor/Pages/components-kuka-robotics/Documentation/KukaRobotics.razor b/src/showcase/app/ix-blazor/showcase.blazor/Pages/components-kuka-robotics/Documentation/KukaRobotics.razor index 727b824d6..c40177944 100644 --- a/src/showcase/app/ix-blazor/showcase.blazor/Pages/components-kuka-robotics/Documentation/KukaRobotics.razor +++ b/src/showcase/app/ix-blazor/showcase.blazor/Pages/components-kuka-robotics/Documentation/KukaRobotics.razor @@ -229,7 +229,7 @@
- +
@@ -337,8 +337,8 @@
- - + +

Sequencer Step Logic

Each block below is parsed from @@ -370,148 +370,6 @@

- -
-
- Maturity: - -
-

- The same AxoKrc4 proxy drives a KUKA KRC5 cell — the DIO512 slot layout is identical, - so only the GSDML and the device template differ. This tab runs against the kuka_rb2 - KRC5 device provisioned by kuka_krc5_dio512. -

- - -
- -
- - -
-
-

Component declaration (ST)

-

- - — <ComponentDeclaration> region -

- @if (_c3DeclarationSnippet != null && !_c3DeclarationSnippet.IsError) - { - - } - else if (_loadingCode) - { -
Loading...
- } - else - { -

Unable to load snippet

- } -
-
-

Component Run call (ST)

-

- - — <Initialization> region -

- @if (_c3InitSnippet != null && !_c3InitSnippet.IsError) - { - - } - else if (_loadingCode) - { -
Loading...
- } - else - { -

Unable to load snippet

- } -
-
- - -
-
-

Device instantiation (hwl)

-

- - — <KukaKrc5Device> region -

- @if (_hwcKrc5DeviceInstanceSnippet != null && !_hwcKrc5DeviceInstanceSnippet.IsError) - { - - } - else if (_loadingCode) - { -
Loading...
- } - else - { -

Unable to load snippet

- } -
-
-

Device template (hwl)

-

- -

-
-
-

PROFINET IO system wiring (hwl)

-

- - — <KukaKrc5IoSystem> region -

- @if (_hwcKrc5IoSystemSnippet != null && !_hwcKrc5IoSystemSnippet.IsError) - { - - } - else if (_loadingCode) - { -
Loading...
- } - else - { -

Unable to load snippet

- } -
-
- - -
- - -
-

Sequencer Step Logic

-

Each block below is parsed from - . -

- @if (_c3StepLogicBlocks.Count > 0) - { -
- @foreach (var step in _c3StepLogicBlocks) - { - _c3StepsBySymbol.TryGetValue(step.StepSymbol, out var liveStep); - - } -
- } - else if (_loadingCode) - { -
Loading step logic...
- } - else - { -
- No sequencer step blocks were detected. -
- } -
-
- - -
- @@ -609,12 +467,7 @@ s => s.Symbol.Substring(s.Symbol.LastIndexOf('.') + 1), s => s ); - _c2StepsBySymbol = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc4_v_5_x_x_2.Steps - .ToDictionary( - s => s.Symbol.Substring(s.Symbol.LastIndexOf('.') + 1), - s => s - ); - _c3StepsBySymbol = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc4_v_5_x_x_krc5.Steps + _c2StepsBySymbol = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc5_v_5_x_x.Steps .ToDictionary( s => s.Symbol.Substring(s.Symbol.LastIndexOf('.') + 1), s => s @@ -635,10 +488,8 @@ { var seq1 = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc4_v_5_x_x.Sequencer; var steps1 = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc4_v_5_x_x.Steps; - var seq2 = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc4_v_5_x_x_2.Sequencer; - var steps2 = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc4_v_5_x_x_2.Steps; - var seq3 = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc4_v_5_x_x_krc5.Sequencer; - var steps3 = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc4_v_5_x_x_krc5.Steps; + var seq2 = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc5_v_5_x_x.Sequencer; + var steps2 = Entry.Plc.Ctx.kuka_robotics_documentation.axoKrc5_v_5_x_x.Steps; this.StartPolling(seq1, 250); foreach (var step in steps1) { @@ -655,14 +506,6 @@ this.StartPolling(step.Order, 250); this.StartPolling(step.Descr, 500); } - this.StartPolling(seq3, 250); - foreach (var step in steps3) - { - this.StartPolling(step.IsActive, 250); - this.StartPolling(step.IsEnabled, 250); - this.StartPolling(step.Order, 250); - this.StartPolling(step.Descr, 500); - } } } @@ -688,11 +531,16 @@ - - - - - - - + + + + + + + + + + + + } diff --git a/src/showcase/showcase.sln b/src/showcase/showcase.sln index 5d3307702..bc5babaa3 100644 --- a/src/showcase/showcase.sln +++ b/src/showcase/showcase.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 12.00 +Microsoft Visual Studio Solution File, Format Version 12.00 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "showcase.solution", "showcase.solution.proj", "{C768FAAD-5770-4942-BA87-3DACC2B3E227}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "inxton_axopen_abstractions", "..\abstractions\src\AXOpen.Abstractions\inxton_axopen_abstractions.csproj", "{7FE122C0-B464-4764-B7BE-45F4CF4FEE8F}" diff --git a/src/traversals/apax/apax.yml b/src/traversals/apax/apax.yml deleted file mode 100644 index c378aea9f..000000000 --- a/src/traversals/apax/apax.yml +++ /dev/null @@ -1,51 +0,0 @@ -name: "apax.traversal" -version: "0.0.0-dev.0" -type: "app" -targets: -- "1500" -registries: - '@inxton': "https://npm.pkg.github.com/" -devDependencies: - '@inxton/ax-sdk': "0.0.0-dev.0" -dependencies: - "@inxton/axopen.abstractions": "0.0.0-dev.0" - "@inxton/ax.axopen.app": "0.0.0-dev.0" - "@inxton/ax.axopen.hwlibrary": "0.0.0-dev.0" - "@inxton/ax.axopen.min": "0.0.0-dev.0" - "@inxton/ax.catalog": "0.0.48" - "@inxton/axopen.components.abb.robotics": "0.0.0-dev.0" - "@inxton/axopen.components.abstractions": "0.0.0-dev.0" - "@inxton/axopen.components.balluff.identification": "0.0.0-dev.0" - "@inxton/axopen.components.cognex.vision": "0.0.0-dev.0" - "@inxton/axopen.components.desoutter.tightening": "0.0.0-dev.0" - "@inxton/axopen.components.drives": "0.0.0-dev.0" - "@inxton/axopen.components.dukane.welders": "0.0.0-dev.0" - "@inxton/axopen.components.elements": "0.0.0-dev.0" - "@inxton/axopen.components.festo.drives": "0.0.0-dev.0" - "@inxton/axopen.components.keyence.vision": "0.0.0-dev.0" - "@inxton/axopen.components.kuka.robotics": "0.0.0-dev.0" - "@inxton/axopen.components.mitsubishi.robotics": "0.0.0-dev.0" - "@inxton/axopen.components.pneumatics": "0.0.0-dev.0" - "@inxton/axopen.components.rexroth.drives": "0.0.0-dev.0" - "@inxton/axopen.components.rexroth.press": "0.0.0-dev.0" - "@inxton/axopen.components.rexroth.tightening": "0.0.0-dev.0" - "@inxton/axopen.components.robotics": "0.0.0-dev.0" - "@inxton/axopen.components.siem.communication": "0.0.0-dev.0" - "@inxton/axopen.components.siem.identification": "0.0.0-dev.0" - "@inxton/axopen.components.ur.robotics": "0.0.0-dev.0" - "@inxton/axopen.components.zebra.vision": "0.0.0-dev.0" - "@inxton/axopen.core": "0.0.0-dev.0" - "@inxton/axopen.data": "0.0.0-dev.0" - "axopen_data_distributed_tests_l4": "0.0.0-dev.0" - "axopen.data.tests_l1": "0.0.0-dev.0" - "axopen.integration.tests_l4": "0.0.0-dev.0" - "@inxton/axopen.inspectors": "0.0.0-dev.0" - "@inxton/axopen.io": "0.0.0-dev.0" - "@inxton/axopen.probers": "0.0.0-dev.0" - "showcase": "0.0.0-dev.0" - "@inxton/axopen.simatic1500": "0.0.0-dev.0" - "@inxton/apaxlibname": "0.0.0-dev.0" - "@inxton/axopen.timers": "0.0.0-dev.0" - "@inxton/axopen.utils": "0.0.0-dev.0" -installStrategy: "overridable" -...