Index: firmware/FTM/Lightpulser_interface/Basic_Version/FM_pulse_generator_Basic.vhd =================================================================== --- firmware/FTM/Lightpulser_interface/Basic_Version/FM_pulse_generator_Basic.vhd (revision 10855) +++ firmware/FTM/Lightpulser_interface/Basic_Version/FM_pulse_generator_Basic.vhd (revision 10879) @@ -11,4 +11,9 @@ -- by Patrick Vogler -- "Lightpulser Basic Version" +-- +-- modified: May 27 2011 +-- by Patrick Vogler, Quirin Weitzel +-- -> clean up + LIBRARY ieee; @@ -24,5 +29,5 @@ ENTITY FM_pulse_generator_Basic IS GENERIC( - pulse_length : integer := FLD_PULSE_LENGTH -- 48ns + pulse_length : integer := FLD_PULSE_LENGTH_BASIC -- 60ns ); PORT( @@ -52,10 +57,10 @@ Z := Z + 1; else - Z := - FLD_MIN_FREQ_DIV; + Z := - FLD_MIN_FREQ_DIV_BASIC; Y := 0; end if; end if; - if (Y < FLD_PULSE_LENGTH_BASIC) then + if (Y < pulse_length) then Y := Y + 1; FM_out <= '1'; Index: firmware/FTM/Lightpulser_interface/Basic_Version/Lightpulser_interface_Basic.vhd =================================================================== --- firmware/FTM/Lightpulser_interface/Basic_Version/Lightpulser_interface_Basic.vhd (revision 10855) +++ firmware/FTM/Lightpulser_interface/Basic_Version/Lightpulser_interface_Basic.vhd (revision 10879) @@ -5,5 +5,5 @@ -- Create Date: 24 February 2010 -- Design Name: --- Module Name: FTM Lightpulser interface +-- Module Name: FTM Lightpulser interface Basic -- Project Name: -- Target Devices: @@ -28,4 +28,8 @@ -- "Lightpulser Basic Version" -- +-- modified: May 27 2011 +-- by Patrick Vogler, Quirin Weitzel +-- -> clean up +-- ---------------------------------------------------------------------------------- @@ -45,6 +49,5 @@ - -entity Lightpulser_interface is +entity Lightpulser_interface_Basic is port( @@ -99,60 +102,54 @@ ); -end Lightpulser_interface; - - -architecture Behavioral of Lightpulser_interface is - +end Lightpulser_interface_Basic; + + +architecture Behavioral of Lightpulser_interface_Basic is component FM_pulse_generator_Basic is - port( - clk : in std_logic; -- 50 MHz - pulse_freq : in std_logic_vector (5 downto 0); - FM_out : out std_logic := '0' - ); + port( + clk : in std_logic; -- 50 MHz + pulse_freq : in std_logic_vector (5 downto 0); + FM_out : out std_logic := '0' + ); end component; - component single_LP_Basic is +component single_LP_Basic is port( - clk_50 : in STD_LOGIC; - LP_Pulse_out : out STD_LOGIC; - LP_pulse_in : in std_logic - ); + clk_50 : in STD_LOGIC; + LP_Pulse_out : out STD_LOGIC; + LP_pulse_in : in std_logic + ); end component; - - - -- LP1: mirror dish - signal Cal_0_1 : STD_LOGIC := '0'; +-- LP1: mirror dish +signal Cal_0_1 : STD_LOGIC := '0'; -- signal Cal_1_1 : STD_LOGIC; - -- LP2: shutter - signal Cal_0_2 : STD_LOGIC := '0'; +-- LP2: shutter +signal Cal_0_2 : STD_LOGIC := '0'; -- signal Cal_1_2 : STD_LOGIC; - -- PWM for amplitude stabilization - signal PWM_sig_1 : std_logic := '0'; -- LP1: mirror dish - signal PWM_sig_2 : std_logic := '0'; -- LP2: shutter - - -- control data latch - signal LP1_ampl_sig : std_logic_vector (15 downto 0) := (others => '0'); - signal LP2_ampl_sig : std_logic_vector (15 downto 0) := (others => '0'); +-- PWM for amplitude stabilization +signal PWM_sig_1 : std_logic := '0'; -- LP1: mirror dish +signal PWM_sig_2 : std_logic := '0'; -- LP2: shutter + +-- control data latch +signal LP1_ampl_sig : std_logic_vector (15 downto 0) := (others => '0'); +signal LP2_ampl_sig : std_logic_vector (15 downto 0) := (others => '0'); - type type_latch_state is (IDLE, COPY, CONFIGURED); - signal latch_state : type_latch_state := IDLE; - - - - +type type_latch_state is (IDLE, COPY, CONFIGURED); +signal latch_state : type_latch_state := IDLE; + begin --- input latch -input_latch : process (clk_50) + -- input latch + input_latch : process (clk_50) begin if rising_edge(clk_50) then @@ -180,111 +177,108 @@ end case; end if; -end process input_latch; + end process input_latch; - Inst_LP1_mirror_dish:single_LP_Basic port map ( - clk_50 => clk_50, - LP_Pulse_out => Cal_0_1, - LP_pulse_in => LP1_pulse - ); - - - Inst_LP2_shutter:single_LP_Basic + clk_50 => clk_50, + LP_Pulse_out => Cal_0_1, + LP_pulse_in => LP1_pulse + ); + + + Inst_LP2_shutter:single_LP_Basic port map ( - clk_50 => clk_50, - LP_Pulse_out => Cal_0_2, - LP_pulse_in => LP2_pulse - ); - -Inst_LP1_FM_pulse_generator:FM_pulse_generator_Basic -- LP1: mirror dish - port map( + clk_50 => clk_50, + LP_Pulse_out => Cal_0_2, + LP_pulse_in => LP2_pulse + ); + + Inst_LP1_FM_pulse_generator:FM_pulse_generator_Basic -- LP1: mirror dish + port map( clk => clk_50, pulse_freq => LP1_ampl_sig(5 downto 0), FM_out => PWM_sig_1 - ); - - -Inst_LP2_FM_pulse_generator:FM_pulse_generator_Basic -- LP2: shutter - port map( + ); + + + Inst_LP2_FM_pulse_generator:FM_pulse_generator_Basic -- LP2: shutter + port map( clk => clk_50, pulse_freq => LP2_ampl_sig(5 downto 0), FM_out => PWM_sig_2 - ); - - --- Light Pulser 1 (in the mirror dish): differential output buffers + ); + + + -- Light Pulser 1 (in the mirror dish): differential output buffers OBUFDS_inst_Cal_0 : OBUFDS - generic map ( - IOSTANDARD => "DEFAULT") - port map ( O => Cal_0_p , -- Diff_p output (connect directly to top-level port) - OB => Cal_0_n , -- Diff_n output (connect directly to top-level port) - I => Cal_0_1 -- Buffer input - ); - - OBUFDS_inst_Cal_1 : OBUFDS - generic map ( - IOSTANDARD => "DEFAULT") - port map ( O => Cal_1_p , -- Diff_p output (connect directly to top-level port) - OB => Cal_1_n , -- Diff_n output (connect directly to top-level port) - I => PWM_sig_1 -- Buffer input - ); - - OBUFDS_inst_Cal_2 : OBUFDS - generic map ( - IOSTANDARD => "DEFAULT") - port map ( O => Cal_2_p , -- Diff_p output (connect directly to top-level port) - OB => Cal_2_n , -- Diff_n output (connect directly to top-level port) - I => LP1_ampl_sig(14) -- Buffer input - ); - - OBUFDS_inst_Cal_3 : OBUFDS - generic map ( - IOSTANDARD => "DEFAULT") - port map ( O => Cal_3_p , -- Diff_p output (connect directly to top-level port) - OB => Cal_3_n , -- Diff_n output (connect directly to top-level port) - I => LP1_ampl_sig(15) -- Buffer input - ); + generic map ( + IOSTANDARD => "DEFAULT") + port map ( O => Cal_0_p , -- Diff_p output (connect directly to top-level port) + OB => Cal_0_n , -- Diff_n output (connect directly to top-level port) + I => Cal_0_1 -- Buffer input + ); + + OBUFDS_inst_Cal_1 : OBUFDS + generic map ( + IOSTANDARD => "DEFAULT") + port map ( O => Cal_1_p , -- Diff_p output (connect directly to top-level port) + OB => Cal_1_n , -- Diff_n output (connect directly to top-level port) + I => PWM_sig_1 -- Buffer input + ); + + OBUFDS_inst_Cal_2 : OBUFDS + generic map ( + IOSTANDARD => "DEFAULT") + port map ( O => Cal_2_p , -- Diff_p output (connect directly to top-level port) + OB => Cal_2_n , -- Diff_n output (connect directly to top-level port) + I => LP1_ampl_sig(14) -- Buffer input + ); + + OBUFDS_inst_Cal_3 : OBUFDS + generic map ( + IOSTANDARD => "DEFAULT") + port map ( O => Cal_3_p , -- Diff_p output (connect directly to top-level port) + OB => Cal_3_n , -- Diff_n output (connect directly to top-level port) + I => LP1_ampl_sig(15) -- Buffer input + ); --- Light Pulser 2 (in the shutter): differential output buffers + -- Light Pulser 2 (in the shutter): differential output buffers - OBUFDS_inst_Cal_4 : OBUFDS - generic map ( - IOSTANDARD => "DEFAULT") - port map ( O => Cal_4_p , -- Diff_p output (connect directly to top-level port) - OB => Cal_4_n , -- Diff_n output (connect directly to top-level port) - I => Cal_0_2 -- Buffer input - ); - - OBUFDS_inst_Cal_5 : OBUFDS - generic map ( - IOSTANDARD => "DEFAULT") - port map ( O => Cal_5_p , -- Diff_p output (connect directly to top-level port) - OB => Cal_5_n , -- Diff_n output (connect directly to top-level port) - I => PWM_sig_2 -- Buffer input - ); - - OBUFDS_inst_Cal_6 : OBUFDS - generic map ( - IOSTANDARD => "DEFAULT") - port map ( O => Cal_6_p , -- Diff_p output (connect directly to top-level port) - OB => Cal_6_n , -- Diff_n output (connect directly to top-level port) - I => LP2_ampl_sig(14) - ); - - OBUFDS_inst_Cal_7 : OBUFDS - generic map ( - IOSTANDARD => "DEFAULT") - port map ( O => Cal_7_p , -- Diff_p output (connect directly to top-level port) - OB => Cal_7_n , -- Diff_n output (connect directly to top-level port) - I => LP2_ampl_sig(15) -- Buffer input - ); + OBUFDS_inst_Cal_4 : OBUFDS + generic map ( + IOSTANDARD => "DEFAULT") + port map ( O => Cal_4_p , -- Diff_p output (connect directly to top-level port) + OB => Cal_4_n , -- Diff_n output (connect directly to top-level port) + I => Cal_0_2 -- Buffer input + ); + + OBUFDS_inst_Cal_5 : OBUFDS + generic map ( + IOSTANDARD => "DEFAULT") + port map ( O => Cal_5_p , -- Diff_p output (connect directly to top-level port) + OB => Cal_5_n , -- Diff_n output (connect directly to top-level port) + I => PWM_sig_2 -- Buffer input + ); + + OBUFDS_inst_Cal_6 : OBUFDS + generic map ( + IOSTANDARD => "DEFAULT") + port map ( O => Cal_6_p , -- Diff_p output (connect directly to top-level port) + OB => Cal_6_n , -- Diff_n output (connect directly to top-level port) + I => LP2_ampl_sig(14) + ); + + OBUFDS_inst_Cal_7 : OBUFDS + generic map ( + IOSTANDARD => "DEFAULT") + port map ( O => Cal_7_p , -- Diff_p output (connect directly to top-level port) + OB => Cal_7_n , -- Diff_n output (connect directly to top-level port) + I => LP2_ampl_sig(15) -- Buffer input + ); end Behavioral; - - Index: firmware/FTM/Lightpulser_interface/Basic_Version/single_LP_Basic.vhd =================================================================== --- firmware/FTM/Lightpulser_interface/Basic_Version/single_LP_Basic.vhd (revision 10855) +++ firmware/FTM/Lightpulser_interface/Basic_Version/single_LP_Basic.vhd (revision 10879) @@ -28,4 +28,8 @@ -- modified: May 27 2011 -- by Patrick Vogler +-- +-- modified: May 27 2011 +-- by Patrick Vogler, Quirin Weitzel +-- -> clean up ---------------------------------------------------------------------------------- ----------------------------------------------------------------------------------