 Lucio Maranta
|
724ac2afb8
|
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 |
|
|
Lucio Maranta
|
3b0ea2854f
|
Fix network monitor thread
|
2019-01-08 10:03:56 +01:00 |
|
|
Lucio Maranta
|
b4535fdc92
|
Fix alarmIds
|
2019-01-07 11:48:53 +01:00 |
|
|
Nicola Carminati
|
e130d2bfa5
|
Fix last commit
|
2018-12-28 15:36:17 +01:00 |
|
|
Nicola Carminati
|
9994ba10c0
|
Added Network card monitoring in Server
|
2018-12-28 15:17:49 +01:00 |
|
|
Lucio Maranta
|
ebfbfd2d9e
|
Added API
WIP Thread
|
2018-12-20 13:18:06 +01:00 |
|
|
Lucio Maranta
|
019f0cd5fc
|
Fix siemens library
Minor Fixes
|
2018-12-04 16:51:12 +01:00 |
|
|
Lucio Maranta
|
b46d043a85
|
Queue Manager
|
2018-09-10 17:19:22 +02:00 |
|
|
Lucio Maranta
|
2e22f4db3d
|
Added api to modify offsets
And magazine signalR
|
2018-08-29 17:02:51 +02:00 |
|
|
Lucio Maranta
|
bbd4535dbf
|
Merge branch 'feature/Osai_ToolTable' into develop
# Conflicts:
# Libs/CMS_CORE_Library.dll
# Step.Core/ThreadsFunctions.cs
# Step.Core/ThreadsHandler.cs
# Step.Database/DatabaseContext.cs
# Step.Database/Migrations/201806220920193_InitMigration.Designer.cs
# Step.Database/Migrations/201806220920193_InitMigration.cs
# Step.Database/Migrations/201807120908403_InitMigration.Designer.cs
# Step.Database/Migrations/201807120908403_InitMigration.cs
# Step.Database/Migrations/201807120908403_InitMigration.resx
# Step.Database/Migrations/201807251330036_InitMigration.Designer.cs
# Step.Database/Migrations/201807251330036_InitMigration.cs
# Step.Database/Step.Database.csproj
# Step.Model/Constants.cs
# Step.NC/NcHandler.cs
# Step/Listeners/ListenersHandler.cs
# Step/Step.csproj
|
2018-08-03 12:59:14 +02:00 |
|
|
Lucio Maranta
|
019939a616
|
Added active program management
|
2018-07-30 17:30:19 +02:00 |
|
|
Lucio Maranta
|
e8c9c9104d
|
WIP
Check right&left before loading a tool
|
2018-07-26 13:25:12 +02:00 |
|
|
Lucio Maranta
|
746ff140c5
|
Added 8 bit status
Added update tool status & life thread/signalR
|
2018-07-25 17:47:33 +02:00 |
|
|
Lucio Maranta
|
ab1701b00b
|
Added axes position (first implementatio only for demo)
|
2018-07-17 15:56:08 +02:00 |
|
|
Lucio Maranta
|
30b72ff724
|
Added offset management
Added family put
Model fix
|
2018-07-05 17:11:45 +02:00 |
|
|
Lucio Maranta
|
f7643c5b65
|
Added magazine action SignalR thread
|
2018-05-22 17:27:53 +02:00 |
|
|
Lucio Maranta
|
2f8966d054
|
Renamed Step.Tasks in Step.Core
|
2018-03-21 16:34:14 +01:00 |
|