Chanages for workshop

[eurobot/public.git] / src / mcl / matlab / reg_mcl.mdl

diff --git a/src/mcl/matlab/reg_mcl.mdl b/src/mcl/matlab/reg_mcl.mdl
index 9d561a3848d708f2eea81a780d5a72026d8bac9f..8dd7a855c906cebd33ec727e262123a4090e5d72 100644 (file)
--- a/src/mcl/matlab/reg_mcl.mdl
+++ b/src/mcl/matlab/reg_mcl.mdl
@@ -6,7 +6,7 @@ Model {
     NumRootInports         0
     NumRootOutports        0
     ParameterArgumentNames  ""
-    ComputedModelVersion    "1.339"
+    ComputedModelVersion    "1.341"
     NumModelReferences     0
     NumTestPointedSignals   0
   }
@@ -48,8 +48,8 @@ Model {
   ModifiedByFormat       "%<Auto>"
   LastModifiedBy         "wsh"
   ModifiedDateFormat     "%<Auto>"
-  LastModifiedDate       "Thu May  1 10:58:09 2008"
-  ModelVersionFormat     "1.%<AutoIncrement:339>"
+  LastModifiedDate       "Sun May  4 09:07:40 2008"
+  ModelVersionFormat     "1.%<AutoIncrement:341>"
   ConfigurationManager   "None"
   SimulationMode         "normal"
   LinearizationMsg       "none"
@@ -800,7 +800,7 @@ Model {
   }
   System {
     Name                   "reg_mcl"
-    Location               [252, 523, 1107, 1000]
+    Location               [4, 523, 859, 1000]
     Open                   on
     ModelBrowserVisibility  off
     ModelBrowserWidth      200
@@ -1065,8 +1065,8 @@ Model {
          Ports                   [1]
          Position                [410, 49, 440, 81]
          Floating                off
-         Location                [254, 56, 1109, 463]
-         Open                    on
+         Location                [254, 56, 1109, 218]
+         Open                    off
          NumInputPorts           "1"
          ZoomMode                "xonly"
          List {
@@ -1397,7 +1397,7 @@ Model {
          }
          System {
            Name                    "Motors"
-           Location                [194, 223, 649, 361]
+           Location                [197, 366, 934, 571]
            Open                    off
            ModelBrowserVisibility  off
            ModelBrowserWidth       200
@@ -1427,7 +1427,7 @@ Model {
              BlockType               Reference
              Name                    "Manual Switch"
              Ports                   [2, 1]
-             Position                [345, 32, 375, 68]
+             Position                [430, 32, 460, 68]
              SourceBlock             "simulink/Signal\nRouting/Manual Switch"
              SourceType              "Manual Switch"
              ShowPortLabels          "FromPortIcon"
@@ -1442,6 +1442,18 @@ Model {
              action                  "0"
              varsize                 off
            }
+           Block {
+             BlockType               RateTransition
+             Name                    "Rate Transition1"
+             Position                [325, 89, 365, 131]
+             X0                      "[0 0]"
+           }
+           Block {
+             BlockType               RateTransition
+             Name                    "Rate Transition2"
+             Position                [325, 19, 365, 61]
+             X0                      "[0 0]"
+           }
            Block {
              BlockType               RateLimiter
              Name                    "acc limit"
@@ -1463,14 +1475,27 @@ Model {
            Block {
              BlockType               Outport
              Name                    "(vl,vr)"
-             Position                [400, 43, 430, 57]
+             Position                [485, 43, 515, 57]
              IconDisplay             "Port number"
              BusOutputAsStruct       off
            }
            Line {
-             SrcBlock                "acc limit"
+             SrcBlock                "Rate Transition1"
              SrcPort                 1
+             Points                  [45, 0]
              DstBlock                "Manual Switch"
+             DstPort                 2
+           }
+           Line {
+             SrcBlock                "Rate Transition2"
+             SrcPort                 1
+             DstBlock                "Manual Switch"
+             DstPort                 1
+           }
+           Line {
+             SrcBlock                "acc limit"
+             SrcPort                 1
+             DstBlock                "Rate Transition2"
              DstPort                 1
            }
            Line {
@@ -1478,14 +1503,14 @@ Model {
              SrcPort                 1
              Points                  [20, 0]
              Branch {
-               Points                  [0, -10]
-               DstBlock                "acc limit"
+               Points                  [0, 60]
+               DstBlock                "Rate Transition1"
                DstPort                 1
              }
              Branch {
-               Points                  [0, 60; 100, 0]
-               DstBlock                "Manual Switch"
-               DstPort                 2
+               Points                  [0, -10]
+               DstBlock                "acc limit"
+               DstPort                 1
              }
            }
            Line {
@@ -2721,7 +2746,7 @@ Model {
       MaskIconOpaque         on
       MaskIconRotate         "none"
       MaskIconUnits          "autoscale"
-      MaskValueString        "path|desc.initpos|desc.wayconstraints|1"
+      MaskValueString        "path|desc.initpos|desc.wayconstraints|3"
       MaskTabNameString              ",,,"
     }
     Block {
@@ -2873,11 +2898,6 @@ Model {
       Ports                  []
       Position               [20, 15, 60, 55]
       IOType                 "viewer"
-      List {
-       ListType                IOSignalStrings
-       set0ParseKeys           "31"
-       set0Sigs                "Robot kinematics/speed2wheel:o1"
-      }
       Location               [345, 294, 669, 533]
       Open                   off
       NumInputPorts          "1"