]> jspc29.x-matter.uni-frankfurt.de Git - trb3.git/commitdiff
Merge branch 'feature/LinkSimulation'
authorTobias Weber <toweber86@gmail.com>
Thu, 2 Aug 2018 11:51:58 +0000 (13:51 +0200)
committerTobias Weber <toweber86@gmail.com>
Thu, 2 Aug 2018 11:51:58 +0000 (13:51 +0200)
1  2 
mupix/Mupix8/sources/MupixBoard.vhd
mupix/Mupix8/sources/SlowControl/PixelControl.vhd

index 1b5a60bed2e8c42186f404a89c37dae196e550cc,e3c559036941e8a5edeca8209254e327c5534817..2f12214127bb9d434b3227bc94f2ca68be8f0003
@@@ -471,13 -479,9 +480,13 @@@ begin  -- Behaviora
  
  
    boardcontrol_1 : entity work.MupixBoardDAC
 +    generic map(
 +        fpga_clock_speed => fpga_clk_speed,
 +        spi_clock_speed  => board_spi_clk_speed
 +    )
      port map(
        clk                  => clk,
-       reset                => reset,
+       reset                => reset_reg,
        spi_dout_dac         => spi_dout_dac_sync,
        dac4_dout            => dac4_dout_sync,
        spi_dout_adc         => spi_dout_adc_sync,