From ff19d1ad9698e90f075a87f7e23b42b7fe0ce580 Mon Sep 17 00:00:00 2001 From: Jan Michel Date: Mon, 8 Apr 2019 15:30:34 +0200 Subject: [PATCH] fix a bug in ADC code when switching off PSA --- ADC/source/adc_processor.vhd | 1 + ADC/trb3_periph_adc.prj | 2 +- ADC/trb3_periph_adc.vhd | 14 +++++++------- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ADC/source/adc_processor.vhd b/ADC/source/adc_processor.vhd index 1f8297e..7751880 100644 --- a/ADC/source/adc_processor.vhd +++ b/ADC/source/adc_processor.vhd @@ -710,6 +710,7 @@ begin psa_clear <= '0'; psa_enable <= '1'; RDO_write_psa <= '0'; + RDO_data_psa <= (others => '0'); case psa_state is when PSA_IDLE => channel := 0; diff --git a/ADC/trb3_periph_adc.prj b/ADC/trb3_periph_adc.prj index cac1d07..d993355 100644 --- a/ADC/trb3_periph_adc.prj +++ b/ADC/trb3_periph_adc.prj @@ -132,7 +132,7 @@ add_file -vhdl -lib work "../../trbnet/special/spi_flash_and_fpga_reload.vhd" add_file -vhdl -lib work "../../trbnet/special/spi_slim.vhd" add_file -vhdl -lib work "../../trbnet/special/spi_master.vhd" add_file -vhdl -lib work "../../trbnet/special/spi_databus_memory.vhd" -add_file -vhdl -lib work "../../trbnet/special/spi_ltc2600.vhd" +add_file -vhdl -lib work "../../trbnet/special/spi_ltc2600_singleoutput.vhd" add_file -vhdl -lib work "../../trbnet/optical_link/f_divider.vhd" add_file -vhdl -lib work "../../trbnet/media_interfaces/ecp3_sfp/sfp_1_200_int.vhd" diff --git a/ADC/trb3_periph_adc.vhd b/ADC/trb3_periph_adc.vhd index eacb02c..e9da475 100644 --- a/ADC/trb3_periph_adc.vhd +++ b/ADC/trb3_periph_adc.vhd @@ -226,12 +226,12 @@ begin MED_READ_IN => '1', REFCLK2CORE_OUT => open, --SFP Connection - SD_RXD_P_IN => SERDES_INT_RX(2), - SD_RXD_N_IN => SERDES_INT_RX(3), - SD_TXD_P_OUT => SERDES_INT_TX(2), - SD_TXD_N_OUT => SERDES_INT_TX(3), - SD_REFCLK_P_IN => open, - SD_REFCLK_N_IN => open, +-- SD_RXD_P_IN => SERDES_INT_RX(2), +-- SD_RXD_N_IN => SERDES_INT_RX(3), +-- SD_TXD_P_OUT => SERDES_INT_TX(2), +-- SD_TXD_N_OUT => SERDES_INT_TX(3), +-- SD_REFCLK_P_IN => open, +-- SD_REFCLK_N_IN => open, SD_PRSNT_N_IN => FPGA5_COMM(0), SD_LOS_IN => FPGA5_COMM(0), SD_TXDIS_OUT => FPGA5_COMM(2), @@ -432,7 +432,7 @@ THE_SPI_RELOAD : entity work.spi_flash_and_fpga_reload -- SPI ------------------------------------------------------------------------------- - FPGA_SPI : spi_ltc2600 + FPGA_SPI : entity work.spi_ltc2600 generic map ( BITS => 32, WAITCYCLES => 15) -- 2.43.0