Merge branch 'dev-2311' into AxoData_Bug_Repair

ix-ax · Mar 15, 2024 · 11435b1 · 11435b1
2 parents 8ec8dc5 + 4d0e1e0
commit 11435b1
Show file tree

Hide file tree

Showing 117 changed files with 222,199 additions and 1,032 deletions.
diff --git a/scripts/build_test_docu.ps1 b/scripts/build_test_docu.ps1
@@ -9,6 +9,8 @@ dotnet ixd `
 .\src\components.elements\ctrl `
 .\src\components.rexroth.drives\ctrl `
 .\src\components.festo.drives\ctrl `
+.\src\components.kuka.robotics\ctrl `
+.\src\components.mitsubishi.robotics\ctrl `
 .\src\template.axolibrary\ctrl `
 -o .\docfx\apictrl\
 

diff --git a/...botics/AxoAbbRobotics_Component_Status_v_1_x_x/AxoAbbRobotics_Component_Status_v_1_x_x.cs b/...botics/AxoAbbRobotics_Component_Status_v_1_x_x/AxoAbbRobotics_Component_Status_v_1_x_x.cs
@@ -10,14 +10,14 @@ namespace AXOpen.Components.Abb.Robotics
 {
     public partial class AxoAbbRobotics_Component_Status_v_1_x_x : AXOpen.Components.Robotics.AxoRobot_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription
         {
             get
             {
-                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if (errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0, "   ");
@@ -102,7 +102,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

diff --git a/...f.Identification/Axo_BIS_M_4XX_045_Component_Status/Axo_BIS_M_4XX_045_Component_Status.cs b/...f.Identification/Axo_BIS_M_4XX_045_Component_Status/Axo_BIS_M_4XX_045_Component_Status.cs
@@ -8,14 +8,14 @@ namespace AXOpen.Components.Balluff.Identification
 {
     public partial class Axo_BIS_M_4XX_045_Component_Status : AXOpen.Components.Abstractions.AxoComponent_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription
         {
             get
             {
-                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if (errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0, "   ");
@@ -81,7 +81,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

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/AxoDataman.cs
@@ -111,14 +111,14 @@ private void InitializeTaskMessenger()
 
     public partial class AxoDataman_Status : AxoComponent_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription
         {
             get
             {
-                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if (errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0, "   ");
@@ -192,7 +192,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

diff --git a/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/AxoInsight/AxoInsight.cs b/src/components.cognex.vision/src/AXOpen.Components.Cognex.Vision/AxoInsight/AxoInsight.cs
@@ -144,14 +144,14 @@ private void InitializeTaskMessenger()
 
     public partial class AxoInsight_Status : AxoComponent_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription 
         {
             get
             {
-                if(errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if(errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if(errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0      , "   ");
@@ -236,7 +236,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

diff --git a/...desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/AxoCVIC_II/AxoCVICC_II.cs b/...desoutter.tightening/src/AXOpen.Components.Desoutter.Tightening/AxoCVIC_II/AxoCVICC_II.cs
@@ -115,14 +115,14 @@ private void InitializeTaskMessenger()
     }
     public partial class AxoCVIC_II_ComponentStatus : AxoComponent_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription
         {
             get
             {
-                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if (errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0, "   ");
@@ -188,7 +188,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

diff --git a/src/components.drives/src/AXOpen.Components.Drives/Drives/AxoDrive.cs b/src/components.drives/src/AXOpen.Components.Drives/Drives/AxoDrive.cs
@@ -75,14 +75,14 @@ private void InitializeTaskMessenger()
 
     public partial class AxoDrive_Status : AxoComponent_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription
         {
             get
             {
-                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if (errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0, "   ");
@@ -131,7 +131,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

diff --git a/...tics/AxoKukaRobotics_Component_Status_v_5_x_x/AxoKukaRobotics_Component_Status_v_5_x_x.cs b/...tics/AxoKukaRobotics_Component_Status_v_5_x_x/AxoKukaRobotics_Component_Status_v_5_x_x.cs
@@ -11,14 +11,14 @@ namespace AXOpen.Components.Kuka.Robotics
 {
     public partial class AxoKukaRobotics_Component_Status_v_5_x_x : AXOpen.Components.Robotics.AxoRobot_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription
         {
             get
             {
-                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if (errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0, "   ");
@@ -107,7 +107,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

diff --git a/...i.robotics/src/AXOpen.Components.Mitsubishi.Robotics/AxoCr800_v_1_x_x/AxoCr800_v_1_x_x.cs b/...i.robotics/src/AXOpen.Components.Mitsubishi.Robotics/AxoCr800_v_1_x_x/AxoCr800_v_1_x_x.cs
@@ -126,14 +126,14 @@ private void InitializeTaskMessenger()
     }
     public partial class AxoMitsubishiRobotics_Component_Status_v_1_x_x : AXOpen.Components.Robotics.AxoRobot_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription
         {
             get
             {
-                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if (errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0, "   ");
@@ -209,7 +209,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

diff --git a/src/components.pneumatics/ctrl/apax.yml b/src/components.pneumatics/ctrl/apax.yml
@@ -1,5 +1,5 @@
 name: "@ix-ax/axopen.components.pneumatics"
-version        : '0.0.0-dev.0'
+version: '0.0.0-dev.0'
 type: lib
 targets:
   - llvm
@@ -12,9 +12,9 @@ variables:
   AXUNIT_TARGET_IP: "172.20.30.110"
   SIM_ENABLED: "true"
 devDependencies:
-  "@ix-ax/ax-sdk"        : '0.0.0-dev.0'
+  "@ix-ax/ax-sdk": '0.0.0-dev.0'
 dependencies:
-  "@ix-ax/axopen.components.abstractions"        : '0.0.0-dev.0'
+  "@ix-ax/axopen.components.abstractions": '0.0.0-dev.0'
 scripts:
   download:
     - START=$(date +%s)

diff --git a/...XOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/AxoSmartFunctionKit_v_4_x_x.cs b/...XOpen.Components.Rexroth.Press/AxoSmartFunctionKit_v_4_x_x/AxoSmartFunctionKit_v_4_x_x.cs
@@ -239,14 +239,14 @@ private void InitializeTaskMessenger()
 
     public partial class AxoSmartFunctionKit_ComponentStatus_v_4_x_x : AXOpen.Components.Abstractions.AxoComponent_Status
     {
-        Dictionary<uint, string> errorDescriptionDict = new Dictionary<uint, string>();
-        Dictionary<uint, string> actionDescriptionDict = new Dictionary<uint, string>();
+        Dictionary<ulong, string> errorDescriptionDict = new Dictionary<ulong, string>();
+        Dictionary<ulong, string> actionDescriptionDict = new Dictionary<ulong, string>();
 
         public string ErrorDescription
         {
             get
             {
-                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<uint, string>(); }
+                if (errorDescriptionDict == null) { errorDescriptionDict = new Dictionary<ulong, string>(); }
                 if (errorDescriptionDict.Count == 0)
                 {
                     errorDescriptionDict.Add(0, "   ");
@@ -355,7 +355,7 @@ public string ActionDescription
         {
             get
             {
-                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<uint, string>(); }
+                if (actionDescriptionDict == null) { actionDescriptionDict = new Dictionary<ulong, string>(); }
                 if (actionDescriptionDict.Count == 0)
                 {
                     actionDescriptionDict.Add(0, "   ");

diff --git a/src/components.siemens.identification/app/JSONREPOS/Groups/AdminGroup b/src/components.siemens.identification/app/JSONREPOS/Groups/AdminGroup
@@ -4,9 +4,15 @@
   "DataEntityId": "AdminGroup",
   "Name": "AdminGroup",
   "Roles": [
-    "Administrator"
+    "Administrator",
+    "process_settings_access",
+    "process_traceability_access",
+    "can_run_ground_mode",
+    "can_run_automat_mode",
+    "can_run_service_mode",
+    "can_skip_steps_in_sequence"
   ],
-  "RolesHash": "AQAAAAIAAYagAAAAEFMQB6OKJ9h2absnop3/241eQ1r0ZKSeKhZ+bKAj028Jt2GjYGXLJF/j94ExpkZt1Q==",
+  "RolesHash": "AQAAAAIAAYagAAAAEH1xzha1PI7SkLMzJcuUwzzyK4d9Hk0FlCj3y2nJmEAqklgr1iQsizbZ1mkSnuiVbQ==",
   "Created": "2023-10-03T11:15:37.5601334+02:00",
-  "Modified": "2023-10-03T11:15:37.7766974+02:00"
+  "Modified": "2024-03-14T09:57:34.2193419+01:00"
 }
diff --git a/src/components.siemens.identification/app/JSONREPOS/Users/ADMIN b/src/components.siemens.identification/app/JSONREPOS/Users/ADMIN
@@ -0,0 +1,24 @@
+{
+  "Group": "AdminGroup",
+  "GroupHash": "AQAAAAIAAYagAAAAEDfOwl1WDQe8NjVdnXjEGVelbtcGr6azPZwrfDE4EK7yUAK+EqVGjKL7FePPhTOt+A==",
+  "CanUserChangePassword": false,
+  "RecordId": null,
+  "DataEntityId": "ADMIN",
+  "Created": "2024-03-14T09:56:53.7019053+01:00",
+  "Modified": "2024-03-14T09:57:11.6211427+01:00",
+  "Id": "febea159-651d-405f-a164-4d5cd26741ff",
+  "UserName": "admin",
+  "NormalizedUserName": "ADMIN",
+  "Email": null,
+  "NormalizedEmail": null,
+  "EmailConfirmed": false,
+  "PasswordHash": "AQAAAAIAAYagAAAAEFqJjr8gCGOxXZ0UOKZl8ETbghofalqIBH95UEe8OKijBVx+0fcdKz5YEL6hVn4JRA==",
+  "SecurityStamp": "80860994-fe41-4916-a70f-5deeb476c23e",
+  "ConcurrencyStamp": "bc720ace-236e-4fe1-b260-a8de7ccd868b",
+  "PhoneNumber": null,
+  "PhoneNumberConfirmed": false,
+  "TwoFactorEnabled": false,
+  "LockoutEnd": null,
+  "LockoutEnabled": false,
+  "AccessFailedCount": 0
+}
diff --git a/...ponents.siemens.identification/app/ix/app_axopen_components_siemens_identification.csproj b/...ponents.siemens.identification/app/ix/app_axopen_components_siemens_identification.csproj
@@ -23,6 +23,12 @@
   	</ItemGroup>
 
 	<ItemGroup>
+		<Folder Include=".g\Onliners\Documentation\" />
+		<Folder Include=".g\Onliners\IO\PLC_LINE\" />
+		<Folder Include=".g\Onliners\Sandbox\" />
+		<Folder Include=".g\POCO\Documentation\" />
+		<Folder Include=".g\POCO\IO\PLC_LINE\" />
+		<Folder Include=".g\POCO\Sandbox\" />
 		<Folder Include=".meta\" />
 		<Content Include=".meta\**" />
 	</ItemGroup>

diff --git a/src/components.siemens.identification/app/message.mon b/src/components.siemens.identification/app/message.mon
@@ -0,0 +1,3 @@
+documentation.componentTwo.IOlinkReader._messageCode
+documentation.componentTwo.IOlinkReader._lastMessageCode
+documentation.componentTwo.IOlinkReader.Messenger
diff --git a/src/components.siemens.identification/app/presence.mon b/src/components.siemens.identification/app/presence.mon
@@ -0,0 +1,3 @@
+documentation.componentTwo.IOlinkReader._switchAntenna_presence
+documentation.componentTwo.IOlinkReader._readTag_presence
+documentation.componentTwo.IOlinkReader._writeTag_presence