diff --git a/CMS_CORE_Application/Form1.cs b/CMS_CORE_Application/Form1.cs index 0f6b34c..d2e5bd9 100644 --- a/CMS_CORE_Application/Form1.cs +++ b/CMS_CORE_Application/Form1.cs @@ -208,6 +208,10 @@ namespace CMS_CORE_Application error = true; SetError(Lines, cmsError); } + + cmsError = N.TOOLS_WStopEditTooling(1); + List config = new List(); + cmsError = N.TOOLS_RMagazineConfig(ref config); // N.TOOLS_WStartEditData(); // cmsError = N.TOOLS_WStartEditTooling(1); // cmsError = N.TOOLS_WRestoreBackup(); @@ -473,8 +477,8 @@ namespace CMS_CORE_Application { TXTip.Enabled = true; TXTport.Enabled = true; - TXTip.Text = "192.168.139.1"; - // TXTip.Text = "192.168.157.2"; + // TXTip.Text = "192.168.139.1"; + TXTip.Text = "192.168.157.2"; TXTport.Text = "8080"; } else if (NcCombo.SelectedItem.ToString().Equals("Demo")) diff --git a/CMS_CORE_Library/DataStructures.cs b/CMS_CORE_Library/DataStructures.cs index 1ef0a95..5c901f7 100644 --- a/CMS_CORE_Library/DataStructures.cs +++ b/CMS_CORE_Library/DataStructures.cs @@ -656,12 +656,16 @@ namespace CMS_CORE_Library public Dictionary> EdgesAdditionalParamsConfiguration; } - public class MagazineConfigModel + public class NcMagazineConfigModel { - public int Id; - public string Name; + public byte Id; public MAGAZINE_TYPE Type; public int MaxPositions; + } + + public class SiemensMagazineConfigModel : NcMagazineConfigModel + { + public string Name; public bool LoadingIsActive; public int LoadPosition; } @@ -678,7 +682,7 @@ namespace CMS_CORE_Library public bool FamilyOptionActive; public bool MagPositionOptionActive; - public List Magazines; + public List Magazines; public List ToolsConfiguration; public FamiliesConfiguration FamiliesConfiguration; public ShanksConfiguration ShanksConfiguration; diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index 3b8cebd..f5c22e6 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -27,11 +27,11 @@ namespace CMS_CORE.Demo private DemoEdgesConfiguration DemoEdgesConfiguration = new DemoEdgesConfiguration(); // Magazine config parameters - private List MagazineConfig = new List() + private List MagazineConfig = new List() { - new MagazineConfigModel{Id = 1, Type = MAGAZINE_TYPE.CHAIN, LoadingIsActive = true, Name = "MAG1"}, - new MagazineConfigModel{Id = 2, Type = MAGAZINE_TYPE.BOX_MAGAZINE, LoadingIsActive = true, Name = "MAG2"}, - new MagazineConfigModel{Id = 3, Type = MAGAZINE_TYPE.BOX_MAGAZINE, LoadingIsActive = false, Name = "MAG3"}, + new SiemensMagazineConfigModel{Id = 1, Type = MAGAZINE_TYPE.CHAIN, LoadingIsActive = true, Name = "MAG1"}, + new SiemensMagazineConfigModel{Id = 2, Type = MAGAZINE_TYPE.BOX_MAGAZINE, LoadingIsActive = true, Name = "MAG2"}, + new SiemensMagazineConfigModel{Id = 3, Type = MAGAZINE_TYPE.BOX_MAGAZINE, LoadingIsActive = false, Name = "MAG3"}, }; /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -2359,7 +2359,7 @@ namespace CMS_CORE.Demo cmsError = TOOLS_RConfiguration(ref config); // Get mag config - MagazineConfigModel magConfig = config.Magazines.Where(x => x.Id == magazineId).FirstOrDefault(); + SiemensMagazineConfigModel magConfig = config.Magazines.Where(x => x.Id == magazineId).FirstOrDefault(); if (magConfig == null || !magConfig.LoadingIsActive) return INCORRECT_PARAMETERS_ERROR; @@ -2463,6 +2463,10 @@ namespace CMS_CORE.Demo /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #region Nc Tool Manager + public override CmsError TOOLS_RMagazineConfig(ref List config) + { + return NO_ERROR; + } public override CmsError TOOLS_ROffset(short offsetId, ref OffsetModel offset) { diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index 0d67092..743435d 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -1796,6 +1796,10 @@ namespace CMS_CORE.Fanuc /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #region Nc Tool Manager + public override CmsError TOOLS_RMagazineConfig(ref List config) + { + return NO_ERROR; + } public override CmsError TOOLS_ROffset(short offsetId, ref OffsetModel offset) { diff --git a/CMS_CORE_Library/Nc.cs b/CMS_CORE_Library/Nc.cs index 483a81b..6737fed 100644 --- a/CMS_CORE_Library/Nc.cs +++ b/CMS_CORE_Library/Nc.cs @@ -1276,7 +1276,7 @@ namespace CMS_CORE /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - #region Tool Table + #region Tool Table Siemens /** * Read tool table configuration @@ -1299,6 +1299,7 @@ namespace CMS_CORE * Returns an error when an internal or a library error occours * Reference to the tools list data object **/ + public abstract CmsError TOOLS_RToolsData(ref List toolsData); /** @@ -1310,6 +1311,7 @@ namespace CMS_CORE * Returns an error when an internal or a library error occours * Reference to the shank list data object **/ + public abstract CmsError TOOLS_RShanksData(ref List shanksData); /** @@ -1321,8 +1323,9 @@ namespace CMS_CORE * Returns an error when an internal or a library error occours * Reference to the tools families data object **/ + public abstract CmsError TOOLS_RFamilyData(ref List families); - + /** * Read magazines positions data from NC * @@ -1332,6 +1335,7 @@ namespace CMS_CORE * Returns an error when an internal or a library error occours * Reference to the tools list data object **/ + public abstract CmsError TOOLS_RMagazinePositions(ref List positions); public abstract CmsError TOOLS_WAddTool(ref SiemensToolModel tool); @@ -1374,7 +1378,7 @@ namespace CMS_CORE public abstract CmsError TOOLS_GetMagazinesStatus(ref MagazineActionModel magazineAction); - #endregion Tool Table + #endregion Tool Table Siemens /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// @@ -1516,19 +1520,19 @@ namespace CMS_CORE /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #region Nc Tool Manager - + public abstract CmsError TOOLS_ROffset(short offsetId, ref OffsetModel offset); public abstract CmsError TOOLS_WOffset(short offsetId, OffsetModel offset); public abstract CmsError TOOLS_WStartEditData(); - + public abstract CmsError TOOLS_WStopEditData(); - + public abstract CmsError TOOLS_WUpdateTools(List list); public abstract CmsError TOOLS_WUpdateFamilies(List list); - + public abstract CmsError TOOLS_WUpdateShanks(List list); public abstract CmsError TOOLS_WUpdateMagazinePositions(List list); @@ -1539,11 +1543,15 @@ namespace CMS_CORE public abstract CmsError TOOLS_WRestoreBackup(); + public abstract CmsError TOOLS_RMagazineConfig(ref List config); + + #endregion Nc Tool Manager /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #region Fixed memory area + // TODO REMOVE //Lingua CN internal MEMORY_CELL PARAM_LING_FANUC = new MEMORY_CELL(MEMORY_TYPE.Null, 3281, 0, 1); diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index d07ac64..4a7806a 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -748,10 +748,6 @@ namespace CMS_CORE.Osai private CmsError PLC_WStrobe(MEMORY_CELL ackCell, MEMORY_CELL strobeCell, uint id) { - // Check id range - if (id > ALARMS_NUMBER) - return INCORRECT_PARAMETERS_ERROR; - CmsError cmsError; bool readValue = false; bool writeValue = true; @@ -789,19 +785,17 @@ namespace CMS_CORE.Osai return NO_ERROR; } - private CmsError ResetStrobe(int strobeBit, int strobeByte, int ackByte, MEMORY_TYPE memType, int ackBit = -1) + private CmsError ResetStrobe(int bit, int strobeByte, int ackByte, MEMORY_TYPE memType) { int n = 720; // 5 minutes bool readValue = false; bool writeValue = false; - if (ackBit == -1) - ackBit = strobeBit; CmsError cmsError; do { // Check ACK - cmsError = MEM_RWBoolean(R, 0, memType, ackByte, ackBit, ref readValue); + cmsError = MEM_RWBoolean(R, 0, memType, ackByte, bit, ref readValue); if (cmsError.IsError()) return cmsError; @@ -809,7 +803,7 @@ namespace CMS_CORE.Osai if (readValue) { // Reset strobe - cmsError = MEM_RWBoolean(W, 0, memType, strobeByte, strobeBit, ref writeValue); + cmsError = MEM_RWBoolean(W, 0, memType, strobeByte, bit, ref writeValue); if (cmsError.IsError()) return cmsError; // Exit from cycle @@ -2130,6 +2124,36 @@ namespace CMS_CORE.Osai #region Nc Tool Manager + public override CmsError TOOLS_RMagazineConfig(ref List config) + { + //Check if the NC is Connected + CmsError cmsError = CheckConnection(); + if (cmsError.IsError()) + return cmsError; + // Read data 10 status, 10 magazine position numbers + List readShorts = new List(); + cmsError = MEM_RWWordList(R, 0, MAGAZINE_TYPES.MemType, MAGAZINE_TYPES.Address, 20, ref readShorts); + if (cmsError.IsError()) + return cmsError; + + List types = new List(); + types = readShorts.SelectMany(BitConverter.GetBytes).ToList(); + + config = new List(); + for(int i = 0; i < 10; i++) + { + if(types[i + 20] > 0) + config.Add(new NcMagazineConfigModel() + { + Id = (byte)(i + 1), + MaxPositions = types[i + 20], + Type = (MAGAZINE_TYPE)types[i] + }); + } + + return NO_ERROR; + } + public override CmsError TOOLS_WStartEditData() { //Check if the NC is Connected @@ -2176,13 +2200,12 @@ namespace CMS_CORE.Osai if (cmsError.IsError()) return cmsError; - // Set reload command to 1 - bool write = true; - cmsError = MEM_RWBoolean(W, 0, TOOL_MANAGER_COMMAND.MemType, TOOL_MANAGER_COMMAND.Address, 0, ref write); + cmsError = DeleteBackup(); if (cmsError.IsError()) return cmsError; - cmsError = DeleteBackup(); + // Set reload command + cmsError = PLC_WStrobe(TOOL_MANAGER_STATUS, TOOL_MANAGER_COMMAND, 1); if (cmsError.IsError()) return cmsError; @@ -2226,7 +2249,7 @@ namespace CMS_CORE.Osai if (cmsError.IsError()) return cmsError; - // Write busy + // Set magazine as free bool write = false; cmsError = MEM_RWBoolean(W, 0, MAGAZINES_TOOLING_COMMAND.MemType, MAGAZINES_TOOLING_COMMAND.Address, magazineId - 1, ref write); if (cmsError.IsError()) @@ -2237,9 +2260,8 @@ namespace CMS_CORE.Osai if (cmsError.IsError()) return cmsError; - // Set reload command to 1 - write = true; - cmsError = MEM_RWBoolean(W, 0, TOOL_MANAGER_COMMAND.MemType, TOOL_MANAGER_COMMAND.Address, 0, ref write); + // Set reload command + cmsError = PLC_WStrobe(TOOL_MANAGER_STATUS, TOOL_MANAGER_COMMAND, 1); if (cmsError.IsError()) return cmsError; @@ -2273,33 +2295,26 @@ namespace CMS_CORE.Osai private CmsError DeleteBackup() { - try - { - string backupFilePath = "{0}_bak.csv"; + string backupFilePath = "{0}_bak.csv"; - // Delete tool manager backup file - CmsError cmsError = FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, FAMILIES_FILE_NAME)); - if (cmsError.IsError()) - return cmsError; + // Delete tool manager backup file + CmsError cmsError = FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, FAMILIES_FILE_NAME)); + if (cmsError.IsError()) + return cmsError; - cmsError = FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, FAM_SIZE_FILE_NAME)); - if (cmsError.IsError()) - return cmsError; + cmsError = FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, FAM_SIZE_FILE_NAME)); + if (cmsError.IsError()) + return cmsError; - cmsError = FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, MAG_POSITION_FILE_NAME)); - if (cmsError.IsError()) - return cmsError; + cmsError = FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, MAG_POSITION_FILE_NAME)); + if (cmsError.IsError()) + return cmsError; - cmsError = FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, SHANKS_FILE_NAME)); - if (cmsError.IsError()) - return cmsError; + cmsError = FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, SHANKS_FILE_NAME)); + if (cmsError.IsError()) + return cmsError; - return FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, TOOLS_FILE_NAME)); - } - catch (Exception ex) - { - return ManageException(ex); - } + return FILES_DeleteProgram(TOOL_MANAGER_DIRECTORY_PATH, string.Format(backupFilePath, TOOLS_FILE_NAME)); } public override CmsError TOOLS_WRestoreBackup() @@ -2308,38 +2323,32 @@ namespace CMS_CORE.Osai CmsError cmsError = CheckConnection(); if (cmsError.IsError()) return cmsError; - try - { - string filePath = TOOL_MANAGER_DIRECTORY_PATH + "{0}.csv"; - string backupFilePath = TOOL_MANAGER_DIRECTORY_PATH + "{0}_bak.csv"; - // Create tool manager backup file - cmsError = FILES_CopyProgram(string.Format(backupFilePath, FAMILIES_FILE_NAME), string.Format(filePath, FAMILIES_FILE_NAME), false); - if (cmsError.IsError()) - return cmsError; - // FamilySize - cmsError = FILES_CopyProgram(string.Format(backupFilePath, FAM_SIZE_FILE_NAME), string.Format(filePath, FAM_SIZE_FILE_NAME), false); - if (cmsError.IsError()) - return cmsError; - // Mag positions - cmsError = FILES_CopyProgram(string.Format(backupFilePath, MAG_POSITION_FILE_NAME), string.Format(filePath, MAG_POSITION_FILE_NAME), false); - if (cmsError.IsError()) - return cmsError; - // Shanks - cmsError = FILES_CopyProgram(string.Format(backupFilePath, SHANKS_FILE_NAME), string.Format(filePath, SHANKS_FILE_NAME), false); - if (cmsError.IsError()) - return cmsError; - // Tools - cmsError = FILES_CopyProgram(string.Format(backupFilePath, TOOLS_FILE_NAME), string.Format(filePath, TOOLS_FILE_NAME), false); - if (cmsError.IsError()) - return cmsError; + string filePath = TOOL_MANAGER_DIRECTORY_PATH + "{0}.csv"; + string backupFilePath = TOOL_MANAGER_DIRECTORY_PATH + "{0}_bak.csv"; - return DeleteBackup(); - } - catch (Exception ex) - { - return ManageException(ex); - } + // Create tool manager backup file + cmsError = FILES_CopyProgram(string.Format(backupFilePath, FAMILIES_FILE_NAME), string.Format(filePath, FAMILIES_FILE_NAME), false); + if (cmsError.IsError()) + return cmsError; + // FamilySize + cmsError = FILES_CopyProgram(string.Format(backupFilePath, FAM_SIZE_FILE_NAME), string.Format(filePath, FAM_SIZE_FILE_NAME), false); + if (cmsError.IsError()) + return cmsError; + // Mag positions + cmsError = FILES_CopyProgram(string.Format(backupFilePath, MAG_POSITION_FILE_NAME), string.Format(filePath, MAG_POSITION_FILE_NAME), false); + if (cmsError.IsError()) + return cmsError; + // Shanks + cmsError = FILES_CopyProgram(string.Format(backupFilePath, SHANKS_FILE_NAME), string.Format(filePath, SHANKS_FILE_NAME), false); + if (cmsError.IsError()) + return cmsError; + // Tools + cmsError = FILES_CopyProgram(string.Format(backupFilePath, TOOLS_FILE_NAME), string.Format(filePath, TOOLS_FILE_NAME), false); + if (cmsError.IsError()) + return cmsError; + + return DeleteBackup(); } public override CmsError TOOLS_WUpdateTools(List tools) @@ -2351,17 +2360,10 @@ namespace CMS_CORE.Osai string filePath = TOOL_MANAGER_DIRECTORY_PATH + TOOLS_FILE_NAME + ".csv"; - try - { - // Update file - cmsError = UpdateToolManagerFile(filePath, tools); - if (cmsError.IsError()) - return cmsError; - } - catch (Exception ex) - { - return ManageException(ex); - } + // Update file + cmsError = UpdateToolManagerFile(filePath, tools); + if (cmsError.IsError()) + return cmsError; return NO_ERROR; } @@ -2375,26 +2377,19 @@ namespace CMS_CORE.Osai string filePath = TOOL_MANAGER_DIRECTORY_PATH + FAMILIES_FILE_NAME + ".csv"; - try - { - List familiesData = families.Select(x => (NcFamilyFileModel)x).ToList(); - // Update file - cmsError = UpdateToolManagerFile(filePath, familiesData); - if (cmsError.IsError()) - return cmsError; + List familiesData = families.Select(x => (NcFamilyFileModel)x).ToList(); + // Update file + cmsError = UpdateToolManagerFile(filePath, familiesData); + if (cmsError.IsError()) + return cmsError; - // Write size file - filePath = TOOL_MANAGER_DIRECTORY_PATH + FAM_SIZE_FILE_NAME + ".csv"; - List familiesSizeData = families.Select(x => (NcFamilySizeFileModel)x).ToList(); - // Update file - cmsError = UpdateToolManagerFile(filePath, familiesSizeData); - if (cmsError.IsError()) - return cmsError; - } - catch (Exception ex) - { - return ManageException(ex); - } + // Write size file + filePath = TOOL_MANAGER_DIRECTORY_PATH + FAM_SIZE_FILE_NAME + ".csv"; + List familiesSizeData = families.Select(x => (NcFamilySizeFileModel)x).ToList(); + // Update file + cmsError = UpdateToolManagerFile(filePath, familiesSizeData); + if (cmsError.IsError()) + return cmsError; return NO_ERROR; } @@ -2408,17 +2403,10 @@ namespace CMS_CORE.Osai string filePath = TOOL_MANAGER_DIRECTORY_PATH + SHANKS_FILE_NAME + ".csv"; - try - { - // Update file - cmsError = UpdateToolManagerFile(filePath, shanks); - if (cmsError.IsError()) - return cmsError; - } - catch (Exception ex) - { - return ManageException(ex); - } + // Update file + cmsError = UpdateToolManagerFile(filePath, shanks); + if (cmsError.IsError()) + return cmsError; return NO_ERROR; } @@ -2432,17 +2420,10 @@ namespace CMS_CORE.Osai string filePath = TOOL_MANAGER_DIRECTORY_PATH + MAG_POSITION_FILE_NAME + ".csv"; - try - { - // Update file - cmsError = UpdateToolManagerFile(filePath, positions); - if (cmsError.IsError()) - return cmsError; - } - catch (Exception ex) - { - return ManageException(ex); - } + // Update file + cmsError = UpdateToolManagerFile(filePath, positions); + if (cmsError.IsError()) + return cmsError; return NO_ERROR; } @@ -2454,35 +2435,28 @@ namespace CMS_CORE.Osai if (cmsError.IsError()) return cmsError; - try + Stopwatch sw = new Stopwatch(); sw.Start(); + + List lines = new List(); + + // Convert data in a csv string + string csvContent = GenerateModelCsv(objs); + lines.Add(csvContent); + + // Write into local file + File.WriteAllLines("C:\\test.csv", lines); + + // Update file + using (FileStream fileStream = new FileStream("C:\\test.csv", FileMode.OpenOrCreate)) { - Stopwatch sw = new Stopwatch(); sw.Start(); - - List lines = new List(); - - // Convert data in a csv string - string csvContent = GenerateModelCsv(objs); - lines.Add(csvContent); - - // Write into local file - File.WriteAllLines("C:\\test.csv", lines); - - // Update file - using (FileStream fileStream = new FileStream("C:\\test.csv", FileMode.OpenOrCreate)) - { - // Write NcFile - cmsError = FILES_WProgramFromFile(filePath, fileStream); - if (cmsError.IsError()) - return cmsError; - } - - Console.WriteLine("Scrivere tool: " + sw.ElapsedMilliseconds); - } - catch (Exception ex) - { - return ManageException(ex); + // Write NcFile + cmsError = FILES_WProgramFromFile(filePath, fileStream); + if (cmsError.IsError()) + return cmsError; } + Console.WriteLine("Scrivere tool: " + sw.ElapsedMilliseconds); + return NO_ERROR; } @@ -3066,11 +3040,16 @@ namespace CMS_CORE.Osai internal static MEMORY_CELL HEADS_ACK = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 12953, 4); internal static MEMORY_CELL HEADS_STROBE_INCREMENT = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 12955, 4); internal static MEMORY_CELL HEADS_STROBE_DECREMENT = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 12957, 4); - + // Tool manager areas internal static MEMORY_CELL TOOL_MANAGER_STATUS = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 13001, 2); internal static MEMORY_CELL TOOL_MANAGER_COMMAND = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 13000, 2); + + internal static MEMORY_CELL MAGAZINE_TYPES = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 13062, 4); + internal static MEMORY_CELL MAGAZINE_POSITIONS_NUMBER = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 13072, 4); + internal static MEMORY_CELL MAGAZINES_ENABLED_COMMAND = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 13082, 4); internal static MEMORY_CELL MAGAZINES_TOOLING_COMMAND = new MEMORY_CELL(MEMORY_TYPE.Osai_MW, 13084, 4); + } #endregion Memory addresses diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index a6da400..6107a30 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -106,7 +106,7 @@ namespace CMS_CORE.Siemens private static List MagazineMountedTools = new List(); public static List FamiliesData = new List(); public static MagazineActionModel MagazineAction = new MagazineActionModel(); - public static List MagazineConfig = new List(); + public static List MagazineConfig = new List(); public static uint multitoolsNumber = 0; @@ -2545,7 +2545,7 @@ namespace CMS_CORE.Siemens return MAGAZINE_BUSY_ERROR; // Get mag config - MagazineConfigModel magConfig = MagazineConfig.Where(x => x.Id == magazineId).FirstOrDefault(); + SiemensMagazineConfigModel magConfig = MagazineConfig.Where(x => x.Id == magazineId).FirstOrDefault(); if (magConfig == null || !magConfig.LoadingIsActive) return INCORRECT_PARAMETERS_ERROR; @@ -2645,7 +2645,7 @@ namespace CMS_CORE.Siemens return MAGAZINE_BUSY_ERROR; // Get mag config - MagazineConfigModel magConfig = MagazineConfig.Where(x => x.Id == magazineId).FirstOrDefault(); + SiemensMagazineConfigModel magConfig = MagazineConfig.Where(x => x.Id == magazineId).FirstOrDefault(); if (magConfig == null || !magConfig.LoadingIsActive) return INCORRECT_PARAMETERS_ERROR; @@ -2872,6 +2872,10 @@ namespace CMS_CORE.Siemens /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// #region Nc Tool Manager + public override CmsError TOOLS_RMagazineConfig(ref List config) + { + return NO_ERROR; + } public override CmsError TOOLS_ROffset(short offsetId, ref OffsetModel offset) { @@ -3590,7 +3594,7 @@ namespace CMS_CORE.Siemens case "$TC_MAP1": { // Magazine type - MagazineConfigModel mag = MagazineConfig.Where(x => x.Id == firstId).FirstOrDefault(); + SiemensMagazineConfigModel mag = MagazineConfig.Where(x => x.Id == firstId).FirstOrDefault(); if (mag == null) { bool active = true; @@ -3598,9 +3602,9 @@ namespace CMS_CORE.Siemens if (type == MAGAZINE_TYPE.MAGAZINE_LOADING_STATION || type == MAGAZINE_TYPE.MAGAZINE_TOOL_BUFFER) active = false; - MagazineConfig.Add(new MagazineConfigModel() + MagazineConfig.Add(new SiemensMagazineConfigModel() { - Id = firstId, + Id = (byte)firstId, Type = (MAGAZINE_TYPE)Convert.ToInt32(actualString.Split('=').LastOrDefault()), LoadingIsActive = active }); @@ -3613,7 +3617,7 @@ namespace CMS_CORE.Siemens case "$TC_MAP2": { // Magazine Name - MagazineConfigModel mag = MagazineConfig.Where(x => x.Id == firstId).FirstOrDefault(); + SiemensMagazineConfigModel mag = MagazineConfig.Where(x => x.Id == firstId).FirstOrDefault(); if (mag != null) mag.Name = actualString.Split('=').LastOrDefault().Replace("\"", ""); } @@ -3622,7 +3626,7 @@ namespace CMS_CORE.Siemens case "$TC_MAP7": { // Add max number of magazine positions - MagazineConfigModel mag = MagazineConfig.Where(x => x.Id == firstId).FirstOrDefault(); + SiemensMagazineConfigModel mag = MagazineConfig.Where(x => x.Id == firstId).FirstOrDefault(); if (mag != null) mag.MaxPositions = Convert.ToInt32(actualString.Split('=').LastOrDefault()); } @@ -3827,7 +3831,7 @@ namespace CMS_CORE.Siemens case "$TC_MDP1": { // Add max number of magazine positions - MagazineConfigModel mag = MagazineConfig.Where(x => x.Id == firstId).FirstOrDefault(); + SiemensMagazineConfigModel mag = MagazineConfig.Where(x => x.Id == firstId).FirstOrDefault(); if (mag != null) mag.LoadPosition = secondId; }