Changeset 183 for trunk/3DEES/Paella.v

Timestamp:

Jan 24, 2014, 3:33:37 PM (11 years ago)

Author:

demin

Message:

fix classifier and add bin number to osc mux

File:

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

trunk/3DEES/Paella.v

@@ -88 +88 @@
         wire                    trg_flag;
 
-        wire    [4*12-1:0]      int_mux_data [N-1:0];
+        wire    [5*12-1:0]      int_mux_data [N-1:0];
 
         wire    [1:0]   amp_flag [3*N-1:0];
@@ -121 +121 @@
 
         assign  tmp_data        =       12'd0;
+/*
         assign  sys_clock       =       CLK_100MHz;
-/*
+*/
         sys_pll sys_pll_unit(
                 .inclk0(CLK_100MHz),
                 .c0(sys_clock));
-*/
+
 /*
         sys_pll sys_pll_unit(
@@ -152 +153 @@
                 .adc_frame(sys_frame),
                 .adc_data({
-                        adc_data[5], adc_data[3], adc_data[2],      // D3, D1, S2
-                        adc_data[4], adc_data[1], adc_data[0]}));   // D2, S1_S, S1_F 
+                        adc_data[5], adc_data[3], adc_data[4],      // D3, D1, D2
+                        adc_data[2], adc_data[1], adc_data[0]}));   // S2, S1_S, S1_F 
 
         wire    [15:0]          cfg_bits [63:0];
@@ -198 +199 @@
                 begin : MUX_DATA
                         assign int_mux_data[j] = {
-//                              {6'd0, cls_data},
 //                              {4'd0, cls_flag, 7'd0},
+                                {6'd0, cls_data},
                                 {4'd0, amp_flag[j][0], 7'd0},
                                 amp_data[j][11:0],
@@ -211 +212 @@
 
         lpm_mux #(
-                .lpm_size(4*6),
+                .lpm_size(5*6),
                 .lpm_type("LPM_MUX"),
                 .lpm_width(12),
@@ -226 +227 @@
                 
                         lpm_mux #(
-                                .lpm_size(4*6),
+                                .lpm_size(5*6),
                                 .lpm_type("LPM_MUX"),
                                 .lpm_width(12),