diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll index e8e6eefa..a9c9cac3 100644 Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ diff --git a/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs b/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs index 3092f19a..c4fac741 100644 --- a/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs +++ b/Step.Model/DTOModels/ToolModels/DTOSiemensToolModel.cs @@ -23,6 +23,12 @@ namespace Step.Model.DTOModels.ToolModels [Required] public int RightSize { get; set; } + [Required] + public double MaxSpeed { get; set; } + + [Required] + public double MaxAcceleration { get; set; } + [Required] public ROTATION Rotation { get; set; } @@ -64,7 +70,8 @@ namespace Step.Model.DTOModels.ToolModels ToolType = dtoModel.ToolType, LifeType = dtoModel.LifeType, FamilyName = dtoModel.FamilyName, - + MaxSpeed = dtoModel.MaxSpeed, + MaxAcceleration = dtoModel.MaxAcceleration, IsEnabled = dtoModel.IsEnabled, IsActive = dtoModel.IsActive, IsInhibited = dtoModel.IsInhibited, diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs index fd2ff6f2..bdbab2d7 100644 --- a/Step.NC/NcHandler.cs +++ b/Step.NC/NcHandler.cs @@ -742,9 +742,9 @@ namespace Step.NC { return numericalControl.TOOLS_WAddTool(ref tool); } - public CmsError UpdateTool(SiemensToolModel tool) + public CmsError UpdateTool(ref SiemensToolModel tool) { - return numericalControl.TOOLS_WUpdateTool(tool); + return numericalControl.TOOLS_WUpdateTool(ref tool); } public CmsError AddFamily(string name, out FamilyModel family) diff --git a/Step/Controllers/WebApi/ToolTableController.cs b/Step/Controllers/WebApi/ToolTableController.cs index 4bf7bc9a..40d7571c 100644 --- a/Step/Controllers/WebApi/ToolTableController.cs +++ b/Step/Controllers/WebApi/ToolTableController.cs @@ -80,7 +80,7 @@ namespace Step.Controllers.WebApi siemensModel.Id = id; ncHandler.Connect(); - CmsError libraryError = ncHandler.UpdateTool(siemensModel); + CmsError libraryError = ncHandler.UpdateTool(ref siemensModel); if (libraryError.IsError()) if (libraryError.errorCode != CMS_ERROR_CODES.NOT_CONNECTED)