diff --git a/MainController/MainController.bdf b/MainController/MainController.bdf index de192c8..346f1ed 100644 --- a/MainController/MainController.bdf +++ b/MainController/MainController.bdf @@ -2336,7 +2336,7 @@ applicable agreement for further details. (symbol (rect 1048 2136 1376 2280) (text "RAM9X8_TEST" (rect 5 0 78 12)(font "Arial" )) - (text "inst24" (rect 8 128 37 140)(font "Arial" )) + (text "inst23" (rect 8 128 37 140)(font "Arial" )) (port (pt 0 32) (input) @@ -2386,6 +2386,13 @@ applicable agreement for further details. (text "leds[3..0]" (rect 269 43 315 55)(font "Arial" )) (line (pt 328 48)(pt 312 48)(line_width 3)) ) + (port + (pt 328 64) + (output) + (text "er0_out" (rect 0 0 36 12)(font "Arial" )) + (text "er0_out" (rect 277 59 313 71)(font "Arial" )) + (line (pt 328 64)(pt 312 64)) + ) (port (pt 328 32) (bidir) @@ -2773,10 +2780,6 @@ applicable agreement for further details. (pt 1840 -48) (pt 1368 -48) ) -(connector - (pt 1840 -32) - (pt 1368 -32) -) (connector (pt 1840 -16) (pt 1368 -16) @@ -3126,11 +3129,6 @@ applicable agreement for further details. (pt 1856 2112) (bus) ) -(connector - (pt 1496 272) - (pt 1496 1432) - (bus) -) (connector (pt 608 1512) (pt 704 1512) @@ -3232,6 +3230,64 @@ applicable agreement for further details. (pt 936 1528) (pt 936 1496) ) +(connector + (text "leds[0]" (rect 1794 2168 1827 2180)(font "Arial" )) + (pt 1784 2184) + (pt 1856 2184) +) +(connector + (pt 1784 2184) + (pt 1784 2200) + (bus) +) +(connector + (text "leds[1]" (rect 1794 2184 1827 2196)(font "Arial" )) + (pt 1784 2200) + (pt 1856 2200) +) +(connector + (text "leds[2]" (rect 1794 2200 1827 2212)(font "Arial" )) + (pt 1784 2216) + (pt 1856 2216) +) +(connector + (pt 1784 2200) + (pt 1784 2216) + (bus) +) +(connector + (pt 1784 2216) + (pt 1784 2232) + (bus) +) +(connector + (text "leds[3]" (rect 1794 2216 1827 2228)(font "Arial" )) + (pt 1856 2232) + (pt 1784 2232) +) +(connector + (pt 1368 576) + (pt 1496 576) + (bus) +) +(connector + (pt 1496 272) + (pt 1496 576) + (bus) +) +(connector + (pt 1496 576) + (pt 1496 1432) + (bus) +) +(connector + (pt 1840 -32) + (pt 1456 -32) +) +(connector + (pt 1456 2200) + (pt 1456 -32) +) (connector (pt 1000 2184) (pt 1048 2184) @@ -3266,6 +3322,12 @@ applicable agreement for further details. (pt 904 2248) (pt 1048 2248) ) +(connector + (text "leds[3..0]" (rect 1386 2168 1432 2180)(font "Arial" )) + (pt 1784 2184) + (pt 1376 2184) + (bus) +) (connector (pt 800 -32) (pt 904 -32) @@ -3327,45 +3389,8 @@ applicable agreement for further details. (pt 608 2168) ) (connector - (text "leds[3..0]" (rect 1386 2168 1432 2180)(font "Arial" )) - (pt 1376 2184) - (pt 1784 2184) - (bus) -) -(connector - (text "leds[0]" (rect 1794 2168 1827 2180)(font "Arial" )) - (pt 1784 2184) - (pt 1856 2184) -) -(connector - (pt 1784 2184) - (pt 1784 2200) - (bus) -) -(connector - (text "leds[1]" (rect 1794 2184 1827 2196)(font "Arial" )) - (pt 1784 2200) - (pt 1856 2200) -) -(connector - (text "leds[2]" (rect 1794 2200 1827 2212)(font "Arial" )) - (pt 1784 2216) - (pt 1856 2216) -) -(connector - (pt 1784 2200) - (pt 1784 2216) - (bus) -) -(connector - (pt 1784 2216) - (pt 1784 2232) - (bus) -) -(connector - (text "leds[3]" (rect 1794 2216 1827 2228)(font "Arial" )) - (pt 1856 2232) - (pt 1784 2232) + (pt 1376 2200) + (pt 1456 2200) ) (junction (pt 1000 288)) (junction (pt 984 304)) @@ -3425,3 +3450,4 @@ applicable agreement for further details. (junction (pt 1784 2184)) (junction (pt 1784 2200)) (junction (pt 1784 2216)) +(junction (pt 1496 576)) diff --git a/MainController/MainController.qsf b/MainController/MainController.qsf index 3752438..28a9805 100644 --- a/MainController/MainController.qsf +++ b/MainController/MainController.qsf @@ -295,8 +295,8 @@ set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to LoadMode set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to Reset set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to RW set_location_assignment PIN_50 -to HWPCLK -set_location_assignment PIN_45 -to Error0In -set_location_assignment PIN_41 -to Error0Out +set_location_assignment PIN_41 -to Error0In +set_location_assignment PIN_45 -to Error0Out set_location_assignment PIN_12 -to LoadMode set_location_assignment PIN_65 -to RW set_location_assignment PIN_64 -to Reset diff --git a/MainController/RAM9X8_TEST.bsf b/MainController/RAM9X8_TEST.bsf index ec0e5fa..c78f4dd 100644 --- a/MainController/RAM9X8_TEST.bsf +++ b/MainController/RAM9X8_TEST.bsf @@ -72,6 +72,13 @@ applicable agreement for further details. (text "leds[3..0]" (rect 272 43 307 55)(font "Arial" )) (line (pt 328 48)(pt 312 48)(line_width 3)) ) + (port + (pt 328 64) + (output) + (text "er0_out" (rect 0 0 30 12)(font "Arial" )) + (text "er0_out" (rect 277 59 307 71)(font "Arial" )) + (line (pt 328 64)(pt 312 64)(line_width 1)) + ) (port (pt 328 32) (bidir) diff --git a/MainController/RAM9X8_TEST.vhd b/MainController/RAM9X8_TEST.vhd index 46f699a..d91da94 100644 --- a/MainController/RAM9X8_TEST.vhd +++ b/MainController/RAM9X8_TEST.vhd @@ -24,7 +24,8 @@ entity RAM9X8_TEST is ce : in std_logic; er0_in : in std_logic; - leds : out std_logic_vector(3 downto 0) + leds : out std_logic_vector(3 downto 0); + er0_out : out std_logic ); end entity; @@ -39,7 +40,8 @@ begin begin if (ce = '0') then -- Если микросхема выбрана addr := conv_integer(address); - if (addr = REG_ADDR_TEST_UPPER_BYTE or addr = REG_ADDR_TEST_LOWER_BYTE) then + if (addr = REG_ADDR_TEST_UPPER_BYTE or addr = REG_ADDR_TEST_LOWER_BYTE + or addr = REG_ADDR_LEDS_LOWER_BYTE or addr = REG_ADDR_LEDS_UPPER_BYTE) then if (oe = '0' and we = '1') then -- Если сигнал чтения активен, а записи нет case addr is when REG_ADDR_TEST_UPPER_BYTE => @@ -78,6 +80,7 @@ begin begin if rising_edge(clk) then leds <= ledsBuf(3 downto 0); + er0_out <= ledsBuf(15); end if; end process; diff --git a/MainController/output_file.rbf b/MainController/output_file.rbf index 557a7f2..9c976a1 100644 Binary files a/MainController/output_file.rbf and b/MainController/output_file.rbf differ