Commit Graph

57 Commits

Author SHA1 Message Date
Unknown
41f96539ed Merge remote-tracking branch 'origin/thomas' into adrien 2018-04-18 10:33:48 +02:00
Thomas Dehaeze
9a91666c19 add sensor to sample 2018-04-18 10:27:19 +02:00
Thomas Dehaeze
4a7b948984 Change how blocks are separated 2018-04-18 10:04:12 +02:00
Unknown
eedfe9e46e Merge remote-tracking branch 'origin/thomas' into adrien 2018-04-18 09:42:48 +02:00
Thomas Dehaeze
0ab3726ce7 add sample 2018-04-17 18:01:46 +02:00
Thomas Dehaeze
47d2d701d9 Add sensor and actuator to NASS 2018-04-17 17:53:57 +02:00
Thomas Dehaeze
3e55f333ef Add axis corrector to Data.m and add sensor/actuator to it 2018-04-17 17:28:49 +02:00
Thomas Dehaeze
55da27cc9b Add sensor and actuator to Hexapod Symetrie 2018-04-17 16:33:04 +02:00
Thomas Dehaeze
087c24f406 Add sensor and actuator to sindle 2018-04-17 16:17:19 +02:00
Thomas Dehaeze
916f6cc737 Match frame from granite to translation stage 2018-04-17 15:20:28 +02:00
Thomas Dehaeze
21ee7d1353 Add sensor and actuator to tilt 2018-04-17 15:17:09 +02:00
Thomas Dehaeze
cf35177883 add rotation angle script 2018-04-17 15:12:13 +02:00
Thomas Dehaeze
ecb128f042 add sensor and actuator to translation stage 2018-04-17 14:44:24 +02:00
Adrien Jublan
3943c1d5a4 sensor between tilt origin and sample origin 2018-04-17 11:30:19 +02:00
Adrien Jublan
4d2f1dad8a add sensor and force in Nass 2018-04-16 11:43:46 +02:00
Adrien Jublan
e6155252d2 Add sensor and force for Hexapod symetrie 2018-04-16 11:15:49 +02:00
Adrien Jublan
26c6d95aef Add mask for Spindle stage (and change coupe to torque in mask) 2018-04-16 10:03:05 +02:00
Adrien Jublan
9048344136 add sensor and torque for Spindle stage 2018-04-16 09:48:39 +02:00
Adrien Jublan
8e7d48a789 Add sensor for tilt stage 2018-04-16 09:36:09 +02:00
Adrien Jublan
8e045ecef6 add couple and sensor but bug with sensor 2018-04-13 11:37:33 +02:00
Adrien Jublan
b12c2550a0 add mask in ty 2018-04-13 11:24:32 +02:00
Adrien Jublan
e9de4b629d add force and sensor for ty stage 2018-04-13 11:17:49 +02:00
Adrien Jublan
5d4b3dac37 add granite and sample 2018-04-12 16:06:46 +02:00
Adrien Jublan
191c050063 add stifness in nass 2018-04-12 15:25:24 +02:00
Adrien Jublan
53a7f97c7b solve errors 2018-04-12 15:16:28 +02:00
Adrien Jublan
b8da3c98ac all uncomment 2018-04-12 14:49:26 +02:00
Adrien Jublan
aecbf42a31 Uncomment correcteur-axe and remove joint in correcteur_axe 2018-04-12 14:40:19 +02:00
Adrien Jublan
340623aad3 add stifness in hexapod symetrie 2018-04-12 14:16:58 +02:00
Adrien Jublan
60d80f04db Uncomment Hexapod Symetrie 2018-04-12 11:39:20 +02:00
Adrien Jublan
45c107f26a solve error 2018-04-12 11:12:15 +02:00
Adrien Jublan
1c1e02d75d add data for Spindle_Stage and add two 6DOF joints 2018-04-12 11:02:45 +02:00
Adrien Jublan
45dce460a8 Second Joint between F2 and F2 2018-04-12 10:49:59 +02:00
Adrien Jublan
209e3e8343 first joint between F4 and F3 2018-04-12 10:28:03 +02:00
Adrien Jublan
0b266ce419 origins for bati_spindle 2018-04-12 09:42:34 +02:00
Adrien Jublan
fa2ea9573a Test Spindle 2018-04-11 16:40:31 +02:00
Adrien Jublan
c9e65651c3 Uncomment Spindle stage 2018-04-11 15:25:47 +02:00
Adrien Jublan
728eaa6a8f 6DOF joint in Tilt stage 2018-04-11 14:54:43 +02:00
Adrien Jublan
f92bd63fb8 change tz in ty in 6DOF joint in Translation stage 2018-04-11 14:41:38 +02:00
Adrien Jublan
ffb6046717 Comment out : Bati_spindle to Sample 2018-04-11 14:35:08 +02:00
Adrien Jublan
e9f7c0de23 add data in ry 2018-04-11 14:32:16 +02:00
Adrien Jublan
9b94dbbe82 change stiffness value for ty 2018-04-11 14:26:26 +02:00
Adrien Jublan
1d4884fa34 Change name : Hexapodg to Hexapod Symetrie 2018-04-11 14:24:15 +02:00
Unknown
091e9a9c8c Merge remote-tracking branch 'origin/master' 2018-04-11 14:02:20 +02:00
Thomas Dehaeze
9d73393b4f change comment 2018-04-11 13:59:47 +02:00
Adrien Jublan
17d617112c align 2018-04-11 13:59:22 +02:00
Thomas Dehaeze
b6b61bada2 nass 2018-04-11 13:44:50 +02:00
Thomas Dehaeze
4356288bfc add gitattributes files 2018-04-11 13:42:21 +02:00
Adrien Jublan
a86bed1079 error in damping 2018-04-11 11:33:57 +02:00
Adrien Jublan
a5519420a3 Debug c attribute 2018-04-11 11:09:14 +02:00
Adrien Jublan
97d24bc4aa Change tz to ty 2018-04-11 10:09:31 +02:00