Commit cfcb77df authored by Stephen Scott's avatar Stephen Scott
Browse files

Minor changes to demo example

parent b3eab80f

src/specification/demo/Demo_Example.mdl

+35 −66
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Model { 
    NumRootInports	    0

    NumRootOutports	    0

    ParameterArgumentNames  ""

    ComputedModelVersion    "1.14"

    ComputedModelVersion    "1.15"

    NumModelReferences	    0

    NumTestPointedSignals   0

    NumProvidedFunctions    0
@@ -76,9 +76,9 @@ Model { 
	  ViewObjType		  "SimulinkTopLevel"

	  LoadSaveID		  "0"

	  Extents		  [858.0, 805.0]

	  ZoomFactor		  [1.4095981106290385]

	  Offset		  [250.06809111445784, 55.457619540662677]

	  SceneRectInView	  [250.06809111445784, 55.457619540662677, 608.68413027108431, 571.08476091867465]

	  ZoomFactor		  [1.1942446043165467]

	  Offset		  [173.2771084337349, 23.966867469879503]

	  SceneRectInView	  [173.2771084337349, 23.966867469879503, 718.44578313253021, 674.066265060241]

	}

	Object {

	  $ObjectID		  6
@@ -143,9 +143,9 @@ Model { 
  ModifiedByFormat	  "%<Auto>"

  LastModifiedBy	  "super"

  ModifiedDateFormat	  "%<Auto>"

  LastModifiedDate	  "Wed Jun 03 18:49:46 2020"

  RTWModifiedTimeStamp	  513110984

  ModelVersionFormat	  "1.%<AutoIncrement:14>"

  LastModifiedDate	  "Wed Jul 08 15:40:58 2020"

  RTWModifiedTimeStamp	  516123592

  ModelVersionFormat	  "1.%<AutoIncrement:15>"

  SampleTimeColors	  off

  SampleTimeAnnotations	  off

  LibraryLinkDisplay	  "disabled"
@@ -1059,6 +1059,14 @@ Model { 
      FramePeriod	      "inf"

      PreserveConstantTs      off

    }

    Block {

      BlockType		      Display

      Format		      "short"

      Decimation	      "10"

      Floating		      off

      Lockdown		      off

      SampleTime	      "-1"

    }

    Block {

      BlockType		      Inport

      Port		      "1"
@@ -1112,10 +1120,6 @@ Model { 
      OutputWhenUnconnectedValue "0"

      VectorParamsAs1DForOutWhenUnconnected on

    }

    Block {

      BlockType		      Scope

      DefaultConfigurationName "Simulink.scopes.TimeScopeBlockCfg"

    }

    Block {

      BlockType		      SubSystem

      ShowPortLabels	      "FromPortIcon"
@@ -1215,15 +1219,15 @@ Model { 
    TiledPaperMargins	    [0.500000, 0.500000, 0.500000, 0.500000]

    TiledPageScale	    1

    ShowPageBoundaries	    off

    ZoomFactor		    "141"

    ZoomFactor		    "119"

    ReportName		    "simulink-default.rpt"

    SIDHighWatermark	    "100"

    SIDHighWatermark	    "102"

    SimulinkSubDomain	    "Simulink"

    Block {

      BlockType		      KnobBlock

      Name		      "Knob"

      SID		      "94"

      Position		      [260, 231, 370, 346]

      Position		      [185, 231, 295, 346]

      ZOrder		      213

      ShowName		      off

      BindingPersistence      "DataTag1"
@@ -1232,63 +1236,28 @@ Model { 
      BlockType		      KnobBlock

      Name		      "Knob1"

      SID		      "95"

      Position		      [260, 336, 370, 451]

      Position		      [185, 376, 295, 491]

      ZOrder		      214

      ShowName		      off

      BindingPersistence      "DataTag2"

    }

    Block {

      BlockType		      Scope

      BlockType		      Display

      Name		      "c_Sensor_Trip_1"

      SID		      "98"

      SID		      "101"

      Ports		      [1]

      Position		      [795, 274, 825, 306]

      ZOrder		      215

      ScopeSpecificationString "Simulink.scopes.TimeScopeBlockCfg('CurrentConfiguration', extmgr.ConfigurationSet(extm"

      "gr.Configuration('Core','General UI',true),extmgr.Configuration('Core','Source UI',true),extmgr.Configuration('S"

      "ources','WiredSimulink',true),extmgr.Configuration('Visuals','Time Domain',true,'SerializedDisplays',{struct('Mi"

      "nYLimReal','-1.00000','MaxYLimReal','1.00000','YLabelReal','','MinYLimMag','0.00000','MaxYLimMag','1.00000','Leg"

      "endVisibility','off','XGrid',true,'YGrid',true,'PlotMagPhase',false,'AxesColor',[0 0 0],'AxesTickColor',[0.68627"

      "4509803922 0.686274509803922 0.686274509803922],'ColorOrder',[1 1 0.0666666666666667;0.0745098039215686 0.623529"

      "411764706 1;1 0.411764705882353 0.16078431372549;0.392156862745098 0.831372549019608 0.0745098039215686;0.717647"

      "058823529 0.274509803921569 1;0.0588235294117647 1 1;1 0.0745098039215686 0.650980392156863],'Title','%<SignalLa"

      "bel>','LinePropertiesCache',{{}},'UserDefinedChannelNames',{{}},'NumLines',1,'LineNames',{{'f_Sensor_Trip_1'}},'"

      "ShowContent',true,'Placement',1)},'DisplayPropertyDefaults',struct('MinYLimReal','-1.00000','MaxYLimReal','1.000"

      "00','YLabelReal','','MinYLimMag','0.00000','MaxYLimMag','1.00000','LegendVisibility','off','XGrid',true,'YGrid',"

      "true,'PlotMagPhase',false,'AxesColor',[0 0 0],'AxesTickColor',[0.686274509803922 0.686274509803922 0.68627450980"

      "3922],'ColorOrder',[0.0745098039215686 0.623529411764706 1;1 0.411764705882353 0.16078431372549;1 1 0.0666666666"

      "666667;0.717647058823529 0.274509803921569 1;0.392156862745098 0.831372549019608 0.0745098039215686;0.0588235294"

      "117647 1 1;1 0.0745098039215686 0.650980392156863])),extmgr.Configuration('Tools','Plot Navigation',true),extmgr"

      ".Configuration('Tools','Measurements',true,'Version','2020a')),'Version','2020a','Position',[2223 498 560 420])"

      NumInputPorts	      "1"

      Floating		      off

      Position		      [790, 275, 880, 305]

      ZOrder		      217

      Decimation	      "1"

    }

    Block {

      BlockType		      Scope

      BlockType		      Display

      Name		      "c_Sensor_Trip_2"

      SID		      "99"

      SID		      "102"

      Ports		      [1]

      Position		      [795, 374, 825, 406]

      ZOrder		      216

      ScopeSpecificationString "Simulink.scopes.TimeScopeBlockCfg('CurrentConfiguration', extmgr.ConfigurationSet(extm"

      "gr.Configuration('Core','General UI',true),extmgr.Configuration('Core','Source UI',true),extmgr.Configuration('S"

      "ources','WiredSimulink',true,'DataLoggingVariableName','ScopeData1'),extmgr.Configuration('Visuals','Time Domain"

      "',true,'SerializedDisplays',{struct('MinYLimReal','-0.125','MaxYLimReal','1.125','YLabelReal','','MinYLimMag','0"

      ".00000','MaxYLimMag','1.125','LegendVisibility','off','XGrid',true,'YGrid',true,'PlotMagPhase',false,'AxesColor'"

      ",[0 0 0],'AxesTickColor',[0.686274509803922 0.686274509803922 0.686274509803922],'ColorOrder',[1 1 0.06666666666"

      "66667;0.0745098039215686 0.623529411764706 1;1 0.411764705882353 0.16078431372549;0.392156862745098 0.8313725490"

      "19608 0.0745098039215686;0.717647058823529 0.274509803921569 1;0.0588235294117647 1 1;1 0.0745098039215686 0.650"

      "980392156863],'Title','%<SignalLabel>','LinePropertiesCache',{{}},'UserDefinedChannelNames',{{}},'NumLines',1,'L"

      "ineNames',{{'f_Sensor_Trip_2'}},'ShowContent',true,'Placement',1)},'DisplayPropertyDefaults',struct('MinYLimReal"

      "','-0.125','MaxYLimReal','1.125','YLabelReal','','MinYLimMag','0.00000','MaxYLimMag','1.125','LegendVisibility',"

      "'off','XGrid',true,'YGrid',true,'PlotMagPhase',false,'AxesColor',[0 0 0],'AxesTickColor',[0.686274509803922 0.68"

      "6274509803922 0.686274509803922],'ColorOrder',[0.0745098039215686 0.623529411764706 1;1 0.411764705882353 0.1607"

      "8431372549;1 1 0.0666666666666667;0.717647058823529 0.274509803921569 1;0.392156862745098 0.831372549019608 0.07"

      "45098039215686;0.0588235294117647 1 1;1 0.0745098039215686 0.650980392156863])),extmgr.Configuration('Tools','Pl"

      "ot Navigation',true),extmgr.Configuration('Tools','Measurements',true,'Version','2020a')),'Version','2020a','Pos"

      "ition',[2783 498 560 420])"

      NumInputPorts	      "1"

      Floating		      off

      Position		      [790, 415, 880, 445]

      ZOrder		      218

      Decimation	      "1"

    }

    Block {

      BlockType		      SubSystem
@@ -1535,7 +1504,7 @@ Model { 
      Name		      "f_Sensor_Trip_2"

      SID		      "82"

      Ports		      [1, 1]

      Position		      [520, 351, 720, 429]

      Position		      [520, 391, 720, 469]

      ZOrder		      197

      RequestExecContextInheritance off

      ContentPreviewEnabled   on
@@ -1774,18 +1743,18 @@ Model { 
      BlockType		      Constant

      Name		      "m_Sensor_Signal_1"

      SID		      "96"

      Position		      [420, 275, 450, 305]

      Position		      [355, 275, 450, 305]

      ZOrder		      211

      Value		      "37.79796600341797"

      Value		      "40"

      OutDataTypeStr	      "int16"

    }

    Block {

      BlockType		      Constant

      Name		      "m_Sensor_Signal_2"

      SID		      "97"

      Position		      [420, 375, 450, 405]

      Position		      [355, 415, 450, 445]

      ZOrder		      212

      Value		      "45.16112772623698"

      Value		      "75"

      OutDataTypeStr	      "int16"

    }

    Line {
@@ -1803,7 +1772,7 @@ Model { 
      DstPort		      1

    }

    Line {

      ZOrder		      30

      ZOrder		      35

      SrcBlock		      "f_Sensor_Trip_2"

      SrcPort		      1

      DstBlock		      "c_Sensor_Trip_2"

src/specification/demo/Demo_Example_With_SF.mdl

+38 −69
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Model { 
    NumRootInports	    0

    NumRootOutports	    0

    ParameterArgumentNames  ""

    ComputedModelVersion    "1.18"

    ComputedModelVersion    "1.20"

    NumModelReferences	    0

    NumTestPointedSignals   0

    NumProvidedFunctions    0
@@ -93,9 +93,9 @@ Model { 
	  ViewObjType		  "SimulinkTopLevel"

	  LoadSaveID		  "0"

	  Extents		  [858.0, 805.0]

	  ZoomFactor		  [1.2227094338754043]

	  Offset		  [233.55001882530121, -49.686958772590344]

	  SceneRectInView	  [233.55001882530121, -49.686958772590344, 701.72027484939758, 658.37391754518069]

	  ZoomFactor		  [1.1066666666666667]

	  Offset		  [172.34939759036143, -71.704819277108413]

	  SceneRectInView	  [172.34939759036143, -71.704819277108413, 775.30120481927713, 727.40963855421683]

	}

	Object {

	  $ObjectID		  7
@@ -144,8 +144,8 @@ Model { 
	  UserData		  ""

	  Floating		  [0]

	  DockPosition		  "Bottom"

	  Width			  [892]

	  Height		  [215]

	  Width			  [278]

	  Height		  [128]

	  Minimized		  "Unset"

	}

	Object {
@@ -188,9 +188,9 @@ Model { 
  ModifiedByFormat	  "%<Auto>"

  LastModifiedBy	  "super"

  ModifiedDateFormat	  "%<Auto>"

  LastModifiedDate	  "Wed Jun 03 18:49:52 2020"

  RTWModifiedTimeStamp	  513109738

  ModelVersionFormat	  "1.%<AutoIncrement:18>"

  LastModifiedDate	  "Wed Jul 08 15:41:10 2020"

  RTWModifiedTimeStamp	  516123573

  ModelVersionFormat	  "1.%<AutoIncrement:20>"

  SampleTimeColors	  off

  SampleTimeAnnotations	  off

  LibraryLinkDisplay	  "disabled"
@@ -1130,6 +1130,14 @@ Model { 
      FramePeriod	      "inf"

      PreserveConstantTs      off

    }

    Block {

      BlockType		      Display

      Format		      "short"

      Decimation	      "10"

      Floating		      off

      Lockdown		      off

      SampleTime	      "-1"

    }

    Block {

      BlockType		      FunctionCaller

      FunctionPrototype	      "y=f(x)"
@@ -1144,10 +1152,6 @@ Model { 
      TickInterval	      "auto"

      ScaleType		      "Linear"

    }

    Block {

      BlockType		      Scope

      DefaultConfigurationName "Simulink.scopes.TimeScopeBlockCfg"

    }

    Block {

      BlockType		      SubSystem

      ShowPortLabels	      "FromPortIcon"
@@ -1270,15 +1274,15 @@ Model { 
    TiledPaperMargins	    [0.500000, 0.500000, 0.500000, 0.500000]

    TiledPageScale	    1

    ShowPageBoundaries	    off

    ZoomFactor		    "122"

    ZoomFactor		    "111"

    ReportName		    "simulink-default.rpt"

    SIDHighWatermark	    "127"

    SIDHighWatermark	    "129"

    SimulinkSubDomain	    "Simulink"

    Block {

      BlockType		      KnobBlock

      Name		      "Knob"

      SID		      "102"

      Position		      [245, 231, 355, 346]

      Position		      [185, 231, 295, 346]

      ZOrder		      209

      ShowName		      off

      BindingPersistence      "DataTag1"
@@ -1287,63 +1291,28 @@ Model { 
      BlockType		      KnobBlock

      Name		      "Knob1"

      SID		      "103"

      Position		      [245, 341, 355, 456]

      Position		      [185, 366, 295, 481]

      ZOrder		      210

      ShowName		      off

      BindingPersistence      "DataTag2"

    }

    Block {

      BlockType		      Scope

      BlockType		      Display

      Name		      "c_Sensor_Trip_1"

      SID		      "100"

      SID		      "128"

      Ports		      [1]

      Position		      [870, 274, 900, 306]

      ZOrder		      207

      ScopeSpecificationString "Simulink.scopes.TimeScopeBlockCfg('CurrentConfiguration', extmgr.ConfigurationSet(extm"

      "gr.Configuration('Core','General UI',true),extmgr.Configuration('Core','Source UI',true),extmgr.Configuration('S"

      "ources','WiredSimulink',true),extmgr.Configuration('Visuals','Time Domain',true,'SerializedDisplays',{struct('Mi"

      "nYLimReal','-0.125','MaxYLimReal','1.125','YLabelReal','','MinYLimMag','0.00000','MaxYLimMag','1.125','LegendVis"

      "ibility','off','XGrid',true,'YGrid',true,'PlotMagPhase',false,'AxesColor',[0 0 0],'AxesTickColor',[0.68627450980"

      "3922 0.686274509803922 0.686274509803922],'ColorOrder',[1 1 0.0666666666666667;0.0745098039215686 0.623529411764"

      "706 1;1 0.411764705882353 0.16078431372549;0.392156862745098 0.831372549019608 0.0745098039215686;0.717647058823"

      "529 0.274509803921569 1;0.0588235294117647 1 1;1 0.0745098039215686 0.650980392156863],'Title','%<SignalLabel>',"

      "'LinePropertiesCache',{{}},'UserDefinedChannelNames',{{}},'NumLines',1,'LineNames',{{'f_Sensor_Trip_1'}},'ShowCo"

      "ntent',true,'Placement',1)},'DisplayPropertyDefaults',struct('MinYLimReal','-0.125','MaxYLimReal','1.125','YLabe"

      "lReal','','MinYLimMag','0.00000','MaxYLimMag','1.125','LegendVisibility','off','XGrid',true,'YGrid',true,'PlotMa"

      "gPhase',false,'AxesColor',[0 0 0],'AxesTickColor',[0.686274509803922 0.686274509803922 0.686274509803922],'Color"

      "Order',[0.0745098039215686 0.623529411764706 1;1 0.411764705882353 0.16078431372549;1 1 0.0666666666666667;0.717"

      "647058823529 0.274509803921569 1;0.392156862745098 0.831372549019608 0.0745098039215686;0.0588235294117647 1 1;1"

      " 0.0745098039215686 0.650980392156863])),extmgr.Configuration('Tools','Plot Navigation',true),extmgr.Configurati"

      "on('Tools','Measurements',true,'Version','2020a')),'Version','2020a','Position',[2342 271 560 420])"

      NumInputPorts	      "1"

      Floating		      off

      Position		      [845, 275, 935, 305]

      ZOrder		      211

      Decimation	      "1"

    }

    Block {

      BlockType		      Scope

      BlockType		      Display

      Name		      "c_Sensor_Trip_2"

      SID		      "101"

      SID		      "129"

      Ports		      [1]

      Position		      [870, 379, 900, 411]

      ZOrder		      208

      ScopeSpecificationString "Simulink.scopes.TimeScopeBlockCfg('CurrentConfiguration', extmgr.ConfigurationSet(extm"

      "gr.Configuration('Core','General UI',true),extmgr.Configuration('Core','Source UI',true),extmgr.Configuration('S"

      "ources','WiredSimulink',true,'DataLoggingVariableName','ScopeData1'),extmgr.Configuration('Visuals','Time Domain"

      "',true,'SerializedDisplays',{struct('MinYLimReal','-1.00000','MaxYLimReal','1.00000','YLabelReal','','MinYLimMag"

      "','0.00000','MaxYLimMag','1.00000','LegendVisibility','off','XGrid',true,'YGrid',true,'PlotMagPhase',false,'Axes"

      "Color',[0 0 0],'AxesTickColor',[0.686274509803922 0.686274509803922 0.686274509803922],'ColorOrder',[1 1 0.06666"

      "66666666667;0.0745098039215686 0.623529411764706 1;1 0.411764705882353 0.16078431372549;0.392156862745098 0.8313"

      "72549019608 0.0745098039215686;0.717647058823529 0.274509803921569 1;0.0588235294117647 1 1;1 0.0745098039215686"

      " 0.650980392156863],'Title','%<SignalLabel>','LinePropertiesCache',{{}},'UserDefinedChannelNames',{{}},'NumLines"

      "',1,'LineNames',{{'f_Sensor_Trip_2'}},'ShowContent',true,'Placement',1)},'DisplayPropertyDefaults',struct('MinYL"

      "imReal','-1.00000','MaxYLimReal','1.00000','YLabelReal','','MinYLimMag','0.00000','MaxYLimMag','1.00000','Legend"

      "Visibility','off','XGrid',true,'YGrid',true,'PlotMagPhase',false,'AxesColor',[0 0 0],'AxesTickColor',[0.68627450"

      "9803922 0.686274509803922 0.686274509803922],'ColorOrder',[0.0745098039215686 0.623529411764706 1;1 0.4117647058"

      "82353 0.16078431372549;1 1 0.0666666666666667;0.717647058823529 0.274509803921569 1;0.392156862745098 0.83137254"

      "9019608 0.0745098039215686;0.0588235294117647 1 1;1 0.0745098039215686 0.650980392156863])),extmgr.Configuration"

      "('Tools','Plot Navigation',true),extmgr.Configuration('Tools','Measurements',true,'Version','2020a')),'Version',"

      "'2020a','Position',[2902 270 560 420])"

      NumInputPorts	      "1"

      Floating		      off

      Position		      [845, 405, 935, 435]

      ZOrder		      212

      Decimation	      "1"

    }

    Block {

      BlockType		      FunctionCaller
@@ -1361,7 +1330,7 @@ Model { 
      Name		      "f_Sensor_Trip_2"

      SID		      "92"

      Ports		      [1, 1]

      Position		      [485, 356, 795, 434]

      Position		      [485, 381, 795, 459]

      ZOrder		      200

      FunctionPrototype	      "c_Sensor_Trip_i = f_Sensor_Trip_i(m_Sensor_Signal_i)"

      InputArgumentSpecifications "int16(1)"
@@ -1630,29 +1599,29 @@ Model { 
      BlockType		      Constant

      Name		      "m_Sensor_Signal_1"

      SID		      "95"

      Position		      [405, 275, 435, 305]

      Position		      [340, 275, 435, 305]

      ZOrder		      202

      Value		      "38.8339106241862"

      Value		      "40"

      OutDataTypeStr	      "int16"

    }

    Block {

      BlockType		      Constant

      Name		      "m_Sensor_Signal_2"

      SID		      "99"

      Position		      [405, 380, 435, 410]

      Position		      [340, 405, 435, 435]

      ZOrder		      206

      Value		      "66.0880839029948"

      Value		      "75"

      OutDataTypeStr	      "int16"

    }

    Line {

      ZOrder		      41

      ZOrder		      45

      SrcBlock		      "f_Sensor_Trip_1"

      SrcPort		      1

      DstBlock		      "c_Sensor_Trip_1"

      DstPort		      1

    }

    Line {

      ZOrder		      42

      ZOrder		      46

      SrcBlock		      "f_Sensor_Trip_2"

      SrcPort		      1

      DstBlock		      "c_Sensor_Trip_2"