1124 unification of the dotnet counter part structure of all complex components

src/components.abb.robotics/components.abb.robotics.code-workspace

@@ -3,10 +3,6 @@
 		{
 			"name": "ctrl",
 			"path": "ctrl"
-		},
-		{
-			"name": "app",
-			"path": "app"
 		}
 	],
 	"settings": {}

src/components.abb.robotics/ctrl/src/AxoIrc5_v_1_x_x.st → 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  :   AxoAbbRobotics_Config_v_1_x_x;
+            Config  :   AxoIrc5_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_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_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_Control;
         END_VAR    
 
         VAR PUBLIC //HardwareDiagnostics

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
+
+
+
+
+

src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Config_v_1_x_x.st → 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 AxoAbbRobotics_Config_v_1_x_x
+    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 : AxoAbbRobotics_HWIDs;
+            HWIDs : AxoIrc5_HWIDs;
         END_VAR 
     END_CLASS    
 END_NAMESPACE

src/components.abb.robotics/ctrl/src/AxoAbbRobotics_Control_v_1_x_x.st → 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 AxoAbbRobotics_Control_v_1_x_x 
+    CLASS AxoIrc5_Control 
         VAR PUBLIC
             {#ix-attr:[Container(Layout.Stack)]}
             {#ix-attr:[Group(GroupLayout.GroupBox)]}

src/components.abb.robotics/ctrl/src/AxoAbbRobotics_HWIDs.st → 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 AxoAbbRobotics_HWIDs 
+CLASS AxoIrc5_HWIDs 
   VAR PUBLIC
      {#ix-set:AttributeName = "<#Hardware ID of the device#>"}
      HW_Device              :  UINT;

src/components.abb.robotics/ctrl/src/AxoAbbRobotics_State_v_1_x_x.st → 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 AxoAbbRobotics_State_v_1_x_x 
+    CLASS AxoIrc5_State 
         VAR PUBLIC
             {#ix-attr:[Container(Layout.Stack)]}
             {#ix-attr:[Group(GroupLayout.GroupBox)]}

src/components.abb.robotics/ctrl/src/AxoOmnicore_v_1_x_x.st → 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  :   AxoAbbRobotics_Config_v_1_x_x;
+            Config  :   AxoOmnicore_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_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_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_Control;
         END_VAR    
 
         VAR PUBLIC //HardwareDiagnostics

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
+
+
+
+
+

src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Config.st

@@ -0,0 +1,16 @@
+NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x
+    {#ix-attr:[Container(Layout.Stack)]}
+    {S7.extern=ReadWrite}
+    CLASS PUBLIC AxoOmnicore_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_HWIDs;
+        END_VAR 
+    END_CLASS    
+END_NAMESPACE

src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_Control.st

@@ -0,0 +1,96 @@
+NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x
+    {S7.extern=ReadWrite}
+    {#ix-attr:[Container(Layout.Wrap)]}
+    CLASS AxoOmnicore_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
+

src/components.abb.robotics/ctrl/src/AxoOmnicore/v_1_x_x/TypesStructuresAndEnums/AxoOmnicore_HWIDs.st

@@ -0,0 +1,13 @@
+NAMESPACE AXOpen.Components.Abb.Robotics.v_1_x_x
+{S7.extern=ReadWrite}
+CLASS AxoOmnicore_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