diff --git a/Thermo.Active.Core/ThreadsFunctions.cs b/Thermo.Active.Core/ThreadsFunctions.cs index cd76ced8..1900087e 100644 --- a/Thermo.Active.Core/ThreadsFunctions.cs +++ b/Thermo.Active.Core/ThreadsFunctions.cs @@ -318,16 +318,8 @@ public static class ThreadsFunctions ManageLibraryError(libraryError); else { - libraryError = ncAdapter.GetM155Data(out List m155Data); - if (libraryError.errorCode != 0) - ManageLibraryError(libraryError); - else - { - // Send processes through signalR - MessageServices.Current.Publish(SEND_PROCESSES_DATA, null, processesPPData); - // Send m155 through signalR - MessageServices.Current.Publish(SEND_M155_DATA, null, m155Data); - } + // Send processes through signalR + MessageServices.Current.Publish(SEND_PROCESSES_DATA, null, processesPPData); } } else diff --git a/Thermo.Active.Core/ThreadsHandler.cs b/Thermo.Active.Core/ThreadsHandler.cs index 14750cbe..b25693a6 100644 --- a/Thermo.Active.Core/ThreadsHandler.cs +++ b/Thermo.Active.Core/ThreadsHandler.cs @@ -16,7 +16,7 @@ namespace Thermo.Active.Core ThreadsFunctions.ReadAlarms, ThreadsFunctions.ReadPowerOnData, ThreadsFunctions.StatThread, - //ThreadsFunctions.ReadProcessesPPStatus, + ThreadsFunctions.ReadProcessesPPStatus, ThreadsFunctions.ReadEnabledFunctionality, ThreadsFunctions.ReadExpiredMaintenances, //ThreadsFunctions.ReadAxesPositionsData, diff --git a/Thermo.Active.Model/DTOModels/DTOProcessDataModel.cs b/Thermo.Active.Model/DTOModels/DTOProcessDataModel.cs index 13e33af9..8cdd684b 100644 --- a/Thermo.Active.Model/DTOModels/DTOProcessDataModel.cs +++ b/Thermo.Active.Model/DTOModels/DTOProcessDataModel.cs @@ -82,11 +82,11 @@ namespace Thermo.Active.Model.DTOModels if (WorkOverride != item.WorkOverride) return false; - if (offsetData.RealLength != item.offsetData.RealLength) - return false; + //if (offsetData.RealLength != item.offsetData.RealLength) + // return false; - if (offsetData.RealRadius != item.offsetData.RealRadius) - return false; + //if (offsetData.RealRadius != item.offsetData.RealRadius) + // return false; if (FeedOverride != item.FeedOverride) return false; diff --git a/Thermo.Active.NC/NcAdapter.cs b/Thermo.Active.NC/NcAdapter.cs index 788b3853..6a88155b 100644 --- a/Thermo.Active.NC/NcAdapter.cs +++ b/Thermo.Active.NC/NcAdapter.cs @@ -636,6 +636,7 @@ namespace Thermo.Active.NC } } +#if false // Read selected axes libraryError = numericalControl.AXES_RSelectedAxis(ref processesData.SelectedAxis); if (libraryError.IsError()) @@ -677,7 +678,8 @@ namespace Thermo.Active.NC // Measure processesData.UnitMeasure = UMeas; - processesData.FeedOverride = selectedData.FeedOverride; + processesData.FeedOverride = selectedData.FeedOverride; +#endif return libraryError; } diff --git a/Thermo.Active/Controllers/SignalR/NcHub.cs b/Thermo.Active/Controllers/SignalR/NcHub.cs index 27959666..b60ebb41 100644 --- a/Thermo.Active/Controllers/SignalR/NcHub.cs +++ b/Thermo.Active/Controllers/SignalR/NcHub.cs @@ -172,6 +172,7 @@ namespace Thermo.Active.Controllers.SignalR throw new HubException(libraryError.localizationKey); } +#if false [SignalRAuthorize(FunctionAccess = GENERAL, Action = ACTIONS.WRITE)] public void WriteM155Response(int process, double responseVal) { @@ -179,7 +180,8 @@ namespace Thermo.Active.Controllers.SignalR CmsError libraryError = ncAdapter.WriteM155Data(process, responseVal); if (libraryError.IsError()) throw new HubException(libraryError.localizationKey); - } + } +#endif [SignalRAuthorize(FunctionAccess = GENERAL, Action = ACTIONS.WRITE)] public void WriteScadaValue(string memIndex, SCADA_MEM_TYPE memType, object value) diff --git a/Thermo.Active/Listeners/ListenersHandler.cs b/Thermo.Active/Listeners/ListenersHandler.cs index 8e2a6e0d..588a8fae 100644 --- a/Thermo.Active/Listeners/ListenersHandler.cs +++ b/Thermo.Active/Listeners/ListenersHandler.cs @@ -78,10 +78,12 @@ namespace Thermo.Active.Listeners SignalRListener.SendPartProgramQueue(a); SignalRDatabaseHandler.UpdateQueue(a); })); +#if false infos.Add(MessageServices.Current.Subscribe(SEND_M155_DATA, (a, b) => - { - SignalRListener.SendM155Data(a); - })); + { + SignalRListener.SendM155Data(a); + })); +#endif infos.Add(MessageServices.Current.Subscribe(SEND_SCADA_DATA, (a, b) => { SignalRListener.SendScadaData(a); diff --git a/Thermo.Active/Listeners/SignalR/SignalRListener.cs b/Thermo.Active/Listeners/SignalR/SignalRListener.cs index 86dbb1f7..d44ef8d0 100644 --- a/Thermo.Active/Listeners/SignalR/SignalRListener.cs +++ b/Thermo.Active/Listeners/SignalR/SignalRListener.cs @@ -226,6 +226,7 @@ namespace Thermo.Active.Listeners.SignalR } } +#if false public static void SendM155Data(object data) { List dtoM155Data = data as List; @@ -236,7 +237,8 @@ namespace Thermo.Active.Listeners.SignalR var context = GlobalHost.ConnectionManager.GetHubContext(); context.Clients.Group("ncData").m155Data(dtoM155Data); } - } + } +#endif public static void SendScadaData(object scada) { @@ -512,8 +514,10 @@ namespace Thermo.Active.Listeners.SignalR group.magazineIsActive(LastNcMagazineIsActive); // Send PP Queue group.partProgramQueue(LastPartProgramQueue); +#if false // Send m155 data - group.m155Data(LastM155Data); + group.m155Data(LastM155Data); +#endif // Send Scada group.scadaData(LastScadaData); diff --git a/Thermo.Active/Listeners/SignalRStaticObjects.cs b/Thermo.Active/Listeners/SignalRStaticObjects.cs index a34ab879..82d094af 100644 --- a/Thermo.Active/Listeners/SignalRStaticObjects.cs +++ b/Thermo.Active/Listeners/SignalRStaticObjects.cs @@ -27,7 +27,9 @@ namespace Thermo.Active.Listeners public static DTOActiveProgramDataModel LastProgramData = new DTOActiveProgramDataModel(); public static Dictionary LastNcMagazineIsActive = new Dictionary(); public static List LastPartProgramQueue = new List(); - public static List LastM155Data = new List(); +#if false + public static List LastM155Data = new List(); +#endif public static List LastScadaData = new List(); // FIXME TODO inserire oggetti corretti per THERMO