Changeset 181 for trunk/3DEES/Paella.v

Timestamp:

Jan 15, 2014, 4:51:59 PM (11 years ago)

Author:

demin

Message:

working classifier

File:

• trunk/3DEES/Paella.v (modified) (3 diffs)

trunk/3DEES/Paella.v

@@ -290 +290 @@
                                 .frame(sys_frame),
                                 .reset(1'b0),
-                                .del_data({6'd0, 6'd32, 6'd32, 6'd32}),
-//                              .del_data({6'd0, cfg_bits[35+6*j][5:0], cfg_bits[33+6*j][5:0], cfg_bits[31+6*j][5:0]}),
+//                              .del_data({6'd0, 6'd32, 6'd32, 6'd32}),
+                                .del_data({6'd0, cfg_bits[35+6*j][5:0], cfg_bits[33+6*j][5:0], cfg_bits[31+6*j][5:0]}),
                                 .amp_data({6'd0, 6'd20, 6'd20, 6'd20}),
-                                .tau_data({16'd0, 16'd19835, 16'd19835, 16'd19835}),
+//                              .tau_data({16'd0, 16'd19835, 16'd19835, 16'd19835}),
 // exp(-32/1000)*1024*20
-//                              .tau_data({16'd0, cfg_bits[33+6*j], cfg_bits[32+6*j], cfg_bits[30+6*j]}),
+                                .tau_data({16'd0, cfg_bits[33+6*j], cfg_bits[32+6*j], cfg_bits[30+6*j]}),
                                 .inp_data({
                                         19'd0, cic_data[j*3+2][18:0], cic_data[j*3+1][18:0], cic_data[j*3+0][18:0]}),
@@ -322 +322 @@
                                 .frame(sys_frame),
                                 .reset(1'b0),
-                                .min_data(13'd20),
+//                              .min_data(13'd20),
+                                .min_data(cfg_bits[10+j][12:0]),
                                 .max_data(13'd4095),
                                 .inp_data(clp_data[j]),
@@ -335 +336 @@
                 .frame(sys_frame),
                 .reset(1'b0),
-                .cfg_data({12'd20, 12'd20,
-                        12'd20, 12'd20, 12'd20, 12'd20, 12'd2000, 12'd20,
-                        12'd20, 12'd2000, 12'd2000, 12'd20, 12'd1000, 12'd1000}),
+//              .cfg_data({12'd20, 12'd20,
+//                      12'd20, 12'd20, 12'd20, 12'd20, 12'd2000, 12'd20,
+//                      12'd20, 12'd2000, 12'd2000, 12'd20, 12'd1000, 12'd1000}),
+                .cfg_data({cfg_bits[29][11:0], cfg_bits[28][11:0],
+                        cfg_bits[27][11:0], cfg_bits[26][11:0], cfg_bits[25][11:0], cfg_bits[24][11:0], 
+                        cfg_bits[23][11:0], cfg_bits[22][11:0], cfg_bits[21][11:0], cfg_bits[20][11:0],
+                        cfg_bits[19][11:0], cfg_bits[18][11:0], cfg_bits[17][11:0], cfg_bits[16][11:0]}),
                 .inp_data({amp_data[5][11:0], amp_data[4][11:0], amp_data[0][11:0],
                         amp_data[0][11:0], amp_data[1][11:0], amp_data[0][11:0]}),