From b4725163e01011a53b640933eb832ea55be02ee5 Mon Sep 17 00:00:00 2001 From: Nicola Carminati Date: Tue, 30 Jan 2018 16:16:24 +0000 Subject: [PATCH] Fix RW Startup Icons --- CMS_CORE_Library/Fanuc/Nc_Fanuc.cs | 18 +++++++++++++----- CMS_CORE_Library/Osai/Nc_Osai.cs | 6 +++--- CMS_CORE_Library/Siemens/Nc_Siemens.cs | 4 ++-- 3 files changed, 18 insertions(+), 10 deletions(-) diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index 4e199d6..dac737a 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -258,11 +258,22 @@ namespace CMS_CORE.Fanuc return NO_ERROR; } + + public override CmsError Nc_RPowerOnData(ref PreAndPostPowerOnModel powerOnModel) { - return FUNCTION_NOT_ALLOWED_ERROR; + return NO_ERROR; } + + + public override CmsError Nc_WPowerOnData(uint id, bool value) + { + return NO_ERROR; + } + + + //Get the process status public override CmsError PROC_RStatus(ushort Number, ref PROC_Status Status) { @@ -375,10 +386,7 @@ namespace CMS_CORE.Fanuc return NO_ERROR; } - public override CmsError Nc_WPowerOnData(uint id, bool value) - { - return FUNCTION_NOT_ALLOWED_ERROR; - } + //Get the process Alarms public override CmsError PROC_RActiveAlarms(ushort ProcNumber, ref List Alarms) diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index c6d5908..1deda0c 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -239,12 +239,12 @@ namespace CMS_CORE.Osai public override CmsError Nc_RPowerOnData(ref PreAndPostPowerOnModel powerOnModel) { - return FUNCTION_NOT_ALLOWED_ERROR; + return NO_ERROR; } public override CmsError Nc_WPowerOnData(uint id, bool value) { - return FUNCTION_NOT_ALLOWED_ERROR; + return NO_ERROR; } //Get the PLC Active Alarms @@ -277,7 +277,7 @@ namespace CMS_CORE.Osai if (messageKeyFound && !string.IsNullOrWhiteSpace(message)) AddAlarmToList((uint)index, message.Trim(), alarms); // Add message to list else - AddAlarmToList((uint)index, "PLC Message not found, PLC error code : " + index, alarms); // Add message not found with error code + AddAlarmToList((uint)index, "MSG not found, PLC error code : " + index, alarms); // Add message not found with error code } // Find key diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index df86ca6..edfe5dc 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -244,12 +244,12 @@ namespace CMS_CORE.Siemens public override CmsError Nc_RPowerOnData(ref PreAndPostPowerOnModel powerOnModel) { - return FUNCTION_NOT_ALLOWED_ERROR; + return NO_ERROR; } public override CmsError Nc_WPowerOnData(uint id, bool value) { - return FUNCTION_NOT_ALLOWED_ERROR; + return NO_ERROR; } //Get the process Mode