diff --git a/implementation/SCARA/06_arm/arm_model-v2.emx b/implementation/SCARA/06_arm/arm_model-v2.emx
index f6f2826..e1de3ac 100644
--- a/implementation/SCARA/06_arm/arm_model-v2.emx
+++ b/implementation/SCARA/06_arm/arm_model-v2.emx
@@ -8,7 +8,7 @@
0
False
C:\users\wouter\My Documents\studie\ma\mahd\implementation\SCARA\06_arm\arm_model-v2.emx
- 2020-7-23 16:01:17
+ 2020-7-23 16:28:58
';
type 'Mainmodel-v2'
@@ -8538,7 +8538,7 @@ equations
0.0
- 6.0
+ 3.2420091467026997
true
3
@@ -9248,36 +9248,36 @@ equations
Camera Looking at Origin
- 0.211790609540361
+ 0.245976429808248
- -0.107655952853072
+ -0.0388302746466069
- 0.123737714793038
+ 0.0780771451714441
- -0.840897145443893
+ -0.976228248439824
- 0.426188883453037
+ 0.15372928256777
- -0.333549136418257
+ -0.152793045094702
- -0.297518598807634
+ -0.150933112017381
- 0.150790284066671
+ 0.0237678422676611
- 0.942732715882203
+ 0.988258207843825
Direct3D
@@ -9576,11 +9576,11 @@ equations
Body1\position[2]
- -0.017071802542194314
+ -0.013216742557477136
Body1\position[3]
- 0.0265923779880002
+ 0.02929685427745184
@@ -9591,11 +9591,11 @@ equations
Body1\R[2,3]
- -0.5021736062379976
+ -0.39150905335206887
Body1\R[3,3]
- 0.8647668293811487
+ 0.9201742558577516
@@ -9605,11 +9605,11 @@ equations
Body1\R[2,2]
- 0.8647668293811487
+ 0.9201742558577516
Body1\R[3,2]
- 0.5021736062379976
+ 0.39150905335206887
Matrix
@@ -9695,11 +9695,11 @@ equations
Body2\position[2]
- -0.010639024121723569
+ -0.010731870933632882
Body2\position[3]
- 0.006594217889494994
+ -0.006377522947254681
@@ -9710,11 +9710,11 @@ equations
Body2\R[2,3]
- 0.5249456675421719
+ -0.5128634791918395
Body2\R[3,3]
- 0.8511357389563098
+ 0.8584701810262496
@@ -9724,11 +9724,11 @@ equations
Body2\R[2,2]
- 0.8511357389563098
+ 0.8584701810262496
Body2\R[3,2]
- -0.5249456675421719
+ 0.5128634791918395
Matrix
@@ -9814,11 +9814,11 @@ equations
Body3\position[2]
- -0.03682020445746276
+ -0.03440839742237934
Body3\position[3]
- 0.041384334395577975
+ 0.016889663750438287
@@ -9829,11 +9829,11 @@ equations
Body3\R[2,3]
- -0.48276125099189626
+ -0.4003112042408226
Body3\R[3,3]
- 0.875752005159417
+ 0.9163792554173531
@@ -9843,11 +9843,11 @@ equations
Body3\R[2,2]
- 0.875752005159417
+ 0.9163792554173531
Body3\R[3,2]
- 0.48276125099189626
+ 0.4003112042408226
Matrix
@@ -9933,11 +9933,11 @@ equations
Body4\position[2]
- -0.033109209191929785
+ -0.02583103540960315
Body4\position[3]
- 0.0542093131266403
+ 0.05894321641561122
@@ -9948,11 +9948,11 @@ equations
Body4\R[2,3]
- 0.6245890404745712
+ -0.49847598509542
Body4\R[3,3]
- 0.7809536033075554
+ 0.8669035080579329
@@ -9962,11 +9962,11 @@ equations
Body4\R[2,2]
- 0.7809536033075554
+ 0.8669035080579329
Body4\R[3,2]
- -0.6245890404745712
+ 0.49847598509542
Matrix
@@ -10052,11 +10052,11 @@ equations
Body5\position[2]
- -0.004186627780447375
+ 0.0064755680322661725
Body5\position[3]
- 0.0310775428306494
+ 0.07751973284114312
@@ -10067,11 +10067,11 @@ equations
Body5\R[2,3]
- 0.6245890426846639
+ -0.4984759842502531
Body5\R[3,3]
- 0.7809536015399732
+ 0.8669035085439103
@@ -10081,11 +10081,11 @@ equations
Body5\R[2,2]
- 0.7809536015399732
+ 0.8669035085439103
Body5\R[3,2]
- -0.6245890426846639
+ 0.4984759842502531
Matrix
@@ -10120,11 +10120,11 @@ equations
Body6\position[2]
- 0.0054542326865783565
+ 0.017244532392109463
Body6\position[3]
- 0.02336700049128123
+ 0.08371196768126417
@@ -10135,11 +10135,11 @@ equations
Body6\R[2,3]
- 0.6245890426846639
+ -0.4984759842502531
Body6\R[3,3]
- 0.7809536015399732
+ 0.8669035085439103
@@ -10149,11 +10149,11 @@ equations
Body6\R[2,2]
- 0.7809536015399732
+ 0.8669035085439103
Body6\R[3,2]
- -0.6245890426846639
+ 0.4984759842502531
Matrix
@@ -10165,17 +10165,7 @@ equations
false
false
-
- 16
- 0.0073
- 0.0073
- 0.135
- true
- true
- true
- true
- false
- true
+
1
@@ -10187,52 +10177,8 @@ equations
1
- true
-
-
- 1
-
-
- 1
-
-
- 1
-
-
- 1.0
-
-
- 1
-
-
- 1
-
-
- 1
-
-
-
-
- true
-
-
- 0.5
-
-
- 0.5
-
-
- 0.5
-
-
-
-
-
- 15
-
- false
false
- Cylinder
+ Reference Frame
@@ -10250,8 +10196,269 @@ equations
false
false
+
+ 16
+ 0.0073
+ 0.0073
+ 0.1
+ true
+ true
+ true
+ true
+ false
+ true
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+ true
+
+
+ 0.752941176470588
+
+
+ 0.752941176470588
+
+
+ 0.752941176470588
+
+
+ 1.0
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ true
+
+
+ 0.5
+
+
+ 0.5
+
+
+ 0.5
+
+
+
+
+
+ 15
+
+ false
+ false
+ Cylinder
+
+
+ 0.015
+
+
+
+
+
+ Bryant
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+ 16
+ 0.007
+ 0.007
+ 0.11
+ true
+ true
+ true
+ true
+ false
+ true
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+ true
+
+
+ 0
+
+
+ 0
+
+
+ 0.627450980392157
+
+
+ 1.0
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ true
+
+
+ 0.5
+
+
+ 0.5
+
+
+ 0.5
+
+
+
+
+
+ 15
+
+ false
+ false
+ Reference Frame
+
+
+ 0.013
+
+
+
+
+
+ Bryant
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
+
+ 16
+ 0.001
+ 0.007
+ 0.02
+ true
+ true
+ true
+ true
+ false
+ true
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+ true
+
+
+ 0
+
+
+ 0
+
+
+ 1
+
+
+ 1.0
+
+
+ 1
+
+
+ 1
+
+
+ 1
+
+
+
+
+ true
+
+
+ 0.5
+
+
+ 0.5
+
+
+ 0.5
+
+
+
+
+
+ 15
+
+ false
+ false
+ Cylinder
+
+
+ -0.05
+
+
+
+
+
+ Bryant
+
+ false
+ false
+ false
+ false
+ false
+ false
+
+
+
-
+
@@ -10331,7 +10538,7 @@ equations
0.0
- 6.0
+ 3.2420091467026997
true
3
@@ -10773,7 +10980,7 @@ equations
0.0
- 6.0
+ 3.2420091467026997
true
3
@@ -10944,7 +11151,7 @@ equations
0.0
- 6.0
+ 3.2420091467026997
true
3
@@ -11082,7 +11289,7 @@ equations
-0 0.0259259 1 1
+0.0770833 0.135185 0.827083 0.859259
0.075 0.0861111 0.917708 0.938889
@@ -11255,6 +11462,9 @@ equations
+
+ 1.0
+