Merge branch 'feature/Scada' into develop

# Conflicts: # Client.Utils/Constants.cs # Client/View/NcWindow.cs # Libs/CMS_CORE_Library.dll # Step.Config/Config/serverConfig.xml # Step.Core/ThreadsFunctions.cs # Step.Model/Constants.cs # Step.Model/DTOModels/AlarmModels/DTOAlarmHistoricModel.cs # Step.Model/DatabaseModels/NcMagazinePositionModel.cs # Step.Model/Step.Model.csproj
2019-01-15 16:58:18 +01:00
parent 58fefd3823 0b63a0e0e6
commit 724ac2afb8
17 changed files with 810 additions and 19 deletions
@@ -24,7 +24,8 @@ namespace Step.Core
                ThreadsFunctions.ReadActiveProgramData,
                ThreadsFunctions.UpdateToolsData,
                ThreadsFunctions.ReadNcMagazineActive,
-                ThreadsFunctions.ReadPartProgramQueueData
+                ThreadsFunctions.ReadPartProgramQueueData,
+                ThreadsFunctions.ReadScadaData
                // ThreadsFunctions.ReadNcSoftKeysData,
            };