diff --git a/src/epics/simLink/CDS_PARTS.mdl b/src/epics/simLink/CDS_PARTS.mdl
index 01b631c5bc47b2c2d2150eb63a531961d394becc..f6f2593d76188e2706cc6a4de0229cc3ff761705 100644
--- a/src/epics/simLink/CDS_PARTS.mdl
+++ b/src/epics/simLink/CDS_PARTS.mdl
@@ -24,7 +24,7 @@ Library {
$ObjectID 2
$ClassName "Simulink.WindowInfo"
IsActive [1]
- Location [529.0, 27.0, 1036.0, 877.0]
+ Location [729.0, 64.0, 1036.0, 877.0]
Object {
$PropName "ModelBrowserInfo"
$ObjectID 3
@@ -86,9 +86,9 @@ Library {
ModifiedByFormat "%<Auto>"
LastModifiedBy "ezekiel.dohmen"
ModifiedDateFormat "%<Auto>"
- LastModifiedDate "Tue Apr 12 09:19:22 2022"
- RTWModifiedTimeStamp 571655951
- ModelVersionFormat "1.%<AutoIncrement:400>"
+ LastModifiedDate "Tue Apr 12 09:35:32 2022"
+ RTWModifiedTimeStamp 571656923
+ ModelVersionFormat "1.%<AutoIncrement:401>"
SampleTimeColors off
SampleTimeAnnotations off
LibraryLinkDisplay "all"
@@ -1192,7 +1192,7 @@ Library {
}
System {
Name "CDS_PARTS"
- Location [763, 59, 1799, 936]
+ Location [729, 64, 1765, 941]
Open off
PortBlocksUseCompactNotation off
SetExecutionDomain off
@@ -1209,7 +1209,7 @@ Library {
ShowPageBoundaries off
ZoomFactor "100"
ReportName "simulink-default.rpt"
- SIDHighWatermark "386"
+ SIDHighWatermark "388"
SimulinkSubDomain "Simulink"
Block {
BlockType SubSystem
@@ -4958,7 +4958,7 @@ Library {
RequestExecContextInheritance off
System {
Name "Osc/Phase"
- Location [529, 27, 1565, 904]
+ Location [729, 64, 1765, 941]
Open on
PortBlocksUseCompactNotation off
SetExecutionDomain off
@@ -5145,18 +5145,16 @@ Library {
}
Block {
BlockType Reference
- Name "GaussianNoiseGenerator"
- SID "383"
+ Name "Gaussian Noise Generator"
+ SID "388"
Tag "cdsGaussianNoiseGenerator"
- Description "Gaussian Noise Generator"
Ports [1, 1]
- Position [70, 578, 190, 632]
- ZOrder 10
+ Position [65, 584, 165, 626]
+ ZOrder 14
BackgroundColor "[1.000000, 0.576471, 0.435294]"
- HideAutomaticName off
AttributesFormatString "%<Tag>"
- LibraryVersion "1.5"
- SourceBlock "cdsNoise/Subsystem"
+ LibraryVersion "1.2"
+ SourceBlock "cdsGaussianNoise/Subsystem"
SourceType "SubSystem"
ShowPortLabels "FromPortIcon"
SystemSampleTime "-1"
@@ -5366,10 +5364,10 @@ Library {
DstPort 1
}
Line {
- ZOrder 6
+ ZOrder 7
SrcBlock "Ground3"
SrcPort 1
- DstBlock "GaussianNoiseGenerator"
+ DstBlock "Gaussian Noise Generator"
DstPort 1
}
Annotation {
diff --git a/src/epics/simLink/lib/cdsGaussianNoise.mdl b/src/epics/simLink/lib/cdsGaussianNoise.mdl
index 10afd18e770f68319cdeeda37613bcd65b4dfcd1..6889856b9686c98e24c4224e18f83ed833475f5d 100644
--- a/src/epics/simLink/lib/cdsGaussianNoise.mdl
+++ b/src/epics/simLink/lib/cdsGaussianNoise.mdl
@@ -24,7 +24,7 @@ Library {
$ObjectID 2
$ClassName "Simulink.WindowInfo"
IsActive [1]
- Location [688.0, 152.0, 716.0, 564.0]
+ Location [117.0, 61.0, 716.0, 564.0]
Object {
$PropName "ModelBrowserInfo"
$ObjectID 3
@@ -33,7 +33,7 @@ Library {
DockPosition "Left"
Width [50]
Height [50]
- Filter [8]
+ Filter [9]
Minimized "On"
}
Object {
@@ -49,7 +49,7 @@ Library {
IsActive [1]
ViewObjType "SimulinkTopLevel"
LoadSaveID "0"
- Extents [631.0, 374.0]
+ Extents [592.0, 374.0]
ZoomFactor [1.0]
Offset [0.0, 0.0]
}
@@ -72,9 +72,9 @@ Library {
"AAAAAAA+wAAABYARABvAGMAawBXAGkAZABnAGUAdAA0AAAAAAD/////AAAAAAAAAAD7AAAAUgBHAEwAVQBFADIAIAB0AHIAZQBlACAAYwBvAG0Ac"
"ABvAG4AZQBuAHQALwBHAEwAVQBFADIAIAB0AHIAZQBlACAAYwBvAG0AcABvAG4AZQBuAHQAAAAAAP////8AAACAAP///wAAAAEAAAAAAAAAAPwCA"
"AAAAfsAAABUAEcATABVAEUAMgA6AFAAcgBvAHAAZQByAHQAeQBJAG4AcwBwAGUAYwB0AG8AcgAvAFAAcgBvAHAAZQByAHQAeQAgAEkAbgBzAHAAZ"
- "QBjAHQAbwByAAAAAAD/////AAABrAD///8AAAKdAAABtwAAAAEAAAACAAAAAQAAAAL8AAAABAAAAAAAAAABAAAANgBjAG8AbABsAGEAcABzAGkAY"
+ "QBjAHQAbwByAAAAAAD/////AAABrAD///8AAAJ2AAABtwAAAAEAAAACAAAAAQAAAAL8AAAABAAAAAAAAAABAAAANgBjAG8AbABsAGEAcABzAGkAY"
"gBsAGUAUABhAG4AZQBsAFQAbwBvAGwAQgBhAHIATABlAGYAdAMAAAAA/////wAAAAAAAAAAAAAAAQAAAAEAAAA4AGMAbwBsAGwAYQBwAHMAaQBiA"
- "GwAZQBQAGEAbgBlAGwAVABvAG8AbABCAGEAcgBSAGkAZwBoAHQCAAAAAP////8AAAAAAAAAAAAAAAIAAAAP/////wAAAAAA/////wAAAAAAAAAA/"
+ "GwAZQBQAGEAbgBlAGwAVABvAG8AbABCAGEAcgBSAGkAZwBoAHQDAAAAAP////8AAAAAAAAAAAAAAAIAAAAP/////wAAAAAA/////wAAAAAAAAAA/"
"////wEAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/"
"////wEAAACK/////wAAAAAAAAAA/////wEAAADy/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/"
"////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wEAAAFK/////wAAAAAAAAAA/"
@@ -89,9 +89,9 @@ Library {
ModifiedByFormat "%<Auto>"
LastModifiedBy "ezekiel.dohmen"
ModifiedDateFormat "%<Auto>"
- LastModifiedDate "Mon Apr 11 16:43:38 2022"
- RTWModifiedTimeStamp 571596207
- ModelVersionFormat "1.%<AutoIncrement:1>"
+ LastModifiedDate "Tue Apr 12 09:35:50 2022"
+ RTWModifiedTimeStamp 571656945
+ ModelVersionFormat "1.%<AutoIncrement:3>"
SampleTimeColors off
SampleTimeAnnotations off
LibraryLinkDisplay "disabled"
@@ -1004,10 +1004,50 @@ Library {
OutputWhenUnconnectedValue "0"
VectorParamsAs1DForOutWhenUnconnected off
}
+ Block {
+ BlockType SubSystem
+ ShowPortLabels "FromPortIcon"
+ Permissions "ReadWrite"
+ PermitHierarchicalResolution "All"
+ TreatAsAtomicUnit off
+ MinAlgLoopOccurrences off
+ PropExecContextOutsideSubsystem off
+ ScheduleAs "Sample time"
+ SystemSampleTime "-1"
+ RTWSystemCode "Auto"
+ RTWFcnNameOpts "Auto"
+ RTWFileNameOpts "Auto"
+ FunctionInterfaceSpec "void_void"
+ FunctionWithSeparateData off
+ RTWMemSecFuncInitTerm "Inherit from model"
+ RTWMemSecFuncExecute "Inherit from model"
+ RTWMemSecDataConstants "Inherit from model"
+ RTWMemSecDataInternal "Inherit from model"
+ RTWMemSecDataParameters "Inherit from model"
+ SimViewingDevice off
+ DataTypeOverride "UseLocalSettings"
+ DataTypeOverrideAppliesTo "AllNumericTypes"
+ MinMaxOverflowLogging "UseLocalSettings"
+ Opaque off
+ MaskHideContents off
+ SFBlockType "NONE"
+ VariantControlMode "Expression"
+ Variant off
+ GeneratePreprocessorConditionals off
+ AllowZeroVariantControls off
+ PropagateVariantConditions off
+ TreatAsGroupedWhenPropagatingVariantConditions on
+ ContentPreviewEnabled off
+ IsWebBlock off
+ IsObserver off
+ Latency "0"
+ AutoFrameSizeCalculation off
+ IsWebBlockPanel off
+ }
}
System {
Name "cdsGaussianNoise"
- Location [688, 152, 1404, 716]
+ Location [117, 61, 833, 625]
Open on
PortBlocksUseCompactNotation off
SetExecutionDomain off
@@ -1024,7 +1064,7 @@ Library {
ShowPageBoundaries off
ZoomFactor "100"
ReportName "simulink-default.rpt"
- SIDHighWatermark "8"
+ SIDHighWatermark "11"
SimulinkSubDomain "Simulink"
Block {
BlockType Inport
@@ -1035,21 +1075,49 @@ Library {
IconDisplay "Port number"
}
Block {
- BlockType Reference
+ BlockType SubSystem
Name "Subsystem"
- SID "7"
+ SID "9"
Ports [1, 1]
- Position [235, 144, 315, 226]
- ZOrder 5
- LibraryVersion "1.5"
- SourceBlock "cdsNoise/Subsystem"
- SourceType "SubSystem"
- ShowPortLabels "FromPortIcon"
- SystemSampleTime "-1"
- GeneratePreprocessorConditionals off
- AllowZeroVariantControls off
- PropagateVariantConditions off
- ContentPreviewEnabled off
+ Position [230, 164, 330, 206]
+ ZOrder 7
+ RequestExecContextInheritance off
+ System {
+ Name "Subsystem"
+ Location [117, 61, 833, 625]
+ Open off
+ PortBlocksUseCompactNotation off
+ SetExecutionDomain off
+ ExecutionDomainType "Deduce"
+ ModelBrowserVisibility on
+ ModelBrowserWidth 200
+ ScreenColor "white"
+ PaperOrientation "landscape"
+ PaperPositionMode "auto"
+ PaperType "usletter"
+ PaperUnits "inches"
+ TiledPaperMargins [0.500000, 0.500000, 0.500000, 0.500000]
+ TiledPageScale 1
+ ShowPageBoundaries off
+ ZoomFactor "100"
+ SimulinkSubDomain "Simulink"
+ Block {
+ BlockType Inport
+ Name "Ground"
+ SID "10"
+ Position [110, 103, 140, 117]
+ ZOrder -1
+ IconDisplay "Port number"
+ }
+ Block {
+ BlockType Outport
+ Name "Noise"
+ SID "11"
+ Position [240, 103, 270, 117]
+ ZOrder -2
+ IconDisplay "Port number"
+ }
+ }
}
Block {
BlockType Outport
@@ -1060,14 +1128,14 @@ Library {
IconDisplay "Port number"
}
Line {
- ZOrder 3
+ ZOrder 8
SrcBlock "Ground"
SrcPort 1
DstBlock "Subsystem"
DstPort 1
}
Line {
- ZOrder 4
+ ZOrder 9
SrcBlock "Subsystem"
SrcPort 1
DstBlock "Noise"