From e170ee1dd323f3f99e154bd5daf026fc8f423465 Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Mon, 16 Jun 2014 00:04:05 +0200
Subject: Refactoring

---
 FPGA/commande/commande.bdf | 150 +++++++++++++++++++++------------------------
 1 file changed, 70 insertions(+), 80 deletions(-)

(limited to 'FPGA/commande/commande.bdf')

diff --git a/FPGA/commande/commande.bdf b/FPGA/commande/commande.bdf
index da0633a..17dc6e2 100644
--- a/FPGA/commande/commande.bdf
+++ b/FPGA/commande/commande.bdf
@@ -34,7 +34,6 @@ applicable agreement for further details.
 		(line (pt 117 12)(pt 121 8))
 	)
 	(text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
-	(annotation_block (location)(rect 0 16 56 32))
 )
 (pin
 	(input)
@@ -51,7 +50,6 @@ applicable agreement for further details.
 		(line (pt 117 12)(pt 121 8))
 	)
 	(text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
-	(annotation_block (location)(rect -8 32 56 48))
 )
 (pin
 	(input)
@@ -68,7 +66,6 @@ applicable agreement for further details.
 		(line (pt 117 12)(pt 121 8))
 	)
 	(text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
-	(annotation_block (location)(rect -8 64 56 80))
 )
 (pin
 	(input)
@@ -85,7 +82,6 @@ applicable agreement for further details.
 		(line (pt 117 12)(pt 121 8))
 	)
 	(text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
-	(annotation_block (location)(rect -8 80 56 96))
 )
 (pin
 	(input)
@@ -102,7 +98,6 @@ applicable agreement for further details.
 		(line (pt 117 12)(pt 121 8))
 	)
 	(text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
-	(annotation_block (location)(rect 0 96 56 112))
 )
 (pin
 	(input)
@@ -119,7 +114,6 @@ applicable agreement for further details.
 		(line (pt 117 12)(pt 121 8))
 	)
 	(text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
-	(annotation_block (location)(rect 0 112 56 128))
 )
 (pin
 	(input)
@@ -136,11 +130,10 @@ applicable agreement for further details.
 		(line (pt 117 12)(pt 121 8))
 	)
 	(text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
-	(annotation_block (location)(rect -8 48 56 64))
 )
 (pin
 	(output)
-	(rect 648 0 824 16)
+	(rect 56 128 232 144)
 	(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)
@@ -153,11 +146,10 @@ applicable agreement for further details.
 		(line (pt 82 8)(pt 78 12))
 		(line (pt 78 12)(pt 82 8))
 	)
-	(annotation_block (location)(rect 824 16 888 32))
 )
 (pin
 	(output)
-	(rect 648 16 824 32)
+	(rect 56 144 232 160)
 	(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)
@@ -170,11 +162,10 @@ applicable agreement for further details.
 		(line (pt 82 8)(pt 78 12))
 		(line (pt 78 12)(pt 82 8))
 	)
-	(annotation_block (location)(rect 824 32 888 48))
 )
 (pin
 	(output)
-	(rect 648 32 824 48)
+	(rect 56 160 232 176)
 	(text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
 	(text "alarm" (rect 90 0 118 11)(font "Arial" ))
 	(pt 0 8)
@@ -187,10 +178,9 @@ applicable agreement for further details.
 		(line (pt 82 8)(pt 78 12))
 		(line (pt 78 12)(pt 82 8))
 	)
-	(annotation_block (location)(rect 824 48 888 64))
 )
 (symbol
-	(rect 384 0 512 128)
+	(rect 456 0 584 128)
 	(text "alarm" (rect 5 0 36 13)(font "Arial" (font_size 8)))
 	(text "alarm_block" (rect 8 113 68 124)(font "Arial" ))
 	(port
@@ -233,7 +223,32 @@ applicable agreement for further details.
 	)
 )
 (symbol
-	(rect 344 192 544 320)
+	(rect 496 144 544 176)
+	(text "NOT" (rect 1 0 21 10)(font "Arial" (font_size 6)))
+	(text "not_block" (rect 3 21 50 32)(font "Arial" ))
+	(port
+		(pt 0 16)
+		(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))
+	)
+	(port
+		(pt 48 16)
+		(output)
+		(text "OUT" (rect 32 7 52 18)(font "Courier New" (bold))(invisible))
+		(text "OUT" (rect 32 7 48 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 416 192 616 320)
 	(text "fan" (rect 5 0 22 13)(font "Arial" (font_size 8)))
 	(text "fan_block" (rect 8 113 55 124)(font "Arial" ))
 	(port
@@ -282,95 +297,70 @@ applicable agreement for further details.
 		(rectangle (rect 16 16 184 112))
 	)
 )
-(symbol
-	(rect 424 144 472 176)
-	(text "NOT" (rect 1 0 21 10)(font "Arial" (font_size 6)))
-	(text "not_block" (rect 3 21 50 32)(font "Arial" ))
-	(port
-		(pt 0 16)
-		(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))
-	)
-	(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))
-	)
-)
 (connector
-	(text "alarm" (rect 520 16 548 27)(font "Arial" ))
-	(pt 512 32)
-	(pt 528 32)
+	(text "alarm" (rect 592 16 620 27)(font "Arial" ))
+	(pt 584 32)
+	(pt 600 32)
 )
 (connector
-	(text "not_alarm" (rect 480 144 529 155)(font "Arial" ))
-	(pt 472 160)
-	(pt 488 160)
+	(text "not_alarm" (rect 552 144 601 155)(font "Arial" ))
+	(pt 544 160)
+	(pt 560 160)
 )
 (connector
-	(text "fan_auto" (rect 552 208 595 219)(font "Arial" ))
-	(pt 544 224)
-	(pt 560 224)
+	(text "fan_auto" (rect 624 208 667 219)(font "Arial" ))
+	(pt 616 224)
+	(pt 632 224)
 )
 (connector
-	(text "speed[1..0]" (rect 552 224 607 235)(font "Arial" ))
-	(pt 544 240)
-	(pt 560 240)
+	(text "speed[1..0]" (rect 624 224 679 235)(font "Arial" ))
+	(pt 616 240)
+	(pt 632 240)
 	(bus)
 )
 (connector
-	(text "clk" (rect 296 16 310 27)(font "Arial" ))
-	(pt 288 32)
-	(pt 384 32)
+	(text "resetn" (rect 368 32 398 43)(font "Arial" ))
+	(pt 360 48)
+	(pt 456 48)
 )
 (connector
-	(text "resetn" (rect 296 32 326 43)(font "Arial" ))
-	(pt 288 48)
-	(pt 384 48)
+	(text "alarm_user" (rect 368 48 424 59)(font "Arial" ))
+	(pt 360 64)
+	(pt 456 64)
 )
 (connector
-	(text "alarm_user" (rect 296 48 352 59)(font "Arial" ))
-	(pt 288 64)
-	(pt 384 64)
+	(text "sound_high_level" (rect 368 64 454 75)(font "Arial" ))
+	(pt 360 80)
+	(pt 456 80)
 )
 (connector
-	(text "sound_high_level" (rect 296 64 382 75)(font "Arial" ))
-	(pt 288 80)
-	(pt 384 80)
+	(text "not_alarm" (rect 344 208 393 219)(font "Arial" ))
+	(pt 336 224)
+	(pt 416 224)
 )
 (connector
-	(text "not_alarm" (rect 272 208 321 219)(font "Arial" ))
-	(pt 264 224)
-	(pt 344 224)
+	(text "fan_auto_user" (rect 344 224 415 235)(font "Arial" ))
+	(pt 336 240)
+	(pt 416 240)
 )
 (connector
-	(text "fan_auto_user" (rect 272 224 343 235)(font "Arial" ))
-	(pt 264 240)
-	(pt 344 240)
+	(text "speed_user[1..0]" (rect 344 240 426 251)(font "Arial" ))
+	(pt 336 256)
+	(pt 416 256)
+	(bus)
 )
 (connector
-	(text "speed_user[1..0]" (rect 272 240 354 251)(font "Arial" ))
-	(pt 264 256)
-	(pt 344 256)
-	(bus)
+	(text "hot" (rect 344 256 359 267)(font "Arial" ))
+	(pt 336 272)
+	(pt 416 272)
 )
 (connector
-	(text "hot" (rect 272 256 287 267)(font "Arial" ))
-	(pt 264 272)
-	(pt 344 272)
+	(text "alarm" (rect 464 144 492 155)(font "Arial" ))
+	(pt 456 160)
+	(pt 496 160)
 )
 (connector
-	(text "alarm" (rect 392 144 420 155)(font "Arial" ))
-	(pt 384 160)
-	(pt 424 160)
+	(text "clk" (rect 368 16 382 27)(font "Arial" ))
+	(pt 360 32)
+	(pt 456 32)
 )
-- 
cgit v1.2.3