From 56e5c6f0840eef043065dbc0220117f739f4c9de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Heredero?= Date: Wed, 15 Dec 2021 20:43:01 +0100 Subject: [PATCH] finish buttons --- Cursor/hds/@button/button.bd | 547 +++++++++---------- Cursor/hds/@button/interface | 16 +- Cursor/hds/button_position/fsm.sm | 380 +++++++------ Cursor/hds/button_position/interface | 205 +++---- Cursor/hds/cursor@circuit/student@version.bd | 135 ++--- Cursor_test/hds/cursor_tb/struct.bd | 56 +- Prefs/hds_user/v2019.2/hds_user_prefs | 257 ++------- 7 files changed, 710 insertions(+), 886 deletions(-) diff --git a/Cursor/hds/@button/button.bd b/Cursor/hds/@button/button.bd index 0c5242d..4e5f6fd 100644 --- a/Cursor/hds/@button/button.bd +++ b/Cursor/hds/@button/button.bd @@ -79,19 +79,19 @@ value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\ ) (vvPair variable "date" -value "07.12.2021" +value "15.12.2021" ) (vvPair variable "day" -value "mar." +value "mer." ) (vvPair variable "day_long" -value "mardi" +value "mercredi" ) (vvPair variable "dd" -value "07" +value "15" ) (vvPair variable "entity_name" @@ -119,7 +119,7 @@ value "remi" ) (vvPair variable "graphical_source_date" -value "07.12.2021" +value "15.12.2021" ) (vvPair variable "graphical_source_group" @@ -131,7 +131,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "09:34:59" +value "20:42:30" ) (vvPair variable "group" @@ -203,7 +203,7 @@ value "button" ) (vvPair variable "time" -value "09:34:59" +value "20:42:30" ) (vvPair variable "unit" @@ -294,7 +294,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,8000,38500,8800" -st "button : unsigned(3 DOWNTO 0)" +st "button : unsigned(3 DOWNTO 0) +" ) ) *3 (PortIoIn @@ -334,8 +335,8 @@ f (Text uid 28,0 va (VaSet ) -xt "-7600,10400,-3000,11600" -st "button4" +xt "-9800,10400,-3000,11600" +st "button4(3)" ju 2 blo "-3000,11400" tm "WireNameMgr" @@ -357,7 +358,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,2400,33500,3200" -st "button4 : std_uLogic" +st "button4 : std_uLogic +" ) ) *5 (PortIoIn @@ -373,16 +375,16 @@ optionalChildren [ uid 39,0 sl 0 ro 270 -xt "-2000,31625,-500,32375" +xt "-4000,31625,-2500,32375" ) (Line uid 40,0 sl 0 ro 270 -xt "-500,32000,0,32000" +xt "-2500,32000,-2000,32000" pts [ -"-500,32000" -"0,32000" +"-2500,32000" +"-2000,32000" ] ) ] @@ -397,10 +399,10 @@ f (Text uid 42,0 va (VaSet ) -xt "-6400,31400,-3000,32600" +xt "-8400,31400,-5000,32600" st "clock" ju 2 -blo "-3000,32400" +blo "-5000,32400" tm "WireNameMgr" ) ) @@ -419,7 +421,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,3200,33500,4000" -st "clock : std_ulogic" +st "clock : std_ulogic +" ) ) *7 (PortIoIn @@ -435,16 +438,16 @@ optionalChildren [ uid 53,0 sl 0 ro 270 -xt "-2000,20625,-500,21375" +xt "-4000,20625,-2500,21375" ) (Line uid 54,0 sl 0 ro 270 -xt "-500,21000,0,21000" +xt "-2500,21000,-2000,21000" pts [ -"-500,21000" -"0,21000" +"-2500,21000" +"-2000,21000" ] ) ] @@ -459,10 +462,10 @@ f (Text uid 56,0 va (VaSet ) -xt "-5600,20400,-3000,21600" +xt "-7600,20400,-5000,21600" st "go1" ju 2 -blo "-3000,21400" +blo "-5000,21400" tm "WireNameMgr" ) ) @@ -481,7 +484,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,4000,33500,4800" -st "go1 : std_uLogic" +st "go1 : std_uLogic +" ) ) *9 (PortIoIn @@ -497,16 +501,16 @@ optionalChildren [ uid 67,0 sl 0 ro 270 -xt "-2000,22625,-500,23375" +xt "-4000,22625,-2500,23375" ) (Line uid 68,0 sl 0 ro 270 -xt "-500,23000,0,23000" +xt "-2500,23000,-2000,23000" pts [ -"-500,23000" -"0,23000" +"-2500,23000" +"-2000,23000" ] ) ] @@ -521,10 +525,10 @@ f (Text uid 70,0 va (VaSet ) -xt "-5600,22400,-3000,23600" +xt "-7600,22400,-5000,23600" st "go2" ju 2 -blo "-3000,23400" +blo "-5000,23400" tm "WireNameMgr" ) ) @@ -543,7 +547,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,4800,33500,5600" -st "go2 : std_uLogic" +st "go2 : std_uLogic +" ) ) *11 (PortIoIn @@ -559,16 +564,16 @@ optionalChildren [ uid 81,0 sl 0 ro 270 -xt "-2000,18625,-500,19375" +xt "-4000,18625,-2500,19375" ) (Line uid 82,0 sl 0 ro 270 -xt "-500,19000,0,19000" +xt "-2500,19000,-2000,19000" pts [ -"-500,19000" -"0,19000" +"-2500,19000" +"-2000,19000" ] ) ] @@ -583,10 +588,10 @@ f (Text uid 84,0 va (VaSet ) -xt "-7100,18400,-3000,19600" +xt "-9100,18400,-5000,19600" st "restart" ju 2 -blo "-3000,19400" +blo "-5000,19400" tm "WireNameMgr" ) ) @@ -605,7 +610,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,6400,33500,7200" -st "restart : std_uLogic" +st "restart : std_uLogic +" ) ) *13 (PortIoIn @@ -621,16 +627,16 @@ optionalChildren [ uid 109,0 sl 0 ro 270 -xt "-2000,26625,-500,27375" +xt "-4000,26625,-2500,27375" ) (Line uid 110,0 sl 0 ro 270 -xt "-500,27000,0,27000" +xt "-2500,27000,-2000,27000" pts [ -"-500,27000" -"0,27000" +"-2500,27000" +"-2000,27000" ] ) ] @@ -645,10 +651,10 @@ f (Text uid 112,0 va (VaSet ) -xt "-7000,26400,-3000,27600" +xt "-9000,26400,-5000,27600" st "unlock" ju 2 -blo "-3000,27400" +blo "-5000,27400" tm "WireNameMgr" ) ) @@ -668,7 +674,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,7200,33500,8000" -st "unlock : std_ulogic" +st "unlock : std_ulogic +" ) ) *15 (Grouping @@ -1018,16 +1025,16 @@ optionalChildren [ uid 280,0 sl 0 ro 270 -xt "-2000,33625,-500,34375" +xt "-4000,33625,-2500,34375" ) (Line uid 281,0 sl 0 ro 270 -xt "-500,34000,0,34000" +xt "-2500,34000,-2000,34000" pts [ -"-500,34000" -"0,34000" +"-2500,34000" +"-2000,34000" ] ) ] @@ -1042,10 +1049,10 @@ f (Text uid 283,0 va (VaSet ) -xt "-6300,33500,-3000,34700" +xt "-8300,33500,-5000,34700" st "reset" ju 2 -blo "-3000,34500" +blo "-5000,34500" tm "WireNameMgr" ) ) @@ -1064,7 +1071,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,5600,33500,6400" -st "reset : std_ulogic" +st "reset : std_ulogic +" ) ) *28 (Blk @@ -1077,7 +1085,7 @@ fg "39936,56832,65280" lineColor "0,0,32768" lineWidth 2 ) -xt "24000,18000,32000,36000" +xt "22000,18000,30000,36000" ) oxt "0,0,8000,10000" ttg (MlTextGroup @@ -1090,9 +1098,9 @@ uid 295,0 va (VaSet font "Verdana,9,1" ) -xt "25600,29200,29300,30400" +xt "23600,29200,27300,30400" st "Cursor" -blo "25600,30200" +blo "23600,30200" tm "BdLibraryNameMgr" ) *30 (Text @@ -1100,9 +1108,9 @@ uid 296,0 va (VaSet font "Verdana,9,1" ) -xt "25600,30400,34800,31600" +xt "23600,30400,32800,31600" st "button_position" -blo "25600,31400" +blo "23600,31400" tm "BlkNameMgr" ) *31 (Text @@ -1110,9 +1118,9 @@ uid 297,0 va (VaSet font "Verdana,9,1" ) -xt "25600,31600,28100,32800" +xt "23600,31600,26100,32800" st "U_0" -blo "25600,32600" +blo "23600,32600" tm "InstanceNameMgr" ) ] @@ -1127,7 +1135,7 @@ uid 300,0 va (VaSet font "Courier New,8,0" ) -xt "25600,39200,25600,39200" +xt "23600,39200,23600,39200" ) header "" ) @@ -1141,7 +1149,7 @@ va (VaSet vasetType 1 fg "49152,49152,49152" ) -xt "24250,34250,25750,35750" +xt "22250,34250,23750,35750" iconName "StateMachineViewIcon.png" iconMaskName "StateMachineViewIcon.msk" ftype 3 @@ -1164,7 +1172,8 @@ va (VaSet font "Courier New,8,0" ) xt "22000,10000,42000,10800" -st "SIGNAL dbus0 : unsigned(2 DOWNTO 0)" +st "SIGNAL dbus0 : unsigned(2 DOWNTO 0) +" ) ) *33 (Wire @@ -1186,14 +1195,14 @@ xt "50000,8000,51000,9000" ) ) *35 (BdJunction -uid 334,0 +uid 389,0 ps "OnConnectorStrategy" shape (Circle -uid 335,0 +uid 390,0 va (VaSet vasetType 1 ) -xt "49600,7600,50400,8400" +xt "55600,7600,56400,8400" radius 400 ) ) @@ -1204,10 +1213,10 @@ va (VaSet vasetType 3 lineWidth 2 ) -xt "50000,8000,60000,8000" +xt "47000,8000,60000,8000" pts [ "60000,8000" -"50000,8000" +"47000,8000" ] ) start &1 @@ -1281,10 +1290,10 @@ uid 44,0 va (VaSet vasetType 3 ) -xt "0,32000,24000,32000" +xt "-2000,32000,22000,32000" pts [ -"0,32000" -"24000,32000" +"-2000,32000" +"22000,32000" ] ) start &5 @@ -1303,9 +1312,9 @@ uid 48,0 va (VaSet isHidden 1 ) -xt "2000,30800,5400,32000" +xt "0,30800,3400,32000" st "clock" -blo "2000,31800" +blo "0,31800" tm "WireNameMgr" ) ) @@ -1318,10 +1327,10 @@ uid 58,0 va (VaSet vasetType 3 ) -xt "0,21000,24000,21000" +xt "-2000,21000,22000,21000" pts [ -"0,21000" -"24000,21000" +"-2000,21000" +"22000,21000" ] ) start &7 @@ -1340,9 +1349,9 @@ uid 62,0 va (VaSet isHidden 1 ) -xt "2000,19800,4600,21000" +xt "0,19800,2600,21000" st "go1" -blo "2000,20800" +blo "0,20800" tm "WireNameMgr" ) ) @@ -1355,10 +1364,10 @@ uid 72,0 va (VaSet vasetType 3 ) -xt "0,23000,24000,23000" +xt "-2000,23000,22000,23000" pts [ -"0,23000" -"24000,23000" +"-2000,23000" +"22000,23000" ] ) start &9 @@ -1377,9 +1386,9 @@ uid 76,0 va (VaSet isHidden 1 ) -xt "2000,21800,4600,23000" +xt "0,21800,2600,23000" st "go2" -blo "2000,22800" +blo "0,22800" tm "WireNameMgr" ) ) @@ -1392,10 +1401,10 @@ uid 86,0 va (VaSet vasetType 3 ) -xt "0,19000,24000,19000" +xt "-2000,19000,22000,19000" pts [ -"0,19000" -"24000,19000" +"-2000,19000" +"22000,19000" ] ) start &11 @@ -1414,9 +1423,9 @@ uid 90,0 va (VaSet isHidden 1 ) -xt "2000,17800,6100,19000" +xt "0,17800,4100,19000" st "restart" -blo "2000,18800" +blo "0,18800" tm "WireNameMgr" ) ) @@ -1429,10 +1438,10 @@ uid 114,0 va (VaSet vasetType 3 ) -xt "0,27000,24000,27000" +xt "-2000,27000,22000,27000" pts [ -"0,27000" -"24000,27000" +"-2000,27000" +"22000,27000" ] ) start &13 @@ -1451,9 +1460,9 @@ uid 118,0 va (VaSet isHidden 1 ) -xt "2000,25800,6000,27000" +xt "0,25800,4000,27000" st "unlock" -blo "2000,26800" +blo "0,26800" tm "WireNameMgr" ) ) @@ -1466,10 +1475,10 @@ uid 285,0 va (VaSet vasetType 3 ) -xt "0,34000,24000,34000" +xt "-2000,34000,22000,34000" pts [ -"0,34000" -"24000,34000" +"-2000,34000" +"22000,34000" ] ) start &26 @@ -1488,9 +1497,9 @@ uid 289,0 va (VaSet isHidden 1 ) -xt "2000,32800,5300,34000" +xt "0,32800,3300,34000" st "reset" -blo "2000,33800" +blo "0,33800" tm "WireNameMgr" ) ) @@ -1498,37 +1507,25 @@ on &27 ) *43 (Wire uid 314,0 -optionalChildren [ -*44 (BdJunction -uid 332,0 -ps "OnConnectorStrategy" -shape (Circle -uid 333,0 -va (VaSet -vasetType 1 -) -xt "47600,3600,48400,4400" -radius 400 -) -) -] shape (OrthoPolyLine uid 315,0 va (VaSet vasetType 3 lineWidth 2 ) -xt "32000,4000,48000,23000" +xt "30000,8000,56000,23000" pts [ -"32000,23000" -"38000,23000" -"38000,4000" -"48000,4000" +"30000,23000" +"42000,23000" +"42000,14000" +"56000,14000" +"56000,8000" ] ) start &28 +end &35 sat 2 -eat 16 +eat 32 sty 1 st 0 sf 1 @@ -1541,49 +1538,9 @@ f (Text uid 321,0 va (VaSet ) -xt "34000,21800,42100,23000" +xt "32000,23000,40100,24200" st "dbus0 : (2:0)" -blo "34000,22800" -tm "WireNameMgr" -) -) -on &32 -) -*45 (Wire -uid 324,0 -shape (OrthoPolyLine -uid 325,0 -va (VaSet -vasetType 3 -lineWidth 2 -) -xt "48000,4000,50000,8000" -pts [ -"48000,4000" -"49000,7000" -"50000,8000" -] -) -start &44 -end &35 -sat 32 -eat 32 -sty 1 -stc 0 -st 0 -sf 1 -si 0 -tg (WTG -uid 326,0 -ps "ConnStartEndStrategy" -stg "STSignalDisplayStrategy" -f (Text -uid 327,0 -va (VaSet -) -xt "45000,5800,48800,7000" -st "dbus0" -blo "45000,6800" +blo "32000,24000" tm "WireNameMgr" ) ) @@ -1601,11 +1558,11 @@ xShown 1 yShown 1 color "26368,26368,26368" ) -packageList *46 (PackageList +packageList *44 (PackageList uid 169,0 stg "VerticalLayoutStrategy" textVec [ -*47 (Text +*45 (Text uid 170,0 va (VaSet font "Verdana,9,1" @@ -1614,7 +1571,7 @@ xt "0,0,7600,1200" st "Package List" blo "0,1000" ) -*48 (MLText +*46 (MLText uid 171,0 va (VaSet ) @@ -1630,7 +1587,7 @@ compDirBlock (MlTextGroup uid 172,0 stg "VerticalLayoutStrategy" textVec [ -*49 (Text +*47 (Text uid 173,0 va (VaSet isHidden 1 @@ -1640,7 +1597,7 @@ xt "20000,0,30800,1200" st "Compiler Directives" blo "20000,1000" ) -*50 (Text +*48 (Text uid 174,0 va (VaSet isHidden 1 @@ -1650,7 +1607,7 @@ xt "20000,1200,33100,2400" st "Pre-module directives:" blo "20000,2200" ) -*51 (MLText +*49 (MLText uid 175,0 va (VaSet isHidden 1 @@ -1660,7 +1617,7 @@ st "`resetall `timescale 1ns/10ps" tm "BdCompilerDirectivesTextMgr" ) -*52 (Text +*50 (Text uid 176,0 va (VaSet isHidden 1 @@ -1670,7 +1627,7 @@ xt "20000,4800,33700,6000" st "Post-module directives:" blo "20000,5800" ) -*53 (MLText +*51 (MLText uid 177,0 va (VaSet isHidden 1 @@ -1678,7 +1635,7 @@ isHidden 1 xt "20000,0,20000,0" tm "BdCompilerDirectivesTextMgr" ) -*54 (Text +*52 (Text uid 178,0 va (VaSet isHidden 1 @@ -1688,7 +1645,7 @@ xt "20000,6000,33200,7200" st "End-module directives:" blo "20000,7000" ) -*55 (MLText +*53 (MLText uid 179,0 va (VaSet isHidden 1 @@ -1699,12 +1656,12 @@ tm "BdCompilerDirectivesTextMgr" ] associable 1 ) -windowSize "-8,-8,1544,928" -viewArea "-13626,-1536,67720,48108" -cachedDiagramExtent "-7600,0,67200,49000" +windowSize "0,0,1537,936" +viewArea "-13600,-1500,67558,48596" +cachedDiagramExtent "-9800,0,67200,49000" hasePageBreakOrigin 1 pageBreakOrigin "-8000,0" -lastUid 337,0 +lastUid 390,0 defaultCommentText (CommentText shape (Rectangle layer 0 @@ -1794,7 +1751,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*56 (Text +*54 (Text va (VaSet font "Verdana,9,1" ) @@ -1803,7 +1760,7 @@ st "" blo "1300,4200" tm "BdLibraryNameMgr" ) -*57 (Text +*55 (Text va (VaSet font "Verdana,9,1" ) @@ -1812,7 +1769,7 @@ st "" blo "1300,5400" tm "BlkNameMgr" ) -*58 (Text +*56 (Text va (VaSet font "Verdana,9,1" ) @@ -1863,7 +1820,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*59 (Text +*57 (Text va (VaSet font "Verdana,9,1" ) @@ -1871,7 +1828,7 @@ xt "-350,3200,3750,4400" st "Library" blo "-350,4200" ) -*60 (Text +*58 (Text va (VaSet font "Verdana,9,1" ) @@ -1879,7 +1836,7 @@ xt "-350,4400,8350,5600" st "MWComponent" blo "-350,5400" ) -*61 (Text +*59 (Text va (VaSet font "Verdana,9,1" ) @@ -1928,7 +1885,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*62 (Text +*60 (Text va (VaSet font "Verdana,9,1" ) @@ -1937,7 +1894,7 @@ st "Library" blo "0,4200" tm "BdLibraryNameMgr" ) -*63 (Text +*61 (Text va (VaSet font "Verdana,9,1" ) @@ -1946,7 +1903,7 @@ st "SaComponent" blo "0,5400" tm "CptNameMgr" ) -*64 (Text +*62 (Text va (VaSet font "Verdana,9,1" ) @@ -2000,7 +1957,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*65 (Text +*63 (Text va (VaSet font "Verdana,9,1" ) @@ -2008,7 +1965,7 @@ xt "-500,3200,3600,4400" st "Library" blo "-500,4200" ) -*66 (Text +*64 (Text va (VaSet font "Verdana,9,1" ) @@ -2016,7 +1973,7 @@ xt "-500,4400,8500,5600" st "VhdlComponent" blo "-500,5400" ) -*67 (Text +*65 (Text va (VaSet font "Verdana,9,1" ) @@ -2061,7 +2018,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*68 (Text +*66 (Text va (VaSet font "Verdana,9,1" ) @@ -2069,7 +2026,7 @@ xt "-1150,3200,2950,4400" st "Library" blo "-1150,4200" ) -*69 (Text +*67 (Text va (VaSet font "Verdana,9,1" ) @@ -2077,7 +2034,7 @@ xt "-1150,4400,9150,5600" st "VerilogComponent" blo "-1150,5400" ) -*70 (Text +*68 (Text va (VaSet font "Verdana,9,1" ) @@ -2118,7 +2075,7 @@ ttg (MlTextGroup ps "CenterOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*71 (Text +*69 (Text va (VaSet font "Verdana,9,1" ) @@ -2127,7 +2084,7 @@ st "eb1" blo "2800,4800" tm "HdlTextNameMgr" ) -*72 (Text +*70 (Text va (VaSet font "Verdana,9,1" ) @@ -2530,7 +2487,7 @@ decls (MlTextGroup ps "BottomRightOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*73 (Text +*71 (Text va (VaSet font "Verdana,9,1" ) @@ -2538,7 +2495,7 @@ xt "11200,20000,22000,21200" st "Frame Declarations" blo "11200,21000" ) -*74 (MLText +*72 (MLText va (VaSet ) xt "11200,21200,11200,21200" @@ -2590,7 +2547,7 @@ decls (MlTextGroup ps "BottomRightOffsetStrategy" stg "VerticalLayoutStrategy" textVec [ -*75 (Text +*73 (Text va (VaSet font "Verdana,9,1" ) @@ -2598,7 +2555,7 @@ xt "11200,20000,22000,21200" st "Frame Declarations" blo "11200,21000" ) -*76 (MLText +*74 (MLText va (VaSet ) xt "11200,21200,11200,21200" @@ -2746,44 +2703,44 @@ commonDM (CommonDM ldm (LogicalDM suid 10,0 usingSuid 1 -emptyRow *77 (LEmptyRow +emptyRow *75 (LEmptyRow ) uid 182,0 optionalChildren [ -*78 (RefLabelRowHdr +*76 (RefLabelRowHdr ) -*79 (TitleRowHdr +*77 (TitleRowHdr ) -*80 (FilterRowHdr +*78 (FilterRowHdr ) -*81 (RefLabelColHdr +*79 (RefLabelColHdr tm "RefLabelColHdrMgr" ) -*82 (RowExpandColHdr +*80 (RowExpandColHdr tm "RowExpandColHdrMgr" ) -*83 (GroupColHdr +*81 (GroupColHdr tm "GroupColHdrMgr" ) -*84 (NameColHdr +*82 (NameColHdr tm "BlockDiagramNameColHdrMgr" ) -*85 (ModeColHdr +*83 (ModeColHdr tm "BlockDiagramModeColHdrMgr" ) -*86 (TypeColHdr +*84 (TypeColHdr tm "BlockDiagramTypeColHdrMgr" ) -*87 (BoundsColHdr +*85 (BoundsColHdr tm "BlockDiagramBoundsColHdrMgr" ) -*88 (InitColHdr +*86 (InitColHdr tm "BlockDiagramInitColHdrMgr" ) -*89 (EolColHdr +*87 (EolColHdr tm "BlockDiagramEolColHdrMgr" ) -*90 (LeafLogPort +*88 (LeafLogPort port (LogicalPort lang 11 decl (Decl @@ -2795,7 +2752,7 @@ suid 2,0 ) uid 121,0 ) -*91 (LeafLogPort +*89 (LeafLogPort port (LogicalPort decl (Decl n "go1" @@ -2806,7 +2763,7 @@ suid 4,0 ) uid 123,0 ) -*92 (LeafLogPort +*90 (LeafLogPort port (LogicalPort decl (Decl n "go2" @@ -2817,7 +2774,7 @@ suid 5,0 ) uid 125,0 ) -*93 (LeafLogPort +*91 (LeafLogPort port (LogicalPort decl (Decl n "restart" @@ -2828,7 +2785,7 @@ suid 6,0 ) uid 127,0 ) -*94 (LeafLogPort +*92 (LeafLogPort port (LogicalPort lang 11 decl (Decl @@ -2840,7 +2797,7 @@ suid 8,0 ) uid 129,0 ) -*95 (LeafLogPort +*93 (LeafLogPort port (LogicalPort lang 11 m 1 @@ -2854,7 +2811,7 @@ suid 1,0 ) uid 131,0 ) -*96 (LeafLogPort +*94 (LeafLogPort port (LogicalPort decl (Decl n "clock" @@ -2865,7 +2822,7 @@ suid 3,0 ) uid 133,0 ) -*97 (LeafLogPort +*95 (LeafLogPort port (LogicalPort decl (Decl n "reset" @@ -2876,7 +2833,7 @@ suid 9,0 ) uid 277,0 ) -*98 (LeafLogPort +*96 (LeafLogPort port (LogicalPort lang 11 m 4 @@ -2897,7 +2854,7 @@ displayShortBounds 1 editShortBounds 1 uid 195,0 optionalChildren [ -*99 (Sheet +*97 (Sheet sheetRow (SheetRow headerVa (MVa cellColor "49152,49152,49152" @@ -2914,82 +2871,82 @@ cellColor "39936,56832,65280" fontColor "0,0,0" font "Tahoma,10,0" ) -emptyMRCItem *100 (MRCItem -litem &77 +emptyMRCItem *98 (MRCItem +litem &75 pos 9 dimension 20 ) uid 197,0 optionalChildren [ -*101 (MRCItem -litem &78 +*99 (MRCItem +litem &76 pos 0 dimension 20 uid 198,0 ) -*102 (MRCItem -litem &79 +*100 (MRCItem +litem &77 pos 1 dimension 23 uid 199,0 ) -*103 (MRCItem -litem &80 +*101 (MRCItem +litem &78 pos 2 hidden 1 dimension 20 uid 200,0 ) -*104 (MRCItem -litem &90 +*102 (MRCItem +litem &88 pos 1 dimension 20 uid 122,0 ) -*105 (MRCItem -litem &91 +*103 (MRCItem +litem &89 pos 3 dimension 20 uid 124,0 ) -*106 (MRCItem -litem &92 +*104 (MRCItem +litem &90 pos 4 dimension 20 uid 126,0 ) -*107 (MRCItem -litem &93 +*105 (MRCItem +litem &91 pos 6 dimension 20 uid 128,0 ) -*108 (MRCItem -litem &94 +*106 (MRCItem +litem &92 pos 7 dimension 20 uid 130,0 ) -*109 (MRCItem -litem &95 +*107 (MRCItem +litem &93 pos 0 dimension 20 uid 132,0 ) -*110 (MRCItem -litem &96 +*108 (MRCItem +litem &94 pos 2 dimension 20 uid 134,0 ) -*111 (MRCItem -litem &97 +*109 (MRCItem +litem &95 pos 5 dimension 20 uid 276,0 ) -*112 (MRCItem -litem &98 +*110 (MRCItem +litem &96 pos 8 dimension 20 uid 337,0 @@ -3005,50 +2962,50 @@ textAngle 90 ) uid 201,0 optionalChildren [ -*113 (MRCItem -litem &81 +*111 (MRCItem +litem &79 pos 0 dimension 20 uid 202,0 ) -*114 (MRCItem -litem &83 +*112 (MRCItem +litem &81 pos 1 dimension 50 uid 203,0 ) -*115 (MRCItem -litem &84 +*113 (MRCItem +litem &82 pos 2 dimension 100 uid 204,0 ) -*116 (MRCItem -litem &85 +*114 (MRCItem +litem &83 pos 3 dimension 50 uid 205,0 ) -*117 (MRCItem -litem &86 +*115 (MRCItem +litem &84 pos 4 dimension 100 uid 206,0 ) -*118 (MRCItem -litem &87 +*116 (MRCItem +litem &85 pos 5 dimension 100 uid 207,0 ) -*119 (MRCItem -litem &88 +*117 (MRCItem +litem &86 pos 6 dimension 50 uid 208,0 ) -*120 (MRCItem -litem &89 +*118 (MRCItem +litem &87 pos 7 dimension 80 uid 209,0 @@ -3068,38 +3025,38 @@ uid 181,0 ) genericsCommonDM (CommonDM ldm (LogicalDM -emptyRow *121 (LEmptyRow +emptyRow *119 (LEmptyRow ) uid 211,0 optionalChildren [ -*122 (RefLabelRowHdr +*120 (RefLabelRowHdr ) -*123 (TitleRowHdr +*121 (TitleRowHdr ) -*124 (FilterRowHdr +*122 (FilterRowHdr ) -*125 (RefLabelColHdr +*123 (RefLabelColHdr tm "RefLabelColHdrMgr" ) -*126 (RowExpandColHdr +*124 (RowExpandColHdr tm "RowExpandColHdrMgr" ) -*127 (GroupColHdr +*125 (GroupColHdr tm "GroupColHdrMgr" ) -*128 (NameColHdr +*126 (NameColHdr tm "GenericNameColHdrMgr" ) -*129 (TypeColHdr +*127 (TypeColHdr tm "GenericTypeColHdrMgr" ) -*130 (InitColHdr +*128 (InitColHdr tm "GenericValueColHdrMgr" ) -*131 (PragmaColHdr +*129 (PragmaColHdr tm "GenericPragmaColHdrMgr" ) -*132 (EolColHdr +*130 (EolColHdr tm "GenericEolColHdrMgr" ) ] @@ -3109,7 +3066,7 @@ displayShortBounds 1 editShortBounds 1 uid 223,0 optionalChildren [ -*133 (Sheet +*131 (Sheet sheetRow (SheetRow headerVa (MVa cellColor "49152,49152,49152" @@ -3126,27 +3083,27 @@ cellColor "39936,56832,65280" fontColor "0,0,0" font "Tahoma,10,0" ) -emptyMRCItem *134 (MRCItem -litem &121 +emptyMRCItem *132 (MRCItem +litem &119 pos 0 dimension 20 ) uid 225,0 optionalChildren [ -*135 (MRCItem -litem &122 +*133 (MRCItem +litem &120 pos 0 dimension 20 uid 226,0 ) -*136 (MRCItem -litem &123 +*134 (MRCItem +litem &121 pos 1 dimension 23 uid 227,0 ) -*137 (MRCItem -litem &124 +*135 (MRCItem +litem &122 pos 2 hidden 1 dimension 20 @@ -3163,44 +3120,44 @@ textAngle 90 ) uid 229,0 optionalChildren [ -*138 (MRCItem -litem &125 +*136 (MRCItem +litem &123 pos 0 dimension 20 uid 230,0 ) -*139 (MRCItem -litem &127 +*137 (MRCItem +litem &125 pos 1 dimension 50 uid 231,0 ) -*140 (MRCItem -litem &128 +*138 (MRCItem +litem &126 pos 2 dimension 100 uid 232,0 ) -*141 (MRCItem -litem &129 +*139 (MRCItem +litem &127 pos 3 dimension 100 uid 233,0 ) -*142 (MRCItem -litem &130 +*140 (MRCItem +litem &128 pos 4 dimension 50 uid 234,0 ) -*143 (MRCItem -litem &131 +*141 (MRCItem +litem &129 pos 5 dimension 50 uid 235,0 ) -*144 (MRCItem -litem &132 +*142 (MRCItem +litem &130 pos 6 dimension 80 uid 236,0 diff --git a/Cursor/hds/@button/interface b/Cursor/hds/@button/interface index 23125b1..358f554 100644 --- a/Cursor/hds/@button/interface +++ b/Cursor/hds/@button/interface @@ -523,19 +523,19 @@ value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\ ) (vvPair variable "date" -value "07.12.2021" +value "15.12.2021" ) (vvPair variable "day" -value "mar." +value "mer." ) (vvPair variable "day_long" -value "mardi" +value "mercredi" ) (vvPair variable "dd" -value "07" +value "15" ) (vvPair variable "entity_name" @@ -563,7 +563,7 @@ value "remi" ) (vvPair variable "graphical_source_date" -value "07.12.2021" +value "15.12.2021" ) (vvPair variable "graphical_source_group" @@ -575,7 +575,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "09:34:59" +value "20:42:30" ) (vvPair variable "group" @@ -647,7 +647,7 @@ value "interface" ) (vvPair variable "time" -value "09:34:59" +value "20:42:30" ) (vvPair variable "unit" @@ -1746,6 +1746,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 357,0 +lastUid 380,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/button_position/fsm.sm b/Cursor/hds/button_position/fsm.sm index f153803..6281e0c 100644 --- a/Cursor/hds/button_position/fsm.sm +++ b/Cursor/hds/button_position/fsm.sm @@ -78,19 +78,19 @@ value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\ ) (vvPair variable "date" -value "07.12.2021" +value "15.12.2021" ) (vvPair variable "day" -value "mar." +value "mer." ) (vvPair variable "day_long" -value "mardi" +value "mercredi" ) (vvPair variable "dd" -value "07" +value "15" ) (vvPair variable "entity_name" @@ -118,7 +118,7 @@ value "remi" ) (vvPair variable "graphical_source_date" -value "07.12.2021" +value "15.12.2021" ) (vvPair variable "graphical_source_group" @@ -130,7 +130,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "09:34:56" +value "20:39:43" ) (vvPair variable "group" @@ -202,7 +202,7 @@ value "fsm" ) (vvPair variable "time" -value "09:34:56" +value "20:39:43" ) (vvPair variable "unit" @@ -230,6 +230,7 @@ value "21" ) ] ) +uid 341,0 optionalChildren [ *1 (ConcurrentSM uid 1,0 @@ -247,7 +248,7 @@ fg "0,65535,65535" lineColor "0,32768,49152" lineWidth 2 ) -xt "32480,2968,40832,11320" +xt "32188,3844,40540,12196" radius 4176 ) name (Text @@ -255,10 +256,10 @@ uid 45,0 va (VaSet font "Verdana,12,1" ) -xt "33156,6444,40156,7844" +xt "32864,7320,39864,8720" st "Unlocked" ju 0 -blo "36656,7644" +blo "36364,8520" tm "ONodeName" ) wait (TextAssociate @@ -271,9 +272,9 @@ isHidden 1 fg "0,0,32768" font "Verdana,12,1" ) -xt "36406,7344,41506,8744" +xt "36114,8220,41214,9620" st "wait 2" -blo "36406,8544" +blo "36114,9420" tm "SmWaitText" ) ) @@ -283,8 +284,8 @@ va (VaSet isHidden 1 font "Verdana,9,1" ) -xt "36656,8244,36656,8244" -blo "36656,8244" +xt "36364,9120,36364,9120" +blo "36364,9120" tm "SmEncodingMgr" ) actionBlk (SmStateActionsBlock @@ -301,7 +302,7 @@ lineColor "39936,56832,65280" lineWidth -1 fillStyle 1 ) -xt "32986,8044,43286,9444" +xt "32694,8920,42994,10320" ) autoResize 1 tline (Line @@ -312,10 +313,10 @@ isHidden 1 lineColor "39936,56832,65280" lineWidth -1 ) -xt "33086,7944,43186,7944" +xt "32794,8820,42894,8820" pts [ -"33086,7944" -"43186,7944" +"32794,8820" +"42894,8820" ] ) bline (Line @@ -326,10 +327,10 @@ isHidden 1 lineColor "39936,56832,65280" lineWidth -1 ) -xt "33086,7344,43186,7344" +xt "32794,8220,42894,8220" pts [ -"33086,7344" -"43186,7344" +"32794,8220" +"42894,8220" ] ) ttri (Triangle @@ -343,7 +344,7 @@ bg "0,0,0" lineColor "39936,56832,65280" lineWidth -1 ) -xt "32636,7569,32986,7919" +xt "32344,8445,32694,8795" ) btri (Triangle uid 56,0 @@ -356,20 +357,20 @@ bg "0,0,0" lineColor "39936,56832,65280" lineWidth -1 ) -xt "32636,5169,32986,5519" +xt "32344,6045,32694,6395" ) entryActions (MLText uid 57,0 va (VaSet ) -xt "33086,7744,33086,7744" +xt "32794,8620,32794,8620" tm "Actions" ) inActions (MLText uid 58,0 va (VaSet ) -xt "33086,8144,43186,9344" +xt "32794,9020,42894,10220" st "dBus0 <= \"000\";" tm "Actions" ) @@ -377,7 +378,7 @@ exitActions (MLText uid 59,0 va (VaSet ) -xt "34136,5344,34136,5344" +xt "33844,6220,33844,6220" tm "Actions" ) ) @@ -390,7 +391,7 @@ va (VaSet isHidden 1 font "Verdana,9,1" ) -xt "34556,8344,41256,9544" +xt "34264,9220,40964,10420" st "CASE: expr" tm "SmCaseExpr" ) @@ -1100,7 +1101,7 @@ fg "0,65535,65535" lineColor "0,32768,49152" lineWidth 2 ) -xt "64277,18485,71379,25587" +xt "65153,16587,72255,23689" radius 3551 ) name (Text @@ -1108,10 +1109,10 @@ uid 172,0 va (VaSet font "Verdana,12,1" ) -xt "65728,21336,69928,22736" +xt "66604,19438,70804,20838" st "Pos2" ju 0 -blo "67828,22536" +blo "68704,20638" tm "ONodeName" ) wait (TextAssociate @@ -1124,9 +1125,9 @@ isHidden 1 fg "0,0,32768" font "Verdana,12,1" ) -xt "67578,22236,72678,23636" +xt "68454,20338,73554,21738" st "wait 2" -blo "67578,23436" +blo "68454,21538" tm "SmWaitText" ) ) @@ -1136,8 +1137,8 @@ va (VaSet isHidden 1 font "Verdana,9,1" ) -xt "67828,23136,67828,23136" -blo "67828,23136" +xt "68704,21238,68704,21238" +blo "68704,21238" tm "SmEncodingMgr" ) actionBlk (SmStateActionsBlock @@ -1154,7 +1155,7 @@ lineColor "39936,56832,65280" lineWidth -1 fillStyle 1 ) -xt "64878,22504,75178,23904" +xt "65754,20606,76054,22006" ) autoResize 1 tline (Line @@ -1165,10 +1166,10 @@ isHidden 1 lineColor "39936,56832,65280" lineWidth -1 ) -xt "64978,22404,75078,22404" +xt "65854,20506,75954,20506" pts [ -"64978,22404" -"75078,22404" +"65854,20506" +"75954,20506" ] ) bline (Line @@ -1179,10 +1180,10 @@ isHidden 1 lineColor "39936,56832,65280" lineWidth -1 ) -xt "64978,21804,75078,21804" +xt "65854,19906,75954,19906" pts [ -"64978,21804" -"75078,21804" +"65854,19906" +"75954,19906" ] ) ttri (Triangle @@ -1196,7 +1197,7 @@ bg "0,0,0" lineColor "39936,56832,65280" lineWidth -1 ) -xt "64528,22029,64878,22379" +xt "65404,20131,65754,20481" ) btri (Triangle uid 183,0 @@ -1209,20 +1210,20 @@ bg "0,0,0" lineColor "39936,56832,65280" lineWidth -1 ) -xt "64528,19629,64878,19979" +xt "65404,17731,65754,18081" ) entryActions (MLText uid 184,0 va (VaSet ) -xt "64978,22204,64978,22204" +xt "65854,20306,65854,20306" tm "Actions" ) inActions (MLText uid 185,0 va (VaSet ) -xt "64978,22604,75078,23804" +xt "65854,20706,75954,21906" st "dBus0 <= \"001\";" tm "Actions" ) @@ -1230,7 +1231,7 @@ exitActions (MLText uid 186,0 va (VaSet ) -xt "66028,19804,66028,19804" +xt "66904,17906,66904,17906" tm "Actions" ) ) @@ -1243,7 +1244,7 @@ va (VaSet isHidden 1 font "Verdana,9,1" ) -xt "65728,23236,72428,24436" +xt "66604,21338,73304,22538" st "CASE: expr" tm "SmCaseExpr" ) @@ -1259,7 +1260,7 @@ fg "0,65535,65535" lineColor "0,32768,49152" lineWidth 2 ) -xt "45773,30725,52875,37827" +xt "45700,30579,52802,37681" radius 3551 ) name (Text @@ -1267,10 +1268,10 @@ uid 189,0 va (VaSet font "Verdana,12,1" ) -xt "47224,33576,51424,34976" +xt "47151,33430,51351,34830" st "Pos1" ju 0 -blo "49324,34776" +blo "49251,34630" tm "ONodeName" ) wait (TextAssociate @@ -1283,9 +1284,9 @@ isHidden 1 fg "0,0,32768" font "Verdana,12,1" ) -xt "49074,34476,54174,35876" +xt "49001,34330,54101,35730" st "wait 2" -blo "49074,35676" +blo "49001,35530" tm "SmWaitText" ) ) @@ -1295,8 +1296,8 @@ va (VaSet isHidden 1 font "Verdana,9,1" ) -xt "49324,35376,49324,35376" -blo "49324,35376" +xt "49251,35230,49251,35230" +blo "49251,35230" tm "SmEncodingMgr" ) actionBlk (SmStateActionsBlock @@ -1313,7 +1314,7 @@ lineColor "39936,56832,65280" lineWidth -1 fillStyle 1 ) -xt "46590,34960,56890,36360" +xt "46517,34814,56817,36214" ) autoResize 1 tline (Line @@ -1324,10 +1325,10 @@ isHidden 1 lineColor "39936,56832,65280" lineWidth -1 ) -xt "46690,34860,56790,34860" +xt "46617,34714,56717,34714" pts [ -"46690,34860" -"56790,34860" +"46617,34714" +"56717,34714" ] ) bline (Line @@ -1338,10 +1339,10 @@ isHidden 1 lineColor "39936,56832,65280" lineWidth -1 ) -xt "46690,34260,56790,34260" +xt "46617,34114,56717,34114" pts [ -"46690,34260" -"56790,34260" +"46617,34114" +"56717,34114" ] ) ttri (Triangle @@ -1355,7 +1356,7 @@ bg "0,0,0" lineColor "39936,56832,65280" lineWidth -1 ) -xt "46240,34485,46590,34835" +xt "46167,34339,46517,34689" ) btri (Triangle uid 200,0 @@ -1368,20 +1369,20 @@ bg "0,0,0" lineColor "39936,56832,65280" lineWidth -1 ) -xt "46240,32085,46590,32435" +xt "46167,31939,46517,32289" ) entryActions (MLText uid 201,0 va (VaSet ) -xt "46690,34660,46690,34660" +xt "46617,34514,46617,34514" tm "Actions" ) inActions (MLText uid 202,0 va (VaSet ) -xt "46690,35060,56790,36260" +xt "46617,34914,56717,36114" st "dBus0 <= \"010\";" tm "Actions" ) @@ -1389,7 +1390,7 @@ exitActions (MLText uid 203,0 va (VaSet ) -xt "47740,32260,47740,32260" +xt "47667,32114,47667,32114" tm "Actions" ) ) @@ -1402,7 +1403,7 @@ va (VaSet isHidden 1 font "Verdana,9,1" ) -xt "47224,35476,53924,36676" +xt "47151,35330,53851,36530" st "CASE: expr" tm "SmCaseExpr" ) @@ -1418,7 +1419,7 @@ fg "0,65535,65535" lineColor "0,32768,49152" lineWidth 2 ) -xt "18557,27341,25659,34443" +xt "17681,28947,24783,36049" radius 3551 ) name (Text @@ -1426,10 +1427,10 @@ uid 206,0 va (VaSet font "Verdana,12,1" ) -xt "20108,30192,24108,31592" +xt "19232,31798,23232,33198" st "start" ju 0 -blo "22108,31392" +blo "21232,32998" tm "ONodeName" ) wait (TextAssociate @@ -1442,9 +1443,9 @@ isHidden 1 fg "0,0,32768" font "Verdana,12,1" ) -xt "21858,31092,26958,32492" +xt "20982,32698,26082,34098" st "wait 2" -blo "21858,32292" +blo "20982,33898" tm "SmWaitText" ) ) @@ -1454,8 +1455,8 @@ va (VaSet isHidden 1 font "Verdana,9,1" ) -xt "22108,31992,22108,31992" -blo "22108,31992" +xt "21232,33598,21232,33598" +blo "21232,33598" tm "SmEncodingMgr" ) actionBlk (SmStateActionsBlock @@ -1472,7 +1473,7 @@ lineColor "39936,56832,65280" lineWidth -1 fillStyle 1 ) -xt "20022,31504,30322,32904" +xt "19146,33110,29446,34510" ) autoResize 1 tline (Line @@ -1483,10 +1484,10 @@ isHidden 1 lineColor "39936,56832,65280" lineWidth -1 ) -xt "20122,31404,30222,31404" +xt "19246,33010,29346,33010" pts [ -"20122,31404" -"30222,31404" +"19246,33010" +"29346,33010" ] ) bline (Line @@ -1497,10 +1498,10 @@ isHidden 1 lineColor "39936,56832,65280" lineWidth -1 ) -xt "20122,30804,30222,30804" +xt "19246,32410,29346,32410" pts [ -"20122,30804" -"30222,30804" +"19246,32410" +"29346,32410" ] ) ttri (Triangle @@ -1514,7 +1515,7 @@ bg "0,0,0" lineColor "39936,56832,65280" lineWidth -1 ) -xt "19672,31029,20022,31379" +xt "18796,32635,19146,32985" ) btri (Triangle uid 217,0 @@ -1527,20 +1528,20 @@ bg "0,0,0" lineColor "39936,56832,65280" lineWidth -1 ) -xt "19672,28629,20022,28979" +xt "18796,30235,19146,30585" ) entryActions (MLText uid 218,0 va (VaSet ) -xt "20122,31204,20122,31204" +xt "19246,32810,19246,32810" tm "Actions" ) inActions (MLText uid 219,0 va (VaSet ) -xt "20122,31604,30222,32804" +xt "19246,33210,29346,34410" st "dBus0 <= \"100\";" tm "Actions" ) @@ -1548,7 +1549,7 @@ exitActions (MLText uid 220,0 va (VaSet ) -xt "21172,28804,21172,28804" +xt "20296,30410,20296,30410" tm "Actions" ) ) @@ -1561,7 +1562,7 @@ va (VaSet isHidden 1 font "Verdana,9,1" ) -xt "20008,32092,26708,33292" +xt "19132,33698,25832,34898" st "CASE: expr" tm "SmCaseExpr" ) @@ -1750,11 +1751,11 @@ uid 282,0 va (VaSet vasetType 3 ) -xt "40028,4682,65622,19254" +xt "39736,5304,66310,17517" pts [ -"40028,4682" -"55895,6984" -"65622,19254" +"39736,5558" +"56198,6447" +"66310,17517" ] arrow 1 ) @@ -1773,7 +1774,7 @@ fg "65535,65535,65535" bg "0,0,0" lineColor "0,32768,49152" ) -xt "52587,5548,58787,7748" +xt "52890,5011,59090,7211" ) autoResize 1 lineShape (Line @@ -1782,17 +1783,17 @@ va (VaSet vasetType 3 isHidden 1 ) -xt "55737,7648,55737,7648" +xt "56040,7111,56040,7111" pts [ -"55737,7648" -"55737,7648" +"56040,7111" +"56040,7111" ] ) condition (MLText uid 286,0 va (VaSet ) -xt "53087,6048,58287,7248" +xt "53390,5511,58590,6711" st "go2 = '1'" tm "Condition" ) @@ -1800,7 +1801,7 @@ actions (MLText uid 287,0 va (VaSet ) -xt "55687,7648,55687,7648" +xt "55990,7111,55990,7111" tm "Actions" ) ) @@ -1814,17 +1815,17 @@ vasetType 1 fg "65535,65535,65535" bg "0,0,0" ) -xt "42153,3805,44279,5931" +xt "41845,4412,43971,6538" radius 1063 ) pr (Text uid 290,0 va (VaSet ) -xt "42516,4268,43916,5468" +xt "42208,4875,43608,6075" st "1" ju 0 -blo "43216,5268" +blo "42908,5875" tm "TransitionPriority" ) padding "100,100" @@ -1837,11 +1838,11 @@ uid 292,0 va (VaSet vasetType 3 ) -xt "39881,9796,64330,21426" +xt "39795,10400,65168,19815" pts [ -"64330,21426" -"51251,19143" -"39881,9796" +"65168,19815" +"51570,18569" +"39795,10400" ] arrow 1 ) @@ -1861,7 +1862,7 @@ fg "65535,65535,65535" bg "0,0,0" lineColor "0,32768,49152" ) -xt "50823,18643,59123,20843" +xt "51142,18069,59442,20269" ) autoResize 1 lineShape (Line @@ -1870,17 +1871,17 @@ va (VaSet vasetType 3 isHidden 1 ) -xt "53973,20743,53973,20743" +xt "54292,20169,54292,20169" pts [ -"53973,20743" -"53973,20743" +"54292,20169" +"54292,20169" ] ) condition (MLText uid 296,0 va (VaSet ) -xt "51323,19143,58623,20343" +xt "51642,18569,58942,19769" st "unlock = '1'" tm "Condition" ) @@ -1888,7 +1889,7 @@ actions (MLText uid 297,0 va (VaSet ) -xt "54973,20743,54973,20743" +xt "55292,20169,55292,20169" tm "Actions" ) ) @@ -1903,7 +1904,7 @@ isHidden 1 fg "65535,65535,65535" bg "0,0,0" ) -xt "60469,20085,62595,22211" +xt "61298,18688,63424,20814" radius 1063 ) pr (Text @@ -1911,10 +1912,10 @@ uid 300,0 va (VaSet isHidden 1 ) -xt "60832,20548,62232,21748" +xt "61661,19151,63061,20351" st "1" ju 0 -blo "61532,21548" +blo "62361,20151" tm "TransitionPriority" ) padding "100,100" @@ -1927,11 +1928,11 @@ uid 302,0 va (VaSet vasetType 3 ) -xt "39125,10511,49452,30734" +xt "38920,11322,49307,30591" pts [ -"39125,10511" -"48584,23411" -"49083,30734" +"38920,11322" +"48414,23585" +"48971,30591" ] arrow 1 ) @@ -1951,7 +1952,7 @@ fg "65535,65535,65535" bg "0,0,0" lineColor "0,32768,49152" ) -xt "46212,23343,52412,25543" +xt "46042,23517,52242,25717" ) autoResize 1 lineShape (Line @@ -1960,17 +1961,17 @@ va (VaSet vasetType 3 isHidden 1 ) -xt "49362,25443,49362,25443" +xt "49192,25617,49192,25617" pts [ -"49362,25443" -"49362,25443" +"49192,25617" +"49192,25617" ] ) condition (MLText uid 306,0 va (VaSet ) -xt "46712,23843,51912,25043" +xt "46542,24017,51742,25217" st "go1 = '1'" tm "Condition" ) @@ -1978,7 +1979,7 @@ actions (MLText uid 307,0 va (VaSet ) -xt "49312,25443,49312,25443" +xt "49142,25617,49142,25617" tm "Actions" ) ) @@ -1992,17 +1993,17 @@ vasetType 1 fg "65535,65535,65535" bg "0,0,0" ) -xt "39501,11304,41627,13430" +xt "39294,12015,41420,14141" radius 1063 ) pr (Text uid 310,0 va (VaSet ) -xt "39864,11767,41264,12967" +xt "39657,12478,41057,13678" st "2" ju 0 -blo "40564,12767" +blo "40357,13478" tm "TransitionPriority" ) padding "100,100" @@ -2015,11 +2016,11 @@ uid 312,0 va (VaSet vasetType 3 ) -xt "37588,11214,47190,31438" +xt "37361,12075,47044,31349" pts [ -"47190,31438" -"40043,21933" -"37588,11214" +"47044,31349" +"39882,22321" +"37361,12075" ] arrow 1 ) @@ -2039,7 +2040,7 @@ fg "65535,65535,65535" bg "0,0,0" lineColor "0,32768,49152" ) -xt "35871,18481,44171,20681" +xt "35637,20329,43937,22529" ) autoResize 1 lineShape (Line @@ -2048,17 +2049,17 @@ va (VaSet vasetType 3 isHidden 1 ) -xt "39021,20581,39021,20581" +xt "38787,22429,38787,22429" pts [ -"39021,20581" -"39021,20581" +"38787,22429" +"38787,22429" ] ) condition (MLText uid 316,0 va (VaSet ) -xt "36371,18981,43671,20181" +xt "36137,20829,43437,22029" st "unlock = '1'" tm "Condition" ) @@ -2066,7 +2067,7 @@ actions (MLText uid 317,0 va (VaSet ) -xt "40021,20581,40021,20581" +xt "39787,22429,39787,22429" tm "Actions" ) ) @@ -2081,7 +2082,7 @@ isHidden 1 fg "65535,65535,65535" bg "0,0,0" ) -xt "44659,28610,46785,30736" +xt "44521,28622,46647,30748" radius 1063 ) pr (Text @@ -2089,10 +2090,10 @@ uid 320,0 va (VaSet isHidden 1 ) -xt "45022,29073,46422,30273" +xt "44884,29085,46284,30285" st "1" ju 0 -blo "45722,30073" +blo "45584,30085" tm "TransitionPriority" ) padding "100,100" @@ -2105,11 +2106,11 @@ uid 322,0 va (VaSet vasetType 3 ) -xt "24650,11137,35434,28413" +xt "23984,12082,35396,30254" pts [ -"35434,11137" -"32486,20769" -"24650,28413" +"35396,12082" +"32770,23091" +"23984,30254" ] arrow 1 ) @@ -2129,7 +2130,7 @@ fg "65535,65535,65535" bg "0,0,0" lineColor "0,32768,49152" ) -xt "28602,21565,37002,23765" +xt "29470,25055,37870,27255" ) autoResize 1 lineShape (Line @@ -2138,17 +2139,17 @@ va (VaSet vasetType 3 isHidden 1 ) -xt "31752,23665,31752,23665" +xt "32620,27155,32620,27155" pts [ -"31752,23665" -"31752,23665" +"32620,27155" +"32620,27155" ] ) condition (MLText uid 326,0 va (VaSet ) -xt "29102,22065,36502,23265" +xt "29970,25555,37370,26755" st "restart = '1'" tm "Condition" ) @@ -2156,7 +2157,7 @@ actions (MLText uid 327,0 va (VaSet ) -xt "32802,23665,32802,23665" +xt "33670,27155,33670,27155" tm "Actions" ) ) @@ -2170,17 +2171,17 @@ vasetType 1 fg "65535,65535,65535" bg "0,0,0" ) -xt "33896,12130,36022,14256" +xt "33980,13271,36106,15397" radius 1063 ) pr (Text uid 330,0 va (VaSet ) -xt "34259,12593,35659,13793" +xt "34343,13734,35743,14934" st "3" ju 0 -blo "34959,13593" +blo "35043,14734" tm "TransitionPriority" ) padding "100,100" @@ -2193,11 +2194,11 @@ uid 332,0 va (VaSet vasetType 3 ) -xt "22966,10054,33662,27447" +xt "22135,10942,33382,29064" pts [ -"22966,27447" -"25268,18215" -"33662,10054" +"22135,29064" +"24655,19492" +"33382,10942" ] arrow 1 ) @@ -2217,7 +2218,7 @@ fg "65535,65535,65535" bg "0,0,0" lineColor "0,32768,49152" ) -xt "24120,15123,32420,17323" +xt "23507,16400,31807,18600" ) autoResize 1 lineShape (Line @@ -2226,17 +2227,17 @@ va (VaSet vasetType 3 isHidden 1 ) -xt "27270,17223,27270,17223" +xt "26657,18500,26657,18500" pts [ -"27270,17223" -"27270,17223" +"26657,18500" +"26657,18500" ] ) condition (MLText uid 336,0 va (VaSet ) -xt "24620,15623,31920,16823" +xt "24007,16900,31307,18100" st "unlock = '1'" tm "Condition" ) @@ -2244,7 +2245,7 @@ actions (MLText uid 337,0 va (VaSet ) -xt "28270,17223,28270,17223" +xt "27657,18500,27657,18500" tm "Actions" ) ) @@ -2259,7 +2260,7 @@ isHidden 1 fg "65535,65535,65535" bg "0,0,0" ) -xt "22229,24278,24355,26404" +xt "21445,25811,23571,27937" radius 1063 ) pr (Text @@ -2267,10 +2268,10 @@ uid 340,0 va (VaSet isHidden 1 ) -xt "22592,24741,23992,25941" +xt "21808,26274,23208,27474" st "1" ju 0 -blo "23292,25741" +blo "22508,27274" tm "TransitionPriority" ) padding "100,100" @@ -2386,8 +2387,8 @@ tm "SmCompilerDirectivesTextMgr" ] associable 1 ) -windowSize "-8,-8,1544,928" -viewArea "-7556,-9140,88204,49036" +windowSize "0,0,1537,936" +viewArea "-7600,-9100,87957,49884" cachedDiagramExtent "-650,-1000,86600,47000" hasePageBreakOrigin 1 pageBreakOrigin "-1000,-2000" @@ -2762,11 +2763,12 @@ stateOrder [ name "csm" ) ] -lastUid 340,0 +lastUid 409,0 commonDM (CommonDM ldm (LogicalDM emptyRow *62 (LEmptyRow ) +uid 343,0 optionalChildren [ *63 (RefLabelRowHdr ) @@ -2903,6 +2905,7 @@ scheme 0 pdm (PhysicalDM displayShortBounds 1 editShortBounds 1 +uid 362,0 optionalChildren [ *88 (Sheet sheetRow (SheetRow @@ -2926,22 +2929,26 @@ litem &62 pos 7 dimension 20 ) +uid 364,0 optionalChildren [ *90 (MRCItem litem &63 pos 0 dimension 20 +uid 365,0 ) *91 (MRCItem litem &64 pos 1 dimension 23 +uid 366,0 ) *92 (MRCItem litem &65 pos 2 hidden 1 dimension 20 +uid 367,0 ) *93 (MRCItem litem &81 @@ -2994,93 +3001,111 @@ fontColor "0,0,0" font "Tahoma,10,0" textAngle 90 ) +uid 368,0 optionalChildren [ *100 (MRCItem litem &66 pos 0 dimension 20 +uid 369,0 ) *101 (MRCItem litem &68 pos 1 dimension 50 +uid 370,0 ) *102 (MRCItem litem &69 pos 2 dimension 70 +uid 371,0 ) *103 (MRCItem litem &70 pos 3 dimension 50 +uid 372,0 ) *104 (MRCItem litem &71 pos 4 dimension 80 +uid 373,0 ) *105 (MRCItem litem &72 pos 5 dimension 80 +uid 374,0 ) *106 (MRCItem litem &73 pos 6 dimension 40 +uid 375,0 ) *107 (MRCItem litem &74 pos 7 dimension 100 +uid 376,0 ) *108 (MRCItem litem &75 pos 8 dimension 60 +uid 377,0 ) *109 (MRCItem litem &76 pos 9 dimension 130 +uid 378,0 ) *110 (MRCItem litem &77 pos 10 dimension 56 +uid 379,0 ) *111 (MRCItem litem &78 pos 11 dimension 50 +uid 380,0 ) *112 (MRCItem litem &79 pos 12 dimension 50 +uid 381,0 ) *113 (MRCItem litem &80 pos 13 dimension 80 +uid 382,0 ) ] ) fixedCol 4 fixedRow 2 name "Ports" +uid 363,0 vaOverrides [ ] ) ] ) +uid 342,0 ) cdmCsm &1 genericsCommonDM (CommonDM ldm (LogicalDM emptyRow *114 (LEmptyRow ) +uid 384,0 optionalChildren [ *115 (RefLabelRowHdr ) @@ -3117,6 +3142,7 @@ tm "GenericEolColHdrMgr" pdm (PhysicalDM displayShortBounds 1 editShortBounds 1 +uid 396,0 optionalChildren [ *126 (Sheet sheetRow (SheetRow @@ -3140,22 +3166,26 @@ litem &114 pos 0 dimension 20 ) +uid 398,0 optionalChildren [ *128 (MRCItem litem &115 pos 0 dimension 20 +uid 399,0 ) *129 (MRCItem litem &116 pos 1 dimension 23 +uid 400,0 ) *130 (MRCItem litem &117 pos 2 hidden 1 dimension 20 +uid 401,0 ) ] ) @@ -3166,52 +3196,62 @@ fontColor "0,0,0" font "Tahoma,10,0" textAngle 90 ) +uid 402,0 optionalChildren [ *131 (MRCItem litem &118 pos 0 dimension 20 +uid 403,0 ) *132 (MRCItem litem &120 pos 1 dimension 50 +uid 404,0 ) *133 (MRCItem litem &121 pos 2 dimension 100 +uid 405,0 ) *134 (MRCItem litem &122 pos 3 dimension 100 +uid 406,0 ) *135 (MRCItem litem &123 pos 4 dimension 50 +uid 407,0 ) *136 (MRCItem litem &124 pos 5 dimension 50 +uid 408,0 ) *137 (MRCItem litem &125 pos 6 dimension 80 +uid 409,0 ) ] ) fixedCol 3 fixedRow 2 name "Ports" +uid 397,0 vaOverrides [ ] ) ] ) +uid 383,0 type 1 ) signalSuffix "_int" @@ -3792,7 +3832,7 @@ va (VaSet vasetType 1 transparent 1 ) -xt "-371,972,-116,1278" +xt "-441,926,-116,1323" ) ] ) @@ -3867,7 +3907,7 @@ va (VaSet vasetType 1 transparent 1 ) -xt "-415,1064,-76,1263" +xt "-425,943,-76,1304" ) (Line sl 0 diff --git a/Cursor/hds/button_position/interface b/Cursor/hds/button_position/interface index 43e5990..2952d4a 100644 --- a/Cursor/hds/button_position/interface +++ b/Cursor/hds/button_position/interface @@ -21,7 +21,7 @@ appVersion "2019.2 (Build 5)" model (Symbol commonDM (CommonDM ldm (LogicalDM -suid 7,0 +suid 14,0 usingSuid 1 emptyRow *1 (LEmptyRow ) @@ -65,11 +65,11 @@ port (LogicalPort decl (Decl n "clock" t "std_ulogic" -o 1 -suid 1,0 +o 2 +suid 8,0 ) ) -uid 86,0 +uid 353,0 ) *15 (LogPort port (LogicalPort @@ -79,55 +79,55 @@ decl (Decl n "dbus0" t "unsigned" b "(2 DOWNTO 0)" -o 7 -suid 2,0 +o 9 +suid 9,0 ) ) -uid 88,0 +uid 355,0 ) *16 (LogPort port (LogicalPort decl (Decl n "go1" t "std_uLogic" -o 2 -suid 3,0 +o 3 +suid 10,0 ) ) -uid 90,0 +uid 357,0 ) *17 (LogPort port (LogicalPort decl (Decl n "go2" t "std_uLogic" -o 3 -suid 4,0 +o 4 +suid 11,0 ) ) -uid 92,0 +uid 359,0 ) *18 (LogPort port (LogicalPort decl (Decl n "reset" t "std_ulogic" -o 4 -suid 5,0 +o 9 +suid 12,0 ) ) -uid 94,0 +uid 361,0 ) *19 (LogPort port (LogicalPort decl (Decl n "restart" t "std_uLogic" -o 5 -suid 6,0 +o 6 +suid 13,0 ) ) -uid 96,0 +uid 363,0 ) *20 (LogPort port (LogicalPort @@ -135,11 +135,11 @@ lang 11 decl (Decl n "unlock" t "std_ulogic" -o 6 -suid 7,0 +o 7 +suid 14,0 ) ) -uid 98,0 +uid 365,0 ) ] ) @@ -195,43 +195,43 @@ uid 120,0 litem &14 pos 0 dimension 20 -uid 87,0 +uid 354,0 ) *27 (MRCItem litem &15 -pos 6 +pos 1 dimension 20 -uid 89,0 +uid 356,0 ) *28 (MRCItem litem &16 -pos 1 +pos 2 dimension 20 -uid 91,0 +uid 358,0 ) *29 (MRCItem litem &17 -pos 2 +pos 3 dimension 20 -uid 93,0 +uid 360,0 ) *30 (MRCItem litem &18 -pos 3 +pos 4 dimension 20 -uid 95,0 +uid 362,0 ) *31 (MRCItem litem &19 -pos 4 +pos 5 dimension 20 -uid 97,0 +uid 364,0 ) *32 (MRCItem litem &20 -pos 5 +pos 6 dimension 20 -uid 99,0 +uid 366,0 ) ] ) @@ -506,19 +506,19 @@ value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\ ) (vvPair variable "date" -value "07.12.2021" +value "15.12.2021" ) (vvPair variable "day" -value "mar." +value "mer." ) (vvPair variable "day_long" -value "mardi" +value "mercredi" ) (vvPair variable "dd" -value "07" +value "15" ) (vvPair variable "entity_name" @@ -546,7 +546,7 @@ value "remi" ) (vvPair variable "graphical_source_date" -value "07.12.2021" +value "15.12.2021" ) (vvPair variable "graphical_source_group" @@ -558,7 +558,7 @@ value "MARVIN" ) (vvPair variable "graphical_source_time" -value "09:34:57" +value "20:42:30" ) (vvPair variable "group" @@ -630,7 +630,7 @@ value "interface" ) (vvPair variable "time" -value "09:34:57" +value "20:42:30" ) (vvPair variable "unit" @@ -665,10 +665,10 @@ optionalChildren [ uid 8,0 optionalChildren [ *66 (CptPort -uid 51,0 +uid 318,0 ps "OnEdgeStrategy" shape (Triangle -uid 52,0 +uid 319,0 ro 90 va (VaSet vasetType 1 @@ -677,11 +677,11 @@ fg "0,65535,0" xt "14250,19625,15000,20375" ) tg (CPTG -uid 53,0 +uid 320,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 54,0 +uid 321,0 va (VaSet font "Verdana,12,0" ) @@ -692,27 +692,28 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 55,0 +uid 322,0 va (VaSet font "Courier New,8,0" ) xt "44000,2400,60500,3200" -st "clock : IN std_ulogic ;" +st "clock : IN std_ulogic ; +" ) thePort (LogicalPort decl (Decl n "clock" t "std_ulogic" -o 1 -suid 1,0 +o 2 +suid 8,0 ) ) ) *67 (CptPort -uid 56,0 +uid 323,0 ps "OnEdgeStrategy" shape (Triangle -uid 57,0 +uid 324,0 ro 90 va (VaSet vasetType 1 @@ -721,11 +722,11 @@ fg "0,65535,0" xt "23000,10625,23750,11375" ) tg (CPTG -uid 58,0 +uid 325,0 ps "CptPortTextPlaceStrategy" stg "RightVerticalLayoutStrategy" f (Text -uid 59,0 +uid 326,0 va (VaSet font "Verdana,12,0" ) @@ -737,12 +738,13 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 60,0 +uid 327,0 va (VaSet font "Courier New,8,0" ) xt "44000,7200,64500,8000" -st "dbus0 : OUT unsigned (2 DOWNTO 0)" +st "dbus0 : OUT unsigned (2 DOWNTO 0) +" ) thePort (LogicalPort lang 11 @@ -751,16 +753,16 @@ decl (Decl n "dbus0" t "unsigned" b "(2 DOWNTO 0)" -o 7 -suid 2,0 +o 9 +suid 9,0 ) ) ) *68 (CptPort -uid 61,0 +uid 328,0 ps "OnEdgeStrategy" shape (Triangle -uid 62,0 +uid 329,0 ro 90 va (VaSet vasetType 1 @@ -769,11 +771,11 @@ fg "0,65535,0" xt "14250,8625,15000,9375" ) tg (CPTG -uid 63,0 +uid 330,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 64,0 +uid 331,0 va (VaSet font "Verdana,12,0" ) @@ -784,27 +786,28 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 65,0 +uid 332,0 va (VaSet font "Courier New,8,0" ) xt "44000,3200,60500,4000" -st "go1 : IN std_uLogic ;" +st "go1 : IN std_uLogic ; +" ) thePort (LogicalPort decl (Decl n "go1" t "std_uLogic" -o 2 -suid 3,0 +o 3 +suid 10,0 ) ) ) *69 (CptPort -uid 66,0 +uid 333,0 ps "OnEdgeStrategy" shape (Triangle -uid 67,0 +uid 334,0 ro 90 va (VaSet vasetType 1 @@ -813,11 +816,11 @@ fg "0,65535,0" xt "14250,10625,15000,11375" ) tg (CPTG -uid 68,0 +uid 335,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 69,0 +uid 336,0 va (VaSet font "Verdana,12,0" ) @@ -828,27 +831,28 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 70,0 +uid 337,0 va (VaSet font "Courier New,8,0" ) xt "44000,4000,60500,4800" -st "go2 : IN std_uLogic ;" +st "go2 : IN std_uLogic ; +" ) thePort (LogicalPort decl (Decl n "go2" t "std_uLogic" -o 3 -suid 4,0 +o 4 +suid 11,0 ) ) ) *70 (CptPort -uid 71,0 +uid 338,0 ps "OnEdgeStrategy" shape (Triangle -uid 72,0 +uid 339,0 ro 90 va (VaSet vasetType 1 @@ -857,11 +861,11 @@ fg "0,65535,0" xt "14250,21625,15000,22375" ) tg (CPTG -uid 73,0 +uid 340,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 74,0 +uid 341,0 va (VaSet font "Verdana,12,0" ) @@ -872,27 +876,28 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 75,0 +uid 342,0 va (VaSet font "Courier New,8,0" ) xt "44000,4800,60500,5600" -st "reset : IN std_ulogic ;" +st "reset : IN std_ulogic ; +" ) thePort (LogicalPort decl (Decl n "reset" t "std_ulogic" -o 4 -suid 5,0 +o 9 +suid 12,0 ) ) ) *71 (CptPort -uid 76,0 +uid 343,0 ps "OnEdgeStrategy" shape (Triangle -uid 77,0 +uid 344,0 ro 90 va (VaSet vasetType 1 @@ -901,11 +906,11 @@ fg "0,65535,0" xt "14250,6625,15000,7375" ) tg (CPTG -uid 78,0 +uid 345,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 79,0 +uid 346,0 va (VaSet font "Verdana,12,0" ) @@ -916,27 +921,28 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 80,0 +uid 347,0 va (VaSet font "Courier New,8,0" ) xt "44000,5600,60500,6400" -st "restart : IN std_uLogic ;" +st "restart : IN std_uLogic ; +" ) thePort (LogicalPort decl (Decl n "restart" t "std_uLogic" -o 5 -suid 6,0 +o 6 +suid 13,0 ) ) ) *72 (CptPort -uid 81,0 +uid 348,0 ps "OnEdgeStrategy" shape (Triangle -uid 82,0 +uid 349,0 ro 90 va (VaSet vasetType 1 @@ -945,11 +951,11 @@ fg "0,65535,0" xt "14250,14625,15000,15375" ) tg (CPTG -uid 83,0 +uid 350,0 ps "CptPortTextPlaceStrategy" stg "VerticalLayoutStrategy" f (Text -uid 84,0 +uid 351,0 va (VaSet font "Verdana,12,0" ) @@ -960,20 +966,21 @@ tm "CptPortNameMgr" ) ) dt (MLText -uid 85,0 +uid 352,0 va (VaSet font "Courier New,8,0" ) xt "44000,6400,60500,7200" -st "unlock : IN std_ulogic ;" +st "unlock : IN std_ulogic ; +" ) thePort (LogicalPort lang 11 decl (Decl n "unlock" t "std_ulogic" -o 6 -suid 7,0 +o 7 +suid 14,0 ) ) ) @@ -1684,6 +1691,6 @@ xt "42000,0,42000,0" tm "SyDeclarativeTextMgr" ) ) -lastUid 294,0 +lastUid 366,0 activeModelName "Symbol:CDM" ) diff --git a/Cursor/hds/cursor@circuit/student@version.bd b/Cursor/hds/cursor@circuit/student@version.bd index d8b043f..c61b4de 100644 --- a/Cursor/hds/cursor@circuit/student@version.bd +++ b/Cursor/hds/cursor@circuit/student@version.bd @@ -66,23 +66,23 @@ value " " ) (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\\cursor@circuit\\student@version.bd.info" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\cursor@circuit\\student@version.bd.info" ) (vvPair variable "SideDataUserDir" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\cursor@circuit\\student@version.bd.user" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\cursor@circuit\\student@version.bd.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" @@ -102,27 +102,27 @@ value "%(unit)_%(view)_config" ) (vvPair variable "d" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\cursor@circuit" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\cursor@circuit" ) (vvPair variable "d_logical" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\cursorCircuit" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\cursorCircuit" ) (vvPair variable "date" -value "14.12.2021" +value "15.12.2021" ) (vvPair variable "day" -value "mar." +value "mer." ) (vvPair variable "day_long" -value "mardi" +value "mercredi" ) (vvPair variable "dd" -value "14" +value "15" ) (vvPair variable "designName" @@ -150,11 +150,11 @@ value "student@version" ) (vvPair variable "graphical_source_author" -value "Simon" +value "remi" ) (vvPair variable "graphical_source_date" -value "14.12.2021" +value "15.12.2021" ) (vvPair variable "graphical_source_group" @@ -162,11 +162,11 @@ value "UNKNOWN" ) (vvPair variable "graphical_source_host" -value "PC-SDM" +value "MARVIN" ) (vvPair variable "graphical_source_time" -value "14:18:34" +value "20:42:35" ) (vvPair variable "group" @@ -174,7 +174,7 @@ value "UNKNOWN" ) (vvPair variable "host" -value "PC-SDM" +value "MARVIN" ) (vvPair variable "language" @@ -222,11 +222,11 @@ value "d ) (vvPair variable "p" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\cursor@circuit\\student@version.bd" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\cursor@circuit\\student@version.bd" ) (vvPair variable "p_logical" -value "C:\\Users\\Simon\\Desktop\\ELN\\Projet\\Cursor\\Prefs\\..\\Cursor\\hds\\cursorCircuit\\studentVersion.bd" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor\\hds\\cursorCircuit\\studentVersion.bd" ) (vvPair variable "package_name" @@ -302,7 +302,7 @@ value "studentVersion" ) (vvPair variable "time" -value "14:18:34" +value "20:42:35" ) (vvPair variable "unit" @@ -310,7 +310,7 @@ value "cursorCircuit" ) (vvPair variable "user" -value "Simon" +value "remi" ) (vvPair variable "version" @@ -347,8 +347,7 @@ va (VaSet isHidden 1 ) xt "26000,1000,37800,2200" -st "reset : std_ulogic -" +st "reset : std_ulogic" ) ) *2 (Net @@ -365,8 +364,7 @@ va (VaSet isHidden 1 ) xt "26000,-2600,37900,-1400" -st "clock : std_ulogic -" +st "clock : std_ulogic" ) ) *3 (Grouping @@ -754,8 +752,7 @@ isHidden 1 font "Verdana,8,0" ) xt "-17000,5800,-7400,6800" -st "restart : std_uLogic -" +st "restart : std_uLogic" ) ) *16 (PortIoIn @@ -828,8 +825,7 @@ isHidden 1 font "Verdana,8,0" ) xt "-17000,5800,-6600,6800" -st "testMode : std_uLogic -" +st "testMode : std_uLogic" ) ) *18 (PortIoOut @@ -901,8 +897,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,20600,1800" -st "testOut : std_uLogic_vector(1 TO testLineNb) -" +st "testOut : std_uLogic_vector(1 TO testLineNb)" ) ) *20 (PortIoIn @@ -975,8 +970,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,10100,1800" -st "sensor1 : std_uLogic -" +st "sensor1 : std_uLogic" ) ) *22 (PortIoIn @@ -1049,8 +1043,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,10100,1800" -st "sensor2 : std_uLogic -" +st "sensor2 : std_uLogic" ) ) *24 (PortIoOut @@ -1121,8 +1114,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,10500,1800" -st "motorOn : std_uLogic -" +st "motorOn : std_uLogic" ) ) *26 (PortIoOut @@ -1193,8 +1185,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,9700,1800" -st "side1 : std_uLogic -" +st "side1 : std_uLogic" ) ) *28 (PortIoOut @@ -1265,8 +1256,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,9700,1800" -st "side2 : std_uLogic -" +st "side2 : std_uLogic" ) ) *30 (PortIoIn @@ -1339,8 +1329,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,10400,1800" -st "encoderA : std_uLogic -" +st "encoderA : std_uLogic" ) ) *32 (PortIoIn @@ -1413,8 +1402,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,10400,1800" -st "encoderB : std_uLogic -" +st "encoderB : std_uLogic" ) ) *34 (PortIoIn @@ -1487,8 +1475,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,10200,1800" -st "encoderI : std_uLogic -" +st "encoderI : std_uLogic" ) ) *36 (PortIoIn @@ -1561,8 +1548,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,9700,1800" -st "go1 : std_uLogic -" +st "go1 : std_uLogic" ) ) *38 (PortIoIn @@ -1635,8 +1621,7 @@ isHidden 1 font "Verdana,8,0" ) xt "0,800,9700,1800" -st "go2 : std_uLogic -" +st "go2 : std_uLogic" ) ) *40 (PortIoIn @@ -1708,8 +1693,7 @@ va (VaSet isHidden 1 ) xt "0,-23800,12800,-22600" -st "button4 : std_uLogic -" +st "button4 : std_uLogic" ) ) *42 (PortIoIn @@ -1836,8 +1820,7 @@ va (VaSet isHidden 1 ) xt "0,400,12600,1600" -st "CS1_n : std_ulogic -" +st "CS1_n : std_ulogic" ) ) *45 (Net @@ -1854,8 +1837,7 @@ va (VaSet isHidden 1 ) xt "0,400,11900,1600" -st "SCL : std_ulogic -" +st "SCL : std_ulogic" ) ) *46 (Net @@ -1872,8 +1854,7 @@ va (VaSet isHidden 1 ) xt "0,400,11300,1600" -st "SI : std_ulogic -" +st "SI : std_ulogic" ) ) *47 (Net @@ -1890,8 +1871,7 @@ va (VaSet isHidden 1 ) xt "0,400,11600,1600" -st "A0 : std_ulogic -" +st "A0 : std_ulogic" ) ) *48 (Net @@ -1908,8 +1888,7 @@ va (VaSet isHidden 1 ) xt "0,400,12500,1600" -st "RST_n : std_ulogic -" +st "RST_n : std_ulogic" ) ) *49 (PortIoOut @@ -2444,8 +2423,7 @@ va (VaSet isHidden 1 ) xt "0,0,16300,1200" -st "SIGNAL RaZ : std_ulogic -" +st "SIGNAL RaZ : std_ulogic" ) ) *71 (Net @@ -2464,8 +2442,7 @@ va (VaSet isHidden 1 ) xt "0,0,24700,1200" -st "SIGNAL Position : unsigned(15 DOWNTO 0) -" +st "SIGNAL Position : unsigned(15 DOWNTO 0)" ) ) *72 (Net @@ -2484,8 +2461,7 @@ va (VaSet isHidden 1 ) xt "0,0,23700,1200" -st "SIGNAL button : unsigned(3 DOWNTO 0) -" +st "SIGNAL button : unsigned(3 DOWNTO 0)" ) ) *73 (Net @@ -2503,8 +2479,7 @@ va (VaSet isHidden 1 ) xt "0,0,16700,1200" -st "SIGNAL unlock : std_ulogic -" +st "SIGNAL unlock : std_ulogic" ) ) *74 (Net @@ -2522,8 +2497,7 @@ va (VaSet isHidden 1 ) xt "0,0,16500,1200" -st "SIGNAL SideL : std_ulogic -" +st "SIGNAL SideL : std_ulogic" ) ) *75 (Net @@ -2542,8 +2516,7 @@ va (VaSet isHidden 1 ) xt "0,0,23800,1200" -st "SIGNAL Power : unsigned(7 DOWNTO 0) -" +st "SIGNAL Power : unsigned(7 DOWNTO 0)" ) ) *76 (Net @@ -2561,8 +2534,7 @@ va (VaSet isHidden 1 ) xt "0,0,15100,1200" -st "SIGNAL clk : unsigned -" +st "SIGNAL clk : unsigned" ) ) *77 (Net @@ -2580,8 +2552,7 @@ va (VaSet isHidden 1 ) xt "0,0,15000,1200" -st "SIGNAL rst : unsigned -" +st "SIGNAL rst : unsigned" ) ) *78 (Wire @@ -4094,8 +4065,8 @@ tm "BdCompilerDirectivesTextMgr" ] associable 1 ) -windowSize "-8,-8,1722,1111" -viewArea "26645,-770,154315,83465" +windowSize "0,0,1537,960" +viewArea "26600,-800,154882,80736" cachedDiagramExtent "-17000,-23800,171000,152000" pageSetupInfo (PageSetupInfo ptrCmd "\\\\ipp://ippsion.hevs.ch\\PREA309_HPLJ3005DN,winspool," @@ -4122,7 +4093,7 @@ boundaryWidth 0 ) hasePageBreakOrigin 1 pageBreakOrigin "24000,-12000" -lastUid 12067,0 +lastUid 12196,0 defaultCommentText (CommentText shape (Rectangle layer 0 @@ -5548,7 +5519,7 @@ font "Tahoma,10,0" ) emptyMRCItem *189 (MRCItem litem &146 -pos 27 +pos 29 dimension 20 ) uid 5729,0 diff --git a/Cursor_test/hds/cursor_tb/struct.bd b/Cursor_test/hds/cursor_tb/struct.bd index 804e25a..cbf75dc 100644 --- a/Cursor_test/hds/cursor_tb/struct.bd +++ b/Cursor_test/hds/cursor_tb/struct.bd @@ -78,23 +78,23 @@ value " " ) (vvPair variable "HDLDir" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hdl" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hdl" ) (vvPair variable "HDSDir" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hds" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hds" ) (vvPair variable "SideDataDesignDir" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb\\struct.bd.info" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb\\struct.bd.info" ) (vvPair variable "SideDataUserDir" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb\\struct.bd.user" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb\\struct.bd.user" ) (vvPair variable "SourceDir" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hds" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hds" ) (vvPair variable "appl" @@ -114,27 +114,27 @@ value "%(unit)_%(view)_config" ) (vvPair variable "d" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb" ) (vvPair variable "d_logical" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb" ) (vvPair variable "date" -value "11.11.2019" +value "15.12.2021" ) (vvPair variable "day" -value "Mon" +value "mer." ) (vvPair variable "day_long" -value "Monday" +value "mercredi" ) (vvPair variable "dd" -value "11" +value "15" ) (vvPair variable "designName" @@ -162,11 +162,11 @@ value "struct" ) (vvPair variable "graphical_source_author" -value "silvan.zahno" +value "remi" ) (vvPair variable "graphical_source_date" -value "11.11.2019" +value "15.12.2021" ) (vvPair variable "graphical_source_group" @@ -174,11 +174,11 @@ value "UNKNOWN" ) (vvPair variable "graphical_source_host" -value "WE6996" +value "MARVIN" ) (vvPair variable "graphical_source_time" -value "08:13:23" +value "20:42:42" ) (vvPair variable "group" @@ -186,7 +186,7 @@ value "UNKNOWN" ) (vvPair variable "host" -value "WE6996" +value "MARVIN" ) (vvPair variable "language" @@ -206,7 +206,7 @@ value "$SCRATCH_DIR/Cursor_test/work" ) (vvPair variable "mm" -value "11" +value "12" ) (vvPair variable "module_name" @@ -214,19 +214,19 @@ value "cursor_tb" ) (vvPair variable "month" -value "Nov" +value "déc." ) (vvPair variable "month_long" -value "November" +value "décembre" ) (vvPair variable "p" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb\\struct.bd" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb\\struct.bd" ) (vvPair variable "p_logical" -value "C:\\work\\git\\Education\\eln\\projects\\solution\\eln_cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb\\struct.bd" +value "C:\\Users\\remi\\OneDrive\\Documents\\Cours\\05-HEVS\\S1fb\\electricity\\1-EIN\\project\\cursor\\HDLdesigner\\Cursor\\Prefs\\..\\Cursor_test\\hds\\cursor_tb\\struct.bd" ) (vvPair variable "package_name" @@ -302,7 +302,7 @@ value "struct" ) (vvPair variable "time" -value "08:13:23" +value "20:42:42" ) (vvPair variable "unit" @@ -310,7 +310,7 @@ value "cursor_tb" ) (vvPair variable "user" -value "silvan.zahno" +value "remi" ) (vvPair variable "version" @@ -322,11 +322,11 @@ value "struct" ) (vvPair variable "year" -value "2019" +value "2021" ) (vvPair variable "yy" -value "19" +value "21" ) ] ) @@ -2531,8 +2531,8 @@ tm "BdCompilerDirectivesTextMgr" ] associable 1 ) -windowSize "74,46,1330,909" -viewArea "-8608,17960,105743,94895" +windowSize "-8,-8,1544,928" +viewArea "-8600,18000,138511,107778" cachedDiagramExtent "-7000,-1400,102000,93000" pageSetupInfo (PageSetupInfo ptrCmd "\\\\ipp://ipp.hevs.ch\\PREA309_HPLJP3005DN,winspool," @@ -2559,7 +2559,7 @@ boundaryWidth 0 ) hasePageBreakOrigin 1 pageBreakOrigin "-7000,19000" -lastUid 4859,0 +lastUid 4912,0 defaultCommentText (CommentText shape (Rectangle layer 0 diff --git a/Prefs/hds_user/v2019.2/hds_user_prefs b/Prefs/hds_user/v2019.2/hds_user_prefs index ca75ee4..d9f8c45 100644 --- a/Prefs/hds_user/v2019.2/hds_user_prefs +++ b/Prefs/hds_user/v2019.2/hds_user_prefs @@ -1290,262 +1290,111 @@ exportedDirectories [ exportStdIncludeRefs 1 exportStdPackageRefs 1 ) -printerName "PR_FOLLOWME" +printerName "CX417de" pageSizes [ (PageSizeInfo -name "12\" x 18\"" -type 512 -width 1106 -height 1658 +name "Lettre US (215,9 x 279,4 mm)" +width 783 +height 1013 ) (PageSizeInfo -name "11\" x 17\"" -type 17 -width 1013 -height 1566 -) -(PageSizeInfo -name "Legal (8,5\" x 14\")" +name "Legal US" type 5 width 783 height 1290 ) (PageSizeInfo -name "Letter (8,5\" x 11\")" -width 783 -height 1013 -) -(PageSizeInfo -name "Executive (7,25\"x10,5\")" -type 7 -width 667 -height 967 -) -(PageSizeInfo -name "5,5\" x 8,5\"" +name "Statement US" type 6 width 506 height 783 ) (PageSizeInfo -name "A3 (297 x 420 mm)" -type 8 -width 1077 -height 1523 +name "Exécutif US (18,42 x 26,67 cm)" +type 7 +width 667 +height 967 ) (PageSizeInfo -name "A4 (210 x 297 mm)" +name "A4" type 9 width 761 height 1077 ) (PageSizeInfo -name "A5 (148 x 210 mm)" +name "A5" type 11 -width 538 +width 536 height 761 ) (PageSizeInfo -name "A6 (105 x 148 mm)" -type 70 -width 380 -height 538 -) -(PageSizeInfo -name "B4 JIS (257 x 364 mm)" -type 12 -width 932 -height 1320 -) -(PageSizeInfo -name "B5 JIS (182 x 257 mm)" +name "B5 (JIS)" type 13 width 660 height 932 ) (PageSizeInfo -name "B6 JIS (128 x 182 mm)" -type 88 -width 464 -height 660 -) -(PageSizeInfo -name "8\" x 13\"" -type 518 -width 737 -height 1198 -) -(PageSizeInfo -name "8,25\" x 13\"" -type 519 -width 760 -height 1198 -) -(PageSizeInfo -name "8,5\" x 13\"" +name "Folio US (215,9 x 330,2 mm)" type 14 width 783 height 1198 ) (PageSizeInfo -name "Com10 Env.(4,125\"x9,5\")" -type 20 +name "A6" +type 70 width 380 -height 875 +height 536 ) (PageSizeInfo -name "Env.Monar.(3,875\"x7,5\")" -type 37 -width 357 +name "Oficio(Mexico)(8,5 x 13,4 po.)" +type 119 +width 783 +height 1234 +) +(PageSizeInfo +name "Universel" +type 120 +width 783 +height 1305 +) +(PageSizeInfo +name "Env. 7 3/4 (3 7/8 x 7 1/2 po)" +type 121 +width 356 height 691 ) (PageSizeInfo -name "Env. DL (110 x 220 mm)" -type 27 -width 399 -height 798 +name "Env. 9 (3 7/8 x 8 7/8 po)" +type 122 +width 356 +height 817 ) (PageSizeInfo -name "Env. C6 (114 x 162 mm)" -type 31 -width 413 -height 587 +name "Env. 10 (4 1/8 x 9 1/2 po)" +type 123 +width 379 +height 875 ) (PageSizeInfo -name "Env. C5 (162 x 229 mm)" -type 28 +name "Enveloppe DL (110 x 220 mm)" +type 124 +width 398 +height 797 +) +(PageSizeInfo +name "Enveloppe C5 (162 x 229 mm)" +type 125 width 587 height 830 ) (PageSizeInfo -name "8K (267 x 390 mm)" -type 520 -width 968 -height 1415 +name "Enveloppe B5 (176 x 250 mm)" +type 126 +width 638 +height 907 ) (PageSizeInfo -name "16K (195 x 267 mm)" -type 521 -width 707 -height 968 -) -(PageSizeInfo -name "100 x 148 mm" -type 43 -width 362 -height 536 -) -(PageSizeInfo -name "148 x 200 mm" -type 82 -width 536 -height 725 -) -(PageSizeInfo -name "JPN Env. #3(120 x 235 mm)" -type 73 -width 435 -height 852 -) -(PageSizeInfo -name "JPN Env. #4(90 x 205 mm)" -type 74 -width 326 -height 743 -) -(PageSizeInfo -name "Yoh Chou #3 E.(120x235mm)" -type 540 -width 435 -height 852 -) -(PageSizeInfo -name "Yoh #4 Env. (105 x 235 mm)" -type 91 -width 380 -height 852 -) -(PageSizeInfo -name "Kaku #2 Env. (240 x 332 mm)" -type 71 -width 870 -height 1204 -) -(PageSizeInfo -name "SRA3 (320 x 450 mm)" -type 530 -width 1161 -height 1632 -) -(PageSizeInfo -name "SRA4 (225 x 320 mm)" -type 531 -width 816 -height 1161 -) -(PageSizeInfo -name "Format papier personnalisé" type 256 -width 783 -height 1013 -) -(PageSizeInfo -name "Format papier personnalisé1(210,0 x 297,0 mm)" -type 257 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé2(210,0 x 297,0 mm)" -type 258 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé3(210,0 x 297,0 mm)" -type 259 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé4(210,0 x 297,0 mm)" -type 260 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé5(210,0 x 297,0 mm)" -type 261 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé6(210,0 x 297,0 mm)" -type 262 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé7(210,0 x 297,0 mm)" -type 263 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé8(210,0 x 297,0 mm)" -type 264 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé9(210,0 x 297,0 mm)" -type 265 -width 761 -height 1077 -) -(PageSizeInfo -name "Format papier personnalisé10(210,0 x 297,0 mm)" -type 266 width 761 height 1077 )