Commit Graph

2980 Commits

Author SHA1 Message Date
Alessandro Francia c46ed8e5a2 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-27 09:44:15 +02:00
Alessandro Francia 922d1933eb depot osai 2018-08-27 09:43:57 +02:00
Lucio Maranta ba4539c2cb Fix conf 2018-08-24 13:12:33 +02:00
Lucio Maranta 6e8fa6cd4b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-24 13:08:48 +02:00
Lucio Maranta 482efe5a2b Added first part of data merging when opening step
Model fix
Added Siemens file list & WIP file info
2018-08-24 13:08:12 +02:00
Alessandro Francia 919eb11f58 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-24 11:16:21 +02:00
Alessandro Francia 185ead206a depot osai 2018-08-24 11:16:02 +02:00
Lucio Maranta f156daa931 Fix available shank query 2018-08-24 11:14:19 +02:00
Alessandro Francia 0715c55d28 fix tab tool osai 2018-08-24 09:03:53 +02:00
Alessandro Francia 3f3d6504ee depot and fix osai 2018-08-23 17:16:02 +02:00
Lucio Maranta 36d037528c Added offsetId into Tools&Family model 2018-08-23 15:28:01 +02:00
Lucio Maranta 018b784056 Fix config 2018-08-23 15:04:37 +02:00
Lucio Maranta bd501934db Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-23 14:59:20 +02:00
Alessandro Francia b14a90743b Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-23 14:58:07 +02:00
Lucio Maranta 82c80aff7f Fix 2018-08-23 14:58:00 +02:00
Alessandro Francia 7c5f79c4f7 depot 2018-08-23 14:57:53 +02:00
Lucio Maranta 1ea0dec80c Fix family&tool model 2018-08-23 14:52:35 +02:00
Alessandro Francia cdf20502e3 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-23 14:22:54 +02:00
Alessandro Francia f8b96de736 shank osai 2018-08-23 14:22:31 +02:00
Lucio Maranta 914c9d28e9 Added following error&Dist to go Siemens 2018-08-23 13:03:35 +02:00
Lucio Maranta 9749ea56a7 WIP Siemens axes 2018-08-23 12:38:48 +02:00
Alessandro Francia 50a4c4cce0 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-23 12:14:03 +02:00
Alessandro Francia b53e1b0139 get available tool shank osai 2018-08-23 12:13:45 +02:00
Lucio Maranta 700624968d Added available_tools 2018-08-23 12:12:14 +02:00
Alessandro Francia 26b23f1a99 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-23 09:50:51 +02:00
Alessandro Francia 2e8e675ea1 tool osai 2018-08-23 09:50:28 +02:00
Lucio Maranta 7cce414044 Added family to tools 2018-08-23 09:27:25 +02:00
Lucio Maranta 13d8274d8d WIP Family option 2018-08-22 17:12:36 +02:00
Alessandro Francia c57814a9f5 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-22 16:28:22 +02:00
Alessandro Francia e0d5d0c5c0 equipment osai 2018-08-22 16:27:36 +02:00
Lucio Maranta eef3f0d0c8 Added demo offset, and fix family option 2018-08-22 15:51:16 +02:00
Alessandro Francia c0ad8c3534 commit 2018-08-21 17:43:17 +02:00
Lucio Maranta 32ab7d3f63 Added first option management 2018-08-21 17:06:25 +02:00
Lucio Maranta 4111b67a36 Write options at startup 2018-08-21 16:04:37 +02:00
Alessandro Francia edd76419f7 value default families osai 2018-08-21 11:42:23 +02:00
Alessandro Francia 705448ed12 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-21 11:05:26 +02:00
Alessandro Francia 48b16eca9c families osai 2018-08-21 11:04:58 +02:00
Lucio Maranta 5f5ead4f2e Fix tools params 2018-08-21 10:42:55 +02:00
Lucio Maranta 8856ff1390 Added cooling translation 2018-08-20 17:26:01 +02:00
Alessandro Francia c9ab2062bb wp4 osai 2018-08-20 17:02:31 +02:00
Lucio Maranta 38fc4bc889 Fix 2018-08-20 15:44:47 +02:00
Lucio Maranta ad22ce02e0 Fix name field & added offset update 2018-08-20 15:42:11 +02:00
Lucio Maranta 37669e5a63 WIP 2018-08-20 12:54:24 +02:00
Lucio Maranta d4afdb5098 Renamed tools field 2018-08-20 12:49:52 +02:00
Lucio Maranta 5182b41b12 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-20 11:07:02 +02:00
Lucio Maranta 5043cced52 Set Demo tool manager configuration to Osai config 2018-08-20 11:05:13 +02:00
Alessandro Francia 46574535da families osai 2018-08-20 11:02:19 +02:00
Alessandro Francia a982ccb1f9 Merge branch 'develop' of https://bitbucket.org/ncarminati/cms_step into develop 2018-08-20 09:34:52 +02:00
Alessandro Francia ed638cdf9d wp7 2018-08-20 09:29:12 +02:00
Nicola Carminati 485e35cdc1 Fix Heads translate Read Config 2018-08-09 16:32:44 +02:00