From: Tobias Weber <toweber86@gmail.com>
Date: Thu, 2 Aug 2018 11:51:58 +0000 (+0200)
Subject: Merge branch 'feature/LinkSimulation'
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=65c6e29d7e09b490748cacb63f6184c1f209ec84;p=trb3.git

Merge branch 'feature/LinkSimulation'
---

65c6e29d7e09b490748cacb63f6184c1f209ec84
diff --cc mupix/Mupix8/sources/MupixBoard.vhd
index 1b5a60b,e3c5590..2f12214
--- a/mupix/Mupix8/sources/MupixBoard.vhd
+++ b/mupix/Mupix8/sources/MupixBoard.vhd
@@@ -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,