Revert "Add edge samples dump, timing untested"

This reverts commit 0464c68bcc92f880c85c24b274bf7276010af8d9.

diff --git a/ADC/source/adc_processor_cfd_ch.vhd b/ADC/source/adc_processor_cfd_ch.vhd
index 4663825857b1b6c58465d3197d3bc233f235b673..6bf2f346ba1f2af31bb909907de2c8a0da093c89 100644 (file)
--- a/ADC/source/adc_processor_cfd_ch.vhd
+++ b/ADC/source/adc_processor_cfd_ch.vhd
@@ -80,11 +80,6 @@ architecture arch of adc_processor_cfd_ch is
 
   signal delay_sub     : subtracted_thresh_t                         := subtracted_thresh_t_INIT;
   
-  
-  type edge_samples_t is array(3 downto 0) of signed(RESOLUTION_SUB - 1 downto 0);
-  signal edge_samples, edge_samples_save : edge_samples_t := (others => (others => '0'));
-  signal edge_samples_in  : signed(RESOLUTION_SUB - 1 downto 0) := (others => '0');
-  
   signal prod, prod_invert : product_thresh_t := product_thresh_t_INIT;
   signal prod_delay        : signed(RESOLUTION_PROD - 1 downto 0) := (others => '0');
 
@@ -99,7 +94,7 @@ architecture arch of adc_processor_cfd_ch is
   signal integral_sum                      : signed(RESOLUTION_CFD - 1 downto 0) := (others => '0');
 
   signal epoch_counter, epoch_counter_save : unsigned(23 downto 0) := (others => '0');
-  type state_t is (IDLE, INTEGRATE, WRITE1, WRITE2, WRITE3, WRITE4, WRITE5, FINISH, LOCKED, DEBUG_DUMP);
+  type state_t is (IDLE, INTEGRATE, WRITE1, WRITE2, WRITE3, FINISH, LOCKED, DEBUG_DUMP);
   signal state : state_t := IDLE;
 
   signal ram_counter : unsigned(8 downto 0) := (others => '0'); 
@@ -232,14 +227,6 @@ begin
     delay_integral     <= delay_integral(delay_integral'high - 1 downto 0) & delay_integral_in;
     delay_integral_out <= delay_integral(delay_integral'high);
   end process proc_integral_delay;
-  
-  -- stores the edge samples relative to zeroX detection
-  edge_samples_in <= delay_cfd_out;
-  proc_edge_samples : process is
-  begin
-    wait until rising_edge(CLK);
-    edge_samples     <= edge_samples(edge_samples'high - 1 downto 0) & edge_samples_in;
-  end process proc_edge_samples;
 
   -- ZeroX detect, integrate, write to RAM
   RAM_ADDR <= std_logic_vector(resize(ram_counter,RAM_ADDR'length));
@@ -273,7 +260,6 @@ begin
           cfd_prev_save <= cfd_prev;
           cfd_save <= cfd.value;
           epoch_counter_save <= epoch_counter;
-          edge_samples_save  <= edge_samples;
         elsif CONF.DebugMode = 0 and RAM_BSY_IN = '1' then
           state <= LOCKED;
         elsif CONF.DebugMode /= 0 and RAM_BSY_IN = '1' then
@@ -299,7 +285,8 @@ begin
           RAM_DATA(23 downto 20) <= std_logic_vector(to_unsigned(DEVICE, 4));
           RAM_DATA(19 downto 16) <= std_logic_vector(to_unsigned(CHANNEL, 4));
           RAM_DATA(15 downto  0) <= debug_mux;
-        end if;
+        end if;  
+          
       
       when INTEGRATE =>
         if integral_counter = 0 then
@@ -314,7 +301,8 @@ begin
         if RAM_BSY_IN = '0' then
           state <= IDLE;           
         end if;
-
+        
+        
       when WRITE1 => 
         RAM_DATA(31 downto 24) <= x"d0";
         RAM_DATA(23 downto 20) <= std_logic_vector(to_unsigned(DEVICE, 4));
@@ -335,18 +323,6 @@ begin
         RAM_DATA(31 downto 16) <= std_logic_vector(cfd_prev_save);
         RAM_DATA(15 downto  0) <= std_logic_vector(cfd_save);
         ram_counter <= ram_counter + 1;
-        state <= WRITE4;
-      
-      when WRITE4 => 
-        RAM_DATA(31 downto 16) <= std_logic_vector(resize(edge_samples_save(0),16));
-        RAM_DATA(15 downto  0) <= std_logic_vector(resize(edge_samples_save(1),16));
-        ram_counter <= ram_counter + 1;
-        state <= WRITE5;
-        
-      when WRITE5 => 
-        RAM_DATA(31 downto 16) <= std_logic_vector(resize(edge_samples_save(2),16));
-        RAM_DATA(15 downto  0) <= std_logic_vector(resize(edge_samples_save(3),16));
-        ram_counter <= ram_counter + 1;
         state <= FINISH;
         
       when FINISH =>