From 3340436b5fe068718bdaec03bc4e8c0545f4fa21 Mon Sep 17 00:00:00 2001 From: Rolf Bork <rolf.bork@ligo.org> Date: Fri, 6 Sep 2013 21:34:28 +0000 Subject: [PATCH] Modified original GPS part and added to parts library. The modified part outputs GPS seconds, as requested in bugzilla entry 492. git-svn-id: https://redoubt.ligo-wa.caltech.edu/svn/advLigoRTS/trunk@3477 6dcd42c9-f523-4c6d-aada-af552506706e --- src/epics/simLink/CDS_PARTS.mdl | 270 ++++++------ src/epics/simLink/lib/cdsGps.mdl | 718 +++++++++++++++++++++++++++---- 2 files changed, 781 insertions(+), 207 deletions(-) diff --git a/src/epics/simLink/CDS_PARTS.mdl b/src/epics/simLink/CDS_PARTS.mdl index 0ecec7e08..f4d17f1d3 100644 --- a/src/epics/simLink/CDS_PARTS.mdl +++ b/src/epics/simLink/CDS_PARTS.mdl @@ -19,7 +19,7 @@ Library { $ObjectID 2 $ClassName "Simulink.WindowInfo" IsActive [1] - Location [560.0, 168.0, 1104.0, 967.0] + Location [458.0, 282.0, 1175.0, 1022.0] Object { $PropName "ModelBrowserInfo" $ObjectID 3 @@ -43,9 +43,9 @@ Library { IsActive [1] ViewObjType "SimulinkTopLevel" LoadSaveID "0" - Extents [1070.0, 805.0] - ZoomFactor [1.5824863174354966] - Offset [1.4031620553359971, -4.7784090909090935] + Extents [1141.0, 860.0] + ZoomFactor [1.5699999999999998] + Offset [-5.6843418860808015e-14, -5.6843418860808015e-14] } } } @@ -55,9 +55,9 @@ Library { ModifiedByFormat "%<Auto>" LastModifiedBy "rolfbork" ModifiedDateFormat "%<Auto>" - LastModifiedDate "Thu Jul 11 14:30:08 2013" - RTWModifiedTimeStamp 295453533 - ModelVersionFormat "1.%<AutoIncrement:352>" + LastModifiedDate "Fri Sep 06 14:32:17 2013" + RTWModifiedTimeStamp 300378735 + ModelVersionFormat "1.%<AutoIncrement:355>" ConfigurationManager "None" SampleTimeColors off SampleTimeAnnotations off @@ -884,7 +884,7 @@ Library { } System { Name "CDS_PARTS" - Location [560, 168, 1664, 1135] + Location [458, 282, 1633, 1304] Open on ModelBrowserVisibility off ModelBrowserWidth 200 @@ -896,15 +896,15 @@ Library { TiledPaperMargins [0.500000, 0.500000, 0.500000, 0.500000] TiledPageScale 1 ShowPageBoundaries off - ZoomFactor "158" + ZoomFactor "156" ReportName "simulink-default.rpt" - SIDHighWatermark "324" + SIDHighWatermark "326" Block { BlockType SubSystem Name "C Code" SID "1" Ports [] - Position [441, 341, 486, 409] + Position [366, 336, 411, 404] ZOrder -1 DropShadow on MinAlgLoopOccurrences off @@ -916,7 +916,7 @@ Library { MaskHideContents off System { Name "C Code" - Location [143, 576, 591, 1078] + Location [458, 282, 1633, 1304] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -952,19 +952,11 @@ Library { BackgroundColor "yellow" ShowName off AttributesFormatString "%<Description>" - LibraryVersion "1.216" + LibraryVersion "1.281" UserDataPersistent on UserData "DataTag0" SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" SourceType "DocBlock" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" DocumentType "Text" } Block { @@ -980,14 +972,6 @@ Library { LibraryVersion "1.3" SourceBlock "cdsFunctionCall/Subsystem" SourceType "SubSystem" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" } Block { BlockType Mux @@ -1019,7 +1003,7 @@ Library { Name "DAQ Channels" SID "6" Ports [] - Position [536, 341, 581, 409] + Position [461, 336, 506, 404] ZOrder -2 DropShadow on AncestorBlock "CDS_PARTS/C Code" @@ -1033,7 +1017,7 @@ Library { MaskHideContents off System { Name "DAQ Channels" - Location [175, 222, 1249, 1097] + Location [458, 282, 1633, 1304] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -1067,7 +1051,8 @@ Library { } Annotation { SID "6:2" - Name "#DAQ Channels\n\nONE_DAQ_CHANNEL 2048\nANOTHER_DAQ_CHANNEL 1024\nDAQ_CHANNEL_AT_DEFAULT_RATE" + Name "#DAQ Channels\n\nONE_DAQ_CHANNEL 2048\nANOTHER_DAQ_CHANNEL 1024\nSCIENCE_FRAME_CHAN* 1024\nUINT32_CHAN ui" + "nt32 2048\nDAQ_CHANNEL_AT_DEFAULT_RATE" Position [66, 131] HorizontalAlignment "left" DropShadow on @@ -1098,7 +1083,7 @@ Library { Name "EpicsParts" SID "8" Ports [] - Position [537, 118, 583, 187] + Position [462, 113, 508, 182] ZOrder -4 DropShadow on MinAlgLoopOccurrences off @@ -1110,7 +1095,7 @@ Library { MaskHideContents off System { Name "EpicsParts" - Location [560, 168, 1346, 1119] + Location [409, 171, 1584, 1193] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -1604,7 +1589,7 @@ Library { Name "Filters/\nGDS" SID "36" Ports [] - Position [346, 225, 393, 295] + Position [271, 220, 318, 290] ZOrder -5 DropShadow on FontSize 12 @@ -1618,7 +1603,7 @@ Library { MaskHideContents off System { Name "Filters/\nGDS" - Location [553, 386, 1351, 1302] + Location [409, 171, 1584, 1193] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -2015,7 +2000,7 @@ Library { Name "IO_PARTS" SID "55" Ports [] - Position [346, 118, 392, 187] + Position [271, 113, 317, 182] ZOrder -6 DropShadow on MinAlgLoopOccurrences off @@ -2027,7 +2012,7 @@ Library { MaskHideContents off System { Name "IO_PARTS" - Location [384, 22, 1354, 1240] + Location [409, 171, 1584, 1193] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -3774,7 +3759,7 @@ Library { Name "MatrixParts" SID "126" Ports [] - Position [443, 225, 489, 294] + Position [368, 220, 414, 289] ZOrder -7 DropShadow on MinAlgLoopOccurrences off @@ -3786,7 +3771,7 @@ Library { MaskHideContents off System { Name "MatrixParts" - Location [175, 222, 1249, 1097] + Location [741, 208, 1916, 1230] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -4185,7 +4170,7 @@ Library { Name "Osc/Phase" SID "150" Ports [] - Position [536, 226, 582, 295] + Position [461, 221, 507, 290] ZOrder -8 DropShadow on MinAlgLoopOccurrences off @@ -4197,7 +4182,7 @@ Library { MaskHideContents off System { Name "Osc/Phase" - Location [175, 222, 1249, 1097] + Location [409, 171, 1584, 1193] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -4414,12 +4399,79 @@ Library { } } } + Block { + BlockType SubSystem + Name "RT Links" + SID "326" + Ports [] + Position [561, 336, 606, 404] + ZOrder 2 + DropShadow on + AncestorBlock "CDS_PARTS/DAQ Channels" + LibraryVersion "*1.352" + MinAlgLoopOccurrences off + PropExecContextOutsideSubsystem off + RTWSystemCode "Auto" + FunctionWithSeparateData off + Opaque off + RequestExecContextInheritance off + MaskHideContents off + System { + Name "RT Links" + Location [458, 282, 1633, 1304] + Open off + ModelBrowserVisibility off + 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" + SIDHighWatermark "7" + SIDPrevWatermark "6" + Block { + BlockType Reference + Name "DocBlock6" + SID "326:6" + Description "GPS" + Ports [] + Position [122, 30, 162, 69] + ZOrder -1 + BackgroundColor "yellow" + ShowName off + AttributesFormatString "%<Description>" + LibraryVersion "1.281" + UserDataPersistent on + UserData "DataTag44" + SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" + SourceType "DocBlock" + DocumentType "Text" + } + Block { + BlockType Reference + Name "GPS" + SID "326:7" + Tag "cdsGps" + Ports [0, 1] + Position [20, 19, 60, 81] + ZOrder 1 + AttributesFormatString "%<Tag>" + LibraryVersion "1.6" + SourceBlock "cdsGps/Subsystem" + SourceType "SubSystem" + } + } + } Block { BlockType SubSystem Name "WatchDogs" SID "164" Ports [] - Position [345, 341, 390, 409] + Position [270, 336, 315, 404] ZOrder -9 DropShadow on MinAlgLoopOccurrences off @@ -4431,7 +4483,7 @@ Library { MaskHideContents off System { Name "WatchDogs" - Location [542, 44, 868, 966] + Location [409, 171, 1584, 1193] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -4460,14 +4512,6 @@ Library { FontSize 12 SourceBlock "cdsDacKill/Subsystem" SourceType "SubSystem" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" } Block { BlockType Reference @@ -4480,19 +4524,11 @@ Library { BackgroundColor "yellow" ShowName off AttributesFormatString "%<Description>" - LibraryVersion "1.216" + LibraryVersion "1.281" UserDataPersistent on - UserData "DataTag44" + UserData "DataTag45" SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" SourceType "DocBlock" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" DocumentType "Text" } Block { @@ -4506,19 +4542,11 @@ Library { BackgroundColor "yellow" ShowName off AttributesFormatString "%<Description>" - LibraryVersion "1.216" + LibraryVersion "1.281" UserDataPersistent on - UserData "DataTag45" + UserData "DataTag46" SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" SourceType "DocBlock" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" DocumentType "Text" } Block { @@ -4532,19 +4560,11 @@ Library { BackgroundColor "yellow" ShowName off AttributesFormatString "%<Description>" - LibraryVersion "1.216" + LibraryVersion "1.281" UserDataPersistent on - UserData "DataTag46" + UserData "DataTag47" SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" SourceType "DocBlock" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" DocumentType "Text" } Block { @@ -4558,19 +4578,11 @@ Library { BackgroundColor "yellow" ShowName off AttributesFormatString "%<Description>" - LibraryVersion "1.216" + LibraryVersion "1.281" UserDataPersistent on - UserData "DataTag47" + UserData "DataTag48" SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" SourceType "DocBlock" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" DocumentType "Text" } Block { @@ -4588,14 +4600,6 @@ Library { LibraryVersion "1.1" SourceBlock "cdsSusWd/Subsystem" SourceType "SubSystem" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" } Block { BlockType Reference @@ -4609,14 +4613,6 @@ Library { LibraryVersion "1.7" SourceBlock "SUS_IOP_WD/WD" SourceType "SubSystem" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" } Block { BlockType Reference @@ -4632,14 +4628,6 @@ Library { LibraryVersion "1.3" SourceBlock "cdsWD/Subsystem" SourceType "SubSystem" - ShowPortLabels "FromPortIcon" - SystemSampleTime "-1" - FunctionWithSeparateData "off" - RTWMemSecFuncInitTerm "Inherit from model" - RTWMemSecFuncExecute "Inherit from model" - RTWMemSecDataConstants "Inherit from model" - RTWMemSecDataInternal "Inherit from model" - RTWMemSecDataParameters "Inherit from model" } } } @@ -4648,7 +4636,7 @@ Library { Name "simLinkParts" SID "322" Ports [] - Position [441, 117, 488, 187] + Position [366, 112, 413, 182] ZOrder -10 DropShadow on MinAlgLoopOccurrences off @@ -4660,7 +4648,7 @@ Library { MaskHideContents off System { Name "simLinkParts" - Location [547, 251, 1621, 1126] + Location [409, 171, 1584, 1193] Open off ModelBrowserVisibility off ModelBrowserWidth 200 @@ -4767,7 +4755,7 @@ Library { AttributesFormatString "%<Description>" LibraryVersion "1.281" UserDataPersistent on - UserData "DataTag48" + UserData "DataTag49" SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" SourceType "DocBlock" DocumentType "Text" @@ -4785,7 +4773,7 @@ Library { AttributesFormatString "%<Description>" LibraryVersion "1.281" UserDataPersistent on - UserData "DataTag49" + UserData "DataTag50" SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" SourceType "DocBlock" DocumentType "Text" @@ -4803,7 +4791,7 @@ Library { AttributesFormatString "%<Description>" LibraryVersion "1.281" UserDataPersistent on - UserData "DataTag50" + UserData "DataTag51" SourceBlock "simulink/Model-Wide\nUtilities/DocBlock" SourceType "DocBlock" DocumentType "Text" @@ -5031,7 +5019,7 @@ Library { } Annotation { SID "204" - Name "Matlab Parts Library for Use with aLIGO Real-time Code Generator - V2.7" + Name "Matlab Parts Library for Use with aLIGO Real-time Code Generator - V2.8" Position [330, 30] FontName "times" FontSize 18 @@ -5039,7 +5027,7 @@ Library { } } MatData { - NumRecords 51 + NumRecords 52 DataRecord { Tag DataTag0 Data " %)30 . R 8 8 ( @ % \" $ ! 0 % 0 \" $ 0 =F5R<" @@ -5067,14 +5055,20 @@ MatData { } DataRecord { Tag DataTag1 - Data " %)30 . @ ( 8 ( @ % \" $ ! 0 % 0 \" $ 8 =F5R<" + Data " %)30 . 8 0 8 ( @ % \" $ ! 0 % 0 \" $ 8 =F5R<" "VEO;@!C;VYT96YT &9O<FUA= #@ #@ & \" 8 !0 @ ! 0 $ \"0 @ S,S,S,S/S/" - "PX \"P 0 !@ @ $ 4 ( 0 'H! ! ! !Z 0 1$%1($-H86YN96QS.@T*/3T]/0T*#0I\">2!U<" + "PX \"0 P !@ @ $ 4 ( 0 %T# ! ! != P 1$%1($-H86YN96QS.@T*/3T]/0T*#0I\">2!U<" "VEN9R!T:&ES('!A<G0L('EO=2!C86X@:&%V92!T:&4@9&%Q($U/1$5,3D%-12YI;FD@9FEL97,@8W)E871E9\"!A=\" -\"F)U:6QD('1I;64@=VET" ":\"!C:&%N;F5L<R!T;R!B92!R96-O<F1E9\"P@86YD('-E=\"!F;W(@=&AE(&-O<G)E8W0@9&%T82!R871E+@T*#0I/;F4@8VAA;FYE;\"!P97(@;&" - "EN92!P;'5S(&%N(&]P=&EO;F%L(&1A=&$@<F%T92X@($QI;F5S(&%R92!D96QI;6ET960@8GD@#0IR971U<FX@*&YE=R!L:6YE*2X@($EF(&YO(&1A" - "=&$@<F%T92!I<R!S<&5C:69I960L(&ET(&ES('-E=\"!T;R!T:&4@;6]D96PG<R -\"F1A=&$@<F%T92P@87,@9&5F:6YE9\"!B>2!T:&4@8V1S4&%" - "R86UE=&5R<R!B;&]C:RX@ #@ # & \" 0 !0 @ ! P $ $ # %185 " + "EN92X@3&EN97,@87)E(&1E;&EM:71E9\"!B>2!R971U<FX@*&YE=R!L:6YE*2X@3W!T:6]N<SH-\"B @(\" Q*2!O<'1I;VYA;\"!D871A(')A=&4N" + "($EF(&YO(&1A=&$@<F%T92!I<R!S<&5C:69I960L(&ET(&ES('-E=\"!T;R!T:&4@#0H@(\" @(\" @;6]D96PG<R!D871A(')A=&4L(&%S(&1E9FE" + "N960@8GD@=&AE(&-D<U!A<F%M971E<G,@8FQO8VLN( T*(\" @(#(I('5I;G0S,CH@1&%T82!T;R!B92!S879E9\"!A<R!U;G-I9VYE9\"!I;G1E9V" + "5R.R!$969A=6QT(&ES(&9L;V%T:6YG( T*(\" @(\" @('!O:6YT(&YU;6)E<BX-\"B @(\" S*2!A<W1E<FES:R H*BD@869T97(@=&AE(&YA;64@" + "*'=I=&AO=70@82!S<&%C92DN($%S(&]F(%)#1R!6,BXW+ T*(\" @(\" @('1H92!$05$@<WES=&5M('-U<'!O<G1S('=R:71I;F<@,B!F<F%M97,Z" + "#0H@(\" @(\" @(\" @(\"!A*2!#;VUM:7-S:6]N:6YG.B!!;&P@8VAA;FYE;',@:6X@;&ES=\"!A<F4@<F5C;W)D960N($AO=V5V97(L#0H@(\" @" + "(\" @(\" @(\" @(\" @=&AI<R!F<F%M92!)4R!.3U0@87)C:&EV960@8GD@3$1!4RX-\"B @(\" @(\" @(\" @(&(I(%-C:65N8V4@9G)A;64Z($" + "]N;'D@=&AO<V4@8VAA;FYE;',@=VET:\"!A;B J(&%R92!R96-O<F1E9\"X-\"B @(\" @(\" @(\" @(\" @(\"!4:&ES(&9R86UE($E3(&%R8VAI" + "=F5D(&)Y($Q$05,N #@ # & \" 0 !0 @ ! P $ $ # %185 " } DataRecord { Tag DataTag2 @@ -5815,6 +5809,14 @@ MatData { } DataRecord { Tag DataTag44 + Data " %)30 . 0 $ 8 ( @ % \" $ ! 0 % 0 \" $ 8 =F5R<" + "VEO;@!C;VYT96YT &9O<FUA= #@ #@ & \" 8 !0 @ ! 0 $ \"0 @ S,S,S,S/S/" + "PX !P !@ @ $ 4 ( 0 #H ! ! Z 1U!3#0HZ#0H]/3T]#0H-\"E1H:7,@<&%R=\"!O=" + "71P=71S($=04R!T:6UE(&EN($=04R!S96-O;F1S+@ X P !@ @ $ 4 ( 0 , ! ! " + " P!46%0 " + } + DataRecord { + Tag DataTag45 Data " %)30 . V $ 8 ( @ % \" $ ! 0 % 0 \" $ 0 =F5R<" "VEO;@!C;VYT96YT X X !@ @ & 4 ( 0 $ ! D ( FIF9F9F9\\3\\. 2 $ " " 8 ( ! % \" $ 1 0 0 0 $0$ &-D<U-U<U=D.@T*/3T]/3T]/3T]#0H-\"E1H:7,@9G5N8W1I;" @@ -5823,7 +5825,7 @@ MatData { "G1E<F9E<F]M971E<BDN#0H-\"E1H:7,@8FQO8VL@<VAO=6QD(&YO=\"!B92!U<V5D(&EN(&%N>2!N97<@9&5S:6=N<RX-\"@ " } DataRecord { - Tag DataTag45 + Tag DataTag46 Data " %)30 . < 8 ( @ % \" $ ! 0 % 0 \" $ 8 =F5R<" "VEO;@!C;VYT96YT &9O<FUA= #@ #@ & \" 8 !0 @ ! 0 $ \"0 @ S,S,S,S/S/" "PX P!@ !@ @ $ 4 ( 0 /\\% ! ! #_!0 8V1S5V%T8VAD;V<Z#0H]/3T]/3T-\"@T*5&AI<" @@ -5848,7 +5850,7 @@ MatData { "T('-I9VYA;',N#0H #@ # & \" 0 !0 @ ! P $ $ # %185 " } DataRecord { - Tag DataTag46 + Tag DataTag47 Data " %)30 . \" 8 8 ( @ % \" $ ! 0 % 0 \" $ 8 =F5R" "<VEO;@!C;VYT96YT &9O<FUA= #@ #@ & \" 8 !0 @ ! 0 $ \"0 @ S,S,S,S/S" "/PX X!0 !@ @ $ 4 ( 0 0% ! ! $!0 8V1S5T0Z#0H]/3T]/3T-\"@T*5&AI<R!B;&]C:" @@ -5870,7 +5872,7 @@ MatData { "T97(N( T* X P !@ @ $ 4 ( 0 , ! ! P!46%0 " } DataRecord { - Tag DataTag47 + Tag DataTag48 Data " %)30 . D 0 8 ( @ % \" $ ! 0 % 0 \" $ 8 =F5R<" "VEO;@!C;VYT96YT &9O<FUA= #@ #@ & \" 8 !0 @ ! 0 $ \"0 @ S,S,S,S/S/" "PX # P !@ @ $ 4 ( 0 (P# ! ! \", P 8V1S1&%Q2VEL;#H-\"CT]/3T]/0T*#0I4:&4@8" @@ -5888,14 +5890,14 @@ MatData { " @ ! P $ $ # %185 " } DataRecord { - Tag DataTag48 + Tag DataTag49 Data " %)30 . * $ 8 ( @ % \" $ ! 0 % 0 \" $ 0 =F5R<" "VEO;@!C;VYT96YT X X !@ @ & 4 ( 0 $ ! D ( FIF9F9F9\\3\\. F " " 8 ( ! % \" $ !G 0 0 9P %5N:71$96QA>3H-\"CT]/3T]/3T]/3T-\"@T*5&AI<R!B;&]C" ":R!I<R!U<V5D(&9E960@8F%C:R!V86QU97,@;VX@=&AE(&YE>'0@8V]D92!C>6-L92!O9B!T:&4@<V]F='=A<F4N#0H " } DataRecord { - Tag DataTag49 + Tag DataTag50 Data " %)30 . D \\ 8 ( @ % \" $ ! 0 % 0 \" $ 0 =F5R" "<VEO;@!C;VYT96YT X X !@ @ & 4 ( 0 $ ! D ( FIF9F9F9\\3\\. \\" " 8 ( ! % \" $ !F!P 0 1 S X $T 80!T &@ 1@!U &X 8P!T &D ;P!N #H #0 * #T /0 ]" @@ -5947,7 +5949,7 @@ MatData { " ( !B &4 ( !S &4 = @ '0 ;P @ 'H 90!R &\\ +@ - H " } DataRecord { - Tag DataTag50 + Tag DataTag51 Data " %)30 . P D 8 ( @ % \" $ ! 0 % 0 \" $ 8 =F5R<" "VEO;@!C;VYT96YT &9O<FUA= #@ #@ & \" 8 !0 @ ! 0 $ \"0 @ S,S,S,S/S/" "PX #P\" !@ @ $ 4 ( 0 +D( ! ! \"Y\" 1F-N.@T*/3T]/0T*#0I4:&ES(&UO9'5L92!I" diff --git a/src/epics/simLink/lib/cdsGps.mdl b/src/epics/simLink/lib/cdsGps.mdl index 2cefc099c..646af19ec 100644 --- a/src/epics/simLink/lib/cdsGps.mdl +++ b/src/epics/simLink/lib/cdsGps.mdl @@ -1,26 +1,80 @@ Library { Name "cdsGps" - Version 6.6 + Version 8.0 MdlSubVersion 0 - SavedCharacterEncoding "UTF-8" + SavedCharacterEncoding "ISO-8859-1" LibraryType "BlockLibrary" SaveDefaultBlockParams on + ScopeRefreshTime 0.035000 + OverrideScopeRefreshTime on + DisableAllScopes off + FPTRunName "Run 1" + MaxMDLFileLineLength 120 + Object { + $PropName "BdWindowsInfo" + $ObjectID 1 + $ClassName "Simulink.BDWindowsInfo" + Object { + $PropName "WindowsInfo" + $ObjectID 2 + $ClassName "Simulink.WindowInfo" + IsActive [1] + Location [223.0, 129.0, 620.0, 438.0] + Object { + $PropName "ModelBrowserInfo" + $ObjectID 3 + $ClassName "Simulink.ModelBrowserInfo" + Visible [0] + DockPosition "Left" + Width [50] + Height [50] + Filter [9] + } + Object { + $PropName "ExplorerBarInfo" + $ObjectID 4 + $ClassName "Simulink.ExplorerBarInfo" + Visible [1] + } + Object { + $PropName "EditorsInfo" + $ObjectID 5 + $ClassName "Simulink.EditorInfo" + IsActive [1] + ViewObjType "SimulinkTopLevel" + LoadSaveID "0" + Extents [586.0, 276.0] + ZoomFactor [1.0] + Offset [0.0, 0.0] + } + } + } + Created "Tue Nov 6 14:27:18 2007" + Creator "aivanov" + UpdateHistory "UpdateHistoryNever" + ModifiedByFormat "%<Auto>" + LastModifiedBy "rolfbork" + ModifiedDateFormat "%<Auto>" + LastModifiedDate "Fri Sep 06 14:05:52 2013" + RTWModifiedTimeStamp 300376217 + ModelVersionFormat "1.%<AutoIncrement:6>" + ConfigurationManager "None" SampleTimeColors off + SampleTimeAnnotations off LibraryLinkDisplay "none" WideLines off ShowLineDimensions off ShowPortDataTypes off + ShowDesignRanges off ShowLoopsOnError on IgnoreBidirectionalLines off ShowStorageClass off ShowTestPointIcons on + ShowSignalResolutionIcons on ShowViewerIcons on SortedOrder off ExecutionContextIcon off ShowLinearizationAnnotations on - ScopeRefreshTime 0.035000 - OverrideScopeRefreshTime on - DisableAllScopes off BlockNameDataTip off BlockParametersDataTip off BlockDescriptionStringDataTip off @@ -28,28 +82,22 @@ Library { StatusBar on BrowserShowLibraryLinks off BrowserLookUnderMasks off - Created "Tue Nov 6 14:27:18 2007" - Creator "aivanov" - UpdateHistory "UpdateHistoryNever" - ModifiedByFormat "%<Auto>" - LastModifiedBy "aivanov" - ModifiedDateFormat "%<Auto>" - LastModifiedDate "Tue Nov 6 15:01:26 2007" - ModelVersionFormat "1.%<AutoIncrement:4>" - ConfigurationManager "None" SimulationMode "normal" LinearizationMsg "none" Profile off ParamWorkspaceSource "MATLABWorkspace" - AccelVerboseBuild off + RecordCoverage off CovSaveName "covdata" CovMetricSettings "dw" CovNameIncrementing off CovHtmlReporting on + CovForceBlockReductionOff on covSaveCumulativeToWorkspaceVar on CovSaveSingleToWorkspaceVar on CovCumulativeReport off CovReportOnPause on + CovModelRefEnable "Off" + CovExternalEMLEnable off ExtModeBatchMode off ExtModeEnableFloating on ExtModeTrigType "manual" @@ -71,11 +119,524 @@ Library { ExtModeSkipDownloadWhenConnect off ExtModeLogAll on ExtModeAutoUpdateStatusClock off - ProdHWDeviceType "32-bit Generic" ShowModelReferenceBlockVersion off ShowModelReferenceBlockIO off + Array { + Type "Handle" + Dimension 1 + Simulink.ConfigSet { + $ObjectID 6 + Version "1.12.1" + Array { + Type "Handle" + Dimension 8 + Simulink.SolverCC { + $ObjectID 7 + Version "1.12.1" + StartTime "0.0" + StopTime "10.0" + AbsTol "auto" + FixedStep "auto" + InitialStep "auto" + MaxNumMinSteps "-1" + MaxOrder 5 + ZcThreshold "auto" + ConsecutiveZCsStepRelTol "10*128*eps" + MaxConsecutiveZCs "1000" + ExtrapolationOrder 4 + NumberNewtonIterations 1 + MaxStep "auto" + MinStep "auto" + MaxConsecutiveMinStep "1" + RelTol "1e-3" + SolverMode "SingleTasking" + EnableConcurrentExecution off + ConcurrentTasks off + Solver "ode45" + SolverName "ode45" + SolverJacobianMethodControl "auto" + ShapePreserveControl "DisableAll" + ZeroCrossControl "UseLocalSettings" + ZeroCrossAlgorithm "Nonadaptive" + AlgebraicLoopSolver "TrustRegion" + SolverResetMethod "Fast" + PositivePriorityOrder off + AutoInsertRateTranBlk off + SampleTimeConstraint "Unconstrained" + InsertRTBMode "Whenever possible" + } + Simulink.DataIOCC { + $ObjectID 8 + Version "1.12.1" + Decimation "1" + ExternalInput "[t, u]" + FinalStateName "xFinal" + InitialState "xInitial" + LimitDataPoints on + MaxDataPoints "1000" + LoadExternalInput off + LoadInitialState off + SaveFinalState off + SaveCompleteFinalSimState off + SaveFormat "Array" + SignalLoggingSaveFormat "ModelDataLogs" + SaveOutput on + SaveState off + SignalLogging on + DSMLogging on + InspectSignalLogs off + SaveTime on + ReturnWorkspaceOutputs off + StateSaveName "xout" + TimeSaveName "tout" + OutputSaveName "yout" + SignalLoggingName "logsout" + DSMLoggingName "dsmout" + OutputOption "RefineOutputTimes" + OutputTimes "[]" + ReturnWorkspaceOutputsName "out" + Refine "1" + } + Simulink.OptimizationCC { + $ObjectID 9 + Version "1.12.1" + Array { + Type "Cell" + Dimension 8 + Cell "BooleansAsBitfields" + Cell "PassReuseOutputArgsAs" + Cell "PassReuseOutputArgsThreshold" + Cell "ZeroExternalMemoryAtStartup" + Cell "ZeroInternalMemoryAtStartup" + Cell "OptimizeModelRefInitCode" + Cell "NoFixptDivByZeroProtection" + Cell "UseSpecifiedMinMax" + PropName "DisabledProps" + } + BlockReduction off + BooleanDataType off + ConditionallyExecuteInputs on + InlineParams off + UseIntDivNetSlope off + UseFloatMulNetSlope off + UseSpecifiedMinMax off + InlineInvariantSignals off + OptimizeBlockIOStorage on + BufferReuse on + EnhancedBackFolding off + StrengthReduction off + ExpressionFolding on + BooleansAsBitfields off + BitfieldContainerType "uint_T" + EnableMemcpy on + MemcpyThreshold 64 + PassReuseOutputArgsAs "Structure reference" + ExpressionDepthLimit 2147483647 + FoldNonRolledExpr on + LocalBlockOutputs on + RollThreshold 5 + SystemCodeInlineAuto off + StateBitsets off + DataBitsets off + UseTempVars off + ZeroExternalMemoryAtStartup on + ZeroInternalMemoryAtStartup on + InitFltsAndDblsToZero off + NoFixptDivByZeroProtection off + EfficientFloat2IntCast off + EfficientMapNaN2IntZero on + OptimizeModelRefInitCode off + LifeSpan "inf" + MaxStackSize "Inherit from target" + BufferReusableBoundary on + SimCompilerOptimization "Off" + AccelVerboseBuild off + ParallelExecutionInRapidAccelerator on + } + Simulink.DebuggingCC { + $ObjectID 10 + Version "1.12.1" + RTPrefix "error" + ConsistencyChecking "none" + ArrayBoundsChecking "none" + SignalInfNanChecking "none" + SignalRangeChecking "none" + ReadBeforeWriteMsg "UseLocalSettings" + WriteAfterWriteMsg "UseLocalSettings" + WriteAfterReadMsg "UseLocalSettings" + AlgebraicLoopMsg "warning" + ArtificialAlgebraicLoopMsg "warning" + SaveWithDisabledLinksMsg "warning" + SaveWithParameterizedLinksMsg "none" + CheckSSInitialOutputMsg on + UnderspecifiedInitializationDetection "Classic" + MergeDetectMultiDrivingBlocksExec "none" + CheckExecutionContextPreStartOutputMsg off + CheckExecutionContextRuntimeOutputMsg off + SignalResolutionControl "TryResolveAllWithWarning" + BlockPriorityViolationMsg "warning" + MinStepSizeMsg "warning" + TimeAdjustmentMsg "none" + MaxConsecutiveZCsMsg "error" + MaskedZcDiagnostic "warning" + IgnoredZcDiagnostic "warning" + SolverPrmCheckMsg "none" + InheritedTsInSrcMsg "warning" + DiscreteInheritContinuousMsg "warning" + MultiTaskDSMMsg "error" + MultiTaskCondExecSysMsg "error" + MultiTaskRateTransMsg "error" + SingleTaskRateTransMsg "none" + TasksWithSamePriorityMsg "warning" + SigSpecEnsureSampleTimeMsg "warning" + CheckMatrixSingularityMsg "none" + IntegerOverflowMsg "warning" + Int32ToFloatConvMsg "warning" + ParameterDowncastMsg "error" + ParameterOverflowMsg "error" + ParameterUnderflowMsg "none" + ParameterPrecisionLossMsg "warning" + ParameterTunabilityLossMsg "warning" + FixptConstUnderflowMsg "none" + FixptConstOverflowMsg "none" + FixptConstPrecisionLossMsg "none" + UnderSpecifiedDataTypeMsg "none" + UnnecessaryDatatypeConvMsg "none" + VectorMatrixConversionMsg "none" + InvalidFcnCallConnMsg "error" + FcnCallInpInsideContextMsg "EnableAllAsError" + SignalLabelMismatchMsg "none" + UnconnectedInputMsg "warning" + UnconnectedOutputMsg "warning" + UnconnectedLineMsg "warning" + SFcnCompatibilityMsg "none" + FrameProcessingCompatibilityMsg "warning" + UniqueDataStoreMsg "none" + BusObjectLabelMismatch "warning" + RootOutportRequireBusObject "warning" + AssertControl "UseLocalSettings" + EnableOverflowDetection off + ModelReferenceIOMsg "none" + ModelReferenceMultiInstanceNormalModeStructChecksumCheck "error" + ModelReferenceVersionMismatchMessage "none" + ModelReferenceIOMismatchMessage "none" + ModelReferenceCSMismatchMessage "none" + UnknownTsInhSupMsg "warning" + ModelReferenceDataLoggingMessage "warning" + ModelReferenceSymbolNameMessage "warning" + ModelReferenceExtraNoncontSigs "error" + StateNameClashWarn "warning" + SimStateInterfaceChecksumMismatchMsg "warning" + SimStateOlderReleaseMsg "error" + InitInArrayFormatMsg "warning" + StrictBusMsg "Warning" + BusNameAdapt "WarnAndRepair" + NonBusSignalsTreatedAsBus "none" + LoggingUnavailableSignals "error" + BlockIODiagnostic "none" + SFUnusedDataAndEventsDiag "warning" + SFUnexpectedBacktrackingDiag "warning" + SFInvalidInputDataAccessInChartInitDiag "warning" + SFNoUnconditionalDefaultTransitionDiag "warning" + SFTransitionOutsideNaturalParentDiag "warning" + SFUnconditionalTransitionShadowingDiag "warning" + SFUndirectedBroadcastEventsDiag "warning" + SFTransitionActionBeforeConditionDiag "warning" + } + Simulink.HardwareCC { + $ObjectID 11 + Version "1.12.1" + ProdBitPerChar 8 + ProdBitPerShort 16 + ProdBitPerInt 32 + ProdBitPerLong 32 + ProdBitPerFloat 32 + ProdBitPerDouble 64 + ProdBitPerPointer 32 + ProdLargestAtomicInteger "Char" + ProdLargestAtomicFloat "None" + ProdIntDivRoundTo "Undefined" + ProdEndianess "Unspecified" + ProdWordSize 32 + ProdShiftRightIntArith on + ProdHWDeviceType "32-bit Generic" + TargetBitPerChar 8 + TargetBitPerShort 16 + TargetBitPerInt 32 + TargetBitPerLong 32 + TargetBitPerFloat 32 + TargetBitPerDouble 64 + TargetBitPerPointer 32 + TargetLargestAtomicInteger "Char" + TargetLargestAtomicFloat "None" + TargetShiftRightIntArith on + TargetIntDivRoundTo "Undefined" + TargetEndianess "Unspecified" + TargetWordSize 32 + TargetTypeEmulationWarnSuppressLevel 0 + TargetPreprocMaxBitsSint 32 + TargetPreprocMaxBitsUint 32 + TargetHWDeviceType "Specified" + TargetUnknown on + ProdEqTarget on + } + Simulink.ModelReferenceCC { + $ObjectID 12 + Version "1.12.1" + UpdateModelReferenceTargets "IfOutOfDateOrStructuralChange" + CheckModelReferenceTargetMessage "error" + EnableParallelModelReferenceBuilds off + ParallelModelReferenceErrorOnInvalidPool on + ParallelModelReferenceMATLABWorkerInit "None" + ModelReferenceNumInstancesAllowed "Multi" + PropagateVarSize "Infer from blocks in model" + ModelReferencePassRootInputsByReference on + ModelReferenceMinAlgLoopOccurrences off + PropagateSignalLabelsOutOfModel off + SupportModelReferenceSimTargetCustomCode off + } + Simulink.SFSimCC { + $ObjectID 13 + Version "1.12.1" + SFSimEnableDebug on + SFSimOverflowDetection on + SFSimEcho on + SimBlas on + SimCtrlC on + SimExtrinsic on + SimIntegrity on + SimUseLocalCustomCode off + SimParseCustomCode on + SimBuildMode "sf_incremental_build" + } + Simulink.RTWCC { + $BackupClass "Simulink.RTWCC" + $ObjectID 14 + Version "1.12.1" + Array { + Type "Cell" + Dimension 15 + Cell "IncludeHyperlinkInReport" + Cell "GenerateTraceInfo" + Cell "GenerateTraceReport" + Cell "GenerateTraceReportSl" + Cell "GenerateTraceReportSf" + Cell "GenerateTraceReportEml" + Cell "PortableWordSizes" + Cell "GenerateWebview" + Cell "GenerateCodeMetricsReport" + Cell "GenerateCodeReplacementReport" + Cell "GenerateErtSFunction" + Cell "CreateSILPILBlock" + Cell "CodeExecutionProfiling" + Cell "CodeProfilingSaveOptions" + Cell "CodeProfilingInstrumentation" + PropName "DisabledProps" + } + SystemTargetFile "grt.tlc" + GenCodeOnly off + MakeCommand "make_rtw" + GenerateMakefile on + PackageGeneratedCodeAndArtifacts off + TemplateMakefile "grt_default_tmf" + GenerateReport off + SaveLog off + RTWVerbose on + RetainRTWFile off + ProfileTLC off + TLCDebug off + TLCCoverage off + TLCAssert off + ProcessScriptMode "Default" + ConfigurationMode "Optimized" + ConfigAtBuild off + RTWUseLocalCustomCode off + RTWUseSimCustomCode off + IncludeHyperlinkInReport off + LaunchReport off + PortableWordSizes off + GenerateErtSFunction off + CreateSILPILBlock "None" + CodeExecutionProfiling off + CodeExecutionProfileVariable "executionProfile" + CodeProfilingSaveOptions "SummaryOnly" + CodeProfilingInstrumentation off + TargetLang "C" + IncludeBusHierarchyInRTWFileBlockHierarchyMap off + IncludeERTFirstTime off + GenerateTraceInfo off + GenerateTraceReport off + GenerateTraceReportSl off + GenerateTraceReportSf off + GenerateTraceReportEml off + GenerateCodeInfo off + GenerateWebview off + GenerateCodeMetricsReport off + GenerateCodeReplacementReport off + RTWCompilerOptimization "Off" + CheckMdlBeforeBuild "Off" + CustomRebuildMode "OnUpdate" + Array { + Type "Handle" + Dimension 2 + Simulink.CodeAppCC { + $ObjectID 15 + Version "1.12.1" + Array { + Type "Cell" + Dimension 22 + Cell "IgnoreCustomStorageClasses" + Cell "IgnoreTestpoints" + Cell "InsertBlockDesc" + Cell "InsertPolySpaceComments" + Cell "SFDataObjDesc" + Cell "MATLABFcnDesc" + Cell "SimulinkDataObjDesc" + Cell "DefineNamingRule" + Cell "SignalNamingRule" + Cell "ParamNamingRule" + Cell "InternalIdentifier" + Cell "InlinedPrmAccess" + Cell "CustomSymbolStr" + Cell "CustomSymbolStrGlobalVar" + Cell "CustomSymbolStrType" + Cell "CustomSymbolStrField" + Cell "CustomSymbolStrFcn" + Cell "CustomSymbolStrFcnArg" + Cell "CustomSymbolStrBlkIO" + Cell "CustomSymbolStrTmpVar" + Cell "CustomSymbolStrMacro" + Cell "ReqsInCode" + PropName "DisabledProps" + } + ForceParamTrailComments off + GenerateComments on + IgnoreCustomStorageClasses on + IgnoreTestpoints off + IncHierarchyInIds off + MaxIdLength 31 + PreserveName off + PreserveNameWithParent off + ShowEliminatedStatement off + OperatorAnnotations off + IncAutoGenComments off + SimulinkDataObjDesc off + SFDataObjDesc off + MATLABFcnDesc off + IncDataTypeInIds off + MangleLength 1 + CustomSymbolStrGlobalVar "$R$N$M" + CustomSymbolStrType "$N$R$M" + CustomSymbolStrField "$N$M" + CustomSymbolStrFcn "$R$N$M$F" + CustomSymbolStrFcnArg "rt$I$N$M" + CustomSymbolStrBlkIO "rtb_$N$M" + CustomSymbolStrTmpVar "$N$M" + CustomSymbolStrMacro "$R$N$M" + DefineNamingRule "None" + ParamNamingRule "None" + SignalNamingRule "None" + InsertBlockDesc off + InsertPolySpaceComments off + SimulinkBlockComments on + MATLABSourceComments off + EnableCustomComments off + InternalIdentifier "Classic" + InlinedPrmAccess "Literals" + ReqsInCode off + UseSimReservedNames off + } + Simulink.GRTTargetCC { + $BackupClass "Simulink.TargetCC" + $ObjectID 16 + Version "1.12.1" + Array { + Type "Cell" + Dimension 15 + Cell "GeneratePreprocessorConditionals" + Cell "IncludeMdlTerminateFcn" + Cell "CombineOutputUpdateFcns" + Cell "SuppressErrorStatus" + Cell "ERTCustomFileBanners" + Cell "GenerateSampleERTMain" + Cell "GenerateTestInterfaces" + Cell "ModelStepFunctionPrototypeControlCompliant" + Cell "CPPClassGenCompliant" + Cell "MultiInstanceERTCode" + Cell "PurelyIntegerCode" + Cell "SupportComplex" + Cell "SupportAbsoluteTime" + Cell "SupportContinuousTime" + Cell "SupportNonInlinedSFcns" + PropName "DisabledProps" + } + TargetFcnLib "ansi_tfl_table_tmw.mat" + TargetLibSuffix "" + TargetPreCompLibLocation "" + CodeReplacementLibrary "ANSI_C" + UtilityFuncGeneration "Auto" + ERTMultiwordTypeDef "System defined" + ERTMultiwordLength 256 + MultiwordLength 2048 + GenerateFullHeader on + GenerateSampleERTMain off + GenerateTestInterfaces off + IsPILTarget off + ModelReferenceCompliant on + ParMdlRefBuildCompliant on + CompOptLevelCompliant on + ConcurrentExecutionCompliant on + IncludeMdlTerminateFcn on + GeneratePreprocessorConditionals "Disable all" + CombineOutputUpdateFcns on + CombineSignalStateStructs off + SuppressErrorStatus off + ERTFirstTimeCompliant off + IncludeFileDelimiter "Auto" + ERTCustomFileBanners off + SupportAbsoluteTime on + LogVarNameModifier "rt_" + MatFileLogging on + MultiInstanceERTCode off + SupportNonFinite on + SupportComplex on + PurelyIntegerCode off + SupportContinuousTime on + SupportNonInlinedSFcns on + SupportVariableSizeSignals off + EnableShiftOperators on + ParenthesesLevel "Nominal" + ModelStepFunctionPrototypeControlCompliant off + CPPClassGenCompliant off + AutosarCompliant off + GRTInterface off + UseMalloc off + ExtMode off + ExtModeStaticAlloc off + ExtModeTesting off + ExtModeStaticAllocSize 1000000 + ExtModeTransport 0 + ExtModeMexFile "ext_comm" + ExtModeIntrfLevel "Level1" + RTWCAPISignals off + RTWCAPIParams off + RTWCAPIStates off + RTWCAPIRootIO off + GenerateASAP2 off + } + PropName "Components" + } + } + PropName "Components" + } + Name "Configuration" + CurrentDlgPage "Solver" + ConfigPrmDlgPosition [ 840, 405, 1720, 1035 ] + } + PropName "ConfigurationSets" + } + ExplicitPartitioning off BlockDefaults { - Orientation "right" ForegroundColor "black" BackgroundColor "white" DropShadow off @@ -85,21 +646,61 @@ Library { FontWeight "normal" FontAngle "normal" ShowName on + BlockRotation 0 + BlockMirror off + } + AnnotationDefaults { + HorizontalAlignment "center" + VerticalAlignment "middle" + ForegroundColor "black" + BackgroundColor "white" + DropShadow off + FontName "Courier" + FontSize 10 + FontWeight "normal" + FontAngle "normal" + UseDisplayTextAsClickCallback off + } + LineDefaults { + FontName "Courier" + FontSize 9 + FontWeight "normal" + FontAngle "normal" + } + MaskDefaults { + SelfModifiable "off" + IconFrame "on" + IconOpaque "on" + RunInitForIconRedraw "off" + IconRotate "none" + PortRotate "default" + IconUnits "autoscale" + } + MaskParameterDefaults { + Evaluate "on" + Tunable "on" + NeverSave "off" + Internal "off" + ReadOnly "off" + Enabled "on" + Visible "on" + ToolTip "on" } BlockParameterDefaults { Block { BlockType Outport Port "1" - UseBusObject off - BusObject "BusObject" + OutMin "[]" + OutMax "[]" + OutDataTypeStr "Inherit: auto" + LockScale off BusOutputAsStruct off PortDimensions "-1" + VarSizeSig "Inherit" SampleTime "-1" - DataType "auto" - OutDataType "sfix(16)" - OutScaling "2^0" SignalType "auto" SamplingMode "auto" + SourceOfInitialOutputValue "Dialog" OutputWhenDisabled "held" InitialOutput "[]" } @@ -109,6 +710,7 @@ Library { Permissions "ReadWrite" PermitHierarchicalResolution "All" TreatAsAtomicUnit off + CheckFcnCallInpInsideContextMsg off SystemSampleTime "-1" RTWFcnNameOpts "Auto" RTWFileNameOpts "Auto" @@ -119,30 +721,16 @@ Library { RTWMemSecDataParameters "Inherit from model" SimViewingDevice off DataTypeOverride "UseLocalSettings" + DataTypeOverrideAppliesTo "AllNumericTypes" MinMaxOverflowLogging "UseLocalSettings" + SFBlockType "NONE" + Variant off + GeneratePreprocessorConditionals off } } - AnnotationDefaults { - HorizontalAlignment "center" - VerticalAlignment "middle" - ForegroundColor "black" - BackgroundColor "white" - DropShadow off - FontName "Courier" - FontSize 10 - FontWeight "normal" - FontAngle "normal" - UseDisplayTextAsClickCallback off - } - LineDefaults { - FontName "Courier" - FontSize 9 - FontWeight "normal" - FontAngle "normal" - } System { Name "cdsGps" - Location [734, 545, 1314, 805] + Location [223, 129, 843, 567] Open on ModelBrowserVisibility off ModelBrowserWidth 200 @@ -156,19 +744,25 @@ Library { ShowPageBoundaries off ZoomFactor "100" ReportName "simulink-default.rpt" + SIDHighWatermark "6" Block { BlockType SubSystem Name "Subsystem" - Ports [0, 4] - Position [190, 92, 230, 153] + SID "1" + Ports [0, 1] + Position [190, 94, 230, 156] + ZOrder -1 MinAlgLoopOccurrences off + PropExecContextOutsideSubsystem off RTWSystemCode "Auto" FunctionWithSeparateData off + Opaque off + RequestExecContextInheritance off MaskHideContents off System { Name "Subsystem" - Location [1032, 645, 1393, 892] - Open on + Location [223, 129, 843, 567] + Open off ModelBrowserVisibility off ModelBrowserWidth 200 ScreenColor "white" @@ -182,48 +776,26 @@ Library { ZoomFactor "100" Block { BlockType Outport - Name "full" + Name "sec" + SID "2" Position [155, 28, 185, 42] + ZOrder -1 IconDisplay "Port number" - BusOutputAsStruct off - } - Block { - BlockType Outport - Name "s" - Position [155, 78, 185, 92] - Port "2" - IconDisplay "Port number" - BusOutputAsStruct off - } - Block { - BlockType Outport - Name "us" - Position [160, 118, 190, 132] - Port "3" - IconDisplay "Port number" - BusOutputAsStruct off - } - Block { - BlockType Outport - Name "ns" - Position [160, 158, 190, 172] - Port "4" - IconDisplay "Port number" - BusOutputAsStruct off } } } Block { BlockType Outport Name "Out1" + SID "6" Position [275, 123, 305, 137] + ZOrder -2 IconDisplay "Port number" - BusOutputAsStruct off } Line { SrcBlock "Subsystem" SrcPort 1 - Points [10, 0; 0, 30] + Points [10, 0; 0, 5] DstBlock "Out1" DstPort 1 } -- GitLab