DAQ capture Timestamps

src/app_fofbnode/hdl/pkg_app_fofb_cellnode.vhd

@@ -45,19 +45,19 @@ package pkg_app_config is
 
     -- Region 0 is BPM data
     constant C_DAQ0_IS_CONTINUOUS       : natural := 0;
-    constant C_DAQ0_MAX_SAMPLES         : natural := 16#02000000#; -- Buffer size / 16 bytes
-    constant C_DAQ0_CHANNELS_IN_TAB     : natural := 4;
+    constant C_DAQ0_MAX_SAMPLES         : natural := 16#04000000#; -- Buffer size / 8 bytes
+    constant C_DAQ0_CHANNELS_IN_TAB     : natural := 2;
     constant C_DAQ0_TAB_COUNT           : natural := 1;
-    constant C_DAQ0_TAB_CONTENTS        : t_natural_vector := (2, 2, 1, 0);
+    constant C_DAQ0_TAB_CONTENTS        : t_natural_vector := (1, 0);
     constant C_DAQ0_BUF0_OFFSET         : natural := 16#00000000#;
     constant C_DAQ0_BUF1_OFFSET         : natural := 16#10000000#;
 
     -- Region 1 is Correction data
     constant C_DAQ1_IS_CONTINUOUS       : natural := 0;
-    constant C_DAQ1_MAX_SAMPLES         : natural := 16#08000000#; -- Buffer size / 4 bytes
-    constant C_DAQ1_CHANNELS_IN_TAB     : natural := 1;
+    constant C_DAQ1_MAX_SAMPLES         : natural := 16#04000000#; -- Buffer size / 8 bytes
+    constant C_DAQ1_CHANNELS_IN_TAB     : natural := 2;
     constant C_DAQ1_TAB_COUNT           : natural := 1;
-    constant C_DAQ1_TAB_CONTENTS        : t_natural_vector := (0=>3);
+    constant C_DAQ1_TAB_CONTENTS        : t_natural_vector := (3, 2);
     constant C_DAQ1_BUF0_OFFSET         : natural := 16#20000000#;
     constant C_DAQ1_BUF1_OFFSET         : natural := 16#30000000#;
 

src/app_fofbnode/hdl/top_app_cellnode.vhd

@@ -108,7 +108,7 @@ architecture struct of bsp_fmc2zup_payload is
     signal axis_combpm_tdata    : std_logic_vector(127 downto 0);
     signal axis_combpm_tvalid   : std_logic;
 
-    -- COMBPM signals
+    -- COMLBP signals
     signal clk_comlbp           : std_logic;
     signal axis_comlbp_tdata    : std_logic_vector(31 downto 0);
     signal axis_comlbp_tvalid   : std_logic;
@@ -775,12 +775,10 @@ begin
     po_payload.s_axi4_daq <= f_common_to_bsp(m_axi4_daq_m2s);
 
     -- Mapping data channel
-    daq_data(0)                 <= axis_pkt_tx_tdata(31 downto 0);
-    daq_data(1)                 <= axis_pkt_tx_tdata(63 downto 32);
-    daq_data(2)(15 downto 0)    <= axis_pkt_tx_tdata(79 downto 64);
-    daq_data(2)(23 downto 16)   <= axis_pkt_tx_tuser;
-    daq_data(2)(31 downto 24)   <= (others => '0');
-    daq_data(3)                 <= axis_pkt_lbp_tdata;
+    daq_data(0)                 <= timeref(31 downto 0);
+    daq_data(1)                 <= timeref(63 downto 32);
+    daq_data(2)                 <= timeref(31 downto 0);
+    daq_data(3)                 <= timeref(63 downto 32);
 
     daq_strobe(0)  <= axis_pkt_tx_tvalid and axis_pkt_tx_tready;
     daq_strobe(1)  <= axis_pkt_lbp_tvalid and axis_pkt_lbp_tready;