Changeset 76 for trunk

Timestamp:

Nov 28, 2009, 2:12:09 AM (15 years ago)

Author:

demin

Message:

add counter between peaks

File:

• trunk/MultiChannelUSB/analyser.v (modified) (9 diffs)

trunk/MultiChannelUSB/analyser.v

@@ -4 +4 @@
                 input   wire                    data_ready,
                 input   wire    [1:0]   uwt_flag,
-                input   wire    [11:0]  uwt_data,
-                output  wire                    peak_ready,
-                output  wire    [11:0]  peak
+                output  wire                    peak_ready
         );
 
@@ -12 +10 @@
         reg             [3:0]   counter_reg, counter_next;
         reg                             peak_ready_reg, peak_ready_next;
-        reg             [11:0]  peak_reg, peak_next;
+
+        wire                    counter_max = (&counter_reg);
 
         always @(posedge clk)
@@ -21 +20 @@
                         counter_reg <= 4'd0;
                         peak_ready_reg <= 1'b0;
-                        peak_reg <= 12'd0;
                 end
                 else
@@ -28 +26 @@
                         counter_reg <= counter_next;
                         peak_ready_reg <= peak_ready_next;
-                        peak_reg <= peak_next;                  
                 end
         end
@@ -37 +34 @@
                 counter_next = counter_reg;
                 peak_ready_next = peak_ready_reg;
-                peak_next = peak_reg;
                 case (state_reg)
                         0: // skip first 16 samples
                         begin
-                                peak_next = 12'd0;
                                 peak_ready_next = 1'b0;
                                 if (data_ready)
                                 begin
                                         counter_next = counter_reg + 4'd1;
-                                        if (&counter_reg)
+                                        if (counter_max)
                                         begin
                                                 state_next = 2'd1;
@@ -58 +53 @@
                                 begin
                                         counter_next = counter_reg + 4'd1;
-                                        if (&counter_reg)
+                                        if (counter_max)
                                         begin
                                                 state_next = 2'd2;
@@ -65 +60 @@
                         end
 
-                        2: // calculate peak height
+                        2:
                         begin
-                                if (data_ready & uwt_flag[0])
+                                if (data_ready & uwt_flag[0] & counter_max)
                                 begin
-                                        peak_next = uwt_data;
+                                        counter_next = 4'd0;
                                         peak_ready_next = 1'b1;
                 end
                 else
                 begin
+                                        if (~counter_max)
+                                        begin
+                                                counter_next = counter_reg + 4'd1;
+                                        end
                                         peak_ready_next = 1'b0;
                                 end
@@ -80 +79 @@
                         default:
                         begin
-                                peak_next = 12'd0;
+                                state_next = 2'd0;
+                                counter_next = 4'd0;
                                 peak_ready_next = 1'b0;
-                                state_next = 2'd0;
                         end
                 endcase
@@ -88 +87 @@
 
         assign  peak_ready = peak_ready_reg;
-        assign  peak = peak_reg;
 endmodule