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))
+        (annotation_block (parameter)(rect 776 240 896 266))
-)
-(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))
-        )
 )
 (symbol
-        (rect 384 32 432 64)
+        (rect 664 -96 776 -8)
-        (text "WIRE" (rect 1 0 25 10)(font "Arial" (font_size 6)))
+        (text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
-        (text "inst4" (rect 3 21 26 32)(font "Arial" ))
+        (text "mux_auto10" (rect 3 77 64 88)(font "Arial" ))
        (port
-                (pt 0 16)
+                (pt 0 64)
                (input)

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.
85	)	85	)
86	(pin	86	(pin
87	(output)	87	(output)
88	(rect 664 24 840 40)	88	(rect 56 120 232 136)
89	(text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))	89	(text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
90	(text "fan_auto" (rect 90 0 133 11)(font "Arial" ))	90	(text "speed[1..0]" (rect 90 0 145 11)(font "Arial" ))
91	(pt 0 8)	91	(pt 0 8)
92	(drawing	92	(drawing
93	(line (pt 0 8)(pt 52 8))	93	(line (pt 0 8)(pt 52 8))
@@ -101,9 +101,9 @@ applicable agreement for further details.
101	)	101	)
102	(pin	102	(pin
103	(output)	103	(output)
104	(rect 664 40 840 56)	104	(rect 56 104 232 120)
105	(text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))	105	(text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
106	(text "speed[1..0]" (rect 90 0 145 11)(font "Arial" ))	106	(text "fan_auto" (rect 90 0 133 11)(font "Arial" ))
107	(pt 0 8)	107	(pt 0 8)
108	(drawing	108	(drawing
109	(line (pt 0 8)(pt 52 8))	109	(line (pt 0 8)(pt 52 8))
@@ -116,9 +116,132 @@ applicable agreement for further details.
116	)	116	)
117	)	117	)
118	(symbol	118	(symbol
119	(rect 368 440 480 528)	119	(rect 376 256 488 304)
		120	(text "lpm_constant_00" (rect 7 0 127 16)(font "Arial" (font_size 10)))
		121	(text "const0" (rect 8 33 41 44)(font "Arial" ))
		122	(port
		123	(pt 112 24)
		124	(output)
		125	(text "result[1..0]" (rect 0 0 59 13)(font "Arial" (font_size 8)))
		126	(text "0" (rect 87 18 94 31)(font "Arial" (font_size 8)))
		127	(line (pt 112 24)(pt 96 24)(line_width 3))
		128	)
		129	(drawing
		130	(text "2" (rect 99 27 106 38)(font "Arial" ))
		131	(line (pt 106 20)(pt 98 28))
		132	(line (pt 16 16)(pt 16 32))
		133	(line (pt 16 16)(pt 96 16))
		134	(line (pt 16 32)(pt 96 32))
		135	(line (pt 96 16)(pt 96 32))
		136	(line (pt 0 0)(pt 114 0))
		137	(line (pt 114 0)(pt 114 50))
		138	(line (pt 0 50)(pt 114 50))
		139	(line (pt 0 0)(pt 0 50))
		140	(line (pt 0 0)(pt 0 0))
		141	(line (pt 0 0)(pt 0 0))
		142	(line (pt 0 0)(pt 0 0))
		143	(line (pt 0 0)(pt 0 0))
		144	)
		145	)
		146	(symbol
		147	(rect 376 192 488 240)
		148	(text "lpm_constant_11" (rect 7 0 127 16)(font "Arial" (font_size 10)))
		149	(text "const1" (rect 8 33 41 44)(font "Arial" ))
		150	(port
		151	(pt 112 24)
		152	(output)
		153	(text "result[1..0]" (rect 0 0 59 13)(font "Arial" (font_size 8)))
		154	(text "3" (rect 87 18 94 31)(font "Arial" (font_size 8)))
		155	(line (pt 112 24)(pt 96 24)(line_width 3))
		156	)
		157	(drawing
		158	(text "2" (rect 99 27 106 38)(font "Arial" ))
		159	(line (pt 106 20)(pt 98 28))
		160	(line (pt 16 16)(pt 16 32))
		161	(line (pt 16 16)(pt 96 16))
		162	(line (pt 16 32)(pt 96 32))
		163	(line (pt 96 16)(pt 96 32))
		164	(line (pt 0 0)(pt 114 0))
		165	(line (pt 114 0)(pt 114 50))
		166	(line (pt 0 50)(pt 114 50))
		167	(line (pt 0 0)(pt 0 50))
		168	(line (pt 0 0)(pt 0 0))
		169	(line (pt 0 0)(pt 0 0))
		170	(line (pt 0 0)(pt 0 0))
		171	(line (pt 0 0)(pt 0 0))
		172	)
		173	)
		174	(symbol
		175	(rect 368 -16 496 80)
		176	(text "lpm_compare_00" (rect 13 0 134 16)(font "Arial" (font_size 10)))
		177	(text "compare00" (rect 8 81 63 92)(font "Arial" ))
		178	(port
		179	(pt 0 48)
		180	(input)
		181	(text "dataa[1..0]" (rect 0 0 60 13)(font "Arial" (font_size 8)))
		182	(text "dataa[1..0]" (rect 20 42 80 55)(font "Arial" (font_size 8)))
		183	(line (pt 0 48)(pt 16 48)(line_width 3))
		184	)
		185	(port
		186	(pt 128 56)
		187	(output)
		188	(text "aeb" (rect 0 0 21 13)(font "Arial" (font_size 8)))
		189	(text "aeb" (rect 91 50 112 63)(font "Arial" (font_size 8)))
		190	(line (pt 128 56)(pt 112 56))
		191	)
		192	(drawing
		193	(text "datab[]=0" (rect 20 58 73 71)(font "Arial" (font_size 8)))
		194	(text "compare" (rect 76 27 119 38)(font "Arial" ))
		195	(line (pt 16 16)(pt 16 80))
		196	(line (pt 16 16)(pt 112 16))
		197	(line (pt 16 80)(pt 112 80))
		198	(line (pt 112 16)(pt 112 80))
		199	(line (pt 0 0)(pt 129 0))
		200	(line (pt 129 0)(pt 129 98))
		201	(line (pt 0 98)(pt 129 98))
		202	(line (pt 0 0)(pt 0 98))
		203	(line (pt 0 0)(pt 0 0))
		204	(line (pt 0 0)(pt 0 0))
		205	(line (pt 0 0)(pt 0 0))
		206	(line (pt 0 0)(pt 0 0))
		207	)
		208	)
		209	(symbol
		210	(rect 400 112 464 160)
		211	(text "AND2" (rect 1 0 28 10)(font "Arial" (font_size 6)))
		212	(text "and_f" (rect 3 37 31 48)(font "Arial" ))
		213	(port
		214	(pt 0 16)
		215	(input)
		216	(text "IN1" (rect 2 7 22 18)(font "Courier New" (bold))(invisible))
		217	(text "IN1" (rect 2 7 22 18)(font "Courier New" (bold))(invisible))
		218	(line (pt 0 16)(pt 14 16))
		219	)
		220	(port
		221	(pt 0 32)
		222	(input)
		223	(text "IN2" (rect 2 23 22 34)(font "Courier New" (bold))(invisible))
		224	(text "IN2" (rect 2 23 22 34)(font "Courier New" (bold))(invisible))
		225	(line (pt 0 32)(pt 14 32))
		226	)
		227	(port
		228	(pt 64 24)
		229	(output)
		230	(text "OUT" (rect 48 15 68 26)(font "Courier New" (bold))(invisible))
		231	(text "OUT" (rect 48 15 68 26)(font "Courier New" (bold))(invisible))
		232	(line (pt 42 24)(pt 64 24))
		233	)
		234	(drawing
		235	(line (pt 14 12)(pt 30 12))
		236	(line (pt 14 37)(pt 31 37))
		237	(line (pt 14 12)(pt 14 37))
		238	(arc (pt 31 37)(pt 30 12)(rect 18 12 43 37))
		239	)
		240	)
		241	(symbol
		242	(rect 664 88 776 176)
120	(text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))	243	(text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
121	(text "inst1" (rect 3 77 26 88)(font "Arial" ))	244	(text "mux_auto" (rect 3 77 51 88)(font "Arial" ))
122	(port	245	(port
123	(pt 0 64)	246	(pt 0 64)
124	(input)	247	(input)
@@ -161,12 +284,12 @@ applicable agreement for further details.
161	(line (pt 44 16)(pt 68 32))	284	(line (pt 44 16)(pt 68 32))
162	(line (pt 44 80)(pt 68 64))	285	(line (pt 44 80)(pt 68 64))
163	)	286	)
164	(annotation_block (parameter)(rect 480 408 600 434))	287	(annotation_block (parameter)(rect 776 56 896 82))
165	)	288	)
166	(symbol	289	(symbol
167	(rect 368 256 480 344)	290	(rect 664 272 776 360)
168	(text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))	291	(text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
169	(text "inst3" (rect 3 77 26 88)(font "Arial" ))	292	(text "mux_ena" (rect 3 77 49 88)(font "Arial" ))
170	(port	293	(port
171	(pt 0 64)	294	(pt 0 64)
172	(input)	295	(input)
@@ -209,201 +332,160 @@ applicable agreement for further details.
209	(line (pt 44 16)(pt 68 32))	332	(line (pt 44 16)(pt 68 32))
210	(line (pt 44 80)(pt 68 64))	333	(line (pt 44 80)(pt 68 64))
211	)	334	)
212	(annotation_block (parameter)(rect 480 224 600 250))	335	(annotation_block (parameter)(rect 776 240 896 266))
213	)
214	(symbol
215	(rect 392 208 424 240)
216	(text "GND" (rect 8 16 29 26)(font "Arial" (font_size 6)))
217	(text "inst" (rect 3 21 20 32)(font "Arial" )(invisible))
218	(port
219	(pt 16 0)
220	(output)
221	(text "1" (rect 18 0 25 11)(font "Courier New" (bold))(invisible))
222	(text "1" (rect 18 0 25 11)(font "Courier New" (bold))(invisible))
223	(line (pt 16 8)(pt 16 0))
224	)
225	(drawing
226	(line (pt 8 8)(pt 16 16))
227	(line (pt 16 16)(pt 24 8))
228	(line (pt 8 8)(pt 24 8))
229	)
230	)	336	)
231	(symbol	337	(symbol
232	(rect 384 32 432 64)	338	(rect 664 -96 776 -8)
233	(text "WIRE" (rect 1 0 25 10)(font "Arial" (font_size 6)))	339	(text "BUSMUX" (rect 28 0 95 16)(font "Arial" (font_size 10)))
234	(text "inst4" (rect 3 21 26 32)(font "Arial" ))	340	(text "mux_auto10" (rect 3 77 64 88)(font "Arial" ))
235	(port	341	(port
236	(pt 0 16)	342	(pt 0 64)
237	(input)	343	(input)