Skip to content
Snippets Groups Projects
Commit bb4fff37 authored by Erik von Reis's avatar Erik von Reis
Browse files

Merge branch 'subsystem-part' into 'master' 

Adding an example subsystem part to the simulink section of CDS parts

See merge request !377
parents 3ddeb674 d52c5195
No related branches found
No related tags found
3 merge requests!439RCG 5.0 release fro deb 10,!387Merge master branch into debian packaging branch,!377Adding an example subsystem part to the simulink section of CDS parts
Hide whitespace changes
Inline Side-by-side
src/epics/simLink/CDS_PARTS.mdl
+ 130
− 27
View file @ bb4fff37
......@@ -2,10 +2,10 @@ Library {
Name "CDS_PARTS"
Version 9.3
SavedCharacterEncoding "UTF-8"
LogicAnalyzerPlugin "on"
WebScopes_FoundationPlugin "on"
DiagnosticSuppressor "on"
SLCCPlugin "on"
WebScopes_FoundationPlugin "on"
LogicAnalyzerPlugin "on"
NotesPlugin "on"
LibraryType "BlockLibrary"
EnableAccessToBaseWorkspace on
......@@ -24,7 +24,7 @@ Library {
$ObjectID 2
$ClassName "Simulink.WindowInfo"
IsActive [1]
Location [729.0, 64.0, 1036.0, 877.0]
Location [2110.0, 146.0, 1036.0, 877.0]
Object {
$PropName "ModelBrowserInfo"
$ObjectID 3
......@@ -48,10 +48,10 @@ Library {
$ClassName "Simulink.EditorInfo"
IsActive [1]
ViewObjType "SimulinkSubsys"
LoadSaveID "150"
Extents [735.0, 687.0]
ZoomFactor [1.5]
Offset [-17.569047619048717, 227.907229427522]
LoadSaveID "322"
Extents [747.0, 703.0]
ZoomFactor [1.25]
Offset [-149.32091882185546, 229.24999999999994]
}
Object {
$PropName "DockComponentsInfo"
......@@ -68,15 +68,15 @@ Library {
Height [480]
Minimized "Unset"
}
WindowState "AAAA/wAAAAD9AAAAAgAAAAAAAAD1AAAC8PwCAAAAA/sAAAAWAEQAbwBjAGsAVwBpAGQAZwBlAHQAMwEAAAAxAAAB+AAAA"
WindowState "AAAA/wAAAAD9AAAAAgAAAAAAAAD1AAAC+fwCAAAAA/sAAAAWAEQAbwBjAGsAVwBpAGQAZwBlAHQAMwEAAAAxAAAB+AAAA"
"AAAAAAA+wAAABYARABvAGMAawBXAGkAZABnAGUAdAA0AAAAAAD/////AAAAAAAAAAD7AAAAUgBHAEwAVQBFADIAIAB0AHIAZQBlACAAYwBvAG0Ac"
"ABvAG4AZQBuAHQALwBHAEwAVQBFADIAIAB0AHIAZQBlACAAYwBvAG0AcABvAG4AZQBuAHQBAAAAQAAAAvAAAACAAP///wAAAAEAAAAAAAAAAPwCA"
"ABvAG4AZQBuAHQALwBHAEwAVQBFADIAIAB0AHIAZQBlACAAYwBvAG0AcABvAG4AZQBuAHQBAAAAOQAAAvkAAABiAP///wAAAAEAAAAAAAAAAPwCA"
"AAAAfsAAABUAEcATABVAEUAMgA6AFAAcgBvAHAAZQByAHQAeQBJAG4AcwBwAGUAYwB0AG8AcgAvAFAAcgBvAHAAZQByAHQAeQAgAEkAbgBzAHAAZ"
"QBjAHQAbwByAAAAAAD/////AAABrAD///8AAAMFAAAC8AAAAAEAAAACAAAAAQAAAAL8AAAAAQAAAAIAAAAP/////wAAAAAA/////wAAAAAAAAAA/"
"QBjAHQAbwByAAAAAAD/////AAABrAD///8AAAMRAAAC+QAAAAEAAAACAAAAAQAAAAL8AAAAAQAAAAIAAAAP/////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/"
"////wEAAAGB/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA"
"////wEAAACA/////wAAAAAAAAAA/////wEAAADo/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/"
"////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA/////wEAAAE7/////wAAAAAAAAAA/"
"////wAAAAAA/////wAAAAAAAAAA/////wAAAAAA/////wAAAAAAAAAA"
}
}
HideAutomaticNames on
......@@ -86,9 +86,9 @@ Library {
ModifiedByFormat "%<Auto>"
LastModifiedBy "ezekiel.dohmen"
ModifiedDateFormat "%<Auto>"
LastModifiedDate "Tue Apr 12 10:14:15 2022"
RTWModifiedTimeStamp 571659248
ModelVersionFormat "1.%<AutoIncrement:404>"
LastModifiedDate "Tue May 31 15:00:36 2022"
RTWModifiedTimeStamp 575910028
ModelVersionFormat "1.%<AutoIncrement:405>"
SampleTimeColors off
SampleTimeAnnotations off
LibraryLinkDisplay "all"
......@@ -1035,6 +1035,25 @@ Library {
Block {
BlockType Ground
}
Block {
BlockType Inport
Port "1"
OutputFunctionCall off
OutMin "[]"
OutMax "[]"
OutDataTypeStr "Inherit: auto"
LockScale off
BusOutputAsStruct off
Unit "inherit"
PortDimensions "-1"
VarSizeSig "Inherit"
SampleTime "-1"
SignalType "auto"
SamplingMode "auto"
LatchByDelayingOutsideSignal off
LatchInputForFeedbackSignals off
Interpolate on
}
Block {
BlockType Logic
Operator "AND"
......@@ -1067,6 +1086,29 @@ Library {
BusObject "BusObject"
NonVirtualBus off
}
Block {
BlockType Outport
Port "1"
OutMin "[]"
OutMax "[]"
OutDataTypeStr "Inherit: auto"
LockScale off
BusOutputAsStruct off
Unit "inherit"
PortDimensions "-1"
VarSizeSig "Inherit"
SampleTime "-1"
SignalType "auto"
SamplingMode "auto"
EnsureOutportIsVirtual off
SourceOfInitialOutputValue "Dialog"
OutputWhenDisabled "held"
InitialOutput "[]"
MustResolveToSignalObject off
OutputWhenUnConnected off
OutputWhenUnconnectedValue "0"
VectorParamsAs1DForOutWhenUnconnected off
}
Block {
BlockType Product
Inputs "2"
......@@ -1192,7 +1234,7 @@ Library {
}
System {
Name "CDS_PARTS"
Location [729, 64, 1765, 941]
Location [2110, 146, 3146, 1023]
Open off
PortBlocksUseCompactNotation off
SetExecutionDomain off
......@@ -1207,9 +1249,9 @@ Library {
TiledPaperMargins [0.500000, 0.500000, 0.500000, 0.500000]
TiledPageScale 1
ShowPageBoundaries off
ZoomFactor "100"
ZoomFactor "125"
ReportName "simulink-default.rpt"
SIDHighWatermark "389"
SIDHighWatermark "392"
SimulinkSubDomain "Simulink"
Block {
BlockType SubSystem
......@@ -5047,8 +5089,8 @@ Library {
RequestExecContextInheritance off
System {
Name "Osc/Phase"
Location [729, 64, 1765, 941]
Open on
Location [2078, 203, 3114, 1080]
Open off
PortBlocksUseCompactNotation off
SetExecutionDomain off
ExecutionDomainType "Deduce"
......@@ -5979,8 +6021,8 @@ Library {
RequestExecContextInheritance off
System {
Name "simLinkParts"
Location [694, 249, 1730, 1296]
Open off
Location [2110, 146, 3146, 1023]
Open on
PortBlocksUseCompactNotation off
SetExecutionDomain off
ExecutionDomainType "Deduce"
......@@ -5994,7 +6036,7 @@ Library {
TiledPaperMargins [0.500000, 0.500000, 0.500000, 0.500000]
TiledPageScale 1
ShowPageBoundaries off
ZoomFactor "100"
ZoomFactor "125"
SimulinkSubDomain "Simulink"
Block {
BlockType Abs
......@@ -6086,13 +6128,14 @@ Library {
BackgroundColor "yellow"
ShowName off
AttributesFormatString "%<Description>"
LibraryVersion "1.281"
LibraryVersion "1.453"
UserDataPersistent on
UserData "DataTag58"
SourceBlock "simulink/Model-Wide\nUtilities/DocBlock"
SourceType "DocBlock"
SourceProductName "Simulink"
SourceProductBaseCode "SL"
ContentPreviewEnabled off
DocumentType "Text"
}
Block {
......@@ -6106,13 +6149,14 @@ Library {
BackgroundColor "yellow"
ShowName off
AttributesFormatString "%<Description>"
LibraryVersion "1.281"
LibraryVersion "1.453"
UserDataPersistent on
UserData "DataTag59"
SourceBlock "simulink/Model-Wide\nUtilities/DocBlock"
SourceType "DocBlock"
SourceProductName "Simulink"
SourceProductBaseCode "SL"
ContentPreviewEnabled off
DocumentType "Text"
}
Block {
......@@ -6126,15 +6170,62 @@ Library {
BackgroundColor "yellow"
ShowName off
AttributesFormatString "%<Description>"
LibraryVersion "1.281"
LibraryVersion "1.453"
UserDataPersistent on
UserData "DataTag60"
SourceBlock "simulink/Model-Wide\nUtilities/DocBlock"
SourceType "DocBlock"
SourceProductName "Simulink"
SourceProductBaseCode "SL"
ContentPreviewEnabled off
DocumentType "Text"
}
Block {
BlockType SubSystem
Name "ExampleSubsystem"
SID "390"
Ports [1, 1]
Position [10, 674, 110, 716]
ZOrder 1
RequestExecContextInheritance off
ContentPreviewEnabled on
System {
Name "ExampleSubsystem"
Location [2110, 146, 3146, 1023]
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 "input1"
SID "391"
Position [110, 103, 140, 117]
ZOrder -1
IconDisplay "Port number"
}
Block {
BlockType Outport
Name "output1"
SID "392"
Position [360, 103, 390, 117]
ZOrder -2
IconDisplay "Port number"
}
}
}
Block {
BlockType Fcn
Name "Fcn"
......@@ -6238,6 +6329,12 @@ Library {
LibraryVersion "1.2"
SourceBlock "cdsSqrt/Subsystem"
SourceType "SubSystem"
ShowPortLabels "FromPortIcon"
SystemSampleTime "-1"
GeneratePreprocessorConditionals off
AllowZeroVariantControls off
PropagateVariantConditions off
ContentPreviewEnabled off
}
Block {
BlockType Saturate
......@@ -6289,6 +6386,12 @@ Library {
LibraryVersion "1.4"
SourceBlock "cdsBitwise/Subsystem"
SourceType "SubSystem"
ShowPortLabels "FromPortIcon"
SystemSampleTime "-1"
GeneratePreprocessorConditionals off
AllowZeroVariantControls off
PropagateVariantConditions off
ContentPreviewEnabled off
}
Annotation {
SID "343"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment