diff --git a/Libs/CMS_CORE_Library.dll b/Libs/CMS_CORE_Library.dll
index 6b65626e..018a0e97 100644
Binary files a/Libs/CMS_CORE_Library.dll and b/Libs/CMS_CORE_Library.dll differ
diff --git a/Step.Database/Controllers/FunctionsAccessController.cs b/Step.Database/Controllers/FunctionsAccessController.cs
index bae23581..c0f08dbd 100644
--- a/Step.Database/Controllers/FunctionsAccessController.cs
+++ b/Step.Database/Controllers/FunctionsAccessController.cs
@@ -68,7 +68,7 @@ namespace Step.Database.Controllers
if (id == 0 || !functionAccessIsEnabled)
return functionAccessIsEnabled;
// Return PLC data
- return functionalityList[id - 1].isActive;
+ return functionalityList[id - 1].IsActive;
}
}
}
diff --git a/Step.Database/DatabaseContext.cs b/Step.Database/DatabaseContext.cs
index ad8cf66f..53b37eed 100644
--- a/Step.Database/DatabaseContext.cs
+++ b/Step.Database/DatabaseContext.cs
@@ -129,7 +129,6 @@ namespace Step.Database
{
if (MachineConfig.Model != NcConfig.NcName)
machinesController.UpdateMachineName(MachineConfig.MachineId, NcConfig.NcName);
-
}
}
}
diff --git a/Step.Model/DTOModels/DTOPowerOnDataModel.cs b/Step.Model/DTOModels/DTOPowerOnDataModel.cs
new file mode 100644
index 00000000..6e75f0a3
--- /dev/null
+++ b/Step.Model/DTOModels/DTOPowerOnDataModel.cs
@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using static CMS_CORE_Library.DataStructures;
+
+namespace Step.Model.DTOModels
+{
+ public class DTOPowerOnDataModel
+ {
+ public PrePowerOnModel PrePowerOn;
+ public PostPowerOnModel PostPowerOn;
+ public AxisResetDataModel AxisReset;
+ }
+}
diff --git a/Step.Model/Step.Model.csproj b/Step.Model/Step.Model.csproj
index ba90eb18..8275ea49 100644
--- a/Step.Model/Step.Model.csproj
+++ b/Step.Model/Step.Model.csproj
@@ -80,6 +80,7 @@
DTOLanguageModel.cs.d.ts
+
diff --git a/Step.NC/NcHandler.cs b/Step.NC/NcHandler.cs
index 5ff0819d..b30b053e 100644
--- a/Step.NC/NcHandler.cs
+++ b/Step.NC/NcHandler.cs
@@ -147,9 +147,9 @@ namespace Step.NC
{
alarms.NcAlarms.Add(new GenericAlarmModel()
{
- id = ncAlarm.id,
- message = ncAlarm.message,
- isWarning = ncAlarm.isWarning,
+ id = ncAlarm.Id,
+ message = ncAlarm.Message,
+ isWarning = ncAlarm.IsWarning,
dateTime = DateTime.Now
});
}
@@ -170,10 +170,10 @@ namespace Step.NC
{
alarms.ProcessAlarms.Add(new ProcessAlarmModel()
{
- id = processAlarm.id,
- message = processAlarm.message,
- process = processAlarm.process,
- isWarning = processAlarm.isWarning,
+ id = processAlarm.Id,
+ message = processAlarm.Message,
+ process = processAlarm.Process,
+ isWarning = processAlarm.IsWarning,
dateTime = DateTime.Now
});
}
@@ -189,9 +189,9 @@ namespace Step.NC
{
alarms.PlcAlarms.Add(new GenericAlarmModel()
{
- id = plcAlarm.id,
- message = plcAlarm.message,
- isWarning = plcAlarm.isWarning,
+ id = plcAlarm.Id,
+ message = plcAlarm.Message,
+ isWarning = plcAlarm.IsWarning,
dateTime = DateTime.Now
});
}
@@ -248,14 +248,25 @@ namespace Step.NC
return cmsError;
}
- public CmsError GetPowerOnData(out PreAndPostPowerOnModel powerOnData)
+ public CmsError GetPowerOnData(out DTOPowerOnDataModel resultPowerOnData)
{
- powerOnData = new PreAndPostPowerOnModel
+ resultPowerOnData = new DTOPowerOnDataModel();
+ // Init object
+ PreAndPostPowerOnModel prePostPowerOn = new PreAndPostPowerOnModel
{
- postPowerOn = new PostPowerOnModel(),
- prePowerOn = new PrePowerOnModel()
+ PostPowerOn = new PostPowerOnModel(),
+ PrePowerOn = new PrePowerOnModel()
};
- CmsError cmsError = numericalControl.PLC_RPowerOnData(ref powerOnData);
+ // Read pre and post power on data
+ CmsError cmsError = numericalControl.PLC_RPowerOnData(ref prePostPowerOn);
+ if (cmsError.IsError())
+ return cmsError;
+ // Set return object
+ resultPowerOnData.PrePowerOn = prePostPowerOn.PrePowerOn;
+ resultPowerOnData.PostPowerOn = prePostPowerOn.PostPowerOn;
+
+ // Read axes procedure data from
+ cmsError = numericalControl.PLC_RAxesResetData(ref resultPowerOnData.AxisReset);
return cmsError;
}
@@ -323,5 +334,13 @@ namespace Step.NC
return cmsError;
}
+ public CmsError RefreshAllAlarms()
+ {
+ return new CmsError(0, "");
+ }
+ public CmsError RefreshAlarm(string id)
+ {
+ return new CmsError(0, "");
+ }
}
}
diff --git a/Step.Tasks/ThreadsFunctions.cs b/Step.Tasks/ThreadsFunctions.cs
index a1a6b883..6c400ee1 100644
--- a/Step.Tasks/ThreadsFunctions.cs
+++ b/Step.Tasks/ThreadsFunctions.cs
@@ -169,7 +169,7 @@ public static class ThreadsFunctions
if (ncHandler.numericalControl.NC_IsConnected())
{
// Get Data from NC
- libraryError = ncHandler.GetPowerOnData(out PreAndPostPowerOnModel powerOnData);
+ libraryError = ncHandler.GetPowerOnData(out DTOPowerOnDataModel powerOnData);
if (libraryError.errorCode != 0)
ManageLibraryError(libraryError);
else
diff --git a/Step/Controllers/SignalR/NcHub.cs b/Step/Controllers/SignalR/NcHub.cs
index 458b3076..88d6e01d 100644
--- a/Step/Controllers/SignalR/NcHub.cs
+++ b/Step/Controllers/SignalR/NcHub.cs
@@ -46,5 +46,19 @@ namespace Step.Controllers.SignalR
ncHandler.PutPowerOnData(id);
}
}
+
+ public void RefreshAllAlarms()
+ {
+ using (NcHandler ncHandler = new NcHandler())
+ {
+ ncHandler.Connect();
+ ncHandler.RefreshAllAlarms();
+ }
+ }
+
+ public void RefreshAlarm(string id)
+ {
+
+ }
}
}
diff --git a/Step/wwwroot/src/@types/signalr.alarms.d.ts b/Step/wwwroot/src/@types/signalr.alarms.d.ts
index 0e1d55ac..539f46b8 100644
--- a/Step/wwwroot/src/@types/signalr.alarms.d.ts
+++ b/Step/wwwroot/src/@types/signalr.alarms.d.ts
@@ -42,7 +42,7 @@ declare module signalr_alarms {
}
interface powerMessage{
- postPowerOn: postPowerOnMessage;
- prePowerOn: prePowerOnMessage;
+ PostPowerOn: postPowerOnMessage;
+ PrePowerOn: prePowerOnMessage;
}
}
diff --git a/Step/wwwroot/src/services/hub.ts b/Step/wwwroot/src/services/hub.ts
index 3e39b51e..cbac4507 100644
--- a/Step/wwwroot/src/services/hub.ts
+++ b/Step/wwwroot/src/services/hub.ts
@@ -47,6 +47,7 @@ export class Hub {
this._hub.client.powerOn = this.managePowerCallbacks;
this._hub.client.ncNetworkStatus = Hub.manageNcStatus;
this._hub.client.processesData = Hub.manageProcesses;
+ this._hub.client.functionalityData = Hub.functionalityData;
this._hub.client.logout = this.logout;
@@ -57,6 +58,10 @@ export class Hub {
appModelActions.CheckLogoff(store, e.id);
}
+ private static functionalityData(status){
+ console.log(status);
+ }
+
private static manageProcesses(status: signalr_process.DTOProcessDataModel) {
console.log(status);
if (status) {
@@ -124,21 +129,21 @@ export class Hub {
private managePowerCallbacks(power: signalr_alarms.powerMessage) {
-
+ console.log(power);
// Receiving messages so NC is connected
Hub.manageNcStatus({ connected: true });
// Pre-power on
- machineStatusActions.setAirPressureAlarm(store, power.prePowerOn.AirPressure);
- machineStatusActions.setPowerAlarm(store, power.prePowerOn.PowerOn);
- machineStatusActions.setEmergencyAlarm(store, power.prePowerOn.EmergencyButtons);
- machineStatusActions.setProtectionsAlarm(store, power.prePowerOn.ProtectionStatus);
- machineStatusActions.setSettingsModeAlarm(store, power.prePowerOn.SettingMode);
- machineStatusActions.setKeyReadyAlarm(store, power.prePowerOn.StartingKey);
+ machineStatusActions.setAirPressureAlarm(store, power.PrePowerOn.AirPressure);
+ machineStatusActions.setPowerAlarm(store, power.PrePowerOn.PowerOn);
+ machineStatusActions.setEmergencyAlarm(store, power.PrePowerOn.EmergencyButtons);
+ machineStatusActions.setProtectionsAlarm(store, power.PrePowerOn.ProtectionStatus);
+ machineStatusActions.setSettingsModeAlarm(store, power.PrePowerOn.SettingMode);
+ machineStatusActions.setKeyReadyAlarm(store, power.PrePowerOn.StartingKey);
// Post-power on
- machineStatusActions.setResetAxesAlarm(store, power.postPowerOn.AxisReset);
- machineStatusActions.setWaterJet1Alarm(store, power.postPowerOn.WaterjetPump);
+ machineStatusActions.setResetAxesAlarm(store, power.PostPowerOn.AxisReset);
+ machineStatusActions.setWaterJet1Alarm(store, power.PostPowerOn.WaterjetPump);
}
public sendPowerCommand(id: number) {