Replace combinatory logic by mux

2 files changed, 194 insertions, 196 deletions

diff --git a/FPGA/commande/commande.qsf b/FPGA/commande/commande.qsf
index 9f700cb..e64ba9e 100644
--- a/FPGA/commande/commande.qsf
+++ b/FPGA/commande/commande.qsf
@@ -68,4 +68,5 @@ set_location_assignment PIN_AB21 -to speed[0]
 set_location_assignment PIN_AF23 -to fan_auto
 set_location_assignment PIN_AE23 -to alarm
 set_global_assignment -name STRATIX_DEVICE_IO_STANDARD "3.3-V LVTTL"
+set_global_assignment -name RESERVE_ALL_UNUSED_PINS_NO_OUTPUT_GND "AS INPUT TRI-STATED"
 set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top
\ No newline at end of file
diff --git a/FPGA/commande/fan.bdf b/FPGA/commande/fan.bdf
index b67a23a..7a62110 100644
--- a/FPGA/commande/fan.bdf
+++ b/FPGA/commande/fan.bdf
@@ -23,7 +23,7 @@ applicable agreement for further details.
         (input)
         (rect 48 40 224 56)
         (text "INPUT" (rect 133 0 161 10)(font "Arial" (font_size 6)))
-        (text "fan_auto_user" (rect 5 0 77 11)(font "Arial" ))
+        (text "fan_auto_user" (rect 5 0 76 11)(font "Arial" ))
         (pt 176 8)
         (drawing
                 (line (pt 92 12)(pt 117 12))
@@ -39,7 +39,7 @@ applicable agreement for further details.
         (input)
         (rect 48 56 224 72)
         (text "INPUT" (rect 133 0 161 10)(font "Arial" (font_size 6)))
-        (text "fan_speed[1..0]" (rect 5 0 82 11)(font "Arial" ))
+        (text "fan_speed[1..0]" (rect 5 0 81 11)(font "Arial" ))
         (pt 176 8)
         (drawing
                 (line (pt 92 12)(pt 117 12))
@@ -55,7 +55,7 @@ applicable agreement for further details.
         (input)
         (rect 56 72 224 88)
         (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
-        (text "hot" (rect 5 0 21 11)(font "Arial" ))
+        (text "hot" (rect 5 0 20 11)(font "Arial" ))
         (pt 168 8)
         (drawing
                 (line (pt 84 12)(pt 109 12))
@@ -71,7 +71,7 @@ applicable agreement for further details.
         (input)
         (rect 56 24 224 40)
         (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
-        (text "enable" (rect 5 0 39 11)(font "Arial" ))
+        (text "enable" (rect 5 0 38 11)(font "Arial" ))
         (pt 168 8)
         (drawing
                 (line (pt 84 12)(pt 109 12))
@@ -85,7 +85,7 @@ applicable agreement for further details.
 )
 (pin
         (output)
-        (rect 544 24 720 40)
+        (rect 664 24 840 40)
         (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
         (text "fan_auto" (rect 90 0 133 11)(font "Arial" ))
         (pt 0 8)
@@ -101,7 +101,7 @@ applicable agreement for further details.
 )
 (pin
         (output)
-        (rect 544 40 720 56)
+        (rect 664 40 840 56)
         (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
         (text "speed[1..0]" (rect 90 0 145 11)(font "Arial" ))
         (pt 0 8)
@@ -116,297 +116,294 @@ applicable agreement for further details.
         )
 )
 (symbol
-        (rect 352 24 416 72)
-        (text "AND2" (rect 1 0 28 10)(font "Arial" (font_size 6)))
-        (text "inst" (rect 3 37 20 48)(font "Arial" ))
+        (rect 368 440 480 528)
+        (text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
+        (text "inst1" (rect 3 77 26 88)(font "Arial" ))
         (port
-                (pt 0 16)
+                (pt 0 64)
                 (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))
+                (text "datab[WIDTH-1..0]" (rect 6 51 111 64)(font "Arial" (font_size 8)))
+                (text "datab[]" (rect 6 51 44 64)(font "Arial" (font_size 8)))
+                (line (pt 0 64)(pt 44 64)(line_width 3))
+        )
+        (port
+                (pt 56 88)
+                (input)
+                (text "sel" (rect 59 70 75 83)(font "Arial" (font_size 8)))
+                (text "sel" (rect 59 70 75 83)(font "Arial" (font_size 8)))
+                (line (pt 56 88)(pt 56 72))
         )
         (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))
+                (text "dataa[WIDTH-1..0]" (rect 6 19 111 32)(font "Arial" (font_size 8)))
+                (text "dataa[]" (rect 6 19 44 32)(font "Arial" (font_size 8)))
+                (line (pt 0 32)(pt 44 32)(line_width 3))
         )
         (port
-                (pt 64 24)
+                (pt 112 48)
                 (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))
+                (text "result[WIDTH-1..0]" (rect 75 35 180 48)(font "Arial" (font_size 8)))
+                (text "result[]" (rect 75 35 112 48)(font "Arial" (font_size 8)))
+                (line (pt 68 48)(pt 112 48)(line_width 3))
+        )
+        (parameter
+                "WIDTH"
+                "2"
+                "Width of I/O, any integer > 0"
+                " 1" " 2" " 3" " 4" " 5" " 6" " 7" " 8" " 9" "10" "11" "12" "13" "14" "15" "16" "20" "24" "28" "32" "40" "48" "56" "64" 
         )
         (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))
+                (text "0" (rect 52 31 59 41)(font "Arial" (font_size 6)))
+                (text "1" (rect 52 55 57 65)(font "Arial" (font_size 6)))
+                (line (pt 68 64)(pt 68 32))
+                (line (pt 44 80)(pt 44 16))
+                (line (pt 44 16)(pt 68 32))
+                (line (pt 44 80)(pt 68 64))
         )
+        (annotation_block (parameter)(rect 480 408 600 434))
 )
 (symbol
-        (rect 360 216 408 248)
-        (text "NOT" (rect 1 0 21 10)(font "Arial" (font_size 6)))
-        (text "inst2" (rect 3 21 26 32)(font "Arial" ))
+        (rect 368 256 480 344)
+        (text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
+        (text "inst3" (rect 3 77 26 88)(font "Arial" ))
         (port
-                (pt 0 16)
+                (pt 0 64)
                 (input)
-                (text "IN" (rect 2 7 16 18)(font "Courier New" (bold))(invisible))
-                (text "IN" (rect 2 7 16 18)(font "Courier New" (bold))(invisible))
-                (line (pt 0 16)(pt 13 16))
+                (text "datab[WIDTH-1..0]" (rect 6 51 111 64)(font "Arial" (font_size 8)))
+                (text "datab[]" (rect 6 51 44 64)(font "Arial" (font_size 8)))
+                (line (pt 0 64)(pt 44 64)(line_width 3))
         )
         (port
-                (pt 48 16)
-                (output)
-                (text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
-                (text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
-                (line (pt 39 16)(pt 48 16))
-        )
-        (drawing
-                (line (pt 13 25)(pt 13 7))
-                (line (pt 13 7)(pt 31 16))
-                (line (pt 13 25)(pt 31 16))
-                (circle (rect 31 12 39 20))
-        )
-)
-(symbol
-        (rect 352 152 416 200)
-        (text "AND2" (rect 1 0 28 10)(font "Arial" (font_size 6)))
-        (text "inst4" (rect 3 37 26 48)(font "Arial" ))
-        (port
-                (pt 0 16)
+                (pt 56 88)
                 (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))
+                (text "sel" (rect 59 70 75 83)(font "Arial" (font_size 8)))
+                (text "sel" (rect 59 70 75 83)(font "Arial" (font_size 8)))
+                (line (pt 56 88)(pt 56 72))
         )
         (port
                 (pt 0 32)
                 (input)