Changeset 9911 for firmware/FTU/counter

Timestamp:

08/30/10 16:01:15 (14 years ago)

Author:

weitzel

Message:

FTU rate counting modified; now synthesis works

File:

• firmware/FTU/counter/FTU_rate_counter.vhd (modified) (4 diffs)

firmware/FTU/counter/FTU_rate_counter.vhd

@@ -75 +75 @@
   begin
 
-    if rising_edge(cntr_reset) then
-      
-      --formula to calculate counting period from prescaling value
-      if (prescaling = "00000000") then
-        counting_period <= COUNTER_FREQUENCY / (2 * CNTR_FREQ_DIVIDER);
-      else
-        counting_period <= ((conv_integer(unsigned(prescaling)) + 1) / 2) * (COUNTER_FREQUENCY / CNTR_FREQ_DIVIDER);
-      end if;
-      
+    if cntr_reset = '1' then
+          
       clk_cntr := 0;      
       period_finished <= '1';
@@ -91 +84 @@
       
     elsif rising_edge(clk_1M_sig) then
+      
       if (clk_cntr < counting_period - 1) then
         clk_cntr := clk_cntr + 1;
@@ -107 +101 @@
   process(trigger, period_finished)
   begin
-    if rising_edge(period_finished) then
+    if period_finished = '1' then
       trigger_counts <= 0;
       overflow_sig <= '0';
@@ -118 +112 @@
           overflow_sig <= '1';
         end if;
+      end if;
+    end if;
+  end process;
+
+  process(cntr_reset, prescaling)
+  begin
+    if rising_edge(cntr_reset) then
+      --formula to calculate counting period from prescaling value
+      if (prescaling = "00000000") then
+        counting_period <= COUNTER_FREQUENCY / (2 * CNTR_FREQ_DIVIDER);
+      else
+        counting_period <= ((conv_integer(unsigned(prescaling)) + 1) / 2) * (COUNTER_FREQUENCY / CNTR_FREQ_DIVIDER);
       end if;
     end if;