diff --git a/implementation/SCARA/02_physics/scara_physics.emx b/implementation/SCARA/02_physics/scara_physics.emx
index 6bdf850..d8a3874 100644
--- a/implementation/SCARA/02_physics/scara_physics.emx
+++ b/implementation/SCARA/02_physics/scara_physics.emx
@@ -8,7 +8,7 @@
0
False
C:\users\wouter\My Documents\studie\ma\mahd\implementation\SCARA\02_physics\scara_physics.emx
- 2020-7-14 18:34:19
+ 2020-7-15 11:18:58
parameters
@@ -360,7 +360,7 @@ equations
state = int(p.e);
p.f = state / i;
implementation_end;
- inverse_kinematics 312 32
+ inverse_kinematics 304 32
description '
4.8
@@ -1313,7 +1313,7 @@ implementation_end;
equations
collect (output) = input;
implementation_end;
- Submodel3 344 480
+ Submodel3 352 480
description '4.0
Template\Submodel-Equation.emx
1
@@ -1338,8 +1338,8 @@ Enter your equations here. You can use the Toolbar buttons at the top ( Add , f(
*/
parameters
real density = 1400 {kg/m3};
- real dimension[3] = [0.005;0.01;0.065] {m};
- real initial_position[2] = [0;0.0325] {m};
+ real dimension[3] = [0.005;0.065;0.01] {m};
+ real initial_position[2] = [0.0325;0] {m};
real initial_angle = 0 {rad};
variables
real body_angle[3];
@@ -1357,8 +1357,8 @@ equations
body_angle = [angle;0;0];
position = int(velocity,initial_position);
body_position = [0; position[1];position[2]];
- joint1=[0;-dimension[3]/2];
- joint2=[0;dimension[3]/2];
+ joint1=[-dimension[2]/2;0];
+ joint2=[dimension[2]/2;0];
implementation_end;
Submodel4 744 480
@@ -1391,8 +1391,8 @@ Enter your equations here. You can use the Toolbar buttons at the top ( Add , f(
*/
parameters
real density = 1400 {kg/m3};
- real dimension[3] = [0.005;0.01;0.05] {m};
- real initial_position[2] = [0.0;0.09] {m};
+ real dimension[3] = [0.005;0.05;0.01] {m};
+ real initial_position[2] = [0.09;0.0] {m};
real initial_angle = 0.0 {rad};
variables
real body_angle[3];
@@ -1410,8 +1410,8 @@ equations
body_angle = [angle;0;0];
position = int(velocity,initial_position);
body_position = [0; position[1];position[2]];
- joint1=[0;-dimension[3]/2];
- joint2=[0;dimension[3]/2];
+ joint1=[-dimension[2]/2;0];
+ joint2=[dimension[2]/2;0];
implementation_end;
TF 504 288
@@ -1901,8 +1901,8 @@ implementation_end;
false
- -0.07410853798627151
- 0.0
+ -0.04357977129155497
+ 0.09
true
3
@@ -1910,8 +1910,8 @@ implementation_end;
- -0.08
- 0.12000000000000001
+ -0.010000000000000004
+ 0.09
true
1
@@ -1953,7 +1953,7 @@ implementation_end;
GraphPlot
- 3
+ 2
false
16777215
true
@@ -2021,7 +2021,7 @@ implementation_end;
0.0
- 20.0
+ 10.0
true
3
@@ -2094,7 +2094,7 @@ implementation_end;
D3DPlot
- 2
+ 3
false
16777215
true
@@ -2701,36 +2701,36 @@ implementation_end;
Camera Looking at Origin
- 3.40085013905783
+ 3.38324006301254
- 0.342236040003864
+ -0.579670639853894
- 1.21109282816646
+ 1.16932529227831
- -0.937843447259703
+ -0.932987163169101
- -0.0943775275033589
+ 0.159854239065772
- -0.33397986576198
+ -0.322461742869407
- -0.332301512200796
+ -0.317830371400678
- -0.033440330791642
+ 0.0544557676438669
- 0.942580208399057
+ 0.946582497400847
Direct3D
@@ -2997,11 +2997,11 @@ implementation_end;
Submodel3\dimension[2]
- 0.01
+ 0.065
Submodel3\dimension[3]
- 0.065
+ 0.01
true
@@ -3057,18 +3057,18 @@ implementation_end;
Submodel3\body_position[2]
- -0.03102478766698046
+ -0.003324486493480361
Submodel3\body_position[3]
- -0.009583285900524256
+ 0.0322803662779697
Submodel3\body_angle[1]
- 1.8698917335338603
+ 1.6732325429015287
Submodel3\body_angle[2]
@@ -3102,11 +3102,11 @@ implementation_end;
Submodel4\dimension[2]
- 0.01
+ 0.05
Submodel4\dimension[3]
- 0.05
+ 0.01
true
@@ -3162,18 +3162,18 @@ implementation_end;
Submodel4\body_position[2]
- -0.070814832000755
+ 0.01712950212216267
Submodel4\body_position[3]
- 0.004242842205841144
+ 0.07220095787584248
Submodel4\body_angle[1]
- 0.3583520801537476
+ 0.3105772067921056
Submodel4\body_angle[2]
@@ -3212,7 +3212,7 @@ implementation_end;
0
1
- 3
+ 2
Base
@@ -3222,17 +3222,17 @@ implementation_end;
Window 2
0
- 2
+ 3
Base
-
-0.126562 0.0935185 0.909896 0.916667
+
+0.125 0.0851852 0.904167 0.898148
-
-0.205729 0.141667 0.845833 0.835185
+
+0.171354 0.140741 0.811458 0.834259
@@ -3370,9 +3370,6 @@ implementation_end;
false
-
- time
-
@@ -3380,7 +3377,7 @@ implementation_end;
- 1.0
+ 0.125