Egalware/cms_thermo_active
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,833 Commits 24 Branches 19 Tags
fbaeebb384f6980bdae4a0d3f9f3a4e93e51a46d
Commit Graph

201 Commits

Author SHA1 Message Date
Lucio Maranta fbaeebb384 Added maxRight/Left 2019-01-25 11:54:06 +01:00
Lucio Maranta 1320962122 Fix scada image model 2019-01-22 10:39:18 +01:00
Lucio Maranta d9a22655b8 Added labels to scada, 
Remove network card monitor
 2019-01-21 09:29:03 +01:00
Lucio Maranta 5c680f55dc Added API write scada value 2019-01-17 13:17:56 +01:00
Lucio Maranta 0339d82a65 Fix scada input enabled name 2019-01-17 10:19:00 +01:00
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 50dc27d480 Fix alarm note/file foreign keys and query 2019-01-14 14:57:30 +01:00
Lucio Maranta 0b63a0e0e6 WIP Scada 
Added subribe
Added thread
Fix & refactor
 2019-01-14 11:30:53 +01:00
Lucio Maranta e8e9a71a73 Fix demo loading file, moved demo and tmp file in C:/CMS/Active 2019-01-11 13:17:48 +01:00
Lucio Maranta 81d31f48ef Fix translations on plc messages 2019-01-11 11:09:17 +01:00
Lucio Maranta c7f4805332 Fix alarms filter, removed "type" field added "sources" field 2019-01-10 10:10:56 +01:00
Lucio Maranta 3b0ea2854f Fix network monitor thread 2019-01-08 10:03:56 +01:00
Lucio Maranta 2b0f3a2e5d Fix model 2019-01-07 14:53:03 +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 c379ed8f22 WIP Scada 
Fanuc fix
 2018-12-21 13:12:56 +01:00
Lucio Maranta ebfbfd2d9e Added API 
WIP Thread
 2018-12-20 13:18:06 +01:00
Lucio Maranta 4a27b1dba4 WIP 2018-12-19 17:10:11 +01:00
Lucio Maranta 355067e963 First commit 2018-12-18 17:40:58 +01:00
Lucio Maranta 76b882ce19 Fix previus commit 2018-12-18 17:03:27 +01:00
Lucio Maranta 79bcf7d2fa added maintainer data to closed maintenances 2018-12-17 16:11:46 +01:00
Lucio Maranta 2d01d818cf Added axis type 
Fix siemens part program info
Added unit of measure
 2018-12-14 16:59:09 +01:00
Lucio Maranta 5167ba49be Added new fields in siemens tool table 
Fix axes position
fix alarms
 2018-12-11 16:59:59 +01:00
Lucio Maranta b9a3c1bb1f Fix alarm api 2018-12-10 16:55:44 +01:00
Lucio Maranta 0f15f2e367 Added OriginPosition 
Fixed fanuc TT
& Minorfixes
 2018-11-30 13:26:46 +01:00
Lucio Maranta 00c7297ee2 WIP minor fix 2018-11-26 17:26:38 +01:00
Lucio Maranta 0e009dc6ec Fanuc TT 
& alarm Fixes
 2018-11-21 17:26:58 +01:00
Lucio Maranta b1628f11d9 WriteM155 response 2018-11-16 12:06:22 +01:00
Lucio Maranta 4d5020665d Added Siemens/Demo M155 SignalR 
WIP fix alarm filters
 2018-11-15 13:29:15 +01:00
Lucio Maranta 209c14530f Fix Fanuc library 
WIP alarms filters
 2018-11-14 17:32:21 +01:00
Lucio Maranta e23d1fce89 Fix Alarm API 2018-11-12 12:30:40 +01:00
Lucio Maranta ddced53d73 Added isSelectable to axes buttons 
Added axes funcitonality
 2018-11-08 13:27:30 +01:00
Lucio Maranta 981646fd2d Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-11-07 17:28:20 +01:00
Lucio Maranta 2294b52a65 Fix Siemens active file 
Fix machine counters
WIP Siemens axes name
 2018-11-07 17:27:44 +01:00
Nicola Carminati 96fc4021d8 Fix Graphic selection on Windows10 2018-11-07 12:19:37 +01:00
Lucio Maranta 76d617d633 Fix cms client primary screen 
Removed shanks from Siemens library
Fix "isInUse" param
etc
 2018-10-31 17:29:25 +01:00
Nicola Carminati 23ac28caeb Fix Application Icons & Names 2018-10-31 17:00:46 +01:00
Lucio Maranta e47d48aea9 Added new alarm filter 2018-10-29 17:00:35 +01:00
Lucio Maranta 110ab7be65 Alarm attachments 2018-10-24 11:25:38 +02:00
Lucio Maranta d85bb1fd0e Added alarm notes 
WIP Fanuc tool table
WIP Siemens Active program fix
 2018-10-23 17:33:00 +02:00
Lucio Maranta 29c4747785 Merge branch 'feature/Remove_autoinc_from_db' into develop 
# Conflicts:
#	Step.Database/Migrations/201809181022557_InitMigration.Designer.cs
#	Step.Database/Migrations/201809181022557_InitMigration.cs
#	Step.Database/Migrations/201810041521424_InitMigration.Designer.cs
#	Step.Database/Migrations/201810041521424_InitMigration.cs
#	Step.Database/Migrations/201810100646276_InitMigration.Designer.cs
#	Step.Database/Migrations/201810100646276_InitMigration.cs
#	Step.Database/Step.Database.csproj
WIP Alarm
 2018-10-16 16:57:46 +02:00
Lucio Maranta 5f3496a925 WIP Alarms 2018-10-15 16:16:53 +02:00
Lucio Maranta 23c173a82e WIP Alarm 2018-10-11 17:41:56 +02:00
Lucio Maranta 3d544a4a35 WIP Alarm test 2018-10-11 17:23:02 +02:00
Lucio Maranta 9fafe86eb8 WIP alarms storaging 2018-10-09 17:29:06 +02:00
Lucio Maranta a50c496557 Fix siemens path 
Added user id in closed maintenances
Minor fixes
 2018-10-04 17:30:47 +02:00
Lucio Maranta f784af225c Merge remote-tracking branch 'origin/develop' into feature/Remove_autoinc_from_db 2018-10-04 17:19:41 +02:00
Lucio Maranta 3ac93d7eec Load job into queue and load&Activate 
WIP get active job information
 2018-10-02 17:19:24 +02:00
Lucio Maranta 92389956b9 Fix client errors 
WIP job loading in the queue
 2018-10-01 12:17:19 +02:00