Changeset 72 for trunk/MultiChannelUSB/oscilloscope.v

Timestamp:

Nov 25, 2009, 11:02:29 PM (15 years ago)

Author:

demin

Message:

testing all components together

File:

• trunk/MultiChannelUSB/oscilloscope.v (modified) (3 diffs)

trunk/MultiChannelUSB/oscilloscope.v

@@ -2 +2 @@
         (
                 input   wire                    clk, reset,
-                input   wire                    data_ready,
-                input   wire    [15:0]  raw_data, uwt_data, threshold,
+                input   wire                    data_ready, trigger,
+                input   wire    [15:0]  data,
                 input   wire    [9:0]   address,
                 output  wire    [9:0]   start_address,
@@ -24 +24 @@
         wire    [15:0]  data_wire;
         
-        assign  data_wire = (flag_reg) ? raw_data : data_reg;
+        assign  data_wire = (flag_reg) ? data : data_reg;
 
         altsyncram #(
@@ -159 +159 @@
                                         state_next = 4'd2;
 
-                                        if ((~trig_reg)
-                                                & (counter_reg == 10'd512)
-                                                & (uwt_data >= threshold))
+                                        if ((~trig_reg) & (trigger) 
+                                                & (counter_reg == 10'd512))
                                         begin
                                                 // trigger