diff --git a/Cursor/hds/@compteur/compteurt.bd b/Cursor/hds/@compteur/compteurt.bd index 534db8d..af57c90 100644 --- a/Cursor/hds/@compteur/compteurt.bd +++ b/Cursor/hds/@compteur/compteurt.bd @@ -163,7 +163,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "16:15:59" +value "16:13:21" ) (vvPair variable "group" @@ -195,11 +195,11 @@ value "Compteur" ) (vvPair variable "month" -value "déc." +value "déc." ) (vvPair variable "month_long" -value "décembre" +value "décembre" ) (vvPair variable "p" @@ -235,7 +235,7 @@ value "compteurt" ) (vvPair variable "time" -value "16:15:59" +value "16:13:21" ) (vvPair variable "unit" @@ -326,7 +326,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-3800,35500,-3000" -st "clock : std_ulogic" +st "clock : std_ulogic +" ) ) *3 (PortIoIn @@ -389,7 +390,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-3000,35500,-2200" -st "down : std_uLogic" +st "down : std_uLogic +" ) ) *5 (PortIoOut @@ -452,7 +454,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 @@ -515,7 +518,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-4600,35500,-3800" -st "RaZ : std_ulogic" +st "RaZ : std_ulogic +" ) ) *9 (PortIoIn @@ -578,7 +582,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-2200,35500,-1400" -st "reset : std_ulogic" +st "reset : std_ulogic +" ) ) *11 (PortIoIn @@ -594,16 +599,16 @@ optionalChildren [ uid 81,0 sl 0 ro 270 -xt "-2000,13625,-500,14375" +xt "-5000,13625,-3500,14375" ) (Line uid 82,0 sl 0 ro 270 -xt "-500,14000,0,14000" +xt "-3500,14000,-3000,14000" pts [ -"-500,14000" -"0,14000" +"-3500,14000" +"-3000,14000" ] ) ] @@ -618,10 +623,10 @@ f (Text uid 84,0 va (VaSet ) -xt "-4900,13400,-3000,14600" +xt "-7900,13400,-6000,14600" st "up" ju 2 -blo "-3000,14400" +blo "-6000,14400" tm "WireNameMgr" ) ) @@ -641,7 +646,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,-1400,35500,-600" -st "up : std_uLogic" +st "up : std_uLogic +" ) ) *13 (Grouping @@ -1073,7 +1079,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,4600,39000,5400" -st "SIGNAL upnotdown : std_uLogic" +st "SIGNAL upnotdown : std_uLogic +" ) ) *29 (Net @@ -1091,7 +1098,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,2200,39000,3000" -st "SIGNAL en : std_ulogic" +st "SIGNAL en : std_ulogic +" ) ) *30 (SaComponent @@ -1108,7 +1116,7 @@ vasetType 1 isHidden 1 fg "0,65535,0" ) -xt "13537,9625,14287,10375" +xt "10537,9625,11287,10375" ) tg (CPTG uid 343,0 @@ -1119,17 +1127,17 @@ uid 344,0 va (VaSet isHidden 1 ) -xt "14509,9250,16809,10450" +xt "11509,9250,13809,10450" st "in1" -blo "14509,10250" +blo "11509,10250" ) s (Text uid 363,0 va (VaSet isHidden 1 ) -xt "14509,10450,14509,10450" -blo "14509,10450" +xt "11509,10450,11509,10450" +blo "11509,10450" ) ) thePort (LogicalPort @@ -1152,7 +1160,7 @@ vasetType 1 isHidden 1 fg "0,65535,0" ) -xt "13536,13625,14286,14375" +xt "10536,13625,11286,14375" ) tg (CPTG uid 347,0 @@ -1163,17 +1171,17 @@ uid 348,0 va (VaSet isHidden 1 ) -xt "14509,13250,16809,14450" +xt "11509,13250,13809,14450" st "in2" -blo "14509,14250" +blo "11509,14250" ) s (Text uid 364,0 va (VaSet isHidden 1 ) -xt "14509,14450,14509,14450" -blo "14509,14450" +xt "11509,14450,11509,14450" +blo "11509,14450" ) ) thePort (LogicalPort @@ -1196,7 +1204,7 @@ vasetType 1 isHidden 1 fg "0,65535,0" ) -xt "20000,11625,20750,12375" +xt "17000,11625,17750,12375" ) tg (CPTG uid 351,0 @@ -1207,19 +1215,19 @@ uid 352,0 va (VaSet isHidden 1 ) -xt "16000,11250,19000,12450" +xt "13000,11250,16000,12450" st "out1" ju 2 -blo "19000,12250" +blo "16000,12250" ) s (Text uid 365,0 va (VaSet isHidden 1 ) -xt "19000,12450,19000,12450" +xt "16000,12450,16000,12450" ju 2 -blo "19000,12450" +blo "16000,12450" ) ) thePort (LogicalPort @@ -1241,7 +1249,7 @@ fg "0,65535,0" lineColor "0,32896,0" lineWidth 2 ) -xt "14000,9000,20000,15000" +xt "11000,9000,17000,15000" ) showPorts 0 oxt "35000,14000,42000,20000" @@ -1255,9 +1263,9 @@ uid 356,0 va (VaSet font "Verdana,8,1" ) -xt "14600,14700,17700,15700" +xt "11600,14700,14700,15700" st "gates" -blo "14600,15500" +blo "11600,15500" tm "BdLibraryNameMgr" ) *35 (Text @@ -1265,9 +1273,9 @@ uid 357,0 va (VaSet font "Verdana,8,1" ) -xt "14600,15700,16800,16700" +xt "11600,15700,13800,16700" st "or2" -blo "14600,16500" +blo "11600,16500" tm "CptNameMgr" ) *36 (Text @@ -1275,9 +1283,9 @@ uid 358,0 va (VaSet font "Verdana,8,1" ) -xt "14600,16700,17100,17700" +xt "11600,16700,14100,17700" st "U_1" -blo "14600,17500" +blo "11600,17500" tm "InstanceNameMgr" ) ] @@ -1293,7 +1301,7 @@ va (VaSet isHidden 1 font "Verdana,8,0" ) -xt "14000,17600,28100,18600" +xt "11000,17600,25100,18600" st "delay = gateDelay ( time ) " ) header "" @@ -1313,7 +1321,7 @@ va (VaSet vasetType 1 fg "49152,49152,49152" ) -xt "14250,13250,15750,14750" +xt "11250,13250,12750,14750" iconName "VhdlFileViewIcon.png" iconMaskName "VhdlFileViewIcon.msk" ftype 10 @@ -1423,7 +1431,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,3000,44500,3800" -st "SIGNAL position20bit : integer(19 DOWNTO 0)" +st "SIGNAL position20bit : integer(19 DOWNTO 0) +" ) ) *42 (Net @@ -1441,7 +1450,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,1400,38000,2200" -st "SIGNAL clk : unsigned" +st "SIGNAL clk : unsigned +" ) ) *43 (Net @@ -1459,7 +1469,8 @@ va (VaSet font "Courier New,8,0" ) xt "21000,3800,38000,4600" -st "SIGNAL rst : unsigned" +st "SIGNAL rst : unsigned +" ) ) *44 (Wire @@ -1501,17 +1512,31 @@ on &2 ) *45 (Wire uid 29,0 +optionalChildren [ +*46 (BdJunction +uid 540,0 +ps "OnConnectorStrategy" +shape (Circle +uid 541,0 +va (VaSet +vasetType 1 +) +xt "5600,11600,6400,12400" +radius 400 +) +) +] shape (OrthoPolyLine uid 30,0 va (VaSet vasetType 3 ) -xt "0,10000,14287,12000" +xt "0,10000,11287,12000" pts [ "0,12000" "10000,12000" "10000,10000" -"14287,10000" +"11287,10000" ] ) start &3 @@ -1539,7 +1564,7 @@ tm "WireNameMgr" ) on &4 ) -*46 (Wire +*47 (Wire uid 43,0 shape (OrthoPolyLine uid 44,0 @@ -1578,7 +1603,7 @@ tm "WireNameMgr" ) on &6 ) -*47 (Wire +*48 (Wire uid 57,0 shape (OrthoPolyLine uid 58,0 @@ -1616,7 +1641,7 @@ tm "WireNameMgr" ) on &8 ) -*48 (Wire +*49 (Wire uid 71,0 shape (OrthoPolyLine uid 72,0 @@ -1653,10 +1678,10 @@ tm "WireNameMgr" ) on &10 ) -*49 (Wire +*50 (Wire uid 85,0 optionalChildren [ -*50 (BdJunction +*51 (BdJunction uid 374,0 ps "OnConnectorStrategy" shape (Circle @@ -1686,10 +1711,10 @@ uid 86,0 va (VaSet vasetType 3 ) -xt "0,14000,14286,14000" +xt "-3000,14000,11286,14000" pts [ -"0,14000" -"14286,14000" +"-3000,14000" +"11286,14000" ] ) start &11 @@ -1709,9 +1734,9 @@ uid 90,0 va (VaSet isHidden 1 ) -xt "2000,12800,3900,14000" +xt "-1000,12800,900,14000" st "up" -blo "2000,13800" +blo "-1000,13800" tm "WireNameMgr" ) ) @@ -1728,7 +1753,7 @@ uid 437,0 va (VaSet vasetType 1 ) -xt "22600,11600,23400,12400" +xt "20600,11600,21400,12400" radius 400 ) ) @@ -1738,9 +1763,9 @@ uid 278,0 va (VaSet vasetType 3 ) -xt "20000,12000,25000,12000" +xt "17000,12000,25000,12000" pts [ -"20000,12000" +"17000,12000" "25000,12000" ] ) @@ -1760,9 +1785,9 @@ f (Text uid 284,0 va (VaSet ) -xt "21000,10800,22900,12000" +xt "18000,10800,19900,12000" st "en" -blo "21000,11800" +blo "18000,11800" tm "WireNameMgr" ) ) @@ -1782,7 +1807,7 @@ pts [ "25000,18000" ] ) -start &50 +start &51 end &24 sat 32 eat 1 @@ -1924,7 +1949,7 @@ uid 543,0 va (VaSet vasetType 1 ) -xt "22600,7600,23400,8400" +xt "20600,7600,21400,8400" radius 400 ) ) @@ -1934,10 +1959,10 @@ uid 431,0 va (VaSet vasetType 3 ) -xt "23000,8000,51000,13000" +xt "21000,8000,51000,13000" pts [ -"23000,12000" -"23000,8000" +"21000,12000" +"21000,8000" "51000,8000" "51000,13000" ] @@ -1974,14 +1999,14 @@ uid 537,0 va (VaSet vasetType 3 ) -xt "6000,8000,23000,14000" +xt "6000,8000,21000,12000" pts [ -"6000,14000" +"6000,12000" "6000,8000" -"23000,8000" +"21000,8000" ] ) -start &51 +start &46 end &59 sat 32 eat 32 @@ -1997,13 +2022,13 @@ f (Text uid 539,0 va (VaSet ) -xt "20000,6800,21900,8000" -st "up" -blo "20000,7800" +xt "17000,6800,20200,8000" +st "down" +blo "17000,7800" tm "WireNameMgr" ) ) -on &12 +on &4 ) ] bg "65535,65535,65535" @@ -2120,7 +2145,7 @@ associable 1 ) windowSize "0,0,1537,936" viewArea "-11300,-12200,89493,50016" -cachedDiagramExtent "-6200,-7000,68800,49000" +cachedDiagramExtent "-7900,-7000,68800,49000" hasePageBreakOrigin 1 pageBreakOrigin "-7000,-49000" lastUid 543,0 diff --git a/Cursor/hds/convertissor_position/interface b/Cursor/hds/convertissor_position/interface index db48416..e6b0191 100644 --- a/Cursor/hds/convertissor_position/interface +++ b/Cursor/hds/convertissor_position/interface @@ -30,7 +30,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 21,0 +suid 26,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -75,11 +75,11 @@ lang 11 decl (Decl n "clk" t "unsigned" -o 1 -suid 17,0 +o 10 +suid 22,0 ) ) -uid 383,0 +uid 464,0 ) *15 (LogPort port (LogicalPort @@ -87,11 +87,11 @@ lang 11 decl (Decl n "en" t "std_ulogic" -o 2 -suid 18,0 +o 7 +suid 23,0 ) ) -uid 385,0 +uid 466,0 ) *16 (LogPort port (LogicalPort @@ -101,11 +101,11 @@ decl (Decl n "Position" t "unsigned" b "(15 DOWNTO 0)" -o 5 -suid 19,0 +o 6 +suid 24,0 ) ) -uid 387,0 +uid 468,0 ) *17 (LogPort port (LogicalPort @@ -114,11 +114,11 @@ decl (Decl n "position20bit" t "integer" b "(19 DOWNTO 0)" -o 3 -suid 20,0 +o 10 +suid 25,0 ) ) -uid 389,0 +uid 470,0 ) *18 (LogPort port (LogicalPort @@ -126,11 +126,11 @@ lang 11 decl (Decl n "rst" t "unsigned" -o 4 -suid 21,0 +o 11 +suid 26,0 ) ) -uid 391,0 +uid 472,0 ) ] ) @@ -186,31 +186,31 @@ uid 85,0 litem &14 pos 0 dimension 20 -uid 384,0 +uid 465,0 ) *25 (MRCItem litem &15 pos 1 dimension 20 -uid 386,0 +uid 467,0 ) *26 (MRCItem litem &16 pos 2 dimension 20 -uid 388,0 +uid 469,0 ) *27 (MRCItem litem &17 pos 3 dimension 20 -uid 390,0 +uid 471,0 ) *28 (MRCItem litem &18 pos 4 dimension 20 -uid 392,0 +uid 473,0 ) ] ) @@ -537,7 +537,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "15:07:48" +value "16:13:21" ) (vvPair variable "group" @@ -609,7 +609,7 @@ value "interface" ) (vvPair variable "time" -value "15:07:48" +value "16:13:21" ) (vvPair variable "unit" @@ -644,10 +644,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *62 (CptPort -uid 358,0 +uid 439,0 ps "OnEdgeStrategy" shape (Triangle -uid 359,0 +uid 440,0 ro 90 va (VaSet vasetType 1 @@ -656,11 +656,11 @@ fg "0,65535,0" xt "14250,13625,15000,14375" ) tg (CPTG -uid 360,0 +uid 441,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 361,0 +uid 442,0 va (VaSet font "Verdana,12,0" ) @@ -671,7 +671,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 362,0 +uid 443,0 va (VaSet font "Courier New,8,0" ) @@ -684,16 +684,16 @@ lang 11 decl (Decl n "clk" t "unsigned" -o 1 -suid 17,0 +o 10 +suid 22,0 ) ) ) *63 (CptPort -uid 363,0 +uid 444,0 ps "OnEdgeStrategy" shape (Triangle -uid 364,0 +uid 445,0 ro 180 va (VaSet vasetType 1 @@ -702,11 +702,11 @@ fg "0,65535,0" xt "17625,5250,18375,6000" ) tg (CPTG -uid 365,0 +uid 446,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 366,0 +uid 447,0 ro 270 va (VaSet font "Verdana,12,0" @@ -719,7 +719,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 367,0 +uid 448,0 va (VaSet font "Courier New,8,0" ) @@ -732,16 +732,16 @@ lang 11 decl (Decl n "en" t "std_ulogic" -o 2 -suid 18,0 +o 7 +suid 23,0 ) ) ) *64 (CptPort -uid 368,0 +uid 449,0 ps "OnEdgeStrategy" shape (Triangle -uid 369,0 +uid 450,0 ro 90 va (VaSet vasetType 1 @@ -750,11 +750,11 @@ fg "0,65535,0" xt "23000,8625,23750,9375" ) tg (CPTG -uid 370,0 +uid 451,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 371,0 +uid 452,0 va (VaSet font "Verdana,12,0" ) @@ -766,7 +766,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 372,0 +uid 453,0 va (VaSet font "Courier New,8,0" ) @@ -781,16 +781,16 @@ decl (Decl n "Position" t "unsigned" b "(15 DOWNTO 0)" -o 5 -suid 19,0 +o 6 +suid 24,0 ) ) ) *65 (CptPort -uid 373,0 +uid 454,0 ps "OnEdgeStrategy" shape (Triangle -uid 374,0 +uid 455,0 ro 90 va (VaSet vasetType 1 @@ -799,11 +799,11 @@ fg "0,65535,0" xt "14250,8625,15000,9375" ) tg (CPTG -uid 375,0 +uid 456,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 376,0 +uid 457,0 va (VaSet font "Verdana,12,0" ) @@ -814,7 +814,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 377,0 +uid 458,0 va (VaSet font "Courier New,8,0" ) @@ -828,16 +828,16 @@ decl (Decl n "position20bit" t "integer" b "(19 DOWNTO 0)" -o 3 -suid 20,0 +o 10 +suid 25,0 ) ) ) *66 (CptPort -uid 378,0 +uid 459,0 ps "OnEdgeStrategy" shape (Triangle -uid 379,0 +uid 460,0 ro 90 va (VaSet vasetType 1 @@ -846,11 +846,11 @@ fg "0,65535,0" xt "14250,14625,15000,15375" ) tg (CPTG -uid 380,0 +uid 461,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 381,0 +uid 462,0 va (VaSet font "Verdana,12,0" ) @@ -861,7 +861,7 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 382,0 +uid 463,0 va (VaSet font "Courier New,8,0" ) @@ -874,8 +874,8 @@ lang 11 decl (Decl n "rst" t "unsigned" -o 4 -suid 21,0 +o 11 +suid 26,0 ) ) ) @@ -1589,6 +1589,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 415,0 +lastUid 473,0 activeModelName "Symbol:CDM" )