Refactoring

17 files changed, 893 insertions, 236 deletions

diff --git a/FPGA/commande/alarm.bdf b/FPGA/commande/alarm.bdf
index 1ad591a..11d21de 100644
--- a/FPGA/commande/alarm.bdf
+++ b/FPGA/commande/alarm.bdf
@@ -23,7 +23,7 @@ applicable agreement for further details.
         (input)
         (rect 24 16 192 32)
         (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
-        (text "clk" (rect 5 0 20 11)(font "Arial" ))
+        (text "clk" (rect 5 0 19 11)(font "Arial" ))
         (pt 168 8)
         (drawing
                 (line (pt 84 12)(pt 109 12))
@@ -39,7 +39,7 @@ applicable agreement for further details.
         (input)
         (rect 24 32 192 48)
         (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
-        (text "resetn" (rect 5 0 36 11)(font "Arial" ))
+        (text "resetn" (rect 5 0 35 11)(font "Arial" ))
         (pt 168 8)
         (drawing
                 (line (pt 84 12)(pt 109 12))
@@ -55,7 +55,7 @@ applicable agreement for further details.
         (input)
         (rect 24 48 192 64)
         (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))
@@ -71,7 +71,7 @@ applicable agreement for further details.
         (input)
         (rect 24 64 192 80)
         (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
-        (text "activate" (rect 5 0 44 11)(font "Arial" ))
+        (text "activate" (rect 5 0 43 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 424 16 600 32)
+        (rect 24 96 200 112)
         (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
         (text "alarm" (rect 90 0 118 11)(font "Arial" ))
         (pt 0 8)
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" ))