summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacien TRAN-GIRARD2014-06-16 00:04:05 +0200
committerPacien TRAN-GIRARD2014-06-16 00:04:05 +0200
commite170ee1dd323f3f99e154bd5daf026fc8f423465 (patch)
tree1f99741a98cabf57221d122e90b60e1851edb00a
parentdcc1a759eab259f4e0b946182637566cd584c694 (diff)
downloadfpga-home-automation-e170ee1dd323f3f99e154bd5daf026fc8f423465.tar.gz
Refactoring
-rw-r--r--FPGA/commande/alarm.bdf10
-rw-r--r--FPGA/commande/commande.bdf150
-rw-r--r--FPGA/commande/commande.qsf11
-rw-r--r--FPGA/commande/commande.qwsbin1415 -> 881 bytes
-rw-r--r--FPGA/commande/fan.bdf376
-rw-r--r--FPGA/commande/lpm_compare_00.bsf56
-rw-r--r--FPGA/commande/lpm_compare_00.cmp22
-rw-r--r--FPGA/commande/lpm_compare_00.qip5
-rw-r--r--FPGA/commande/lpm_compare_00.vhd131
-rw-r--r--FPGA/commande/lpm_constant_00.bsf (renamed from FPGA/display/lpm_constant7nada.bsf)10
-rw-r--r--FPGA/commande/lpm_constant_00.cmp (renamed from FPGA/display/lpm_constant7nada.cmp)4
-rw-r--r--FPGA/commande/lpm_constant_00.qip (renamed from FPGA/display/lpm_constant_1.qip)6
-rw-r--r--FPGA/commande/lpm_constant_00.vhd (renamed from FPGA/display/lpm_constant7nada.vhd)42
-rw-r--r--FPGA/commande/lpm_constant_11.bsf49
-rw-r--r--FPGA/commande/lpm_constant_11.cmp21
-rw-r--r--FPGA/commande/lpm_constant_11.qip (renamed from FPGA/display/lpm_constant7nada.qip)6
-rw-r--r--FPGA/commande/lpm_constant_11.vhd109
-rw-r--r--FPGA/display/display.bdf437
-rw-r--r--FPGA/display/display.qsf4
-rw-r--r--FPGA/display/display.qwsbin842 -> 613 bytes
-rw-r--r--FPGA/display/lpm_constant_2x0.bsf49
-rw-r--r--FPGA/display/lpm_constant_2x0.cmp21
-rw-r--r--FPGA/display/lpm_constant_2x0.qip5
-rw-r--r--FPGA/display/lpm_constant_2x0.vhd109
-rw-r--r--FPGA/display/lpm_constant_7x1.bsf (renamed from FPGA/display/lpm_constant_1.bsf)2
-rw-r--r--FPGA/display/lpm_constant_7x1.cmp (renamed from FPGA/display/lpm_constant_1.cmp)2
-rw-r--r--FPGA/display/lpm_constant_7x1.qip5
-rw-r--r--FPGA/display/lpm_constant_7x1.vhd (renamed from FPGA/display/lpm_constant_1.vhd)18
-rw-r--r--FPGA/display/useless.bdf762
-rw-r--r--FPGA/top/top.bdf646
-rw-r--r--FPGA/top/top.qsf7
-rw-r--r--FPGA/top/top.qwsbin2997 -> 1623 bytes
-rw-r--r--FPGA/vhdl/message.vhd2
-rw-r--r--FPGA/vhdl/message.vhd.bak71
34 files changed, 1930 insertions, 1218 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.
23 (input) 23 (input)
24 (rect 24 16 192 32) 24 (rect 24 16 192 32)
25 (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6))) 25 (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
26 (text "clk" (rect 5 0 20 11)(font "Arial" )) 26 (text "clk" (rect 5 0 19 11)(font "Arial" ))
27 (pt 168 8) 27 (pt 168 8)
28 (drawing 28 (drawing
29 (line (pt 84 12)(pt 109 12)) 29 (line (pt 84 12)(pt 109 12))
@@ -39,7 +39,7 @@ applicable agreement for further details.
39 (input) 39 (input)
40 (rect 24 32 192 48) 40 (rect 24 32 192 48)
41 (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6))) 41 (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
42 (text "resetn" (rect 5 0 36 11)(font "Arial" )) 42 (text "resetn" (rect 5 0 35 11)(font "Arial" ))
43 (pt 168 8) 43 (pt 168 8)
44 (drawing 44 (drawing
45 (line (pt 84 12)(pt 109 12)) 45 (line (pt 84 12)(pt 109 12))
@@ -55,7 +55,7 @@ applicable agreement for further details.
55 (input) 55 (input)
56 (rect 24 48 192 64) 56 (rect 24 48 192 64)
57 (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6))) 57 (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
58 (text "enable" (rect 5 0 39 11)(font "Arial" )) 58 (text "enable" (rect 5 0 38 11)(font "Arial" ))
59 (pt 168 8) 59 (pt 168 8)
60 (drawing 60 (drawing
61 (line (pt 84 12)(pt 109 12)) 61 (line (pt 84 12)(pt 109 12))
@@ -71,7 +71,7 @@ applicable agreement for further details.
71 (input) 71 (input)
72 (rect 24 64 192 80) 72 (rect 24 64 192 80)
73 (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6))) 73 (text "INPUT" (rect 125 0 153 10)(font "Arial" (font_size 6)))
74 (text "activate" (rect 5 0 44 11)(font "Arial" )) 74 (text "activate" (rect 5 0 43 11)(font "Arial" ))
75 (pt 168 8) 75 (pt 168 8)
76 (drawing 76 (drawing
77 (line (pt 84 12)(pt 109 12)) 77 (line (pt 84 12)(pt 109 12))
@@ -85,7 +85,7 @@ applicable agreement for further details.
85) 85)
86(pin 86(pin
87 (output) 87 (output)
88 (rect 424 16 600 32) 88 (rect 24 96 200 112)
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 "alarm" (rect 90 0 118 11)(font "Arial" )) 90 (text "alarm" (rect 90 0 118 11)(font "Arial" ))
91 (pt 0 8) 91 (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.
34 (line (pt 117 12)(pt 121 8)) 34 (line (pt 117 12)(pt 121 8))
35 ) 35 )
36 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6))) 36 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
37 (annotation_block (location)(rect 0 16 56 32))
38) 37)
39(pin 38(pin
40 (input) 39 (input)
@@ -51,7 +50,6 @@ applicable agreement for further details.
51 (line (pt 117 12)(pt 121 8)) 50 (line (pt 117 12)(pt 121 8))
52 ) 51 )
53 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6))) 52 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
54 (annotation_block (location)(rect -8 32 56 48))
55) 53)
56(pin 54(pin
57 (input) 55 (input)
@@ -68,7 +66,6 @@ applicable agreement for further details.
68 (line (pt 117 12)(pt 121 8)) 66 (line (pt 117 12)(pt 121 8))
69 ) 67 )
70 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6))) 68 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
71 (annotation_block (location)(rect -8 64 56 80))
72) 69)
73(pin 70(pin
74 (input) 71 (input)
@@ -85,7 +82,6 @@ applicable agreement for further details.
85 (line (pt 117 12)(pt 121 8)) 82 (line (pt 117 12)(pt 121 8))
86 ) 83 )
87 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6))) 84 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
88 (annotation_block (location)(rect -8 80 56 96))
89) 85)
90(pin 86(pin
91 (input) 87 (input)
@@ -102,7 +98,6 @@ applicable agreement for further details.
102 (line (pt 117 12)(pt 121 8)) 98 (line (pt 117 12)(pt 121 8))
103 ) 99 )
104 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6))) 100 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
105 (annotation_block (location)(rect 0 96 56 112))
106) 101)
107(pin 102(pin
108 (input) 103 (input)
@@ -119,7 +114,6 @@ applicable agreement for further details.
119 (line (pt 117 12)(pt 121 8)) 114 (line (pt 117 12)(pt 121 8))
120 ) 115 )
121 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6))) 116 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
122 (annotation_block (location)(rect 0 112 56 128))
123) 117)
124(pin 118(pin
125 (input) 119 (input)
@@ -136,11 +130,10 @@ applicable agreement for further details.
136 (line (pt 117 12)(pt 121 8)) 130 (line (pt 117 12)(pt 121 8))
137 ) 131 )
138 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6))) 132 (text "VCC" (rect 136 7 156 17)(font "Arial" (font_size 6)))
139 (annotation_block (location)(rect -8 48 56 64))
140) 133)
141(pin 134(pin
142 (output) 135 (output)
143 (rect 648 0 824 16) 136 (rect 56 128 232 144)
144 (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6))) 137 (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
145 (text "speed[1..0]" (rect 90 0 145 11)(font "Arial" )) 138 (text "speed[1..0]" (rect 90 0 145 11)(font "Arial" ))
146 (pt 0 8) 139 (pt 0 8)
@@ -153,11 +146,10 @@ applicable agreement for further details.
153 (line (pt 82 8)(pt 78 12)) 146 (line (pt 82 8)(pt 78 12))
154 (line (pt 78 12)(pt 82 8)) 147 (line (pt 78 12)(pt 82 8))
155 ) 148 )
156 (annotation_block (location)(rect 824 16 888 32))
157) 149)
158(pin 150(pin
159 (output) 151 (output)
160 (rect 648 16 824 32) 152 (rect 56 144 232 160)
161 (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6))) 153 (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
162 (text "fan_auto" (rect 90 0 133 11)(font "Arial" )) 154 (text "fan_auto" (rect 90 0 133 11)(font "Arial" ))
163 (pt 0 8) 155 (pt 0 8)
@@ -170,11 +162,10 @@ applicable agreement for further details.
170 (line (pt 82 8)(pt 78 12)) 162 (line (pt 82 8)(pt 78 12))
171 (line (pt 78 12)(pt 82 8)) 163 (line (pt 78 12)(pt 82 8))
172 ) 164 )
173 (annotation_block (location)(rect 824 32 888 48))
174) 165)
175(pin 166(pin
176 (output) 167 (output)
177 (rect 648 32 824 48) 168 (rect 56 160 232 176)
178 (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6))) 169 (text "OUTPUT" (rect 1 0 39 10)(font "Arial" (font_size 6)))
179 (text "alarm" (rect 90 0 118 11)(font "Arial" )) 170 (text "alarm" (rect 90 0 118 11)(font "Arial" ))