From 69ad4bf18c1f5a9615e52f0bf13b8172c5da092c Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Fri, 26 Jun 2020 10:07:53 +0200 Subject: [PATCH] Added method for barriers not ok (pre poweron) management --- CMS_CORE_Library/Demo/Nc_Demo.cs | 3 ++- CMS_CORE_Library/Fanuc/Nc_Fanuc.cs | 3 ++- CMS_CORE_Library/Osai/Nc_Osai.cs | 3 ++- CMS_CORE_Library/S7Net/Nc_S7Net.cs | 3 ++- CMS_CORE_Library/Siemens/Nc_Siemens.cs | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/CMS_CORE_Library/Demo/Nc_Demo.cs b/CMS_CORE_Library/Demo/Nc_Demo.cs index e663f4d..f7919e3 100644 --- a/CMS_CORE_Library/Demo/Nc_Demo.cs +++ b/CMS_CORE_Library/Demo/Nc_Demo.cs @@ -496,7 +496,8 @@ namespace CMS_CORE_Library.Demo ProtectionStatus = new PowerOnDataModel() { Id = 2, Active = bits[2], Clickable = bits[10] }, EmergencyButtons = new PowerOnDataModel() { Id = 3, Active = bits[3], Clickable = bits[11] }, SettingMode = new PowerOnDataModel() { Id = 4, Active = bits[4], Clickable = bits[12] }, - StartingKey = new PowerOnDataModel() { Id = 5, Active = bits[5], Clickable = bits[13] } + StartingKey = new PowerOnDataModel() { Id = 5, Active = bits[5], Clickable = bits[13] }, + BarriersNotOk = new PowerOnDataModel() { Id = 7, Active = bits[6], Clickable = bits[14] } }; // Create and set post power on object PostPowerOnModel postPowerOn = new PostPowerOnModel() diff --git a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs index 3e4fab2..36d4b88 100644 --- a/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs +++ b/CMS_CORE_Library/Fanuc/Nc_Fanuc.cs @@ -677,7 +677,8 @@ namespace CMS_CORE_Library.Fanuc ProtectionStatus = new PowerOnDataModel() { Id = 3, Active = bits[2], Clickable = bits[18] }, EmergencyButtons = new PowerOnDataModel() { Id = 4, Active = bits[3], Clickable = bits[19] }, SettingMode = new PowerOnDataModel() { Id = 5, Active = bits[4], Clickable = bits[20] }, - StartingKey = new PowerOnDataModel() { Id = 6, Active = bits[5], Clickable = bits[21] } + StartingKey = new PowerOnDataModel() { Id = 6, Active = bits[5], Clickable = bits[21] }, + BarriersNotOk = new PowerOnDataModel() { Id = 7, Active = bits[6], Clickable = bits[22] } }; // Create and set post power on object PostPowerOnModel postPowerOn = new PostPowerOnModel() diff --git a/CMS_CORE_Library/Osai/Nc_Osai.cs b/CMS_CORE_Library/Osai/Nc_Osai.cs index f81c60e..7aed046 100644 --- a/CMS_CORE_Library/Osai/Nc_Osai.cs +++ b/CMS_CORE_Library/Osai/Nc_Osai.cs @@ -638,7 +638,8 @@ namespace CMS_CORE_Library.Osai ProtectionStatus = new PowerOnDataModel() { Id = 3, Active = bits[2], Clickable = bits[18] }, EmergencyButtons = new PowerOnDataModel() { Id = 4, Active = bits[3], Clickable = bits[19] }, SettingMode = new PowerOnDataModel() { Id = 5, Active = bits[4], Clickable = bits[20] }, - StartingKey = new PowerOnDataModel() { Id = 6, Active = bits[5], Clickable = bits[21] } + StartingKey = new PowerOnDataModel() { Id = 6, Active = bits[5], Clickable = bits[21] }, + BarriersNotOk = new PowerOnDataModel() { Id = 7, Active = bits[6], Clickable = bits[22] } }; // Create and set post power on object PostPowerOnModel postPowerOn = new PostPowerOnModel() diff --git a/CMS_CORE_Library/S7Net/Nc_S7Net.cs b/CMS_CORE_Library/S7Net/Nc_S7Net.cs index 7b2238e..5a16af7 100644 --- a/CMS_CORE_Library/S7Net/Nc_S7Net.cs +++ b/CMS_CORE_Library/S7Net/Nc_S7Net.cs @@ -646,7 +646,8 @@ namespace CMS_CORE_Library.S7Net ProtectionStatus = new PowerOnDataModel() { Id = 3, Active = bits[2], Clickable = bits[18] }, EmergencyButtons = new PowerOnDataModel() { Id = 4, Active = bits[3], Clickable = bits[19] }, SettingMode = new PowerOnDataModel() { Id = 5, Active = bits[4], Clickable = bits[20] }, - StartingKey = new PowerOnDataModel() { Id = 6, Active = bits[5], Clickable = bits[21] } + StartingKey = new PowerOnDataModel() { Id = 6, Active = bits[5], Clickable = bits[21] }, + BarriersNotOk = new PowerOnDataModel() { Id = 7, Active = bits[6], Clickable = bits[22] } }; // Create and set post power on object diff --git a/CMS_CORE_Library/Siemens/Nc_Siemens.cs b/CMS_CORE_Library/Siemens/Nc_Siemens.cs index 031d21d..ac2e466 100644 --- a/CMS_CORE_Library/Siemens/Nc_Siemens.cs +++ b/CMS_CORE_Library/Siemens/Nc_Siemens.cs @@ -939,7 +939,8 @@ namespace CMS_CORE_Library.Siemens ProtectionStatus = new PowerOnDataModel() { Id = 3, Active = bits[2], Clickable = bits[18] }, EmergencyButtons = new PowerOnDataModel() { Id = 4, Active = bits[3], Clickable = bits[19] }, SettingMode = new PowerOnDataModel() { Id = 5, Active = bits[4], Clickable = bits[20] }, - StartingKey = new PowerOnDataModel() { Id = 6, Active = bits[5], Clickable = bits[21] } + StartingKey = new PowerOnDataModel() { Id = 6, Active = bits[5], Clickable = bits[21] }, + BarriersNotOk = new PowerOnDataModel() { Id = 7, Active = bits[6], Clickable = bits[22] } }; // Create and set post power on object