Refactoring

1 files changed, 229 insertions, 147 deletions

diff --git a/FPGA/commande/fan.bdf b/FPGA/commande/fan.bdf
index 7a62110..efc37dc 100644
--- a/FPGA/commande/fan.bdf
+++ b/FPGA/commande/fan.bdf
@@ -85,9 +85,9 @@ applicable agreement for further details.
 )
 (pin
         (output)
-        (rect 664 24 840 40)
+        (rect 56 120 232 136)
         (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
-        (text "fan_auto" (rect 90 0 133 11)(font "Arial" ))
+        (text "speed[1..0]" (rect 90 0 145 11)(font "Arial" ))
         (pt 0 8)
         (drawing
                 (line (pt 0 8)(pt 52 8))
@@ -101,9 +101,9 @@ applicable agreement for further details.
 )
 (pin
         (output)
-        (rect 664 40 840 56)
+        (rect 56 104 232 120)
         (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
-        (text "speed[1..0]" (rect 90 0 145 11)(font "Arial" ))
+        (text "fan_auto" (rect 90 0 133 11)(font "Arial" ))
         (pt 0 8)
         (drawing
                 (line (pt 0 8)(pt 52 8))
@@ -116,9 +116,132 @@ applicable agreement for further details.
         )
 )
 (symbol
-        (rect 368 440 480 528)
+        (rect 376 256 488 304)
+        (text "lpm_constant_00" (rect 7 0 127 16)(font "Arial" (font_size 10)))
+        (text "const0" (rect 8 33 41 44)(font "Arial" ))
+        (port
+                (pt 112 24)
+                (output)
+                (text "result[1..0]" (rect 0 0 59 13)(font "Arial" (font_size 8)))
+                (text "0" (rect 87 18 94 31)(font "Arial" (font_size 8)))
+                (line (pt 112 24)(pt 96 24)(line_width 3))
+        )
+        (drawing
+                (text "2" (rect 99 27 106 38)(font "Arial" ))
+                (line (pt 106 20)(pt 98 28))
+                (line (pt 16 16)(pt 16 32))
+                (line (pt 16 16)(pt 96 16))
+                (line (pt 16 32)(pt 96 32))
+                (line (pt 96 16)(pt 96 32))
+                (line (pt 0 0)(pt 114 0))
+                (line (pt 114 0)(pt 114 50))
+                (line (pt 0 50)(pt 114 50))
+                (line (pt 0 0)(pt 0 50))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+        )
+)
+(symbol
+        (rect 376 192 488 240)
+        (text "lpm_constant_11" (rect 7 0 127 16)(font "Arial" (font_size 10)))
+        (text "const1" (rect 8 33 41 44)(font "Arial" ))
+        (port
+                (pt 112 24)
+                (output)
+                (text "result[1..0]" (rect 0 0 59 13)(font "Arial" (font_size 8)))
+                (text "3" (rect 87 18 94 31)(font "Arial" (font_size 8)))
+                (line (pt 112 24)(pt 96 24)(line_width 3))
+        )
+        (drawing
+                (text "2" (rect 99 27 106 38)(font "Arial" ))
+                (line (pt 106 20)(pt 98 28))
+                (line (pt 16 16)(pt 16 32))
+                (line (pt 16 16)(pt 96 16))
+                (line (pt 16 32)(pt 96 32))
+                (line (pt 96 16)(pt 96 32))
+                (line (pt 0 0)(pt 114 0))
+                (line (pt 114 0)(pt 114 50))
+                (line (pt 0 50)(pt 114 50))
+                (line (pt 0 0)(pt 0 50))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+        )
+)
+(symbol
+        (rect 368 -16 496 80)
+        (text "lpm_compare_00" (rect 13 0 134 16)(font "Arial" (font_size 10)))
+        (text "compare00" (rect 8 81 63 92)(font "Arial" ))
+        (port
+                (pt 0 48)
+                (input)
+                (text "dataa[1..0]" (rect 0 0 60 13)(font "Arial" (font_size 8)))
+                (text "dataa[1..0]" (rect 20 42 80 55)(font "Arial" (font_size 8)))
+                (line (pt 0 48)(pt 16 48)(line_width 3))
+        )
+        (port
+                (pt 128 56)
+                (output)
+                (text "aeb" (rect 0 0 21 13)(font "Arial" (font_size 8)))
+                (text "aeb" (rect 91 50 112 63)(font "Arial" (font_size 8)))
+                (line (pt 128 56)(pt 112 56))
+        )
+        (drawing
+                (text "datab[]=0" (rect 20 58 73 71)(font "Arial" (font_size 8)))
+                (text "compare" (rect 76 27 119 38)(font "Arial" ))
+                (line (pt 16 16)(pt 16 80))
+                (line (pt 16 16)(pt 112 16))
+                (line (pt 16 80)(pt 112 80))
+                (line (pt 112 16)(pt 112 80))
+                (line (pt 0 0)(pt 129 0))
+                (line (pt 129 0)(pt 129 98))
+                (line (pt 0 98)(pt 129 98))
+                (line (pt 0 0)(pt 0 98))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+                (line (pt 0 0)(pt 0 0))
+        )
+)
+(symbol
+        (rect 400 112 464 160)
+        (text "AND2" (rect 1 0 28 10)(font "Arial" (font_size 6)))
+        (text "and_f" (rect 3 37 31 48)(font "Arial" ))
+        (port
+                (pt 0 16)
+                (input)
+                (text "IN1" (rect 2 7 22 18)(font "Courier New" (bold))(invisible))
+                (text "IN1" (rect 2 7 22 18)(font "Courier New" (bold))(invisible))
+                (line (pt 0 16)(pt 14 16))
+        )
+        (port
+                (pt 0 32)
+                (input)
+                (text "IN2" (rect 2 23 22 34)(font "Courier New" (bold))(invisible))
+                (text "IN2" (rect 2 23 22 34)(font "Courier New" (bold))(invisible))
+                (line (pt 0 32)(pt 14 32))
+        )
+        (port
+                (pt 64 24)
+                (output)
+                (text "OUT" (rect 48 15 68 26)(font "Courier New" (bold))(invisible))
+                (text "OUT" (rect 48 15 68 26)(font "Courier New" (bold))(invisible))
+                (line (pt 42 24)(pt 64 24))
+        )
+        (drawing
+                (line (pt 14 12)(pt 30 12))
+                (line (pt 14 37)(pt 31 37))
+                (line (pt 14 12)(pt 14 37))
+                (arc (pt 31 37)(pt 30 12)(rect 18 12 43 37))
+        )
+)
+(symbol
+        (rect 664 88 776 176)
         (text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
-        (text "inst1" (rect 3 77 26 88)(font "Arial" ))
+        (text "mux_auto" (rect 3 77 51 88)(font "Arial" ))
         (port
                 (pt 0 64)
                 (input)
@@ -161,12 +284,12 @@ applicable agreement for further details.
                 (line (pt 44 16)(pt 68 32))
                 (line (pt 44 80)(pt 68 64))
         )
-        (annotation_block (parameter)(rect 480 408 600 434))
+        (annotation_block (parameter)(rect 776 56 896 82))
 )
 (symbol
-        (rect 368 256 480 344)
+        (rect 664 272 776 360)
         (text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
-        (text "inst3" (rect 3 77 26 88)(font "Arial" ))
+        (text "mux_ena" (rect 3 77 49 88)(font "Arial" ))
         (port
                 (pt 0 64)
                 (input)
@@ -209,201 +332,160 @@ applicable agreement for further details.
                 (line (pt 44 16)(pt 68 32))
                 (line (pt 44 80)(pt 68 64))
         )
-        (annotation_block (parameter)(rect 480 224 600 250))
-)
-(symbol
-        (rect 392 208 424 240)
-        (text "GND" (rect 8 16 29 26)(font "Arial" (font_size 6)))
-        (text "inst" (rect 3 21 20 32)(font "Arial" )(invisible))
-        (port
-                (pt 16 0)
-                (output)
-                (text "1" (rect 18 0 25 11)(font "Courier New" (bold))(invisible))
-                (text "1" (rect 18 0 25 11)(font "Courier New" (bold))(invisible))
-                (line (pt 16 8)(pt 16 0))
-        )
-        (drawing
-                (line (pt 8 8)(pt 16 16))
-                (line (pt 16 16)(pt 24 8))
-                (line (pt 8 8)(pt 24 8))
-        )
+        (annotation_block (parameter)(rect 776 240 896 266))
 )
 (symbol
-        (rect 384 32 432 64)
-        (text "WIRE" (rect 1 0 25 10)(font "Arial" (font_size 6)))
+        (rect 664 -96 776 -8)
+        (text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))