Egalware/cms-core-active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_core_library into develop

Browse Source
This commit is contained in:
Luca Mascherone
2020-08-26 16:52:49 +02:00
parent 4fa6ed3081 888ea4f718
commit 9ca10aeb69
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMS_CORE_Library/Siemens/Nc_Siemens.cs
+1 -1
View File
@@ -2727,7 +2727,7 @@ namespace CMS_CORE_Library.Siemens
// Set the path to read on which process is the axis
ncAxes[i - 1] = new Item("/Nck/MachineAxis/chanNoAxisIsActive[" + i + "]");
// Set the path in order to find which axes are visible
ncAxes[i - 1 + MAX_AXES_FOR_PROCESS] = new Item("/NC/_N_CH_TEA_ACX/$MC_DISPLAY_AXIS[u" + channel + "," + i + "]");
ncAxes[i - 1 + MAX_AXES_FOR_PROCESS] = new Item("/Nck/MachineAxis/displayAxis[" + i + "]");
// Set the path of the axes type
ncAxes[i - 1 + (MAX_AXES_FOR_PROCESS * 2)] = new Item("/Nck/Configuration/axisType[" + i + "]");
}
CMS_CORE_Library/ToolConfigurations.cs
+1 -1
View File
@@ -244,7 +244,7 @@ namespace CMS_CORE_Library
public const int NC_MAX_TOOL_NUMER = 300;
public const int NC_MAX_EDGES_PER_TOOL = 3;
public const int NC_MAX_TOOLS_PER_FAMILY = 300;
public const int NC_MAX_MULTITOOLS_NUMBER = 3;
public const int NC_MAX_MULTITOOLS_NUMBER = 100;
public const int NC_MAX_TOOLS_PER_MULTITOOL = 3;
public struct CATEGORY_NAMES