From ffeb1bcce4c7db39d25d3a4ee55af05a61be8074 Mon Sep 17 00:00:00 2001 From: Andreas Neiser Date: Mon, 7 Jul 2014 19:10:24 +0200 Subject: [PATCH] ADC Addon: Cleaning up code, adding LED output --- adc_addon/adc_addon.vhd | 32 +++++++++++++++++++++----------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/adc_addon/adc_addon.vhd b/adc_addon/adc_addon.vhd index bb76aa6..8669caa 100644 --- a/adc_addon/adc_addon.vhd +++ b/adc_addon/adc_addon.vhd @@ -166,8 +166,8 @@ architecture adc_addon_arch of adc_addon is type ram_t is array(0 to 15) of std_logic_vector(15 downto 0); signal ram : ram_t; - - + + signal spi_reg20_i : std_logic_vector(15 downto 0); signal spi_reg40_i : std_logic_vector(15 downto 0); signal spi_data_i : std_logic_vector(15 downto 0); @@ -196,24 +196,24 @@ architecture adc_addon_arch of adc_addon is signal flash_busy : std_logic; signal flash_err : std_logic; - + signal leds : std_logic_vector(4 downto 0) := (others => '0'); - + signal flash_go_tmp : std_logic_vector(5 downto 0); signal flash_reset_n : std_logic; - + signal fsm_job : std_logic_vector(1 downto 0); signal ram_fsm_data_i : std_logic_vector(7 downto 0); signal ram_fsm_addr_i : std_logic_vector(3 downto 0); signal ram_fsm_write_i: std_logic; signal enable_cfg_flash : std_logic; - + signal adc_csb_reg : std_logic_vector(12 downto 1) := x"000"; - + begin @@ -277,7 +277,7 @@ begin spi_cs <= '1'; SPI_CONN_L_CS <= '1'; SPI_CONN_H_CS <= '0'; - SPI_TRB_OUT(0) <= SPI_CONN_H_IN; + SPI_TRB_OUT(0) <= SPI_CONN_H_IN; when others => spi_cs <= '1'; SPI_CONN_L_CS <= '1'; @@ -291,9 +291,9 @@ begin SPI_CONN_H_CLK <= SPI_TRB_CLK(0); SPI_CONN_L_OUT <= SPI_TRB_IN(0); SPI_CONN_H_OUT <= SPI_TRB_IN(0); - - + + spi_reg40_i <= flash_busy & flash_err & "000000" & ram_data_o; --------------------------------------------------------------------------- @@ -371,7 +371,7 @@ begin mem_rd_data => flashram_data_o ); - + --------------------------------------------------------------------------- -- I/O Register 0x20 @@ -413,6 +413,16 @@ begin -- Rest of the I/O --------------------------------------------------------------------------- + LED_WHITE <= not leds(0); + LED_RED <= not leds(1); + LED_GREEN <= not leds(2); + LED_YELLOW <= not leds(3); + LED_ORANGE <= not leds(4); + + + + + GP_LINE <= (others => '0'); end architecture; -- 2.43.0