diff --git a/Cursor/hds/@compteur/compteurt.bd b/Cursor/hds/@compteur/compteurt.bd index a41af41..bb5def5 100644 --- a/Cursor/hds/@compteur/compteurt.bd +++ b/Cursor/hds/@compteur/compteurt.bd @@ -173,7 +173,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "15:04:17" +value "15:11:17" ) (vvPair variable "group" @@ -245,7 +245,7 @@ value "compteurt" ) (vvPair variable "time" -value "15:04:17" +value "15:11:17" ) (vvPair variable "unit" @@ -336,7 +336,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-3800,35500,-3000" -st "clock : std_ulogic" +st "clock : std_ulogic +" ) ) *3 (PortIoIn @@ -399,7 +400,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-3000,35500,-2200" -st "down : std_uLogic" +st "down : std_uLogic +" ) ) *5 (PortIoOut @@ -462,7 +464,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-600,41000,200" -st "Position : unsigned(15 DOWNTO 0)" +st "Position : unsigned(15 DOWNTO 0) +" ) ) *7 (PortIoIn @@ -525,7 +528,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-4600,35500,-3800" -st "RaZ : std_ulogic" +st "RaZ : std_ulogic +" ) ) *9 (PortIoIn @@ -588,7 +592,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-2200,35500,-1400" -st "reset : std_ulogic" +st "reset : std_ulogic +" ) ) *11 (PortIoIn @@ -651,7 +656,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-1400,35500,-600" -st "up : std_uLogic" +st "up : std_uLogic +" ) ) *13 (Grouping @@ -1082,8 +1088,9 @@ uid 326,0 va (VaSet font "Courier New,8,0" ) -xt "21000,4600,39000,5400" -st "SIGNAL upnotdown : std_uLogic" +xt "21000,3000,39000,3800" +st "SIGNAL upnotdown : std_uLogic +" ) ) *29 (Net @@ -1100,8 +1107,9 @@ uid 328,0 va (VaSet font "Courier New,8,0" ) -xt "21000,2200,39000,3000" -st "SIGNAL en : std_ulogic" +xt "21000,1400,39000,2200" +st "SIGNAL en : std_ulogic +" ) ) *30 (SaComponent @@ -1347,8 +1355,9 @@ fg "39936,56832,65280" lineColor "0,0,32768" lineWidth 2 ) -xt "48000,13000,56000,23000" +xt "48000,13000,56000,25000" ) +oxt "48000,13000,56000,23000" ttg (MlTextGroup uid 386,0 ps "CenterOffsetStrategy" @@ -1410,7 +1419,7 @@ va (VaSet vasetType 1 fg "49152,49152,49152" ) -xt "48250,21250,49750,22750" +xt "48250,23250,49750,24750" iconName "StateMachineViewIcon.png" iconMaskName "StateMachineViewIcon.msk" ftype 3 @@ -1432,50 +1441,15 @@ uid 395,0 va (VaSet font "Courier New,8,0" ) -xt "21000,3000,45000,3800" -st "SIGNAL position20bit : unsigned(19 DOWNTO 0)" +xt "21000,2200,45000,3000" +st "SIGNAL position20bit : unsigned(19 DOWNTO 0) +" ) ) -*42 (Net -uid 404,0 -lang 11 -decl (Decl -n "clk" -t "unsigned" -o 7 -suid 17,0 -) -declText (MLText -uid 405,0 -va (VaSet -font "Courier New,8,0" -) -xt "21000,1400,38000,2200" -st "SIGNAL clk : unsigned" -) -) -*43 (Net -uid 414,0 -lang 11 -decl (Decl -n "rst" -t "unsigned" -o 10 -suid 18,0 -) -declText (MLText -uid 415,0 -va (VaSet -font "Courier New,8,0" -) -xt "21000,3800,38000,4600" -st "SIGNAL rst : unsigned" -) -) -*44 (SaComponent +*42 (SaComponent uid 719,0 optionalChildren [ -*45 (CptPort +*43 (CptPort uid 711,0 ps "OnEdgeStrategy" shape (Triangle @@ -1519,7 +1493,7 @@ suid 1,0 ) ) ) -*46 (CptPort +*44 (CptPort uid 715,0 ps "OnEdgeStrategy" shape (Triangle @@ -1585,7 +1559,7 @@ uid 721,0 ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*47 (Text +*45 (Text uid 722,0 va (VaSet font "Verdana,8,1" @@ -1595,7 +1569,7 @@ st "gates" blo "4910,21500" tm "BdLibraryNameMgr" ) -*48 (Text +*46 (Text uid 723,0 va (VaSet font "Verdana,8,1" @@ -1605,7 +1579,7 @@ st "bufferUlogic" blo "4910,22500" tm "CptNameMgr" ) -*49 (Text +*47 (Text uid 724,0 va (VaSet font "Verdana,8,1" @@ -1661,7 +1635,7 @@ sT 1 ) archFileType "UNKNOWN" ) -*50 (Wire +*48 (Wire uid 15,0 shape (OrthoPolyLine uid 16,0 @@ -1698,7 +1672,7 @@ tm "WireNameMgr" ) on &2 ) -*51 (Wire +*49 (Wire uid 29,0 shape (OrthoPolyLine uid 30,0 @@ -1738,7 +1712,7 @@ tm "WireNameMgr" ) on &4 ) -*52 (Wire +*50 (Wire uid 43,0 shape (OrthoPolyLine uid 44,0 @@ -1777,7 +1751,7 @@ tm "WireNameMgr" ) on &6 ) -*53 (Wire +*51 (Wire uid 57,0 shape (OrthoPolyLine uid 58,0 @@ -1815,7 +1789,7 @@ tm "WireNameMgr" ) on &8 ) -*54 (Wire +*52 (Wire uid 71,0 shape (OrthoPolyLine uid 72,0 @@ -1852,10 +1826,10 @@ tm "WireNameMgr" ) on &10 ) -*55 (Wire +*53 (Wire uid 85,0 optionalChildren [ -*56 (BdJunction +*54 (BdJunction uid 735,0 ps "OnConnectorStrategy" shape (Circle @@ -1904,10 +1878,10 @@ tm "WireNameMgr" ) on &12 ) -*57 (Wire +*55 (Wire uid 277,0 optionalChildren [ -*58 (BdJunction +*56 (BdJunction uid 436,0 ps "OnConnectorStrategy" shape (Circle @@ -1955,7 +1929,7 @@ tm "WireNameMgr" ) on &29 ) -*59 (Wire +*57 (Wire uid 317,0 shape (OrthoPolyLine uid 318,0 @@ -1968,7 +1942,7 @@ pts [ "25000,18000" ] ) -start &46 +start &44 end &24 sat 32 eat 1 @@ -1991,7 +1965,7 @@ tm "WireNameMgr" ) on &28 ) -*60 (Wire +*58 (Wire uid 396,0 shape (OrthoPolyLine uid 397,0 @@ -2018,15 +1992,15 @@ f (Text uid 403,0 va (VaSet ) -xt "46000,19800,48200,21000" -st "clk" +xt "46000,19800,49400,21000" +st "clock" blo "46000,20800" tm "WireNameMgr" ) ) -on &42 +on &2 ) -*61 (Wire +*59 (Wire uid 406,0 shape (OrthoPolyLine uid 407,0 @@ -2053,15 +2027,15 @@ f (Text uid 413,0 va (VaSet ) -xt "46000,20800,48100,22000" -st "rst" +xt "46000,20800,49300,22000" +st "reset" blo "46000,21800" tm "WireNameMgr" ) ) -on &43 +on &10 ) -*62 (Wire +*60 (Wire uid 430,0 shape (OrthoPolyLine uid 431,0 @@ -2076,7 +2050,7 @@ pts [ "51000,13000" ] ) -start &58 +start &56 end &37 sat 32 eat 1 @@ -2101,7 +2075,7 @@ tm "WireNameMgr" ) on &29 ) -*63 (Wire +*61 (Wire uid 603,0 shape (OrthoPolyLine uid 604,0 @@ -2139,7 +2113,7 @@ tm "WireNameMgr" ) on &41 ) -*64 (Wire +*62 (Wire uid 731,0 shape (OrthoPolyLine uid 732,0 @@ -2153,8 +2127,8 @@ pts [ "4000,18000" ] ) -start &56 -end &45 +start &54 +end &43 sat 32 eat 32 stc 0 @@ -2189,11 +2163,11 @@ xShown 1 yShown 1 color "26368,26368,26368" ) -packageList *65 (PackageList +packageList *63 (PackageList uid 137,0 stg "VerticalLayoutStrategy" textVec [ -*66 (Text +*64 (Text uid 138,0 va (VaSet font "Verdana,9,1" @@ -2202,7 +2176,7 @@ xt "0,-400,7600,800" st "Package List" blo "0,600" ) -*67 (MLText +*65 (MLText uid 139,0 va (VaSet ) @@ -2220,7 +2194,7 @@ compDirBlock (MlTextGroup uid 140,0 stg "VerticalLayoutStrategy" textVec [ -*68 (Text +*66 (Text uid 141,0 va (VaSet isHidden 1 @@ -2230,7 +2204,7 @@ xt "20000,0,30800,1200" st "Compiler Directives" blo "20000,1000" ) -*69 (Text +*67 (Text uid 142,0 va (VaSet isHidden 1 @@ -2240,7 +2214,7 @@ xt "20000,1200,33100,2400" st "Pre-module directives:" blo "20000,2200" ) -*70 (MLText +*68 (MLText uid 143,0 va (VaSet isHidden 1 @@ -2250,7 +2224,7 @@ st "`resetall `timescale 1ns/10ps" tm "BdCompilerDirectivesTextMgr" ) -*71 (Text +*69 (Text uid 144,0 va (VaSet isHidden 1 @@ -2260,7 +2234,7 @@ xt "20000,4800,33700,6000" st "Post-module directives:" blo "20000,5800" ) -*72 (MLText +*70 (MLText uid 145,0 va (VaSet isHidden 1 @@ -2268,7 +2242,7 @@ isHidden 1 xt "20000,0,20000,0" tm "BdCompilerDirectivesTextMgr" ) -*73 (Text +*71 (Text uid 146,0 va (VaSet isHidden 1 @@ -2278,7 +2252,7 @@ xt "20000,6000,33200,7200" st "End-module directives:" blo "20000,7000" ) -*74 (MLText +*72 (MLText uid 147,0 va (VaSet isHidden 1 @@ -2294,7 +2268,7 @@ viewArea "-21100,-16900,79693,45316" cachedDiagramExtent "-6200,-7000,68800,49000" hasePageBreakOrigin 1 pageBreakOrigin "-7000,-49000" -lastUid 981,0 +lastUid 1111,0 defaultCommentText (CommentText shape (Rectangle layer 0 @@ -2384,7 +2358,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*75 (Text +*73 (Text va (VaSet font "Verdana,9,1" ) @@ -2393,7 +2367,7 @@ st "" blo "1300,4200" tm "BdLibraryNameMgr" ) -*76 (Text +*74 (Text va (VaSet font "Verdana,9,1" ) @@ -2402,7 +2376,7 @@ st "" blo "1300,5400" tm "BlkNameMgr" ) -*77 (Text +*75 (Text va (VaSet font "Verdana,9,1" ) @@ -2453,7 +2427,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*78 (Text +*76 (Text va (VaSet font "Verdana,9,1" ) @@ -2461,7 +2435,7 @@ xt "-350,3200,3750,4400" st "Library" blo "-350,4200" ) -*79 (Text +*77 (Text va (VaSet font "Verdana,9,1" ) @@ -2469,7 +2443,7 @@ xt "-350,4400,8350,5600" st "MWComponent" blo "-350,5400" ) -*80 (Text +*78 (Text va (VaSet font "Verdana,9,1" ) @@ -2518,7 +2492,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*81 (Text +*79 (Text va (VaSet font "Verdana,9,1" ) @@ -2527,7 +2501,7 @@ st "Library" blo "0,4200" tm "BdLibraryNameMgr" ) -*82 (Text +*80 (Text va (VaSet font "Verdana,9,1" ) @@ -2536,7 +2510,7 @@ st "SaComponent" blo "0,5400" tm "CptNameMgr" ) -*83 (Text +*81 (Text va (VaSet font "Verdana,9,1" ) @@ -2590,7 +2564,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*84 (Text +*82 (Text va (VaSet font "Verdana,9,1" ) @@ -2598,7 +2572,7 @@ xt "-500,3200,3600,4400" st "Library" blo "-500,4200" ) -*85 (Text +*83 (Text va (VaSet font "Verdana,9,1" ) @@ -2606,7 +2580,7 @@ xt "-500,4400,8500,5600" st "VhdlComponent" blo "-500,5400" ) -*86 (Text +*84 (Text va (VaSet font "Verdana,9,1" ) @@ -2651,7 +2625,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*87 (Text +*85 (Text va (VaSet font "Verdana,9,1" ) @@ -2659,7 +2633,7 @@ xt "-1150,3200,2950,4400" st "Library" blo "-1150,4200" ) -*88 (Text +*86 (Text va (VaSet font "Verdana,9,1" ) @@ -2667,7 +2641,7 @@ xt "-1150,4400,9150,5600" st "VerilogComponent" blo "-1150,5400" ) -*89 (Text +*87 (Text va (VaSet font "Verdana,9,1" ) @@ -2708,7 +2682,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*90 (Text +*88 (Text va (VaSet font "Verdana,9,1" ) @@ -2717,7 +2691,7 @@ st "eb1" blo "2800,4800" tm "HdlTextNameMgr" ) -*91 (Text +*89 (Text va (VaSet font "Verdana,9,1" ) @@ -3120,7 +3094,7 @@ decls (MlTextGroup ps "BottomRightOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*92 (Text +*90 (Text va (VaSet font "Verdana,9,1" ) @@ -3128,7 +3102,7 @@ xt "11200,20000,22000,21200" st "Frame Declarations" blo "11200,21000" ) -*93 (MLText +*91 (MLText va (VaSet ) xt "11200,21200,11200,21200" @@ -3180,7 +3154,7 @@ decls (MlTextGroup ps "BottomRightOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*94 (Text +*92 (Text va (VaSet font "Verdana,9,1" ) @@ -3188,7 +3162,7 @@ xt "11200,20000,22000,21200" st "Frame Declarations" blo "11200,21000" ) -*95 (MLText +*93 (MLText va (VaSet ) xt "11200,21200,11200,21200" @@ -3334,46 +3308,46 @@ tm "BdDeclarativeTextMgr" ) commonDM (CommonDM ldm (LogicalDM -suid 20,0 +suid 22,0 usingSuid 1 -emptyRow *96 (LEmptyRow +emptyRow *94 (LEmptyRow ) uid 150,0 optionalChildren [ -*97 (RefLabelRowHdr +*95 (RefLabelRowHdr ) -*98 (TitleRowHdr +*96 (TitleRowHdr ) -*99 (FilterRowHdr +*97 (FilterRowHdr ) -*100 (RefLabelColHdr +*98 (RefLabelColHdr tm "RefLabelColHdrMgr" ) -*101 (RowExpandColHdr +*99 (RowExpandColHdr tm "RowExpandColHdrMgr" ) -*102 (GroupColHdr +*100 (GroupColHdr tm "GroupColHdrMgr" ) -*103 (NameColHdr +*101 (NameColHdr tm "BlockDiagramNameColHdrMgr" ) -*104 (ModeColHdr +*102 (ModeColHdr tm "BlockDiagramModeColHdrMgr" ) -*105 (TypeColHdr +*103 (TypeColHdr tm "BlockDiagramTypeColHdrMgr" ) -*106 (BoundsColHdr +*104 (BoundsColHdr tm "BlockDiagramBoundsColHdrMgr" ) -*107 (InitColHdr +*105 (InitColHdr tm "BlockDiagramInitColHdrMgr" ) -*108 (EolColHdr +*106 (EolColHdr tm "BlockDiagramEolColHdrMgr" ) -*109 (LeafLogPort +*107 (LeafLogPort port (LogicalPort lang 11 decl (Decl @@ -3385,7 +3359,7 @@ suid 4,0 ) uid 93,0 ) -*110 (LeafLogPort +*108 (LeafLogPort port (LogicalPort lang 11 decl (Decl @@ -3397,7 +3371,7 @@ suid 1,0 ) uid 95,0 ) -*111 (LeafLogPort +*109 (LeafLogPort port (LogicalPort lang 11 decl (Decl @@ -3409,7 +3383,7 @@ suid 2,0 ) uid 97,0 ) -*112 (LeafLogPort +*110 (LeafLogPort port (LogicalPort lang 11 decl (Decl @@ -3421,7 +3395,7 @@ suid 5,0 ) uid 99,0 ) -*113 (LeafLogPort +*111 (LeafLogPort port (LogicalPort lang 11 decl (Decl @@ -3433,7 +3407,7 @@ suid 6,0 ) uid 101,0 ) -*114 (LeafLogPort +*112 (LeafLogPort port (LogicalPort lang 11 m 1 @@ -3447,7 +3421,7 @@ suid 3,0 ) uid 103,0 ) -*115 (LeafLogPort +*113 (LeafLogPort port (LogicalPort lang 11 m 4 @@ -3460,7 +3434,7 @@ suid 12,0 ) uid 378,0 ) -*116 (LeafLogPort +*114 (LeafLogPort port (LogicalPort lang 11 m 4 @@ -3473,7 +3447,7 @@ suid 13,0 ) uid 380,0 ) -*117 (LeafLogPort +*115 (LeafLogPort port (LogicalPort lang 11 m 4 @@ -3487,32 +3461,6 @@ suid 16,0 ) uid 416,0 ) -*118 (LeafLogPort -port (LogicalPort -lang 11 -m 4 -decl (Decl -n "clk" -t "unsigned" -o 7 -suid 17,0 -) -) -uid 418,0 -) -*119 (LeafLogPort -port (LogicalPort -lang 11 -m 4 -decl (Decl -n "rst" -t "unsigned" -o 10 -suid 18,0 -) -) -uid 420,0 -) ] ) pdm (PhysicalDM @@ -3520,7 +3468,7 @@ displayShortBounds 1 editShortBounds 1 uid 163,0 optionalChildren [ -*120 (Sheet +*116 (Sheet sheetRow (SheetRow headerVa (MVa cellColor "49152,49152,49152" @@ -3537,98 +3485,86 @@ cellColor "39936,56832,65280" fontColor "0,0,0" font "Tahoma,10,0" ) -emptyMRCItem *121 (MRCItem -litem &96 -pos 11 +emptyMRCItem *117 (MRCItem +litem &94 +pos 9 dimension 20 ) uid 165,0 optionalChildren [ -*122 (MRCItem -litem &97 +*118 (MRCItem +litem &95 pos 0 dimension 20 uid 166,0 ) -*123 (MRCItem -litem &98 +*119 (MRCItem +litem &96 pos 1 dimension 23 uid 167,0 ) -*124 (MRCItem -litem &99 +*120 (MRCItem +litem &97 pos 2 hidden 1 dimension 20 uid 168,0 ) -*125 (MRCItem -litem &109 +*121 (MRCItem +litem &107 pos 0 dimension 20 uid 94,0 ) -*126 (MRCItem -litem &110 +*122 (MRCItem +litem &108 pos 1 dimension 20 uid 96,0 ) -*127 (MRCItem -litem &111 +*123 (MRCItem +litem &109 pos 2 dimension 20 uid 98,0 ) -*128 (MRCItem -litem &112 +*124 (MRCItem +litem &110 pos 3 dimension 20 uid 100,0 ) -*129 (MRCItem -litem &113 +*125 (MRCItem +litem &111 pos 4 dimension 20 uid 102,0 ) -*130 (MRCItem -litem &114 +*126 (MRCItem +litem &112 pos 5 dimension 20 uid 104,0 ) -*131 (MRCItem -litem &115 +*127 (MRCItem +litem &113 pos 6 dimension 20 uid 379,0 ) -*132 (MRCItem -litem &116 +*128 (MRCItem +litem &114 pos 7 dimension 20 uid 381,0 ) -*133 (MRCItem -litem &117 +*129 (MRCItem +litem &115 pos 8 dimension 20 uid 417,0 ) -*134 (MRCItem -litem &118 -pos 9 -dimension 20 -uid 419,0 -) -*135 (MRCItem -litem &119 -pos 10 -dimension 20 -uid 421,0 -) ] ) sheetCol (SheetCol @@ -3640,50 +3576,50 @@ textAngle 90 ) uid 169,0 optionalChildren [ -*136 (MRCItem -litem &100 +*130 (MRCItem +litem &98 pos 0 dimension 20 uid 170,0 ) -*137 (MRCItem -litem &102 +*131 (MRCItem +litem &100 pos 1 dimension 50 uid 171,0 ) -*138 (MRCItem -litem &103 +*132 (MRCItem +litem &101 pos 2 dimension 100 uid 172,0 ) -*139 (MRCItem -litem &104 +*133 (MRCItem +litem &102 pos 3 dimension 50 uid 173,0 ) -*140 (MRCItem -litem &105 +*134 (MRCItem +litem &103 pos 4 dimension 100 uid 174,0 ) -*141 (MRCItem -litem &106 +*135 (MRCItem +litem &104 pos 5 dimension 100 uid 175,0 ) -*142 (MRCItem -litem &107 +*136 (MRCItem +litem &105 pos 6 dimension 50 uid 176,0 ) -*143 (MRCItem -litem &108 +*137 (MRCItem +litem &106 pos 7 dimension 80 uid 177,0 @@ -3703,38 +3639,38 @@ uid 149,0 ) genericsCommonDM (CommonDM ldm (LogicalDM -emptyRow *144 (LEmptyRow +emptyRow *138 (LEmptyRow ) uid 179,0 optionalChildren [ -*145 (RefLabelRowHdr +*139 (RefLabelRowHdr ) -*146 (TitleRowHdr +*140 (TitleRowHdr ) -*147 (FilterRowHdr +*141 (FilterRowHdr ) -*148 (RefLabelColHdr +*142 (RefLabelColHdr tm "RefLabelColHdrMgr" ) -*149 (RowExpandColHdr +*143 (RowExpandColHdr tm "RowExpandColHdrMgr" ) -*150 (GroupColHdr +*144 (GroupColHdr tm "GroupColHdrMgr" ) -*151 (NameColHdr +*145 (NameColHdr tm "GenericNameColHdrMgr" ) -*152 (TypeColHdr +*146 (TypeColHdr tm "GenericTypeColHdrMgr" ) -*153 (InitColHdr +*147 (InitColHdr tm "GenericValueColHdrMgr" ) -*154 (PragmaColHdr +*148 (PragmaColHdr tm "GenericPragmaColHdrMgr" ) -*155 (EolColHdr +*149 (EolColHdr tm "GenericEolColHdrMgr" ) ] @@ -3744,7 +3680,7 @@ displayShortBounds 1 editShortBounds 1 uid 191,0 optionalChildren [ -*156 (Sheet +*150 (Sheet sheetRow (SheetRow headerVa (MVa cellColor "49152,49152,49152" @@ -3761,27 +3697,27 @@ cellColor "39936,56832,65280" fontColor "0,0,0" font "Tahoma,10,0" ) -emptyMRCItem *157 (MRCItem -litem &144 +emptyMRCItem *151 (MRCItem +litem &138 pos 0 dimension 20 ) uid 193,0 optionalChildren [ -*158 (MRCItem -litem &145 +*152 (MRCItem +litem &139 pos 0 dimension 20 uid 194,0 ) -*159 (MRCItem -litem &146 +*153 (MRCItem +litem &140 pos 1 dimension 23 uid 195,0 ) -*160 (MRCItem -litem &147 +*154 (MRCItem +litem &141 pos 2 hidden 1 dimension 20 @@ -3798,44 +3734,44 @@ textAngle 90 ) uid 197,0 optionalChildren [ -*161 (MRCItem -litem &148 +*155 (MRCItem +litem &142 pos 0 dimension 20 uid 198,0 ) -*162 (MRCItem -litem &150 +*156 (MRCItem +litem &144 pos 1 dimension 50 uid 199,0 ) -*163 (MRCItem -litem &151 +*157 (MRCItem +litem &145 pos 2 dimension 100 uid 200,0 ) -*164 (MRCItem -litem &152 +*158 (MRCItem +litem &146 pos 3 dimension 100 uid 201,0 ) -*165 (MRCItem -litem &153 +*159 (MRCItem +litem &147 pos 4 dimension 50 uid 202,0 ) -*166 (MRCItem -litem &154 +*160 (MRCItem +litem &148 pos 5 dimension 50 uid 203,0 ) -*167 (MRCItem -litem &155 +*161 (MRCItem +litem &149 pos 6 dimension 80 uid 204,0 diff --git a/Cursor/hds/@main/struct.bd b/Cursor/hds/@main/struct.bd index bfbcb11..08f3e99 100644 --- a/Cursor/hds/@main/struct.bd +++ b/Cursor/hds/@main/struct.bd @@ -227,7 +227,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:44:45" +value "15:15:57" ) (vvPair variable "group" @@ -299,7 +299,7 @@ value "struct" ) (vvPair variable "time" -value "14:44:45" +value "15:15:57" ) (vvPair variable "unit" @@ -1942,7 +1942,7 @@ uid 627,0 lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 16 suid 34,0 @@ -1960,7 +1960,7 @@ uid 629,0 lang 11 decl (Decl n "info_cruse" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 17 suid 35,0 @@ -1978,7 +1978,7 @@ uid 631,0 lang 11 decl (Decl n "info_deceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 18 suid 36,0 @@ -2341,7 +2341,7 @@ uid 1348,0 lang 11 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 suid 51,0 @@ -2359,7 +2359,7 @@ uid 1350,0 lang 11 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 suid 52,0 @@ -3068,43 +3068,6 @@ uid 72,0 va (VaSet vasetType 3 ) -xt "95000,22000,115000,22000" -pts [ -"115000,22000" -"95000,22000" -] -) -start &9 -end &38 -sat 32 -eat 2 -st 0 -sf 1 -si 0 -tg (WTG -uid 75,0 -ps "ConnStartEndStrategy" -stg "STSignalDisplayStrategy" -f (Text -uid 76,0 -va (VaSet -isHidden 1 -) -xt "114000,20800,116700,22000" -st "RaZ" -blo "114000,21800" -tm "WireNameMgr" -) -) -on &10 -) -*112 (Wire -uid 71,0 -shape (OrthoPolyLine -uid 72,0 -va (VaSet -vasetType 3 -) xt "35000,40000,114000,45000" pts [ "114000,45000" @@ -3137,6 +3100,43 @@ tm "WireNameMgr" ) on &16 ) +*112 (Wire +uid 71,0 +shape (OrthoPolyLine +uid 72,0 +va (VaSet +vasetType 3 +) +xt "95000,22000,115000,22000" +pts [ +"115000,22000" +"95000,22000" +] +) +start &9 +end &38 +sat 32 +eat 2 +st 0 +sf 1 +si 0 +tg (WTG +uid 75,0 +ps "ConnStartEndStrategy" +stg "STSignalDisplayStrategy" +f (Text +uid 76,0 +va (VaSet +isHidden 1 +) +xt "114000,20800,116700,22000" +st "RaZ" +blo "114000,21800" +tm "WireNameMgr" +) +) +on &10 +) *113 (Wire uid 85,0 optionalChildren [ @@ -5640,11 +5640,11 @@ tm "BdCompilerDirectivesTextMgr" associable 1 ) windowSize "0,0,1537,960" -viewArea "-20700,-29700,91874,41852" +viewArea "-11800,-22638,100774,48914" cachedDiagramExtent "-37000,-20200,122900,50000" hasePageBreakOrigin 1 pageBreakOrigin "-82000,-49000" -lastUid 3753,0 +lastUid 4314,0 defaultCommentText (CommentText shape (Rectangle layer 0 @@ -6953,7 +6953,7 @@ lang 11 m 4 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 16 suid 34,0 @@ -6967,7 +6967,7 @@ lang 11 m 4 decl (Decl n "info_cruse" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 17 suid 35,0 @@ -6981,7 +6981,7 @@ lang 11 m 4 decl (Decl n "info_deceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 18 suid 36,0 @@ -7071,7 +7071,7 @@ lang 11 m 4 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 suid 51,0 @@ -7085,7 +7085,7 @@ lang 11 m 4 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 suid 52,0 diff --git a/Cursor/hds/accelerator/interface b/Cursor/hds/accelerator/interface index 68214f0..64dac6d 100644 --- a/Cursor/hds/accelerator/interface +++ b/Cursor/hds/accelerator/interface @@ -21,7 +21,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 80,0 +suid 87,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -67,10 +67,10 @@ decl (Decl n "clk" t "std_ulogic" o 2 -suid 74,0 +suid 81,0 ) ) -uid 1022,0 +uid 1117,0 ) *15 (LogPort port (LogicalPort @@ -78,24 +78,24 @@ lang 11 decl (Decl n "end_acceleration" t "std_ulogic" -o 3 -suid 75,0 +o 7 +suid 82,0 ) ) -uid 1024,0 +uid 1119,0 ) *16 (LogPort port (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" -o 4 -suid 76,0 +o 3 +suid 83,0 ) ) -uid 1026,0 +uid 1121,0 ) *17 (LogPort port (LogicalPort @@ -105,10 +105,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 77,0 +suid 84,0 ) ) -uid 1028,0 +uid 1123,0 ) *18 (LogPort port (LogicalPort @@ -118,11 +118,11 @@ decl (Decl n "power_acceleration" t "unsigned" b "(7 DOWNTO 0)" -o 7 -suid 78,0 +o 8 +suid 85,0 ) ) -uid 1030,0 +uid 1125,0 ) *19 (LogPort port (LogicalPort @@ -130,11 +130,11 @@ lang 11 decl (Decl n "rst" t "std_ulogic" -o 5 -suid 79,0 +o 4 +suid 86,0 ) ) -uid 1032,0 +uid 1127,0 ) *20 (LogPort port (LogicalPort @@ -142,11 +142,11 @@ lang 11 decl (Decl n "sideL_acceleration" t "std_ulogic" -o 6 -suid 80,0 +o 9 +suid 87,0 ) ) -uid 1034,0 +uid 1129,0 ) ] ) @@ -202,43 +202,43 @@ uid 106,0 litem &14 pos 0 dimension 20 -uid 1023,0 +uid 1118,0 ) *27 (MRCItem litem &15 pos 1 dimension 20 -uid 1025,0 +uid 1120,0 ) *28 (MRCItem litem &16 pos 2 dimension 20 -uid 1027,0 +uid 1122,0 ) *29 (MRCItem litem &17 pos 3 dimension 20 -uid 1029,0 +uid 1124,0 ) *30 (MRCItem litem &18 pos 4 dimension 20 -uid 1031,0 +uid 1126,0 ) *31 (MRCItem litem &19 pos 5 dimension 20 -uid 1033,0 +uid 1128,0 ) *32 (MRCItem litem &20 pos 6 dimension 20 -uid 1035,0 +uid 1130,0 ) ] ) @@ -565,7 +565,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:39:05" +value "15:14:17" ) (vvPair variable "group" @@ -637,7 +637,7 @@ value "interface" ) (vvPair variable "time" -value "14:39:05" +value "15:14:17" ) (vvPair variable "unit" @@ -672,10 +672,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *66 (CptPort -uid 987,0 +uid 1082,0 ps "OnEdgeStrategy" shape (Triangle -uid 988,0 +uid 1083,0 ro 90 va (VaSet vasetType 1 @@ -684,11 +684,11 @@ fg "0,65535,0" xt "14250,9625,15000,10375" ) tg (CPTG -uid 989,0 +uid 1084,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 990,0 +uid 1085,0 va (VaSet font "Verdana,12,0" ) @@ -699,7 +699,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 991,0 +uid 1086,0 va (VaSet font "Courier New,8,0" ) @@ -713,15 +713,15 @@ decl (Decl n "clk" t "std_ulogic" o 2 -suid 74,0 +suid 81,0 ) ) ) *67 (CptPort -uid 992,0 +uid 1087,0 ps "OnEdgeStrategy" shape (Triangle -uid 993,0 +uid 1088,0 va (VaSet vasetType 1 fg "0,65535,0" @@ -729,11 +729,11 @@ fg "0,65535,0" xt "19625,16000,20375,16750" ) tg (CPTG -uid 994,0 +uid 1089,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 995,0 +uid 1090,0 ro 270 va (VaSet font "Verdana,12,0" @@ -745,7 +745,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 996,0 +uid 1091,0 va (VaSet font "Courier New,8,0" ) @@ -758,16 +758,16 @@ lang 11 decl (Decl n "end_acceleration" t "std_ulogic" -o 3 -suid 75,0 +o 7 +suid 82,0 ) ) ) *68 (CptPort -uid 997,0 +uid 1092,0 ps "OnEdgeStrategy" shape (Triangle -uid 998,0 +uid 1093,0 ro 90 va (VaSet vasetType 1 @@ -776,11 +776,11 @@ fg "0,65535,0" xt "14250,7625,15000,8375" ) tg (CPTG -uid 999,0 +uid 1094,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1000,0 +uid 1095,0 va (VaSet font "Verdana,12,0" ) @@ -791,30 +791,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1001,0 +uid 1096,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4800,76500,5600" -st "info_acceleration : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4800,72000,5600" +st "info_acceleration : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" -o 4 -suid 76,0 +o 3 +suid 83,0 ) ) ) *69 (CptPort -uid 1002,0 +uid 1097,0 ps "OnEdgeStrategy" shape (Triangle -uid 1003,0 +uid 1098,0 ro 90 va (VaSet vasetType 1 @@ -823,11 +823,11 @@ fg "0,65535,0" xt "14250,6625,15000,7375" ) tg (CPTG -uid 1004,0 +uid 1099,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1005,0 +uid 1100,0 va (VaSet font "Verdana,12,0" ) @@ -838,7 +838,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1006,0 +uid 1101,0 va (VaSet font "Courier New,8,0" ) @@ -853,15 +853,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 77,0 +suid 84,0 ) ) ) *70 (CptPort -uid 1007,0 +uid 1102,0 ps "OnEdgeStrategy" shape (Triangle -uid 1008,0 +uid 1103,0 ro 90 va (VaSet vasetType 1 @@ -870,11 +870,11 @@ fg "0,65535,0" xt "23000,6625,23750,7375" ) tg (CPTG -uid 1009,0 +uid 1104,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1010,0 +uid 1105,0 va (VaSet font "Verdana,12,0" ) @@ -886,7 +886,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1011,0 +uid 1106,0 va (VaSet font "Courier New,8,0" ) @@ -901,16 +901,16 @@ decl (Decl n "power_acceleration" t "unsigned" b "(7 DOWNTO 0)" -o 7 -suid 78,0 +o 8 +suid 85,0 ) ) ) *71 (CptPort -uid 1012,0 +uid 1107,0 ps "OnEdgeStrategy" shape (Triangle -uid 1013,0 +uid 1108,0 ro 90 va (VaSet vasetType 1 @@ -919,11 +919,11 @@ fg "0,65535,0" xt "14250,10625,15000,11375" ) tg (CPTG -uid 1014,0 +uid 1109,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1015,0 +uid 1110,0 va (VaSet font "Verdana,12,0" ) @@ -934,7 +934,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1016,0 +uid 1111,0 va (VaSet font "Courier New,8,0" ) @@ -947,16 +947,16 @@ lang 11 decl (Decl n "rst" t "std_ulogic" -o 5 -suid 79,0 +o 4 +suid 86,0 ) ) ) *72 (CptPort -uid 1017,0 +uid 1112,0 ps "OnEdgeStrategy" shape (Triangle -uid 1018,0 +uid 1113,0 va (VaSet vasetType 1 fg "0,65535,0" @@ -964,11 +964,11 @@ fg "0,65535,0" xt "17625,16000,18375,16750" ) tg (CPTG -uid 1019,0 +uid 1114,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1020,0 +uid 1115,0 ro 270 va (VaSet font "Verdana,12,0" @@ -980,7 +980,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1021,0 +uid 1116,0 va (VaSet font "Courier New,8,0" ) @@ -993,8 +993,8 @@ lang 11 decl (Decl n "sideL_acceleration" t "std_ulogic" -o 6 -suid 80,0 +o 9 +suid 87,0 ) ) ) @@ -1705,6 +1705,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 1058,0 +lastUid 1130,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/convertissor_position/fsm.sm b/Cursor/hds/convertissor_position/fsm.sm index 65de31d..a9658b8 100644 --- a/Cursor/hds/convertissor_position/fsm.sm +++ b/Cursor/hds/convertissor_position/fsm.sm @@ -139,7 +139,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:27:52" +value "15:10:53" ) (vvPair variable "group" @@ -211,7 +211,7 @@ value "fsm" ) (vvPair variable "time" -value "14:27:52" +value "15:10:53" ) (vvPair variable "unit" @@ -406,278 +406,7 @@ tm "SmCaseExpr" ) ) ) -*3 (SmClockPoint -uid 60,0 -shape (CompositeShape -uid 61,0 -va (VaSet -vasetType 1 -fg "65535,65535,0" -) -optionalChildren [ -(Pentagon -uid 62,0 -sl 0 -ro 270 -xt "3366,16778,5616,17778" -) -(OrthoPolyLine -uid 63,0 -sl 0 -ro 270 -va (VaSet -vasetType 3 -) -xt "4266,16978,4865,17578" -pts [ -"4266,17578" -"4565,17578" -"4565,16978" -"4865,16978" -] -) -(Arc2D -pts [ -"3875,17431" -"3620,17125" -"3875,17125" -] -uid 64,0 -sl 0 -ro 270 -va (VaSet -vasetType 1 -transparent 1 -) -xt "3547,17078,3875,17477" -) -] -) -name (TextAssociate -uid 65,0 -ps "CenterOffsetStrategy" -text (Text -uid 66,0 -va (VaSet -) -xt "666,16778,2866,17978" -st "clk" -ju 2 -blo "2866,17778" -tm "SmControlSignalNameMgr" -) -) -cond (SmControlCondition -uid 67,0 -ps "CenterOffsetStrategy" -shape (Rectangle -uid 68,0 -va (VaSet -vasetType 1 -fg "65535,65535,65535" -lineColor "0,32768,49152" -) -xt "5732,16636,20632,18036" -) -autoResize 1 -cond (MLText -uid 69,0 -va (VaSet -) -xt "5832,16736,20532,17936" -st "clk'EVENT AND clk = '1'" -tm "SmControlConditionMgr" -) -) -) -*4 (SmResetPoint -uid 70,0 -shape (CompositeShape -uid 71,0 -va (VaSet -vasetType 1 -fg "65535,65535,0" -) -optionalChildren [ -(Pentagon -uid 72,0 -sl 0 -ro 270 -xt "3250,19500,5500,20500" -) -(OrthoPolyLine -uid 73,0 -sl 0 -ro 270 -va (VaSet -vasetType 3 -) -xt "4150,19700,4749,20300" -pts [ -"4749,20300" -"4449,20300" -"4449,19700" -"4150,19700" -] -) -(Line -uid 74,0 -sl 0 -ro 270 -xt "3499,19825,3599,19875" -pts [ -"3499,19875" -"3599,19825" -] -) -(Line -uid 75,0 -sl 0 -ro 270 -xt "3499,19825,3499,20175" -pts [ -"3499,20175" -"3499,19825" -] -) -(Circle -uid 76,0 -layer 10 -sl 0 -ro 270 -va (VaSet -vasetType 1 -isHidden 1 -fg "65535,65535,0" -) -xt "4299,19850,4599,20150" -radius 150 -) -] -) -cond (SmControlCondition -uid 82,0 -ps "CenterOffsetStrategy" -shape (Rectangle -uid 83,0 -va (VaSet -vasetType 1 -isHidden 1 -fg "65535,65535,65535" -lineColor "0,32768,49152" -) -xt "3250,17700,8150,19100" -) -autoResize 1 -cond (MLText -uid 84,0 -va (VaSet -isHidden 1 -) -xt "3350,17800,8050,19000" -st "rst = '0'" -tm "SmControlConditionMgr" -) -) -prio (TransitionPriority -uid 79,0 -ps "PercentageFromStartStrategy" -shape (Circle -uid 80,0 -va (VaSet -vasetType 1 -isHidden 1 -fg "65535,65535,65535" -bg "0,0,0" -) -xt "5500,18937,7626,21063" -radius 1063 -) -pr (Text -uid 81,0 -va (VaSet -isHidden 1 -) -xt "5863,19400,7263,20600" -st "1" -ju 0 -blo "6563,20400" -tm "TransitionPriority" -) -padding "100,100" -) -name (TextAssociate -uid 77,0 -ps "CenterOffsetStrategy" -text (Text -uid 78,0 -va (VaSet -) -xt "1150,19400,3250,20600" -st "rst" -ju 2 -blo "3250,20400" -tm "SmControlSignalNameMgr" -) -) -actions (TextAssociate -uid 85,0 -ps "CenterOffsetStrategy" -text (MLText -uid 86,0 -va (VaSet -isHidden 1 -) -xt "11125,24125,19725,25325" -st "< Automatic >" -tm "Actions" -) -) -) -*5 (Link -uid 87,0 -shape (CompositeShape -uid 88,0 -va (VaSet -vasetType 1 -fg "65535,65535,0" -bg "0,0,0" -) -optionalChildren [ -(Pentagon -uid 89,0 -sl 0 -ro 270 -xt "17000,19500,19250,20500" -) -(Line -uid 90,0 -sl 0 -ro 270 -xt "16500,20000,17000,20000" -pts [ -"16500,20000" -"17000,20000" -] -) -] -) -name (TextAssociate -uid 91,0 -ps "CenterOffsetStrategy" -text (Text -uid 92,0 -va (VaSet -font "Verdana,9,1" -) -xt "19750,19500,21450,20700" -st "s0" -blo "19750,20500" -tm "LinkName" -) -) -) -*6 (SmRecoveryStatePoint +*3 (SmRecoveryStatePoint uid 93,0 shape (CompositeShape uid 94,0 @@ -723,7 +452,7 @@ pts [ ] ) ) -*7 (Link +*4 (Link uid 98,0 shape (CompositeShape uid 99,0 @@ -766,10 +495,10 @@ tm "LinkName" ) ) ) -*8 (Grouping +*5 (Grouping uid 124,0 optionalChildren [ -*9 (CommentText +*6 (CommentText uid 126,0 shape (Rectangle uid 127,0 @@ -801,7 +530,7 @@ position 1 ignorePrefs 1 titleBlock 1 ) -*10 (CommentText +*7 (CommentText uid 129,0 shape (Rectangle uid 130,0 @@ -833,7 +562,7 @@ position 1 ignorePrefs 1 titleBlock 1 ) -*11 (CommentText +*8 (CommentText uid 132,0 shape (Rectangle uid 133,0 @@ -865,7 +594,7 @@ position 1 ignorePrefs 1 titleBlock 1 ) -*12 (CommentText +*9 (CommentText uid 135,0 shape (Rectangle uid 136,0 @@ -897,7 +626,7 @@ position 1 ignorePrefs 1 titleBlock 1 ) -*13 (CommentText +*10 (CommentText uid 138,0 shape (Rectangle uid 139,0 @@ -928,7 +657,7 @@ visibleWidth 20000 ignorePrefs 1 titleBlock 1 ) -*14 (CommentText +*11 (CommentText uid 141,0 shape (Rectangle uid 142,0 @@ -960,7 +689,7 @@ position 1 ignorePrefs 1 titleBlock 1 ) -*15 (CommentText +*12 (CommentText uid 144,0 shape (Rectangle uid 145,0 @@ -991,7 +720,7 @@ position 1 ignorePrefs 1 titleBlock 1 ) -*16 (CommentText +*13 (CommentText uid 147,0 shape (Rectangle uid 148,0 @@ -1023,7 +752,7 @@ position 1 ignorePrefs 1 titleBlock 1 ) -*17 (CommentText +*14 (CommentText uid 150,0 shape (Rectangle uid 151,0 @@ -1055,7 +784,7 @@ position 1 ignorePrefs 1 titleBlock 1 ) -*18 (CommentText +*15 (CommentText uid 153,0 shape (Rectangle uid 154,0 @@ -1100,7 +829,7 @@ xt "32000,42000,73000,47000" ) oxt "14000,66000,55000,71000" ) -*19 (State +*16 (State uid 164,0 shape (Circle uid 165,0 @@ -1259,7 +988,7 @@ tm "SmCaseExpr" ) ) ) -*20 (State +*17 (State uid 181,0 shape (Circle uid 182,0 @@ -1418,7 +1147,7 @@ tm "SmCaseExpr" ) ) ) -*21 (State +*18 (State uid 330,0 shape (Circle uid 331,0 @@ -1577,96 +1306,278 @@ tm "SmCaseExpr" ) ) ) -*22 (Transition -uid 104,0 -shape (Spline -uid 105,0 +*19 (SmClockPoint +uid 487,0 +shape (CompositeShape +uid 488,0 +va (VaSet +vasetType 1 +fg "65535,65535,0" +) +optionalChildren [ +(Pentagon +uid 489,0 +sl 0 +ro 270 +xt "3675,18080,5925,19080" +) +(OrthoPolyLine +uid 490,0 +sl 0 +ro 270 va (VaSet vasetType 3 ) -xt "5500,20000,16500,20000" +xt "4575,18280,5174,18880" pts [ -"5500,20000" -"16500,20000" +"4575,18880" +"4874,18880" +"4874,18280" +"5174,18280" ] ) -start &4 -end &5 -ss 0 -es 0 -cond "rst = '0'" -tb (TransitionBlock -uid 106,0 +(Arc2D +pts [ +"4184,18733" +"3929,18427" +"4184,18427" +] +uid 491,0 +sl 0 +ro 270 +va (VaSet +vasetType 1 +transparent 1 +) +xt "3856,18380,4184,18779" +) +] +) +name (TextAssociate +uid 492,0 +ps "CenterOffsetStrategy" +text (Text +uid 493,0 +va (VaSet +) +xt "-225,18080,3175,19280" +st "clock" +ju 2 +blo "3175,19080" +tm "SmControlSignalNameMgr" +) +) +cond (SmControlCondition +uid 494,0 ps "CenterOffsetStrategy" shape (Rectangle -uid 107,0 +uid 495,0 va (VaSet vasetType 1 fg "65535,65535,65535" -bg "0,0,0" lineColor "0,32768,49152" ) -xt "8150,18900,13850,21100" +xt "5985,17820,23285,19220" ) autoResize 1 -lineShape (Line -uid 108,0 +cond (MLText +uid 496,0 +va (VaSet +) +xt "6085,17920,23185,19120" +st "clock'EVENT AND clock = '1'" +tm "SmControlConditionMgr" +) +) +) +*20 (SmResetPoint +uid 497,0 +shape (CompositeShape +uid 498,0 +va (VaSet +vasetType 1 +fg "65535,65535,0" +) +optionalChildren [ +(Pentagon +uid 499,0 +sl 0 +ro 270 +xt "2550,21920,4800,22920" +) +(OrthoPolyLine +uid 500,0 +sl 0 +ro 270 va (VaSet vasetType 3 ) -xt "8650,20500,13350,20500" +xt "3450,22120,4049,22720" pts [ -"8650,20500" -"13350,20500" +"4049,22720" +"3749,22720" +"3749,22120" +"3450,22120" ] ) -condition (MLText -uid 109,0 +(Line +uid 501,0 +sl 0 +ro 270 +xt "2799,22245,2899,22295" +pts [ +"2799,22295" +"2899,22245" +] +) +(Line +uid 502,0 +sl 0 +ro 270 +xt "2799,22245,2799,22595" +pts [ +"2799,22595" +"2799,22245" +] +) +(Circle +uid 503,0 +layer 10 +sl 0 +ro 270 va (VaSet +vasetType 1 +isHidden 1 +fg "65535,65535,0" ) -xt "8650,18900,13350,20100" -st "rst = '0'" -tm "Condition" +xt "3599,22270,3899,22570" +radius 150 ) -actions (MLText -uid 110,0 +] +) +cond (SmControlCondition +uid 509,0 +ps "CenterOffsetStrategy" +shape (Rectangle +uid 510,0 +va (VaSet +vasetType 1 +isHidden 1 +fg "65535,65535,65535" +lineColor "0,32768,49152" +) +xt "1600,20120,8400,21520" +) +autoResize 1 +cond (MLText +uid 511,0 va (VaSet isHidden 1 ) -xt "6700,20900,15300,22100" -st "< Automatic >" -tm "Actions" +xt "1700,20220,8300,21420" +st "reset = '0'" +tm "SmControlConditionMgr" ) ) -tp (TransitionPriority -uid 111,0 +prio (TransitionPriority +uid 506,0 ps "PercentageFromStartStrategy" shape (Circle -uid 112,0 +uid 507,0 va (VaSet vasetType 1 isHidden 1 fg "65535,65535,65535" bg "0,0,0" ) -xt "5537,18937,7663,21063" +xt "4800,21357,6926,23483" radius 1063 ) pr (Text -uid 113,0 +uid 508,0 va (VaSet isHidden 1 ) -xt "5900,19400,7300,20600" +xt "5163,21820,6563,23020" st "1" ju 0 -blo "6600,20400" +blo "5863,22820" tm "TransitionPriority" ) padding "100,100" ) +name (TextAssociate +uid 504,0 +ps "CenterOffsetStrategy" +text (Text +uid 505,0 +va (VaSet ) -*23 (Transition +xt "-750,21820,2550,23020" +st "reset" +ju 2 +blo "2550,22820" +tm "SmControlSignalNameMgr" +) +) +actions (TextAssociate +uid 512,0 +ps "CenterOffsetStrategy" +text (MLText +uid 513,0 +va (VaSet +isHidden 1 +) +xt "10425,26545,19025,27745" +st "< Automatic >" +tm "Actions" +) +) +) +*21 (Link +uid 514,0 +shape (CompositeShape +uid 515,0 +va (VaSet +vasetType 1 +fg "65535,65535,0" +bg "0,0,0" +) +optionalChildren [ +(Pentagon +uid 516,0 +sl 0 +ro 270 +xt "16050,21920,18300,22920" +) +(Line +uid 517,0 +sl 0 +ro 270 +xt "15550,22420,16050,22420" +pts [ +"15550,22420" +"16050,22420" +] +) +] +) +name (TextAssociate +uid 518,0 +ps "CenterOffsetStrategy" +text (Text +uid 519,0 +va (VaSet +font "Verdana,9,1" +) +xt "18800,21920,20500,23120" +st "s0" +blo "18800,22920" +tm "LinkName" +) +) +) +*22 (Transition uid 114,0 shape (Spline uid 115,0 @@ -1679,8 +1590,8 @@ pts [ "16500,15000" ] ) -start &6 -end &7 +start &3 +end &4 ss 0 es 0 tb (TransitionBlock @@ -1753,7 +1664,7 @@ tm "TransitionPriority" padding "100,100" ) ) -*24 (Transition +*23 (Transition uid 198,0 shape (Spline uid 199,0 @@ -1767,8 +1678,8 @@ pts [ ] arrow 1 ) -start &20 -end &19 +start &17 +end &16 cond "position20bit(19) = '1'" tb (TransitionBlock uid 200,0 @@ -1838,7 +1749,7 @@ tm "TransitionPriority" padding "100,100" ) ) -*25 (Transition +*24 (Transition uid 208,0 shape (Spline uid 209,0 @@ -1853,8 +1764,8 @@ pts [ ] arrow 1 ) -start &19 -end &20 +start &16 +end &17 ss 0 es 0 cond "position20bit(19) = '0'" @@ -1928,7 +1839,7 @@ tm "TransitionPriority" padding "100,100" ) ) -*26 (Transition +*25 (Transition uid 218,0 shape (Spline uid 219,0 @@ -1943,7 +1854,7 @@ pts [ arrow 1 ) start &2 -end &20 +end &17 es 0 cond "en = '1'" tb (TransitionBlock @@ -2016,7 +1927,7 @@ tm "TransitionPriority" padding "100,100" ) ) -*27 (Transition +*26 (Transition uid 347,0 shape (Spline uid 348,0 @@ -2031,8 +1942,8 @@ pts [ ] arrow 1 ) -start &20 -end &21 +start &17 +end &18 ss 0 es 0 cond "position20bit >262143" @@ -2104,7 +2015,7 @@ tm "TransitionPriority" padding "100,100" ) ) -*28 (Transition +*27 (Transition uid 357,0 shape (Spline uid 358,0 @@ -2119,8 +2030,8 @@ pts [ ] arrow 1 ) -start &21 -end &20 +start &18 +end &17 ss 0 cond "position20bit < 262143" tb (TransitionBlock @@ -2193,6 +2104,95 @@ tm "TransitionPriority" padding "100,100" ) ) +*28 (Transition +uid 520,0 +shape (Spline +uid 521,0 +va (VaSet +vasetType 3 +) +xt "4800,22420,15550,22420" +pts [ +"4800,22420" +"15550,22420" +] +) +start &20 +end &21 +ss 0 +es 0 +cond "reset = '0'" +tb (TransitionBlock +uid 522,0 +ps "CenterOffsetStrategy" +shape (Rectangle +uid 523,0 +va (VaSet +vasetType 1 +fg "65535,65535,65535" +bg "0,0,0" +lineColor "0,32768,49152" +) +xt "7325,21320,14925,23520" +) +autoResize 1 +lineShape (Line +uid 524,0 +va (VaSet +vasetType 3 +) +xt "7825,22920,14425,22920" +pts [ +"7825,22920" +"14425,22920" +] +) +condition (MLText +uid 525,0 +va (VaSet +) +xt "7825,21320,14425,22520" +st "reset = '0'" +tm "Condition" +) +actions (MLText +uid 526,0 +va (VaSet +isHidden 1 +) +xt "6825,23320,15425,24520" +st "< Automatic >" +tm "Actions" +) +) +tp (TransitionPriority +uid 527,0 +ps "PercentageFromStartStrategy" +shape (Circle +uid 528,0 +va (VaSet +vasetType 1 +isHidden 1 +fg "65535,65535,65535" +bg "0,0,0" +) +xt "4812,21357,6938,23483" +radius 1063 +) +pr (Text +uid 529,0 +va (VaSet +isHidden 1 +) +xt "5175,21820,6575,23020" +st "1" +ju 0 +blo "5875,22820" +tm "TransitionPriority" +) +padding "100,100" +) +) ] bg "65535,65535,65535" grid (Grid @@ -2306,11 +2306,11 @@ tm "SmCompilerDirectivesTextMgr" ] associable 1 ) -windowSize "76,33,1264,960" -viewArea "18600,-4700,76200,41560" -cachedDiagramExtent "0,-1000,86600,47000" +windowSize "76,33,1266,960" +viewArea "-4400,-9440,53320,36820" +cachedDiagramExtent "-750,-1000,86600,47000" hasePageBreakOrigin 1 -pageBreakOrigin "0,-2000" +pageBreakOrigin "-73000,-2000" isTopLevel 1 defaultCommentText (CommentText shape (Rectangle @@ -2675,14 +2675,14 @@ radix 2 ) stateOrder [ &2 -&19 -&20 -&21 +&16 +&17 +&18 ] name "csm" ) ] -lastUid 453,0 +lastUid 562,0 commonDM (CommonDM ldm (LogicalDM emptyRow *61 (LEmptyRow @@ -2770,32 +2770,6 @@ scheme 0 port (LogicalPort lang 11 decl (Decl -n "clk" -t "unsigned" -o 1 -) -) -uid 160,0 -cat 1 -expr "clk'EVENT AND clk = '1'" -) -*83 (LeafLogPort -port (LogicalPort -lang 11 -decl (Decl -n "rst" -t "unsigned" -o 4 -) -) -uid 162,0 -cat 8 -expr "rst = '0'" -) -*84 (LeafLogPort -port (LogicalPort -lang 11 -decl (Decl n "en" t "std_ulogic" o 2 @@ -2804,6 +2778,34 @@ o 2 uid 327,0 ass "" ) +*83 (LeafLogPort +port (LogicalPort +lang 11 +decl (Decl +n "clock" +t "std_ulogic" +o 1 +) +) +uid 484,0 +cat 1 +ass "" +expr "clock'EVENT AND clock = '1'" +) +*84 (LeafLogPort +port (LogicalPort +lang 11 +decl (Decl +n "reset" +t "std_ulogic" +o 4 +) +) +uid 486,0 +cat 8 +ass "" +expr "reset = '0'" +) ] ) pdm (PhysicalDM @@ -2868,22 +2870,22 @@ uid 159,0 ) *92 (MRCItem litem &82 -pos 0 -dimension 20 -uid 161,0 -) -*93 (MRCItem -litem &83 -pos 4 -dimension 20 -uid 163,0 -) -*94 (MRCItem -litem &84 pos 1 dimension 20 uid 326,0 ) +*93 (MRCItem +litem &83 +pos 0 +dimension 20 +uid 483,0 +) +*94 (MRCItem +litem &84 +pos 4 +dimension 20 +uid 485,0 +) ] ) sheetCol (SheetCol diff --git a/Cursor/hds/convertissor_position/interface b/Cursor/hds/convertissor_position/interface index c61ea22..1dd549e 100644 --- a/Cursor/hds/convertissor_position/interface +++ b/Cursor/hds/convertissor_position/interface @@ -26,7 +26,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 61,0 +suid 80,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -69,13 +69,13 @@ tm "EolColHdrMgr" port (LogicalPort lang 11 decl (Decl -n "clk" -t "unsigned" -o 7 -suid 57,0 +n "clock" +t "std_ulogic" +o 2 +suid 76,0 ) ) -uid 916,0 +uid 1164,0 ) *15 (LogPort port (LogicalPort @@ -84,10 +84,10 @@ decl (Decl n "en" t "std_ulogic" o 8 -suid 58,0 +suid 77,0 ) ) -uid 918,0 +uid 1166,0 ) *16 (LogPort port (LogicalPort @@ -98,10 +98,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 6 -suid 59,0 +suid 78,0 ) ) -uid 920,0 +uid 1168,0 ) *17 (LogPort port (LogicalPort @@ -111,22 +111,22 @@ n "position20bit" t "unsigned" b "(19 DOWNTO 0)" o 9 -suid 60,0 +suid 79,0 ) ) -uid 922,0 +uid 1170,0 ) *18 (LogPort port (LogicalPort lang 11 decl (Decl -n "rst" -t "unsigned" -o 10 -suid 61,0 +n "reset" +t "std_ulogic" +o 4 +suid 80,0 ) ) -uid 924,0 +uid 1172,0 ) ] ) @@ -182,31 +182,31 @@ uid 85,0 litem &14 pos 0 dimension 20 -uid 917,0 +uid 1165,0 ) *25 (MRCItem litem &15 pos 1 dimension 20 -uid 919,0 +uid 1167,0 ) *26 (MRCItem litem &16 pos 2 dimension 20 -uid 921,0 +uid 1169,0 ) *27 (MRCItem litem &17 pos 3 dimension 20 -uid 923,0 +uid 1171,0 ) *28 (MRCItem litem &18 pos 4 dimension 20 -uid 925,0 +uid 1173,0 ) ] ) @@ -533,7 +533,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:56:15" +value "15:10:53" ) (vvPair variable "group" @@ -605,7 +605,7 @@ value "interface" ) (vvPair variable "time" -value "14:56:15" +value "15:10:53" ) (vvPair variable "unit" @@ -640,10 +640,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *62 (CptPort -uid 891,0 +uid 1139,0 ps "OnEdgeStrategy" shape (Triangle -uid 892,0 +uid 1140,0 ro 90 va (VaSet vasetType 1 @@ -652,44 +652,41 @@ fg "0,65535,0" xt "14250,13625,15000,14375" ) tg (CPTG -uid 893,0 +uid 1141,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 894,0 +uid 1142,0 va (VaSet font "Verdana,12,0" ) -xt "16000,13300,18400,14700" -st "clk" +xt "16000,13300,19800,14700" +st "clock" blo "16000,14500" tm "CptPortNameMgr" ) ) dt (MLText -uid 895,0 +uid 1143,0 va (VaSet font "Courier New,8,0" ) -xt "44000,2400,62500,3200" -st "clk : IN unsigned ; -" ) thePort (LogicalPort lang 11 decl (Decl -n "clk" -t "unsigned" -o 7 -suid 57,0 +n "clock" +t "std_ulogic" +o 2 +suid 76,0 ) ) ) *63 (CptPort -uid 896,0 +uid 1144,0 ps "OnEdgeStrategy" shape (Triangle -uid 897,0 +uid 1145,0 ro 180 va (VaSet vasetType 1 @@ -698,11 +695,11 @@ fg "0,65535,0" xt "17625,5250,18375,6000" ) tg (CPTG -uid 898,0 +uid 1146,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 899,0 +uid 1147,0 ro 270 va (VaSet font "Verdana,12,0" @@ -715,13 +712,10 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 900,0 +uid 1148,0 va (VaSet font "Courier New,8,0" ) -xt "44000,3200,63500,4000" -st "en : IN std_ulogic ; -" ) thePort (LogicalPort lang 11 @@ -729,15 +723,15 @@ decl (Decl n "en" t "std_ulogic" o 8 -suid 58,0 +suid 77,0 ) ) ) *64 (CptPort -uid 901,0 +uid 1149,0 ps "OnEdgeStrategy" shape (Triangle -uid 902,0 +uid 1150,0 ro 90 va (VaSet vasetType 1 @@ -746,11 +740,11 @@ fg "0,65535,0" xt "23000,8625,23750,9375" ) tg (CPTG -uid 903,0 +uid 1151,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 904,0 +uid 1152,0 va (VaSet font "Verdana,12,0" ) @@ -762,13 +756,10 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 905,0 +uid 1153,0 va (VaSet font "Courier New,8,0" ) -xt "44000,5600,68500,6400" -st "Position : OUT unsigned (15 DOWNTO 0) -" ) thePort (LogicalPort lang 11 @@ -778,15 +769,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 6 -suid 59,0 +suid 78,0 ) ) ) *65 (CptPort -uid 906,0 +uid 1154,0 ps "OnEdgeStrategy" shape (Triangle -uid 907,0 +uid 1155,0 ro 90 va (VaSet vasetType 1 @@ -795,11 +786,11 @@ fg "0,65535,0" xt "14250,8625,15000,9375" ) tg (CPTG -uid 908,0 +uid 1156,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 909,0 +uid 1157,0 va (VaSet font "Verdana,12,0" ) @@ -810,13 +801,10 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 910,0 +uid 1158,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4000,69500,4800" -st "position20bit : IN unsigned (19 DOWNTO 0) ; -" ) thePort (LogicalPort lang 11 @@ -825,15 +813,15 @@ n "position20bit" t "unsigned" b "(19 DOWNTO 0)" o 9 -suid 60,0 +suid 79,0 ) ) ) *66 (CptPort -uid 911,0 +uid 1159,0 ps "OnEdgeStrategy" shape (Triangle -uid 912,0 +uid 1160,0 ro 90 va (VaSet vasetType 1 @@ -842,36 +830,33 @@ fg "0,65535,0" xt "14250,14625,15000,15375" ) tg (CPTG -uid 913,0 +uid 1161,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 914,0 +uid 1162,0 va (VaSet font "Verdana,12,0" ) -xt "16000,14300,18500,15700" -st "rst" +xt "16000,14300,20100,15700" +st "reset" blo "16000,15500" tm "CptPortNameMgr" ) ) dt (MLText -uid 915,0 +uid 1163,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4800,62500,5600" -st "rst : IN unsigned ; -" ) thePort (LogicalPort lang 11 decl (Decl -n "rst" -t "unsigned" -o 10 -suid 61,0 +n "reset" +t "std_ulogic" +o 4 +suid 80,0 ) ) ) @@ -884,8 +869,9 @@ fg "0,65535,0" lineColor "0,32896,0" lineWidth 2 ) -xt "15000,6000,23000,16000" +xt "15000,6000,23000,18000" ) +oxt "15000,6000,23000,16000" biTextGroup (BiTextGroup uid 10,0 ps "CenterOffsetStrategy" @@ -895,18 +881,18 @@ uid 11,0 va (VaSet font "Verdana,9,1" ) -xt "12750,9800,16450,11000" +xt "12750,10800,16450,12000" st "Cursor" -blo "12750,10800" +blo "12750,11800" ) second (Text uid 12,0 va (VaSet font "Verdana,9,1" ) -xt "12750,11000,25250,12200" +xt "12750,12000,25250,13200" st "convertissor_position" -blo "12750,12000" +blo "12750,13000" ) ) gi *67 (GenericInterface @@ -919,7 +905,7 @@ uid 15,0 va (VaSet font "Courier New,8,0" ) -xt "-18000,7000,-6500,7800" +xt "-25500,7000,-14000,7800" st "Generic Declarations" ) header "Generic Declarations" @@ -1584,6 +1570,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 925,0 +lastUid 1173,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/cursor@circuit/student@version.bd b/Cursor/hds/cursor@circuit/student@version.bd index 01be00f..459efee 100644 --- a/Cursor/hds/cursor@circuit/student@version.bd +++ b/Cursor/hds/cursor@circuit/student@version.bd @@ -166,7 +166,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "15:01:19" +value "15:15:24" ) (vvPair variable "group" @@ -302,7 +302,7 @@ value "studentVersion" ) (vvPair variable "time" -value "15:01:19" +value "15:15:24" ) (vvPair variable "unit" @@ -4680,7 +4680,7 @@ tm "BdCompilerDirectivesTextMgr" associable 1 ) windowSize "0,0,1537,960" -viewArea "26700,-14200,153673,66504" +viewArea "26700,-6149,153673,74555" cachedDiagramExtent "-17000,-23800,171000,152000" pageSetupInfo (PageSetupInfo ptrCmd "\\\\ipp://ippsion.hevs.ch\\PREA309_HPLJ3005DN,winspool," @@ -4707,7 +4707,7 @@ boundaryWidth 0 ) hasePageBreakOrigin 1 pageBreakOrigin "24000,-12000" -lastUid 13639,0 +lastUid 13722,0 defaultCommentText (CommentText shape (Rectangle layer 0 diff --git a/Cursor/hds/enable_acceleration/interface b/Cursor/hds/enable_acceleration/interface index 4fa9909..c3c9414 100644 --- a/Cursor/hds/enable_acceleration/interface +++ b/Cursor/hds/enable_acceleration/interface @@ -21,7 +21,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 74,0 +suid 82,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -67,10 +67,10 @@ decl (Decl n "clk" t "std_ulogic" o 2 -suid 67,0 +suid 75,0 ) ) -uid 909,0 +uid 988,0 ) *15 (LogPort port (LogicalPort @@ -80,23 +80,23 @@ decl (Decl n "end_acceleration" t "std_ulogic" o 7 -suid 68,0 +suid 76,0 ) ) -uid 911,0 +uid 990,0 ) *16 (LogPort port (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 3 -suid 69,0 +suid 77,0 ) ) -uid 913,0 +uid 992,0 ) *17 (LogPort port (LogicalPort @@ -106,10 +106,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 70,0 +suid 78,0 ) ) -uid 915,0 +uid 994,0 ) *18 (LogPort port (LogicalPort @@ -118,10 +118,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 71,0 +suid 79,0 ) ) -uid 917,0 +uid 996,0 ) *19 (LogPort port (LogicalPort @@ -130,10 +130,10 @@ decl (Decl n "sideL_acceleration" t "std_ulogic" o 9 -suid 72,0 +suid 80,0 ) ) -uid 919,0 +uid 998,0 ) *20 (LogPort port (LogicalPort @@ -142,10 +142,10 @@ decl (Decl n "skip_acceleration" t "std_ulogic" o 5 -suid 73,0 +suid 81,0 ) ) -uid 921,0 +uid 1000,0 ) *21 (LogPort port (LogicalPort @@ -154,10 +154,10 @@ decl (Decl n "unlock" t "std_ulogic" o 6 -suid 74,0 +suid 82,0 ) ) -uid 923,0 +uid 1002,0 ) ] ) @@ -213,49 +213,49 @@ uid 99,0 litem &14 pos 0 dimension 20 -uid 910,0 +uid 989,0 ) *28 (MRCItem litem &15 pos 1 dimension 20 -uid 912,0 +uid 991,0 ) *29 (MRCItem litem &16 pos 2 dimension 20 -uid 914,0 +uid 993,0 ) *30 (MRCItem litem &17 pos 3 dimension 20 -uid 916,0 +uid 995,0 ) *31 (MRCItem litem &18 pos 4 dimension 20 -uid 918,0 +uid 997,0 ) *32 (MRCItem litem &19 pos 5 dimension 20 -uid 920,0 +uid 999,0 ) *33 (MRCItem litem &20 pos 6 dimension 20 -uid 922,0 +uid 1001,0 ) *34 (MRCItem litem &21 pos 7 dimension 20 -uid 924,0 +uid 1003,0 ) ] ) @@ -582,7 +582,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:36:24" +value "15:14:17" ) (vvPair variable "group" @@ -654,7 +654,7 @@ value "interface" ) (vvPair variable "time" -value "14:36:24" +value "15:14:17" ) (vvPair variable "unit" @@ -689,10 +689,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *68 (CptPort -uid 869,0 +uid 948,0 ps "OnEdgeStrategy" shape (Triangle -uid 870,0 +uid 949,0 ro 90 va (VaSet vasetType 1 @@ -701,11 +701,11 @@ fg "0,65535,0" xt "14250,13625,15000,14375" ) tg (CPTG -uid 871,0 +uid 950,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 872,0 +uid 951,0 va (VaSet font "Verdana,12,0" ) @@ -716,7 +716,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 873,0 +uid 952,0 va (VaSet font "Courier New,8,0" ) @@ -730,15 +730,15 @@ decl (Decl n "clk" t "std_ulogic" o 2 -suid 67,0 +suid 75,0 ) ) ) *69 (CptPort -uid 874,0 +uid 953,0 ps "OnEdgeStrategy" shape (Triangle -uid 875,0 +uid 954,0 ro 90 va (VaSet vasetType 1 @@ -747,11 +747,11 @@ fg "0,65535,0" xt "23000,14625,23750,15375" ) tg (CPTG -uid 876,0 +uid 955,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 877,0 +uid 956,0 va (VaSet font "Verdana,12,0" ) @@ -763,7 +763,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 878,0 +uid 957,0 va (VaSet font "Courier New,8,0" ) @@ -778,15 +778,15 @@ decl (Decl n "end_acceleration" t "std_ulogic" o 7 -suid 68,0 +suid 76,0 ) ) ) *70 (CptPort -uid 879,0 +uid 958,0 ps "OnEdgeStrategy" shape (Triangle -uid 880,0 +uid 959,0 ro 90 va (VaSet vasetType 1 @@ -795,11 +795,11 @@ fg "0,65535,0" xt "14250,10625,15000,11375" ) tg (CPTG -uid 881,0 +uid 960,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 882,0 +uid 961,0 va (VaSet font "Verdana,12,0" ) @@ -810,30 +810,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 883,0 +uid 962,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4000,76500,4800" -st "info_acceleration : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4000,72000,4800" +st "info_acceleration : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 3 -suid 69,0 +suid 77,0 ) ) ) *71 (CptPort -uid 884,0 +uid 963,0 ps "OnEdgeStrategy" shape (Triangle -uid 885,0 +uid 964,0 ro 90 va (VaSet vasetType 1 @@ -842,11 +842,11 @@ fg "0,65535,0" xt "14250,9625,15000,10375" ) tg (CPTG -uid 886,0 +uid 965,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 887,0 +uid 966,0 va (VaSet font "Verdana,12,0" ) @@ -857,7 +857,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 888,0 +uid 967,0 va (VaSet font "Courier New,8,0" ) @@ -872,15 +872,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 70,0 +suid 78,0 ) ) ) *72 (CptPort -uid 889,0 +uid 968,0 ps "OnEdgeStrategy" shape (Triangle -uid 890,0 +uid 969,0 ro 90 va (VaSet vasetType 1 @@ -889,11 +889,11 @@ fg "0,65535,0" xt "14250,14625,15000,15375" ) tg (CPTG -uid 891,0 +uid 970,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 892,0 +uid 971,0 va (VaSet font "Verdana,12,0" ) @@ -904,7 +904,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 893,0 +uid 972,0 va (VaSet font "Courier New,8,0" ) @@ -918,15 +918,15 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 71,0 +suid 79,0 ) ) ) *73 (CptPort -uid 894,0 +uid 973,0 ps "OnEdgeStrategy" shape (Triangle -uid 895,0 +uid 974,0 ro 90 va (VaSet vasetType 1 @@ -935,11 +935,11 @@ fg "0,65535,0" xt "14250,7625,15000,8375" ) tg (CPTG -uid 896,0 +uid 975,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 897,0 +uid 976,0 va (VaSet font "Verdana,12,0" ) @@ -950,7 +950,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 898,0 +uid 977,0 va (VaSet font "Courier New,8,0" ) @@ -964,15 +964,15 @@ decl (Decl n "sideL_acceleration" t "std_ulogic" o 9 -suid 72,0 +suid 80,0 ) ) ) *74 (CptPort -uid 899,0 +uid 978,0 ps "OnEdgeStrategy" shape (Triangle -uid 900,0 +uid 979,0 ro 90 va (VaSet vasetType 1 @@ -981,11 +981,11 @@ fg "0,65535,0" xt "14250,12625,15000,13375" ) tg (CPTG -uid 901,0 +uid 980,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 902,0 +uid 981,0 va (VaSet font "Verdana,12,0" ) @@ -996,7 +996,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 903,0 +uid 982,0 va (VaSet font "Courier New,8,0" ) @@ -1010,15 +1010,15 @@ decl (Decl n "skip_acceleration" t "std_ulogic" o 5 -suid 73,0 +suid 81,0 ) ) ) *75 (CptPort -uid 904,0 +uid 983,0 ps "OnEdgeStrategy" shape (Triangle -uid 905,0 +uid 984,0 ro 90 va (VaSet vasetType 1 @@ -1027,11 +1027,11 @@ fg "0,65535,0" xt "14250,11625,15000,12375" ) tg (CPTG -uid 906,0 +uid 985,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 907,0 +uid 986,0 va (VaSet font "Verdana,12,0" ) @@ -1042,7 +1042,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 908,0 +uid 987,0 va (VaSet font "Courier New,8,0" ) @@ -1056,7 +1056,7 @@ decl (Decl n "unlock" t "std_ulogic" o 6 -suid 74,0 +suid 82,0 ) ) ) @@ -1145,7 +1145,7 @@ fg "0,0,32768" bg "0,0,32768" font "Arial,8,0" ) -xt "36200,48000,46000,49000" +xt "36200,48000,45400,49000" st " by %user on %dd %month %year " @@ -1767,6 +1767,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 924,0 +lastUid 1003,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/process_acceleration/interface b/Cursor/hds/process_acceleration/interface index c212322..21ed7b5 100644 --- a/Cursor/hds/process_acceleration/interface +++ b/Cursor/hds/process_acceleration/interface @@ -26,7 +26,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 138,0 +suid 147,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -71,11 +71,11 @@ lang 11 decl (Decl n "clk" t "std_ulogic" -o 3 -suid 130,0 +o 2 +suid 139,0 ) ) -uid 1677,0 +uid 1763,0 ) *15 (LogPort port (LogicalPort @@ -84,24 +84,24 @@ m 1 decl (Decl n "end_acceleration" t "std_ulogic" -o 13 -suid 131,0 +o 7 +suid 140,0 ) ) -uid 1679,0 +uid 1765,0 ) *16 (LogPort port (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" -o 16 -suid 132,0 +o 3 +suid 141,0 ) ) -uid 1681,0 +uid 1767,0 ) *17 (LogPort port (LogicalPort @@ -111,10 +111,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 133,0 +suid 142,0 ) ) -uid 1683,0 +uid 1769,0 ) *18 (LogPort port (LogicalPort @@ -124,11 +124,11 @@ decl (Decl n "power_acceleration" t "unsigned" b "(7 DOWNTO 0)" -o 22 -suid 134,0 +o 8 +suid 143,0 ) ) -uid 1685,0 +uid 1771,0 ) *19 (LogPort port (LogicalPort @@ -137,10 +137,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 135,0 +suid 144,0 ) ) -uid 1687,0 +uid 1773,0 ) *20 (LogPort port (LogicalPort @@ -149,11 +149,11 @@ m 1 decl (Decl n "sideL_acceleration" t "std_ulogic" -o 26 -suid 136,0 +o 9 +suid 145,0 ) ) -uid 1689,0 +uid 1775,0 ) *21 (LogPort port (LogicalPort @@ -161,11 +161,11 @@ lang 11 decl (Decl n "skip_acceleration" t "std_ulogic" -o 29 -suid 137,0 +o 5 +suid 146,0 ) ) -uid 1691,0 +uid 1777,0 ) *22 (LogPort port (LogicalPort @@ -173,11 +173,11 @@ lang 11 decl (Decl n "unlock" t "std_ulogic" -o 12 -suid 138,0 +o 6 +suid 147,0 ) ) -uid 1693,0 +uid 1779,0 ) ] ) @@ -233,55 +233,55 @@ uid 106,0 litem &14 pos 0 dimension 20 -uid 1678,0 +uid 1764,0 ) *29 (MRCItem litem &15 pos 1 dimension 20 -uid 1680,0 +uid 1766,0 ) *30 (MRCItem litem &16 pos 2 dimension 20 -uid 1682,0 +uid 1768,0 ) *31 (MRCItem litem &17 pos 3 dimension 20 -uid 1684,0 +uid 1770,0 ) *32 (MRCItem litem &18 pos 4 dimension 20 -uid 1686,0 +uid 1772,0 ) *33 (MRCItem litem &19 pos 5 dimension 20 -uid 1688,0 +uid 1774,0 ) *34 (MRCItem litem &20 pos 6 dimension 20 -uid 1690,0 +uid 1776,0 ) *35 (MRCItem litem &21 pos 7 dimension 20 -uid 1692,0 +uid 1778,0 ) *36 (MRCItem litem &22 pos 8 dimension 20 -uid 1694,0 +uid 1780,0 ) ] ) @@ -608,7 +608,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:37:58" +value "15:14:17" ) (vvPair variable "group" @@ -680,7 +680,7 @@ value "interface" ) (vvPair variable "time" -value "14:37:58" +value "15:14:17" ) (vvPair variable "unit" @@ -715,10 +715,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *70 (CptPort -uid 1632,0 +uid 1718,0 ps "OnEdgeStrategy" shape (Triangle -uid 1633,0 +uid 1719,0 ro 90 va (VaSet vasetType 1 @@ -727,11 +727,11 @@ fg "0,65535,0" xt "14250,7625,15000,8375" ) tg (CPTG -uid 1634,0 +uid 1720,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1635,0 +uid 1721,0 va (VaSet font "Verdana,12,0" ) @@ -742,7 +742,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1636,0 +uid 1722,0 va (VaSet font "Courier New,8,0" ) @@ -755,16 +755,16 @@ lang 11 decl (Decl n "clk" t "std_ulogic" -o 3 -suid 130,0 +o 2 +suid 139,0 ) ) ) *71 (CptPort -uid 1637,0 +uid 1723,0 ps "OnEdgeStrategy" shape (Triangle -uid 1638,0 +uid 1724,0 ro 180 va (VaSet vasetType 1 @@ -773,11 +773,11 @@ fg "0,65535,0" xt "33625,15000,34375,15750" ) tg (CPTG -uid 1639,0 +uid 1725,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1640,0 +uid 1726,0 ro 270 va (VaSet font "Verdana,12,0" @@ -789,7 +789,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1641,0 +uid 1727,0 va (VaSet font "Courier New,8,0" ) @@ -803,16 +803,16 @@ m 1 decl (Decl n "end_acceleration" t "std_ulogic" -o 13 -suid 131,0 +o 7 +suid 140,0 ) ) ) *72 (CptPort -uid 1642,0 +uid 1728,0 ps "OnEdgeStrategy" shape (Triangle -uid 1643,0 +uid 1729,0 ro 180 va (VaSet vasetType 1 @@ -821,11 +821,11 @@ fg "0,65535,0" xt "20625,5250,21375,6000" ) tg (CPTG -uid 1644,0 +uid 1730,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1645,0 +uid 1731,0 ro 270 va (VaSet font "Verdana,12,0" @@ -838,30 +838,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1646,0 +uid 1732,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4000,76500,4800" -st "info_acceleration : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4000,72000,4800" +st "info_acceleration : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" -o 16 -suid 132,0 +o 3 +suid 141,0 ) ) ) *73 (CptPort -uid 1647,0 +uid 1733,0 ps "OnEdgeStrategy" shape (Triangle -uid 1648,0 +uid 1734,0 ro 180 va (VaSet vasetType 1 @@ -870,11 +870,11 @@ fg "0,65535,0" xt "18625,5250,19375,6000" ) tg (CPTG -uid 1649,0 +uid 1735,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1650,0 +uid 1736,0 ro 270 va (VaSet font "Verdana,12,0" @@ -887,7 +887,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1651,0 +uid 1737,0 va (VaSet font "Courier New,8,0" ) @@ -902,15 +902,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 133,0 +suid 142,0 ) ) ) *74 (CptPort -uid 1652,0 +uid 1738,0 ps "OnEdgeStrategy" shape (Triangle -uid 1653,0 +uid 1739,0 ro 180 va (VaSet vasetType 1 @@ -919,11 +919,11 @@ fg "0,65535,0" xt "31625,15000,32375,15750" ) tg (CPTG -uid 1654,0 +uid 1740,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1655,0 +uid 1741,0 ro 270 va (VaSet font "Verdana,12,0" @@ -935,7 +935,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1656,0 +uid 1742,0 va (VaSet font "Courier New,8,0" ) @@ -950,16 +950,16 @@ decl (Decl n "power_acceleration" t "unsigned" b "(7 DOWNTO 0)" -o 22 -suid 134,0 +o 8 +suid 143,0 ) ) ) *75 (CptPort -uid 1657,0 +uid 1743,0 ps "OnEdgeStrategy" shape (Triangle -uid 1658,0 +uid 1744,0 ro 90 va (VaSet vasetType 1 @@ -968,11 +968,11 @@ fg "0,65535,0" xt "14250,8625,15000,9375" ) tg (CPTG -uid 1659,0 +uid 1745,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1660,0 +uid 1746,0 va (VaSet font "Verdana,12,0" ) @@ -983,7 +983,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1661,0 +uid 1747,0 va (VaSet font "Courier New,8,0" ) @@ -997,15 +997,15 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 135,0 +suid 144,0 ) ) ) *76 (CptPort -uid 1662,0 +uid 1748,0 ps "OnEdgeStrategy" shape (Triangle -uid 1663,0 +uid 1749,0 ro 180 va (VaSet vasetType 1 @@ -1014,11 +1014,11 @@ fg "0,65535,0" xt "29625,15000,30375,15750" ) tg (CPTG -uid 1664,0 +uid 1750,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1665,0 +uid 1751,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1030,7 +1030,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1666,0 +uid 1752,0 va (VaSet font "Courier New,8,0" ) @@ -1044,16 +1044,16 @@ m 1 decl (Decl n "sideL_acceleration" t "std_ulogic" -o 26 -suid 136,0 +o 9 +suid 145,0 ) ) ) *77 (CptPort -uid 1667,0 +uid 1753,0 ps "OnEdgeStrategy" shape (Triangle -uid 1668,0 +uid 1754,0 ro 180 va (VaSet vasetType 1 @@ -1062,11 +1062,11 @@ fg "0,65535,0" xt "23625,5250,24375,6000" ) tg (CPTG -uid 1669,0 +uid 1755,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1670,0 +uid 1756,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1079,7 +1079,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1671,0 +uid 1757,0 va (VaSet font "Courier New,8,0" ) @@ -1092,16 +1092,16 @@ lang 11 decl (Decl n "skip_acceleration" t "std_ulogic" -o 29 -suid 137,0 +o 5 +suid 146,0 ) ) ) *78 (CptPort -uid 1672,0 +uid 1758,0 ps "OnEdgeStrategy" shape (Triangle -uid 1673,0 +uid 1759,0 ro 270 va (VaSet vasetType 1 @@ -1110,11 +1110,11 @@ fg "0,65535,0" xt "36000,11625,36750,12375" ) tg (CPTG -uid 1674,0 +uid 1760,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1675,0 +uid 1761,0 va (VaSet font "Verdana,12,0" ) @@ -1126,7 +1126,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1676,0 +uid 1762,0 va (VaSet font "Courier New,8,0" ) @@ -1139,8 +1139,8 @@ lang 11 decl (Decl n "unlock" t "std_ulogic" -o 12 -suid 138,0 +o 6 +suid 147,0 ) ) ) @@ -1853,6 +1853,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 1694,0 +lastUid 1803,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/process_acceleration/struct1.bd b/Cursor/hds/process_acceleration/struct1.bd index 08fcc0e..85f4cc0 100644 --- a/Cursor/hds/process_acceleration/struct1.bd +++ b/Cursor/hds/process_acceleration/struct1.bd @@ -149,7 +149,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:36:24" +value "15:14:17" ) (vvPair variable "group" @@ -221,7 +221,7 @@ value "struct1" ) (vvPair variable "time" -value "14:36:24" +value "15:14:17" ) (vvPair variable "unit" @@ -429,7 +429,7 @@ uid 49,0 lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 3 suid 3,0 @@ -724,7 +724,7 @@ fg "0,0,32768" bg "0,0,32768" font "Arial,8,0" ) -xt "22200,48000,32000,49000" +xt "22200,48000,31400,49000" st " by %user on %dd %month %year " @@ -2460,11 +2460,11 @@ tm "BdCompilerDirectivesTextMgr" associable 1 ) windowSize "0,0,1537,960" -viewArea "-30000,-15600,79956,51936" +viewArea "-30000,-15600,79956,54288" cachedDiagramExtent "-15300,-6200,74400,49000" hasePageBreakOrigin 1 pageBreakOrigin "-87000,-49000" -lastUid 1319,0 +lastUid 1398,0 defaultCommentText (CommentText shape (Rectangle layer 0 @@ -3591,7 +3591,7 @@ port (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 3 suid 3,0 @@ -3989,5 +3989,5 @@ vaOverrides [ uid 194,0 type 1 ) -activeModelName "BlockDiag:CDM" +activeModelName "BlockDiag" ) diff --git a/Cursor/hds/process_cruse/interface b/Cursor/hds/process_cruse/interface index 8f5639f..0aa31ca 100644 --- a/Cursor/hds/process_cruse/interface +++ b/Cursor/hds/process_cruse/interface @@ -26,7 +26,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 108,0 +suid 117,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -72,10 +72,10 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 100,0 +suid 109,0 ) ) -uid 1306,0 +uid 1392,0 ) *15 (LogPort port (LogicalPort @@ -85,23 +85,23 @@ decl (Decl n "end_cruse" t "std_ulogic" o 14 -suid 101,0 +suid 110,0 ) ) -uid 1308,0 +uid 1394,0 ) *16 (LogPort port (LogicalPort lang 11 decl (Decl n "info_cruse" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 17 -suid 102,0 +suid 111,0 ) ) -uid 1310,0 +uid 1396,0 ) *17 (LogPort port (LogicalPort @@ -111,10 +111,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 103,0 +suid 112,0 ) ) -uid 1312,0 +uid 1398,0 ) *18 (LogPort port (LogicalPort @@ -125,10 +125,10 @@ n "power_cruse" t "unsigned" b "(7 DOWNTO 0)" o 23 -suid 104,0 +suid 113,0 ) ) -uid 1314,0 +uid 1400,0 ) *19 (LogPort port (LogicalPort @@ -137,10 +137,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 105,0 +suid 114,0 ) ) -uid 1316,0 +uid 1402,0 ) *20 (LogPort port (LogicalPort @@ -150,10 +150,10 @@ n "sensor_bus" t "std_ulogic_vector" b "(1 DOWNTO 0)" o 25 -suid 106,0 +suid 115,0 ) ) -uid 1318,0 +uid 1404,0 ) *21 (LogPort port (LogicalPort @@ -163,10 +163,10 @@ decl (Decl n "sideL_cruse" t "std_ulogic" o 27 -suid 107,0 +suid 116,0 ) ) -uid 1320,0 +uid 1406,0 ) *22 (LogPort port (LogicalPort @@ -175,10 +175,10 @@ decl (Decl n "unlock" t "std_ulogic" o 12 -suid 108,0 +suid 117,0 ) ) -uid 1322,0 +uid 1408,0 ) ] ) @@ -234,55 +234,55 @@ uid 120,0 litem &14 pos 0 dimension 20 -uid 1307,0 +uid 1393,0 ) *29 (MRCItem litem &15 pos 1 dimension 20 -uid 1309,0 +uid 1395,0 ) *30 (MRCItem litem &16 pos 2 dimension 20 -uid 1311,0 +uid 1397,0 ) *31 (MRCItem litem &17 pos 3 dimension 20 -uid 1313,0 +uid 1399,0 ) *32 (MRCItem litem &18 pos 4 dimension 20 -uid 1315,0 +uid 1401,0 ) *33 (MRCItem litem &19 pos 5 dimension 20 -uid 1317,0 +uid 1403,0 ) *34 (MRCItem litem &20 pos 6 dimension 20 -uid 1319,0 +uid 1405,0 ) *35 (MRCItem litem &21 pos 7 dimension 20 -uid 1321,0 +uid 1407,0 ) *36 (MRCItem litem &22 pos 8 dimension 20 -uid 1323,0 +uid 1409,0 ) ] ) @@ -609,7 +609,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:37:58" +value "15:13:22" ) (vvPair variable "group" @@ -681,7 +681,7 @@ value "interface" ) (vvPair variable "time" -value "14:37:58" +value "15:13:22" ) (vvPair variable "unit" @@ -716,10 +716,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *70 (CptPort -uid 1261,0 +uid 1347,0 ps "OnEdgeStrategy" shape (Triangle -uid 1262,0 +uid 1348,0 ro 90 va (VaSet vasetType 1 @@ -728,11 +728,11 @@ fg "0,65535,0" xt "14250,6625,15000,7375" ) tg (CPTG -uid 1263,0 +uid 1349,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1264,0 +uid 1350,0 va (VaSet font "Verdana,12,0" ) @@ -743,7 +743,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1265,0 +uid 1351,0 va (VaSet font "Courier New,8,0" ) @@ -757,15 +757,15 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 100,0 +suid 109,0 ) ) ) *71 (CptPort -uid 1266,0 +uid 1352,0 ps "OnEdgeStrategy" shape (Triangle -uid 1267,0 +uid 1353,0 ro 180 va (VaSet vasetType 1 @@ -774,11 +774,11 @@ fg "0,65535,0" xt "33625,15000,34375,15750" ) tg (CPTG -uid 1268,0 +uid 1354,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1269,0 +uid 1355,0 ro 270 va (VaSet font "Verdana,12,0" @@ -790,7 +790,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1270,0 +uid 1356,0 va (VaSet font "Courier New,8,0" ) @@ -805,15 +805,15 @@ decl (Decl n "end_cruse" t "std_ulogic" o 14 -suid 101,0 +suid 110,0 ) ) ) *72 (CptPort -uid 1271,0 +uid 1357,0 ps "OnEdgeStrategy" shape (Triangle -uid 1272,0 +uid 1358,0 ro 180 va (VaSet vasetType 1 @@ -822,11 +822,11 @@ fg "0,65535,0" xt "20625,5250,21375,6000" ) tg (CPTG -uid 1273,0 +uid 1359,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1274,0 +uid 1360,0 ro 270 va (VaSet font "Verdana,12,0" @@ -839,30 +839,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1275,0 +uid 1361,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4000,73000,4800" -st "info_cruse : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4000,68500,4800" +st "info_cruse : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "info_cruse" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 17 -suid 102,0 +suid 111,0 ) ) ) *73 (CptPort -uid 1276,0 +uid 1362,0 ps "OnEdgeStrategy" shape (Triangle -uid 1277,0 +uid 1363,0 ro 180 va (VaSet vasetType 1 @@ -871,11 +871,11 @@ fg "0,65535,0" xt "18625,5250,19375,6000" ) tg (CPTG -uid 1278,0 +uid 1364,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1279,0 +uid 1365,0 ro 270 va (VaSet font "Verdana,12,0" @@ -888,7 +888,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1280,0 +uid 1366,0 va (VaSet font "Courier New,8,0" ) @@ -903,15 +903,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 103,0 +suid 112,0 ) ) ) *74 (CptPort -uid 1281,0 +uid 1367,0 ps "OnEdgeStrategy" shape (Triangle -uid 1282,0 +uid 1368,0 ro 180 va (VaSet vasetType 1 @@ -920,11 +920,11 @@ fg "0,65535,0" xt "31625,15000,32375,15750" ) tg (CPTG -uid 1283,0 +uid 1369,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1284,0 +uid 1370,0 ro 270 va (VaSet font "Verdana,12,0" @@ -936,7 +936,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1285,0 +uid 1371,0 va (VaSet font "Courier New,8,0" ) @@ -952,15 +952,15 @@ n "power_cruse" t "unsigned" b "(7 DOWNTO 0)" o 23 -suid 104,0 +suid 113,0 ) ) ) *75 (CptPort -uid 1286,0 +uid 1372,0 ps "OnEdgeStrategy" shape (Triangle -uid 1287,0 +uid 1373,0 ro 90 va (VaSet vasetType 1 @@ -969,11 +969,11 @@ fg "0,65535,0" xt "14250,7625,15000,8375" ) tg (CPTG -uid 1288,0 +uid 1374,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1289,0 +uid 1375,0 va (VaSet font "Verdana,12,0" ) @@ -984,7 +984,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1290,0 +uid 1376,0 va (VaSet font "Courier New,8,0" ) @@ -998,15 +998,15 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 105,0 +suid 114,0 ) ) ) *76 (CptPort -uid 1291,0 +uid 1377,0 ps "OnEdgeStrategy" shape (Triangle -uid 1292,0 +uid 1378,0 ro 270 va (VaSet vasetType 1 @@ -1015,11 +1015,11 @@ fg "0,65535,0" xt "36000,12625,36750,13375" ) tg (CPTG -uid 1293,0 +uid 1379,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1294,0 +uid 1380,0 va (VaSet font "Verdana,12,0" ) @@ -1031,7 +1031,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1295,0 +uid 1381,0 va (VaSet font "Courier New,8,0" ) @@ -1046,15 +1046,15 @@ n "sensor_bus" t "std_ulogic_vector" b "(1 DOWNTO 0)" o 25 -suid 106,0 +suid 115,0 ) ) ) *77 (CptPort -uid 1296,0 +uid 1382,0 ps "OnEdgeStrategy" shape (Triangle -uid 1297,0 +uid 1383,0 ro 180 va (VaSet vasetType 1 @@ -1063,11 +1063,11 @@ fg "0,65535,0" xt "29625,15000,30375,15750" ) tg (CPTG -uid 1298,0 +uid 1384,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1299,0 +uid 1385,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1079,7 +1079,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1300,0 +uid 1386,0 va (VaSet font "Courier New,8,0" ) @@ -1094,15 +1094,15 @@ decl (Decl n "sideL_cruse" t "std_ulogic" o 27 -suid 107,0 +suid 116,0 ) ) ) *78 (CptPort -uid 1301,0 +uid 1387,0 ps "OnEdgeStrategy" shape (Triangle -uid 1302,0 +uid 1388,0 ro 270 va (VaSet vasetType 1 @@ -1111,11 +1111,11 @@ fg "0,65535,0" xt "36000,10625,36750,11375" ) tg (CPTG -uid 1303,0 +uid 1389,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1304,0 +uid 1390,0 va (VaSet font "Verdana,12,0" ) @@ -1127,7 +1127,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1305,0 +uid 1391,0 va (VaSet font "Courier New,8,0" ) @@ -1141,7 +1141,7 @@ decl (Decl n "unlock" t "std_ulogic" o 12 -suid 108,0 +suid 117,0 ) ) ) @@ -1854,6 +1854,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 1323,0 +lastUid 1409,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/process_deceleration/interface b/Cursor/hds/process_deceleration/interface index 29280d2..362c2e6 100644 --- a/Cursor/hds/process_deceleration/interface +++ b/Cursor/hds/process_deceleration/interface @@ -26,7 +26,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 100,0 +suid 110,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -72,10 +72,10 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 91,0 +suid 101,0 ) ) -uid 1110,0 +uid 1203,0 ) *15 (LogPort port (LogicalPort @@ -85,23 +85,23 @@ decl (Decl n "end_deceleration" t "std_ulogic" o 15 -suid 92,0 +suid 102,0 ) ) -uid 1112,0 +uid 1205,0 ) *16 (LogPort port (LogicalPort lang 11 decl (Decl n "info_deceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 18 -suid 93,0 +suid 103,0 ) ) -uid 1114,0 +uid 1207,0 ) *17 (LogPort port (LogicalPort @@ -111,10 +111,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 94,0 +suid 104,0 ) ) -uid 1116,0 +uid 1209,0 ) *18 (LogPort port (LogicalPort @@ -125,10 +125,10 @@ n "power_deceleration" t "unsigned" b "(7 DOWNTO 0)" o 24 -suid 95,0 +suid 105,0 ) ) -uid 1118,0 +uid 1211,0 ) *19 (LogPort port (LogicalPort @@ -138,10 +138,10 @@ decl (Decl n "RaZ" t "std_ulogic" o 9 -suid 96,0 +suid 106,0 ) ) -uid 1120,0 +uid 1213,0 ) *20 (LogPort port (LogicalPort @@ -150,10 +150,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 97,0 +suid 107,0 ) ) -uid 1122,0 +uid 1215,0 ) *21 (LogPort port (LogicalPort @@ -163,10 +163,10 @@ decl (Decl n "sideL_deceleration" t "std_ulogic" o 28 -suid 98,0 +suid 108,0 ) ) -uid 1124,0 +uid 1217,0 ) *22 (LogPort port (LogicalPort @@ -175,10 +175,10 @@ decl (Decl n "skip_deceleration" t "std_uLogic" o 30 -suid 99,0 +suid 109,0 ) ) -uid 1126,0 +uid 1219,0 ) *23 (LogPort port (LogicalPort @@ -187,10 +187,10 @@ decl (Decl n "unlock" t "std_ulogic" o 12 -suid 100,0 +suid 110,0 ) ) -uid 1128,0 +uid 1221,0 ) ] ) @@ -246,61 +246,61 @@ uid 127,0 litem &14 pos 0 dimension 20 -uid 1111,0 +uid 1204,0 ) *30 (MRCItem litem &15 pos 1 dimension 20 -uid 1113,0 +uid 1206,0 ) *31 (MRCItem litem &16 pos 2 dimension 20 -uid 1115,0 +uid 1208,0 ) *32 (MRCItem litem &17 pos 3 dimension 20 -uid 1117,0 +uid 1210,0 ) *33 (MRCItem litem &18 pos 4 dimension 20 -uid 1119,0 +uid 1212,0 ) *34 (MRCItem litem &19 pos 5 dimension 20 -uid 1121,0 +uid 1214,0 ) *35 (MRCItem litem &20 pos 6 dimension 20 -uid 1123,0 +uid 1216,0 ) *36 (MRCItem litem &21 pos 7 dimension 20 -uid 1125,0 +uid 1218,0 ) *37 (MRCItem litem &22 pos 8 dimension 20 -uid 1127,0 +uid 1220,0 ) *38 (MRCItem litem &23 pos 9 dimension 20 -uid 1129,0 +uid 1222,0 ) ] ) @@ -627,7 +627,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:37:58" +value "15:13:22" ) (vvPair variable "group" @@ -699,7 +699,7 @@ value "interface" ) (vvPair variable "time" -value "14:37:58" +value "15:13:22" ) (vvPair variable "unit" @@ -734,10 +734,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *72 (CptPort -uid 1060,0 +uid 1153,0 ps "OnEdgeStrategy" shape (Triangle -uid 1061,0 +uid 1154,0 ro 90 va (VaSet vasetType 1 @@ -746,11 +746,11 @@ fg "0,65535,0" xt "14250,6625,15000,7375" ) tg (CPTG -uid 1062,0 +uid 1155,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1063,0 +uid 1156,0 va (VaSet font "Verdana,12,0" ) @@ -761,7 +761,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1064,0 +uid 1157,0 va (VaSet font "Courier New,8,0" ) @@ -775,15 +775,15 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 91,0 +suid 101,0 ) ) ) *73 (CptPort -uid 1065,0 +uid 1158,0 ps "OnEdgeStrategy" shape (Triangle -uid 1066,0 +uid 1159,0 ro 180 va (VaSet vasetType 1 @@ -792,11 +792,11 @@ fg "0,65535,0" xt "33625,15000,34375,15750" ) tg (CPTG -uid 1067,0 +uid 1160,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1068,0 +uid 1161,0 ro 270 va (VaSet font "Verdana,12,0" @@ -808,7 +808,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1069,0 +uid 1162,0 va (VaSet font "Courier New,8,0" ) @@ -823,15 +823,15 @@ decl (Decl n "end_deceleration" t "std_ulogic" o 15 -suid 92,0 +suid 102,0 ) ) ) *74 (CptPort -uid 1070,0 +uid 1163,0 ps "OnEdgeStrategy" shape (Triangle -uid 1071,0 +uid 1164,0 ro 180 va (VaSet vasetType 1 @@ -840,11 +840,11 @@ fg "0,65535,0" xt "20625,5250,21375,6000" ) tg (CPTG -uid 1072,0 +uid 1165,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1073,0 +uid 1166,0 ro 270 va (VaSet font "Verdana,12,0" @@ -857,30 +857,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1074,0 +uid 1167,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4000,76500,4800" -st "info_deceleration : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4000,72000,4800" +st "info_deceleration : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "info_deceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 18 -suid 93,0 +suid 103,0 ) ) ) *75 (CptPort -uid 1075,0 +uid 1168,0 ps "OnEdgeStrategy" shape (Triangle -uid 1076,0 +uid 1169,0 ro 180 va (VaSet vasetType 1 @@ -889,11 +889,11 @@ fg "0,65535,0" xt "18625,5250,19375,6000" ) tg (CPTG -uid 1077,0 +uid 1170,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1078,0 +uid 1171,0 ro 270 va (VaSet font "Verdana,12,0" @@ -906,7 +906,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1079,0 +uid 1172,0 va (VaSet font "Courier New,8,0" ) @@ -921,15 +921,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 94,0 +suid 104,0 ) ) ) *76 (CptPort -uid 1080,0 +uid 1173,0 ps "OnEdgeStrategy" shape (Triangle -uid 1081,0 +uid 1174,0 ro 180 va (VaSet vasetType 1 @@ -938,11 +938,11 @@ fg "0,65535,0" xt "31625,15000,32375,15750" ) tg (CPTG -uid 1082,0 +uid 1175,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1083,0 +uid 1176,0 ro 270 va (VaSet font "Verdana,12,0" @@ -954,7 +954,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1084,0 +uid 1177,0 va (VaSet font "Courier New,8,0" ) @@ -970,15 +970,15 @@ n "power_deceleration" t "unsigned" b "(7 DOWNTO 0)" o 24 -suid 95,0 +suid 105,0 ) ) ) *77 (CptPort -uid 1085,0 +uid 1178,0 ps "OnEdgeStrategy" shape (Triangle -uid 1086,0 +uid 1179,0 ro 90 va (VaSet vasetType 1 @@ -987,11 +987,11 @@ fg "0,65535,0" xt "36000,8625,36750,9375" ) tg (CPTG -uid 1087,0 +uid 1180,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1088,0 +uid 1181,0 va (VaSet font "Verdana,12,0" ) @@ -1003,7 +1003,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1089,0 +uid 1182,0 va (VaSet font "Courier New,8,0" ) @@ -1018,15 +1018,15 @@ decl (Decl n "RaZ" t "std_ulogic" o 9 -suid 96,0 +suid 106,0 ) ) ) *78 (CptPort -uid 1090,0 +uid 1183,0 ps "OnEdgeStrategy" shape (Triangle -uid 1091,0 +uid 1184,0 ro 90 va (VaSet vasetType 1 @@ -1035,11 +1035,11 @@ fg "0,65535,0" xt "14250,7625,15000,8375" ) tg (CPTG -uid 1092,0 +uid 1185,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1093,0 +uid 1186,0 va (VaSet font "Verdana,12,0" ) @@ -1050,7 +1050,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1094,0 +uid 1187,0 va (VaSet font "Courier New,8,0" ) @@ -1064,15 +1064,15 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 97,0 +suid 107,0 ) ) ) *79 (CptPort -uid 1095,0 +uid 1188,0 ps "OnEdgeStrategy" shape (Triangle -uid 1096,0 +uid 1189,0 ro 180 va (VaSet vasetType 1 @@ -1081,11 +1081,11 @@ fg "0,65535,0" xt "29625,15000,30375,15750" ) tg (CPTG -uid 1097,0 +uid 1190,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1098,0 +uid 1191,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1097,7 +1097,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1099,0 +uid 1192,0 va (VaSet font "Courier New,8,0" ) @@ -1112,15 +1112,15 @@ decl (Decl n "sideL_deceleration" t "std_ulogic" o 28 -suid 98,0 +suid 108,0 ) ) ) *80 (CptPort -uid 1100,0 +uid 1193,0 ps "OnEdgeStrategy" shape (Triangle -uid 1101,0 +uid 1194,0 ro 180 va (VaSet vasetType 1 @@ -1129,11 +1129,11 @@ fg "0,65535,0" xt "23625,5250,24375,6000" ) tg (CPTG -uid 1102,0 +uid 1195,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1103,0 +uid 1196,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1146,7 +1146,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1104,0 +uid 1197,0 va (VaSet font "Courier New,8,0" ) @@ -1160,15 +1160,15 @@ decl (Decl n "skip_deceleration" t "std_uLogic" o 30 -suid 99,0 +suid 109,0 ) ) ) *81 (CptPort -uid 1105,0 +uid 1198,0 ps "OnEdgeStrategy" shape (Triangle -uid 1106,0 +uid 1199,0 ro 270 va (VaSet vasetType 1 @@ -1177,11 +1177,11 @@ fg "0,65535,0" xt "36000,11625,36750,12375" ) tg (CPTG -uid 1107,0 +uid 1200,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1108,0 +uid 1201,0 va (VaSet font "Verdana,12,0" ) @@ -1193,7 +1193,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1109,0 +uid 1202,0 va (VaSet font "Courier New,8,0" ) @@ -1207,7 +1207,7 @@ decl (Decl n "unlock" t "std_ulogic" o 12 -suid 100,0 +suid 110,0 ) ) ) @@ -1920,6 +1920,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 1129,0 +lastUid 1222,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/selector_acceleration/interface b/Cursor/hds/selector_acceleration/interface index 2a166ef..83f44f8 100644 --- a/Cursor/hds/selector_acceleration/interface +++ b/Cursor/hds/selector_acceleration/interface @@ -26,7 +26,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 99,0 +suid 117,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -73,10 +73,10 @@ n "button" t "unsigned" b "(3 DOWNTO 0)" o 2 -suid 91,0 +suid 109,0 ) ) -uid 1220,0 +uid 1392,0 ) *15 (LogPort port (LogicalPort @@ -85,10 +85,10 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 92,0 +suid 110,0 ) ) -uid 1222,0 +uid 1394,0 ) *16 (LogPort port (LogicalPort @@ -96,39 +96,39 @@ lang 11 m 1 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 16 -suid 93,0 +suid 111,0 ) ) -uid 1224,0 +uid 1396,0 ) *17 (LogPort port (LogicalPort lang 11 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 -suid 94,0 +suid 112,0 ) ) -uid 1226,0 +uid 1398,0 ) *18 (LogPort port (LogicalPort lang 11 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 -suid 95,0 +suid 113,0 ) ) -uid 1228,0 +uid 1400,0 ) *19 (LogPort port (LogicalPort @@ -138,10 +138,10 @@ n "pos_init" t "std_ulogic_vector" b "(15 DOWNTO 0)" o 21 -suid 96,0 +suid 114,0 ) ) -uid 1230,0 +uid 1402,0 ) *20 (LogPort port (LogicalPort @@ -151,10 +151,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 97,0 +suid 115,0 ) ) -uid 1232,0 +uid 1404,0 ) *21 (LogPort port (LogicalPort @@ -163,10 +163,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 98,0 +suid 116,0 ) ) -uid 1234,0 +uid 1406,0 ) *22 (LogPort port (LogicalPort @@ -176,10 +176,10 @@ decl (Decl n "skip_acceleration" t "std_ulogic" o 29 -suid 99,0 +suid 117,0 ) ) -uid 1236,0 +uid 1408,0 ) ] ) @@ -235,55 +235,55 @@ uid 113,0 litem &14 pos 0 dimension 20 -uid 1221,0 +uid 1393,0 ) *29 (MRCItem litem &15 pos 1 dimension 20 -uid 1223,0 +uid 1395,0 ) *30 (MRCItem litem &16 pos 2 dimension 20 -uid 1225,0 +uid 1397,0 ) *31 (MRCItem litem &17 pos 3 dimension 20 -uid 1227,0 +uid 1399,0 ) *32 (MRCItem litem &18 pos 4 dimension 20 -uid 1229,0 +uid 1401,0 ) *33 (MRCItem litem &19 pos 5 dimension 20 -uid 1231,0 +uid 1403,0 ) *34 (MRCItem litem &20 pos 6 dimension 20 -uid 1233,0 +uid 1405,0 ) *35 (MRCItem litem &21 pos 7 dimension 20 -uid 1235,0 +uid 1407,0 ) *36 (MRCItem litem &22 pos 8 dimension 20 -uid 1237,0 +uid 1409,0 ) ] ) @@ -610,7 +610,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:44:45" +value "15:15:57" ) (vvPair variable "group" @@ -682,7 +682,7 @@ value "interface" ) (vvPair variable "time" -value "14:44:45" +value "15:15:57" ) (vvPair variable "unit" @@ -717,10 +717,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *70 (CptPort -uid 1175,0 +uid 1347,0 ps "OnEdgeStrategy" shape (Triangle -uid 1176,0 +uid 1348,0 ro 180 va (VaSet vasetType 1 @@ -729,11 +729,11 @@ fg "0,65535,0" xt "16625,5250,17375,6000" ) tg (CPTG -uid 1177,0 +uid 1349,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1178,0 +uid 1350,0 ro 270 va (VaSet font "Verdana,12,0" @@ -746,7 +746,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1179,0 +uid 1351,0 va (VaSet font "Courier New,8,0" ) @@ -761,15 +761,15 @@ n "button" t "unsigned" b "(3 DOWNTO 0)" o 2 -suid 91,0 +suid 109,0 ) ) ) *71 (CptPort -uid 1180,0 +uid 1352,0 ps "OnEdgeStrategy" shape (Triangle -uid 1181,0 +uid 1353,0 ro 180 va (VaSet vasetType 1 @@ -778,11 +778,11 @@ fg "0,65535,0" xt "19625,5250,20375,6000" ) tg (CPTG -uid 1182,0 +uid 1354,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1183,0 +uid 1355,0 ro 270 va (VaSet font "Verdana,12,0" @@ -795,7 +795,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1184,0 +uid 1356,0 va (VaSet font "Courier New,8,0" ) @@ -809,15 +809,15 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 92,0 +suid 110,0 ) ) ) *72 (CptPort -uid 1185,0 +uid 1357,0 ps "OnEdgeStrategy" shape (Triangle -uid 1186,0 +uid 1358,0 ro 180 va (VaSet vasetType 1 @@ -826,11 +826,11 @@ fg "0,65535,0" xt "16625,13000,17375,13750" ) tg (CPTG -uid 1187,0 +uid 1359,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1188,0 +uid 1360,0 ro 270 va (VaSet font "Verdana,12,0" @@ -842,12 +842,12 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1189,0 +uid 1361,0 va (VaSet font "Courier New,8,0" ) -xt "44000,8000,76000,8800" -st "info_acceleration : OUT std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,8000,71500,8800" +st "info_acceleration : OUT unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort @@ -855,18 +855,18 @@ lang 11 m 1 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 16 -suid 93,0 +suid 111,0 ) ) ) *73 (CptPort -uid 1190,0 +uid 1362,0 ps "OnEdgeStrategy" shape (Triangle -uid 1191,0 +uid 1363,0 ro 90 va (VaSet vasetType 1 @@ -875,11 +875,11 @@ fg "0,65535,0" xt "14250,11625,15000,12375" ) tg (CPTG -uid 1192,0 +uid 1364,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1193,0 +uid 1365,0 va (VaSet font "Verdana,12,0" ) @@ -890,30 +890,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1194,0 +uid 1366,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4800,76000,5600" -st "pos1 : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4800,71500,5600" +st "pos1 : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 -suid 94,0 +suid 112,0 ) ) ) *74 (CptPort -uid 1195,0 +uid 1367,0 ps "OnEdgeStrategy" shape (Triangle -uid 1196,0 +uid 1368,0 ro 90 va (VaSet vasetType 1 @@ -922,11 +922,11 @@ fg "0,65535,0" xt "14250,10625,15000,11375" ) tg (CPTG -uid 1197,0 +uid 1369,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1198,0 +uid 1370,0 va (VaSet font "Verdana,12,0" ) @@ -937,30 +937,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1199,0 +uid 1371,0 va (VaSet font "Courier New,8,0" ) -xt "44000,5600,76000,6400" -st "pos2 : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,5600,71500,6400" +st "pos2 : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 -suid 95,0 +suid 113,0 ) ) ) *75 (CptPort -uid 1200,0 +uid 1372,0 ps "OnEdgeStrategy" shape (Triangle -uid 1201,0 +uid 1373,0 ro 90 va (VaSet vasetType 1 @@ -969,11 +969,11 @@ fg "0,65535,0" xt "14250,9625,15000,10375" ) tg (CPTG -uid 1202,0 +uid 1374,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1203,0 +uid 1375,0 va (VaSet font "Verdana,12,0" ) @@ -984,7 +984,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1204,0 +uid 1376,0 va (VaSet font "Courier New,8,0" ) @@ -999,15 +999,15 @@ n "pos_init" t "std_ulogic_vector" b "(15 DOWNTO 0)" o 21 -suid 96,0 +suid 114,0 ) ) ) *76 (CptPort -uid 1205,0 +uid 1377,0 ps "OnEdgeStrategy" shape (Triangle -uid 1206,0 +uid 1378,0 ro 90 va (VaSet vasetType 1 @@ -1016,11 +1016,11 @@ fg "0,65535,0" xt "14250,7625,15000,8375" ) tg (CPTG -uid 1207,0 +uid 1379,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1208,0 +uid 1380,0 va (VaSet font "Verdana,12,0" ) @@ -1031,7 +1031,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1209,0 +uid 1381,0 va (VaSet font "Courier New,8,0" ) @@ -1046,15 +1046,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 97,0 +suid 115,0 ) ) ) *77 (CptPort -uid 1210,0 +uid 1382,0 ps "OnEdgeStrategy" shape (Triangle -uid 1211,0 +uid 1383,0 ro 180 va (VaSet vasetType 1 @@ -1063,11 +1063,11 @@ fg "0,65535,0" xt "21625,5250,22375,6000" ) tg (CPTG -uid 1212,0 +uid 1384,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1213,0 +uid 1385,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1080,7 +1080,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1214,0 +uid 1386,0 va (VaSet font "Courier New,8,0" ) @@ -1094,15 +1094,15 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 98,0 +suid 116,0 ) ) ) *78 (CptPort -uid 1215,0 +uid 1387,0 ps "OnEdgeStrategy" shape (Triangle -uid 1216,0 +uid 1388,0 ro 180 va (VaSet vasetType 1 @@ -1111,11 +1111,11 @@ fg "0,65535,0" xt "19625,13000,20375,13750" ) tg (CPTG -uid 1217,0 +uid 1389,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1218,0 +uid 1390,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1127,7 +1127,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1219,0 +uid 1391,0 va (VaSet font "Courier New,8,0" ) @@ -1142,7 +1142,7 @@ decl (Decl n "skip_acceleration" t "std_ulogic" o 29 -suid 99,0 +suid 117,0 ) ) ) @@ -1855,6 +1855,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 1237,0 +lastUid 1409,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/selector_cruse/interface b/Cursor/hds/selector_cruse/interface index f45d11e..ba088a7 100644 --- a/Cursor/hds/selector_cruse/interface +++ b/Cursor/hds/selector_cruse/interface @@ -26,7 +26,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 80,0 +suid 96,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -73,10 +73,10 @@ n "button" t "unsigned" b "(3 DOWNTO 0)" o 2 -suid 73,0 +suid 89,0 ) ) -uid 1043,0 +uid 1201,0 ) *15 (LogPort port (LogicalPort @@ -85,10 +85,10 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 74,0 +suid 90,0 ) ) -uid 1045,0 +uid 1203,0 ) *16 (LogPort port (LogicalPort @@ -96,39 +96,39 @@ lang 11 m 1 decl (Decl n "info_cruse" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 17 -suid 75,0 +suid 91,0 ) ) -uid 1047,0 +uid 1205,0 ) *17 (LogPort port (LogicalPort lang 11 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 -suid 76,0 +suid 92,0 ) ) -uid 1049,0 +uid 1207,0 ) *18 (LogPort port (LogicalPort lang 11 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 -suid 77,0 +suid 93,0 ) ) -uid 1051,0 +uid 1209,0 ) *19 (LogPort port (LogicalPort @@ -138,10 +138,10 @@ n "pos_init" t "std_ulogic_vector" b "(15 DOWNTO 0)" o 21 -suid 78,0 +suid 94,0 ) ) -uid 1053,0 +uid 1211,0 ) *20 (LogPort port (LogicalPort @@ -151,10 +151,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 79,0 +suid 95,0 ) ) -uid 1055,0 +uid 1213,0 ) *21 (LogPort port (LogicalPort @@ -163,10 +163,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 80,0 +suid 96,0 ) ) -uid 1057,0 +uid 1215,0 ) ] ) @@ -222,49 +222,49 @@ uid 127,0 litem &14 pos 0 dimension 20 -uid 1044,0 +uid 1202,0 ) *28 (MRCItem litem &15 pos 1 dimension 20 -uid 1046,0 +uid 1204,0 ) *29 (MRCItem litem &16 pos 2 dimension 20 -uid 1048,0 +uid 1206,0 ) *30 (MRCItem litem &17 pos 3 dimension 20 -uid 1050,0 +uid 1208,0 ) *31 (MRCItem litem &18 pos 4 dimension 20 -uid 1052,0 +uid 1210,0 ) *32 (MRCItem litem &19 pos 5 dimension 20 -uid 1054,0 +uid 1212,0 ) *33 (MRCItem litem &20 pos 6 dimension 20 -uid 1056,0 +uid 1214,0 ) *34 (MRCItem litem &21 pos 7 dimension 20 -uid 1058,0 +uid 1216,0 ) ] ) @@ -591,7 +591,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:44:45" +value "15:15:57" ) (vvPair variable "group" @@ -663,7 +663,7 @@ value "interface" ) (vvPair variable "time" -value "14:44:45" +value "15:15:57" ) (vvPair variable "unit" @@ -698,10 +698,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *68 (CptPort -uid 1003,0 +uid 1161,0 ps "OnEdgeStrategy" shape (Triangle -uid 1004,0 +uid 1162,0 ro 180 va (VaSet vasetType 1 @@ -710,11 +710,11 @@ fg "0,65535,0" xt "16625,5250,17375,6000" ) tg (CPTG -uid 1005,0 +uid 1163,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1006,0 +uid 1164,0 ro 270 va (VaSet font "Verdana,12,0" @@ -727,7 +727,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1007,0 +uid 1165,0 va (VaSet font "Courier New,8,0" ) @@ -742,15 +742,15 @@ n "button" t "unsigned" b "(3 DOWNTO 0)" o 2 -suid 73,0 +suid 89,0 ) ) ) *69 (CptPort -uid 1008,0 +uid 1166,0 ps "OnEdgeStrategy" shape (Triangle -uid 1009,0 +uid 1167,0 ro 180 va (VaSet vasetType 1 @@ -759,11 +759,11 @@ fg "0,65535,0" xt "19625,5250,20375,6000" ) tg (CPTG -uid 1010,0 +uid 1168,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1011,0 +uid 1169,0 ro 270 va (VaSet font "Verdana,12,0" @@ -776,7 +776,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1012,0 +uid 1170,0 va (VaSet font "Courier New,8,0" ) @@ -790,15 +790,15 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 74,0 +suid 90,0 ) ) ) *70 (CptPort -uid 1013,0 +uid 1171,0 ps "OnEdgeStrategy" shape (Triangle -uid 1014,0 +uid 1172,0 ro 180 va (VaSet vasetType 1 @@ -807,11 +807,11 @@ fg "0,65535,0" xt "16625,13000,17375,13750" ) tg (CPTG -uid 1015,0 +uid 1173,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1016,0 +uid 1174,0 ro 270 va (VaSet font "Verdana,12,0" @@ -823,12 +823,12 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1017,0 +uid 1175,0 va (VaSet font "Courier New,8,0" ) -xt "44000,8000,71500,8800" -st "info_cruse : OUT std_ulogic_vector (15 DOWNTO 0) +xt "44000,8000,67000,8800" +st "info_cruse : OUT unsigned (15 DOWNTO 0) " ) thePort (LogicalPort @@ -836,18 +836,18 @@ lang 11 m 1 decl (Decl n "info_cruse" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 17 -suid 75,0 +suid 91,0 ) ) ) *71 (CptPort -uid 1018,0 +uid 1176,0 ps "OnEdgeStrategy" shape (Triangle -uid 1019,0 +uid 1177,0 ro 90 va (VaSet vasetType 1 @@ -856,11 +856,11 @@ fg "0,65535,0" xt "14250,10625,15000,11375" ) tg (CPTG -uid 1020,0 +uid 1178,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1021,0 +uid 1179,0 va (VaSet font "Verdana,12,0" ) @@ -871,30 +871,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1022,0 +uid 1180,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4800,72500,5600" -st "pos1 : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4800,68000,5600" +st "pos1 : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 -suid 76,0 +suid 92,0 ) ) ) *72 (CptPort -uid 1023,0 +uid 1181,0 ps "OnEdgeStrategy" shape (Triangle -uid 1024,0 +uid 1182,0 ro 90 va (VaSet vasetType 1 @@ -903,11 +903,11 @@ fg "0,65535,0" xt "14250,9625,15000,10375" ) tg (CPTG -uid 1025,0 +uid 1183,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1026,0 +uid 1184,0 va (VaSet font "Verdana,12,0" ) @@ -918,30 +918,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1027,0 +uid 1185,0 va (VaSet font "Courier New,8,0" ) -xt "44000,5600,72500,6400" -st "pos2 : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,5600,68000,6400" +st "pos2 : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 -suid 77,0 +suid 93,0 ) ) ) *73 (CptPort -uid 1028,0 +uid 1186,0 ps "OnEdgeStrategy" shape (Triangle -uid 1029,0 +uid 1187,0 ro 90 va (VaSet vasetType 1 @@ -950,11 +950,11 @@ fg "0,65535,0" xt "14250,8625,15000,9375" ) tg (CPTG -uid 1030,0 +uid 1188,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1031,0 +uid 1189,0 va (VaSet font "Verdana,12,0" ) @@ -965,7 +965,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1032,0 +uid 1190,0 va (VaSet font "Courier New,8,0" ) @@ -980,15 +980,15 @@ n "pos_init" t "std_ulogic_vector" b "(15 DOWNTO 0)" o 21 -suid 78,0 +suid 94,0 ) ) ) *74 (CptPort -uid 1033,0 +uid 1191,0 ps "OnEdgeStrategy" shape (Triangle -uid 1034,0 +uid 1192,0 ro 90 va (VaSet vasetType 1 @@ -997,11 +997,11 @@ fg "0,65535,0" xt "14250,6625,15000,7375" ) tg (CPTG -uid 1035,0 +uid 1193,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1036,0 +uid 1194,0 va (VaSet font "Verdana,12,0" ) @@ -1012,7 +1012,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1037,0 +uid 1195,0 va (VaSet font "Courier New,8,0" ) @@ -1027,15 +1027,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 79,0 +suid 95,0 ) ) ) *75 (CptPort -uid 1038,0 +uid 1196,0 ps "OnEdgeStrategy" shape (Triangle -uid 1039,0 +uid 1197,0 ro 180 va (VaSet vasetType 1 @@ -1044,11 +1044,11 @@ fg "0,65535,0" xt "21625,5250,22375,6000" ) tg (CPTG -uid 1040,0 +uid 1198,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1041,0 +uid 1199,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1061,7 +1061,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1042,0 +uid 1200,0 va (VaSet font "Courier New,8,0" ) @@ -1075,7 +1075,7 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 80,0 +suid 96,0 ) ) ) @@ -1788,6 +1788,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 1058,0 +lastUid 1216,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/selector_deceleration/interface b/Cursor/hds/selector_deceleration/interface index 4665cc9..b44ca47 100644 --- a/Cursor/hds/selector_deceleration/interface +++ b/Cursor/hds/selector_deceleration/interface @@ -26,7 +26,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 89,0 +suid 107,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -73,10 +73,10 @@ n "button" t "unsigned" b "(3 DOWNTO 0)" o 2 -suid 81,0 +suid 99,0 ) ) -uid 1058,0 +uid 1230,0 ) *15 (LogPort port (LogicalPort @@ -85,10 +85,10 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 82,0 +suid 100,0 ) ) -uid 1060,0 +uid 1232,0 ) *16 (LogPort port (LogicalPort @@ -96,39 +96,39 @@ lang 11 m 1 decl (Decl n "info_deceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 18 -suid 83,0 +suid 101,0 ) ) -uid 1062,0 +uid 1234,0 ) *17 (LogPort port (LogicalPort lang 11 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 -suid 84,0 +suid 102,0 ) ) -uid 1064,0 +uid 1236,0 ) *18 (LogPort port (LogicalPort lang 11 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 -suid 85,0 +suid 103,0 ) ) -uid 1066,0 +uid 1238,0 ) *19 (LogPort port (LogicalPort @@ -138,10 +138,10 @@ n "pos_init" t "std_ulogic_vector" b "(15 DOWNTO 0)" o 21 -suid 86,0 +suid 104,0 ) ) -uid 1068,0 +uid 1240,0 ) *20 (LogPort port (LogicalPort @@ -151,10 +151,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 87,0 +suid 105,0 ) ) -uid 1070,0 +uid 1242,0 ) *21 (LogPort port (LogicalPort @@ -163,10 +163,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 88,0 +suid 106,0 ) ) -uid 1072,0 +uid 1244,0 ) *22 (LogPort port (LogicalPort @@ -176,10 +176,10 @@ decl (Decl n "skip_deceleration" t "std_uLogic" o 30 -suid 89,0 +suid 107,0 ) ) -uid 1074,0 +uid 1246,0 ) ] ) @@ -235,55 +235,55 @@ uid 127,0 litem &14 pos 0 dimension 20 -uid 1059,0 +uid 1231,0 ) *29 (MRCItem litem &15 pos 1 dimension 20 -uid 1061,0 +uid 1233,0 ) *30 (MRCItem litem &16 pos 2 dimension 20 -uid 1063,0 +uid 1235,0 ) *31 (MRCItem litem &17 pos 3 dimension 20 -uid 1065,0 +uid 1237,0 ) *32 (MRCItem litem &18 pos 4 dimension 20 -uid 1067,0 +uid 1239,0 ) *33 (MRCItem litem &19 pos 5 dimension 20 -uid 1069,0 +uid 1241,0 ) *34 (MRCItem litem &20 pos 6 dimension 20 -uid 1071,0 +uid 1243,0 ) *35 (MRCItem litem &21 pos 7 dimension 20 -uid 1073,0 +uid 1245,0 ) *36 (MRCItem litem &22 pos 8 dimension 20 -uid 1075,0 +uid 1247,0 ) ] ) @@ -610,7 +610,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:44:45" +value "15:15:57" ) (vvPair variable "group" @@ -682,7 +682,7 @@ value "interface" ) (vvPair variable "time" -value "14:44:45" +value "15:15:57" ) (vvPair variable "unit" @@ -717,10 +717,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *70 (CptPort -uid 1013,0 +uid 1185,0 ps "OnEdgeStrategy" shape (Triangle -uid 1014,0 +uid 1186,0 ro 180 va (VaSet vasetType 1 @@ -729,11 +729,11 @@ fg "0,65535,0" xt "15625,5250,16375,6000" ) tg (CPTG -uid 1015,0 +uid 1187,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1016,0 +uid 1188,0 ro 270 va (VaSet font "Verdana,12,0" @@ -746,7 +746,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1017,0 +uid 1189,0 va (VaSet font "Courier New,8,0" ) @@ -761,15 +761,15 @@ n "button" t "unsigned" b "(3 DOWNTO 0)" o 2 -suid 81,0 +suid 99,0 ) ) ) *71 (CptPort -uid 1018,0 +uid 1190,0 ps "OnEdgeStrategy" shape (Triangle -uid 1019,0 +uid 1191,0 ro 180 va (VaSet vasetType 1 @@ -778,11 +778,11 @@ fg "0,65535,0" xt "18625,5250,19375,6000" ) tg (CPTG -uid 1020,0 +uid 1192,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1021,0 +uid 1193,0 ro 270 va (VaSet font "Verdana,12,0" @@ -795,7 +795,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1022,0 +uid 1194,0 va (VaSet font "Courier New,8,0" ) @@ -809,15 +809,15 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 82,0 +suid 100,0 ) ) ) *72 (CptPort -uid 1023,0 +uid 1195,0 ps "OnEdgeStrategy" shape (Triangle -uid 1024,0 +uid 1196,0 ro 180 va (VaSet vasetType 1 @@ -826,11 +826,11 @@ fg "0,65535,0" xt "16625,13000,17375,13750" ) tg (CPTG -uid 1025,0 +uid 1197,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1026,0 +uid 1198,0 ro 270 va (VaSet font "Verdana,12,0" @@ -842,12 +842,12 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1027,0 +uid 1199,0 va (VaSet font "Courier New,8,0" ) -xt "44000,8000,76000,8800" -st "info_deceleration : OUT std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,8000,71500,8800" +st "info_deceleration : OUT unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort @@ -855,18 +855,18 @@ lang 11 m 1 decl (Decl n "info_deceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 18 -suid 83,0 +suid 101,0 ) ) ) *73 (CptPort -uid 1028,0 +uid 1200,0 ps "OnEdgeStrategy" shape (Triangle -uid 1029,0 +uid 1201,0 ro 90 va (VaSet vasetType 1 @@ -875,11 +875,11 @@ fg "0,65535,0" xt "14250,10625,15000,11375" ) tg (CPTG -uid 1030,0 +uid 1202,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1031,0 +uid 1203,0 va (VaSet font "Verdana,12,0" ) @@ -890,30 +890,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1032,0 +uid 1204,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4800,76000,5600" -st "pos1 : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4800,71500,5600" +st "pos1 : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 -suid 84,0 +suid 102,0 ) ) ) *74 (CptPort -uid 1033,0 +uid 1205,0 ps "OnEdgeStrategy" shape (Triangle -uid 1034,0 +uid 1206,0 ro 90 va (VaSet vasetType 1 @@ -922,11 +922,11 @@ fg "0,65535,0" xt "14250,9625,15000,10375" ) tg (CPTG -uid 1035,0 +uid 1207,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1036,0 +uid 1208,0 va (VaSet font "Verdana,12,0" ) @@ -937,30 +937,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1037,0 +uid 1209,0 va (VaSet font "Courier New,8,0" ) -xt "44000,5600,76000,6400" -st "pos2 : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,5600,71500,6400" +st "pos2 : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 -suid 85,0 +suid 103,0 ) ) ) *75 (CptPort -uid 1038,0 +uid 1210,0 ps "OnEdgeStrategy" shape (Triangle -uid 1039,0 +uid 1211,0 ro 90 va (VaSet vasetType 1 @@ -969,11 +969,11 @@ fg "0,65535,0" xt "14250,8625,15000,9375" ) tg (CPTG -uid 1040,0 +uid 1212,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1041,0 +uid 1213,0 va (VaSet font "Verdana,12,0" ) @@ -984,7 +984,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1042,0 +uid 1214,0 va (VaSet font "Courier New,8,0" ) @@ -999,15 +999,15 @@ n "pos_init" t "std_ulogic_vector" b "(15 DOWNTO 0)" o 21 -suid 86,0 +suid 104,0 ) ) ) *76 (CptPort -uid 1043,0 +uid 1215,0 ps "OnEdgeStrategy" shape (Triangle -uid 1044,0 +uid 1216,0 ro 90 va (VaSet vasetType 1 @@ -1016,11 +1016,11 @@ fg "0,65535,0" xt "14250,6625,15000,7375" ) tg (CPTG -uid 1045,0 +uid 1217,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1046,0 +uid 1218,0 va (VaSet font "Verdana,12,0" ) @@ -1031,7 +1031,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1047,0 +uid 1219,0 va (VaSet font "Courier New,8,0" ) @@ -1046,15 +1046,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 87,0 +suid 105,0 ) ) ) *77 (CptPort -uid 1048,0 +uid 1220,0 ps "OnEdgeStrategy" shape (Triangle -uid 1049,0 +uid 1221,0 ro 180 va (VaSet vasetType 1 @@ -1063,11 +1063,11 @@ fg "0,65535,0" xt "20625,5250,21375,6000" ) tg (CPTG -uid 1050,0 +uid 1222,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 1051,0 +uid 1223,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1080,7 +1080,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1052,0 +uid 1224,0 va (VaSet font "Courier New,8,0" ) @@ -1094,15 +1094,15 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 88,0 +suid 106,0 ) ) ) *78 (CptPort -uid 1053,0 +uid 1225,0 ps "OnEdgeStrategy" shape (Triangle -uid 1054,0 +uid 1226,0 ro 180 va (VaSet vasetType 1 @@ -1111,11 +1111,11 @@ fg "0,65535,0" xt "19625,13000,20375,13750" ) tg (CPTG -uid 1055,0 +uid 1227,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 1056,0 +uid 1228,0 ro 270 va (VaSet font "Verdana,12,0" @@ -1127,7 +1127,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 1057,0 +uid 1229,0 va (VaSet font "Courier New,8,0" ) @@ -1142,7 +1142,7 @@ decl (Decl n "skip_deceleration" t "std_uLogic" o 30 -suid 89,0 +suid 107,0 ) ) ) @@ -1855,6 +1855,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 1075,0 +lastUid 1247,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/set_position/interface b/Cursor/hds/set_position/interface index 9cca13d..306ad0c 100644 --- a/Cursor/hds/set_position/interface +++ b/Cursor/hds/set_position/interface @@ -26,7 +26,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 40,0 +suid 45,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -72,10 +72,10 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 36,0 +suid 41,0 ) ) -uid 608,0 +uid 666,0 ) *15 (LogPort port (LogicalPort @@ -83,13 +83,13 @@ lang 11 m 1 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 -suid 37,0 +suid 42,0 ) ) -uid 610,0 +uid 668,0 ) *16 (LogPort port (LogicalPort @@ -97,13 +97,13 @@ lang 11 m 1 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 -suid 38,0 +suid 43,0 ) ) -uid 612,0 +uid 670,0 ) *17 (LogPort port (LogicalPort @@ -114,10 +114,10 @@ n "pos_init" t "std_ulogic_vector" b "(15 DOWNTO 0)" o 21 -suid 39,0 +suid 44,0 ) ) -uid 614,0 +uid 672,0 ) *18 (LogPort port (LogicalPort @@ -126,10 +126,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 40,0 +suid 45,0 ) ) -uid 616,0 +uid 674,0 ) ] ) @@ -185,31 +185,31 @@ uid 92,0 litem &14 pos 0 dimension 20 -uid 609,0 +uid 667,0 ) *25 (MRCItem litem &15 pos 1 dimension 20 -uid 611,0 +uid 669,0 ) *26 (MRCItem litem &16 pos 2 dimension 20 -uid 613,0 +uid 671,0 ) *27 (MRCItem litem &17 pos 3 dimension 20 -uid 615,0 +uid 673,0 ) *28 (MRCItem litem &18 pos 4 dimension 20 -uid 617,0 +uid 675,0 ) ] ) @@ -440,23 +440,23 @@ VExpander (VariableExpander vvMap [ (vvPair variable "HDLDir" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hdl" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hdl" ) (vvPair variable "HDSDir" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds" ) (vvPair variable "SideDataDesignDir" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position\\interface.info" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position\\interface.info" ) (vvPair variable "SideDataUserDir" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position\\interface.user" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position\\interface.user" ) (vvPair variable "SourceDir" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds" ) (vvPair variable "appl" @@ -476,11 +476,11 @@ value "%(unit)_%(view)_config" ) (vvPair variable "d" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position" ) (vvPair variable "d_logical" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position" ) (vvPair variable "date" @@ -520,7 +520,7 @@ value "interface" ) (vvPair variable "graphical_source_author" -value "Simon" +value "remi" ) (vvPair variable "graphical_source_date" @@ -532,11 +532,11 @@ value "UNKNOWN" ) (vvPair variable "graphical_source_host" -value "PC-SDM" +value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:07:25" +value "15:15:57" ) (vvPair variable "group" @@ -544,7 +544,7 @@ value "UNKNOWN" ) (vvPair variable "host" -value "PC-SDM" +value "MARVIN" ) (vvPair variable "language" @@ -576,11 +576,11 @@ value "d ) (vvPair variable "p" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position\\interface" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position\\interface" ) (vvPair variable "p_logical" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position\\interface" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\set_position\\interface" ) (vvPair variable "package_name" @@ -608,7 +608,7 @@ value "interface" ) (vvPair variable "time" -value "14:07:25" +value "15:15:57" ) (vvPair variable "unit" @@ -616,7 +616,7 @@ value "set_position" ) (vvPair variable "user" -value "Simon" +value "remi" ) (vvPair variable "version" @@ -643,10 +643,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *62 (CptPort -uid 583,0 +uid 641,0 ps "OnEdgeStrategy" shape (Triangle -uid 584,0 +uid 642,0 ro 90 va (VaSet vasetType 1 @@ -655,11 +655,11 @@ fg "0,65535,0" xt "14250,6625,15000,7375" ) tg (CPTG -uid 585,0 +uid 643,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 586,0 +uid 644,0 va (VaSet font "Verdana,12,0" ) @@ -670,7 +670,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 587,0 +uid 645,0 va (VaSet font "Courier New,8,0" ) @@ -684,15 +684,15 @@ decl (Decl n "clk" t "std_ulogic" o 3 -suid 36,0 +suid 41,0 ) ) ) *63 (CptPort -uid 588,0 +uid 646,0 ps "OnEdgeStrategy" shape (Triangle -uid 589,0 +uid 647,0 ro 90 va (VaSet vasetType 1 @@ -701,11 +701,11 @@ fg "0,65535,0" xt "23000,11625,23750,12375" ) tg (CPTG -uid 590,0 +uid 648,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 591,0 +uid 649,0 va (VaSet font "Verdana,12,0" ) @@ -717,12 +717,12 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 592,0 +uid 650,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4000,71500,4800" -st "pos1 : OUT std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4000,67000,4800" +st "pos1 : OUT unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort @@ -730,18 +730,18 @@ lang 11 m 1 decl (Decl n "pos1" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 19 -suid 37,0 +suid 42,0 ) ) ) *64 (CptPort -uid 593,0 +uid 651,0 ps "OnEdgeStrategy" shape (Triangle -uid 594,0 +uid 652,0 ro 90 va (VaSet vasetType 1 @@ -750,11 +750,11 @@ fg "0,65535,0" xt "23000,10625,23750,11375" ) tg (CPTG -uid 595,0 +uid 653,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 596,0 +uid 654,0 va (VaSet font "Verdana,12,0" ) @@ -766,12 +766,12 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 597,0 +uid 655,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4800,71500,5600" -st "pos2 : OUT std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4800,67000,5600" +st "pos2 : OUT unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort @@ -779,18 +779,18 @@ lang 11 m 1 decl (Decl n "pos2" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 20 -suid 38,0 +suid 43,0 ) ) ) *65 (CptPort -uid 598,0 +uid 656,0 ps "OnEdgeStrategy" shape (Triangle -uid 599,0 +uid 657,0 ro 90 va (VaSet vasetType 1 @@ -799,11 +799,11 @@ fg "0,65535,0" xt "23000,9625,23750,10375" ) tg (CPTG -uid 600,0 +uid 658,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 601,0 +uid 659,0 va (VaSet font "Verdana,12,0" ) @@ -815,7 +815,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 602,0 +uid 660,0 va (VaSet font "Courier New,8,0" ) @@ -831,15 +831,15 @@ n "pos_init" t "std_ulogic_vector" b "(15 DOWNTO 0)" o 21 -suid 39,0 +suid 44,0 ) ) ) *66 (CptPort -uid 603,0 +uid 661,0 ps "OnEdgeStrategy" shape (Triangle -uid 604,0 +uid 662,0 ro 90 va (VaSet vasetType 1 @@ -848,11 +848,11 @@ fg "0,65535,0" xt "14250,7625,15000,8375" ) tg (CPTG -uid 605,0 +uid 663,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 606,0 +uid 664,0 va (VaSet font "Verdana,12,0" ) @@ -863,7 +863,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 607,0 +uid 665,0 va (VaSet font "Courier New,8,0" ) @@ -877,7 +877,7 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 40,0 +suid 45,0 ) ) ) @@ -1590,6 +1590,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 617,0 +lastUid 675,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/side_acceleration/interface b/Cursor/hds/side_acceleration/interface index 7115549..a7bfa8d 100644 --- a/Cursor/hds/side_acceleration/interface +++ b/Cursor/hds/side_acceleration/interface @@ -21,7 +21,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 35,0 +suid 40,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -67,23 +67,23 @@ decl (Decl n "clk" t "std_ulogic" o 2 -suid 31,0 +suid 36,0 ) ) -uid 573,0 +uid 631,0 ) *15 (LogPort port (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 3 -suid 32,0 +suid 37,0 ) ) -uid 575,0 +uid 633,0 ) *16 (LogPort port (LogicalPort @@ -93,10 +93,10 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 33,0 +suid 38,0 ) ) -uid 577,0 +uid 635,0 ) *17 (LogPort port (LogicalPort @@ -105,10 +105,10 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 34,0 +suid 39,0 ) ) -uid 579,0 +uid 637,0 ) *18 (LogPort port (LogicalPort @@ -118,10 +118,10 @@ decl (Decl n "sideL_acceleration" t "std_ulogic" o 9 -suid 35,0 +suid 40,0 ) ) -uid 581,0 +uid 639,0 ) ] ) @@ -177,31 +177,31 @@ uid 92,0 litem &14 pos 0 dimension 20 -uid 574,0 +uid 632,0 ) *25 (MRCItem litem &15 pos 1 dimension 20 -uid 576,0 +uid 634,0 ) *26 (MRCItem litem &16 pos 2 dimension 20 -uid 578,0 +uid 636,0 ) *27 (MRCItem litem &17 pos 3 dimension 20 -uid 580,0 +uid 638,0 ) *28 (MRCItem litem &18 pos 4 dimension 20 -uid 582,0 +uid 640,0 ) ] ) @@ -528,7 +528,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:36:24" +value "15:14:17" ) (vvPair variable "group" @@ -600,7 +600,7 @@ value "interface" ) (vvPair variable "time" -value "14:36:24" +value "15:14:17" ) (vvPair variable "unit" @@ -635,10 +635,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *62 (CptPort -uid 548,0 +uid 606,0 ps "OnEdgeStrategy" shape (Triangle -uid 549,0 +uid 607,0 ro 90 va (VaSet vasetType 1 @@ -647,11 +647,11 @@ fg "0,65535,0" xt "14250,13625,15000,14375" ) tg (CPTG -uid 550,0 +uid 608,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 551,0 +uid 609,0 va (VaSet font "Verdana,12,0" ) @@ -662,7 +662,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 552,0 +uid 610,0 va (VaSet font "Courier New,8,0" ) @@ -676,15 +676,15 @@ decl (Decl n "clk" t "std_ulogic" o 2 -suid 31,0 +suid 36,0 ) ) ) *63 (CptPort -uid 553,0 +uid 611,0 ps "OnEdgeStrategy" shape (Triangle -uid 554,0 +uid 612,0 ro 90 va (VaSet vasetType 1 @@ -693,11 +693,11 @@ fg "0,65535,0" xt "14250,10625,15000,11375" ) tg (CPTG -uid 555,0 +uid 613,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 556,0 +uid 614,0 va (VaSet font "Verdana,12,0" ) @@ -708,30 +708,30 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 557,0 +uid 615,0 va (VaSet font "Courier New,8,0" ) -xt "44000,4000,76500,4800" -st "info_acceleration : IN std_ulogic_vector (15 DOWNTO 0) ; +xt "44000,4000,72000,4800" +st "info_acceleration : IN unsigned (15 DOWNTO 0) ; " ) thePort (LogicalPort lang 11 decl (Decl n "info_acceleration" -t "std_ulogic_vector" +t "unsigned" b "(15 DOWNTO 0)" o 3 -suid 32,0 +suid 37,0 ) ) ) *64 (CptPort -uid 558,0 +uid 616,0 ps "OnEdgeStrategy" shape (Triangle -uid 559,0 +uid 617,0 ro 90 va (VaSet vasetType 1 @@ -740,11 +740,11 @@ fg "0,65535,0" xt "14250,9625,15000,10375" ) tg (CPTG -uid 560,0 +uid 618,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 561,0 +uid 619,0 va (VaSet font "Verdana,12,0" ) @@ -755,7 +755,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 562,0 +uid 620,0 va (VaSet font "Courier New,8,0" ) @@ -770,15 +770,15 @@ n "Position" t "unsigned" b "(15 DOWNTO 0)" o 1 -suid 33,0 +suid 38,0 ) ) ) *65 (CptPort -uid 563,0 +uid 621,0 ps "OnEdgeStrategy" shape (Triangle -uid 564,0 +uid 622,0 ro 90 va (VaSet vasetType 1 @@ -787,11 +787,11 @@ fg "0,65535,0" xt "14250,14625,15000,15375" ) tg (CPTG -uid 565,0 +uid 623,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 566,0 +uid 624,0 va (VaSet font "Verdana,12,0" ) @@ -802,7 +802,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 567,0 +uid 625,0 va (VaSet font "Courier New,8,0" ) @@ -816,15 +816,15 @@ decl (Decl n "rst" t "std_ulogic" o 4 -suid 34,0 +suid 39,0 ) ) ) *66 (CptPort -uid 568,0 +uid 626,0 ps "OnEdgeStrategy" shape (Triangle -uid 569,0 +uid 627,0 ro 90 va (VaSet vasetType 1 @@ -833,11 +833,11 @@ fg "0,65535,0" xt "23000,10625,23750,11375" ) tg (CPTG -uid 570,0 +uid 628,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 571,0 +uid 629,0 va (VaSet font "Verdana,12,0" ) @@ -849,7 +849,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 572,0 +uid 630,0 va (VaSet font "Courier New,8,0" ) @@ -864,7 +864,7 @@ decl (Decl n "sideL_acceleration" t "std_ulogic" o 9 -suid 35,0 +suid 40,0 ) ) ) @@ -953,7 +953,7 @@ fg "0,0,32768" bg "0,0,32768" font "Arial,8,0" ) -xt "36200,48000,46000,49000" +xt "36200,48000,45400,49000" st " by %user on %dd %month %year " @@ -1575,6 +1575,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 582,0 +lastUid 640,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor_test/hds/cursor_tb/struct.bd b/Cursor_test/hds/cursor_tb/struct.bd index 680e5d5..b277459 100644 --- a/Cursor_test/hds/cursor_tb/struct.bd +++ b/Cursor_test/hds/cursor_tb/struct.bd @@ -55,7 +55,7 @@ value "pwmBitNb" (GiElement name "testLineNb" type "positive" -value "0" +value "1" ) ] mwi 0 @@ -178,7 +178,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:45:58" +value "15:17:00" ) (vvPair variable "group" @@ -302,7 +302,7 @@ value "struct" ) (vvPair variable "time" -value "14:45:58" +value "15:17:00" ) (vvPair variable "unit" @@ -1806,7 +1806,8 @@ position1 = position1 ( positive ) position2 = position2 ( positive ) slopeShiftBitNb = slopeShiftBitNb ( positive ) pwmBitNb = pwmBitNb ( positive ) -testLineNb = 0 ( positive ) " +testLineNb = 1 ( positive ) +" ) header "" ) @@ -1839,7 +1840,7 @@ value "pwmBitNb" (GiElement name "testLineNb" type "positive" -value "0" +value "1" ) ] ) @@ -2532,7 +2533,7 @@ tm "BdCompilerDirectivesTextMgr" associable 1 ) windowSize "0,0,1537,960" -viewArea "-3100,19200,97693,83264" +viewArea "-3100,25591,97693,89655" cachedDiagramExtent "-7000,-1400,102000,93000" pageSetupInfo (PageSetupInfo ptrCmd "\\\\ipp://ipp.hevs.ch\\PREA309_HPLJP3005DN,winspool," @@ -2559,7 +2560,7 @@ boundaryWidth 0 ) hasePageBreakOrigin 1 pageBreakOrigin "-7000,19000" -lastUid 5790,0 +lastUid 5843,0 defaultCommentText (CommentText shape (Rectangle layer 0