Changeset 132

Timestamp:

Feb 25, 2011, 5:51:42 PM (14 years ago)

Author:

demin

Message:

add 4th stage to the deconvolution module

File:

• sandbox/MultiChannelUSB/Paella.v (modified) (5 diffs)

sandbox/MultiChannelUSB/Paella.v

@@ -139 +139 @@
         wire    [1:0]   uwt_flag2 [N-1:0];
 
-        wire    [24:0]  cic_data1 [N-1:0];
-        wire    [24:0]  cic_data2 [N-1:0];
-        wire    [24:0]  cic_data3 [N-1:0];
+        wire    [20:0]  cic_data [N-1:0];
 
         wire    [11:0]  dec_data [N-1:0];
+        wire    [11:0]  tmp_data;
 
         wire    [1:0]   ext_flag [N-1:0];
@@ -221 +220 @@
                                 {ext_flag[j][1], 11'd0},
                                 {ext_flag[j][0], 11'd0},
-                                cic_data3[j][23:12],
+                                cic_data[j][19:8],
                                 sys_data[j]};
                 end
@@ -277 +276 @@
                 .bus_busy(bus_busy[1]));
 
-        filter #(.size(3), .width(12)) filter_unit (
+        new_filter #(.size(3), .width(12)) filter_unit (
                 .clock(sys_clock),
                 .frame(sys_frame),
                 .reset(1'b0),
                 .inp_data({sys_data[2], sys_data[1], sys_data[0]}),
-                .out_data2({cic_data2[2], cic_data2[1], cic_data2[0]}),
-                .out_data3({cic_data3[2], cic_data3[1], cic_data3[0]}),
-                .out_data({cic_data1[2], cic_data1[1], cic_data1[0]}));
+                .out_data({cic_data[2], cic_data[1], cic_data[0]}));
         
-        deconv #(.size(1), .shift(25), .width(24), .widthr(12)) deconv_unit (
+        deconv #(.size(1), .shift(22), .width(20), .widthr(12)) deconv_unit (
                 .clock(sys_clock),
                 .frame(sys_frame),
                 .reset(1'b0),
-                .del_data({6'd18, 6'd18, 6'd18}),
-                .amp_data({4'd9, 4'd9, 4'd9}),
-                .tau_data({16'd8820, 16'd8820, 16'd8820}),
+                .del_data({6'd14, 6'd14, 6'd14, 6'd14}),
+                .amp_data({6'd17, 6'd17, 6'd17, 6'd17}),
+                .tau_data({16'd16660, 16'd16660, 16'd16660, 16'd16660}),
 //              .del_data({cfg_bits[16][5:0], cfg_bits[15][13:8], cfg_bits[15][5:0]}),
 //              .amp_data({cfg_bits[18][7:0], cfg_bits[17][15:8], cfg_bits[17][7:0]}),
 //              .tau_data({cfg_bits[21], cfg_bits[20], cfg_bits[19]}),
-                .inp_data({cic_data3[2][23:0], cic_data3[1][23:0], cic_data3[0][23:0]}),
-                .out_data({dec_data[2], dec_data[1], dec_data[0]}));
+                .inp_data({cic_data[2][19:0], cic_data[1][19:0], cic_data[0][19:0], 20'd0}),
+                .out_data({dec_data[2], dec_data[1], dec_data[0], tmp_data}));
 
 
@@ -305 +302 @@
 
                         assign sys_data[j] = (cfg_bits[1][4*j]) ? (adc_data[j] ^ 12'hfff) : (adc_data[j]);
-/*
-                        uwt_bior31 #(.level(1), .width(13)) uwt_1_unit (
-                                .clock(sys_clock),
-                                .frame(sys_frame),
-                                .reset(1'b0),
-                                .inp_data(dec_data[j][12:0]),
-                                .out_data(uwt_data1[j]),
-                                .out_flag(uwt_flag1[j]));
-                
-                        uwt_bior31 #(.level(1), .width(16)) uwt_2_unit (
-                                .clock(sys_clock),
-                                .frame(sys_frame),
-                                .reset(1'b0),
-                                .inp_data(uwt_data1[j]),
-                                .out_data(uwt_data2[j]),
-                                .out_flag(uwt_flag2[j]));
-*/              
+
                         extrema #(.width(12)) extrema_unit (
                                 .clock(sys_clock),
                                 .frame(sys_frame),
                                 .reset(1'b0),
-//                              .inp_data(cic_data3[j][26:15]),
                                 .inp_data(dec_data[j]),
                                 .out_flag(ext_flag[j]));
@@ -348 +328 @@
 //                              .cfg_data(cfg_bits[12][11:0]),
                                 .cfg_data(12'd5),
-//                              .inp_data(cic_data3[j][22:11]),
                                 .inp_data(dec_data[j]),
                                 .out_flag(amp_flag[j]),