diff --git a/implementation/SCARA/02_physics/scara_physics.emx b/implementation/SCARA/02_physics/scara_physics.emx
index d8a3874..85e72f7 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-15 11:18:58
+ 2020-7-15 11:32:27
parameters
@@ -35,7 +35,7 @@ initialequations
real mass = 1 {kg};';
type Submodel
ports
- power in p [2,1];
+ translation in p [2,1];
signal in mass {kg} ;
end;
icon bg ellipse bottom
@@ -96,7 +96,7 @@ implementation_end;
';
knot OneJunction
ports
- power knot duplicatable none p [2,1];
+ translation knot duplicatable none p [2,1];
signal knot out flow [2,1];
restrictions
causality constraint one_out p;
@@ -444,7 +444,7 @@ implementation_end;
';
type MSe
ports
- power out p;
+ rotation out p;
signal in effort;
restrictions
causality fixed out p;
@@ -531,7 +531,7 @@ implementation_end;
';
knot OneJunction
ports
- power knot duplicatable none p [2,1];
+ translation knot duplicatable none p [2,1];
signal knot out flow [2,1];
restrictions
causality constraint one_out p;
@@ -558,7 +558,7 @@ implementation_end;
';
knot OneJunction
ports
- power knot duplicatable none p [1];
+ rotation knot duplicatable none p [1];
signal knot out flow [1];
restrictions
causality constraint one_out p;
@@ -639,7 +639,7 @@ implementation_end;
';
knot OneJunction
ports
- power knot duplicatable none p [1];
+ rotation knot duplicatable none p [1];
signal knot out flow [1];
restrictions
causality constraint one_out p;
@@ -859,7 +859,7 @@ equations
pistate = int (pirate);
output = pistate + pdout;
implementation_end;
- PlusMinus1 632 400
+ PlusMinus1 616 400
description '4.01False
Signal\Block Diagram\PlusMinus.emx
2007-9-27 10:15:13
@@ -872,7 +872,7 @@ equations
end;
icon bg ellipse
figures
- ellipse 624 392 640 408 color 0 fill 16777215;
+ ellipse 608 392 624 408 color 0 fill 16777215;
end;
implementation eq
equations
@@ -1036,7 +1036,7 @@ equations
p1.e = transpose (r) * p2.e;
p2.f = r * p1.f;
implementation_end;
- RTF1 632 368
+ RTF1 616 368
description '
4.8
@@ -1056,7 +1056,7 @@ implementation_end;
end;
icon bg bottom
figures
- text 'RTF' 632 368 color 0 18 bold;
+ text 'RTF' 616 368 color 0 18 bold;
end;
implementation eq
/*
@@ -1630,7 +1630,7 @@ implementation_end;
';
knot ZeroJunction
ports
- power knot duplicatable none p [1];
+ rotation knot duplicatable none p [1];
signal knot out effort [1];
restrictions
causality constraint one_in p;
@@ -1657,7 +1657,7 @@ implementation_end;
';
knot ZeroJunction
ports
- power knot duplicatable none p [1];
+ rotation knot duplicatable none p [1];
signal knot out effort [1];
restrictions
causality constraint one_in p;
@@ -1807,8 +1807,6 @@ implementation_end;
time
- Submodel4\position[2]
- Submodel4\position[1]
Submodel3\body_position[1]
Submodel3\body_position[2]
Submodel3\body_position[3]
@@ -1829,6 +1827,8 @@ implementation_end;
Submodel4\body_position[3]
PlusMinus2\output
PlusMinus3\output
+ MSe2\effort
+ MSe1\effort
@@ -1901,25 +1901,51 @@ implementation_end;
false
- -0.04357977129155497
- 0.09
+ 0.0
+ 10.0
true
3
-
+
- -0.010000000000000004
- 0.09
+ -60.0
+ 140.0
true
1
-
+
+
+
+ -60.0
+ 140.0
+ true
+ 1
+
+
+ 3355111
+ 1
+ 6076255
+ 0
+ true
+ 1
+ 1
+ 1
+ true
+
+ true
+ time
+
+
+ true
+ MSe1\effort
+
+
6076255
1
@@ -1932,11 +1958,11 @@ implementation_end;
true
true
- Submodel4\position[1]
+ time
true
- Submodel4\position[2]
+ MSe2\effort
@@ -3057,18 +3083,18 @@ implementation_end;
Submodel3\body_position[2]
- -0.003324486493480361
+ -0.015591054468984419
Submodel3\body_position[3]
- 0.0322803662779697
+ 0.02839804369188481
Submodel3\body_angle[1]
- 1.6732325429015287
+ 2.0707634357697753
Submodel3\body_angle[2]
@@ -3162,18 +3188,18 @@ implementation_end;
Submodel4\body_position[2]
- 0.01712950212216267
+ -0.010135822953757957
Submodel4\body_position[3]
- 0.07220095787584248
+ 0.043352853018051335
Submodel4\body_angle[1]
- 0.3105772067921056
+ -0.5673063175192282
Submodel4\body_angle[2]
@@ -3377,7 +3403,7 @@ implementation_end;
- 0.125
+ 1.0