Changeset 182
- Timestamp:
- Jan 17, 2014, 10:18:16 AM (11 years ago)
- Location:
- trunk/3DEES
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/3DEES/Paella.v
r181 r182 152 152 .adc_frame(sys_frame), 153 153 .adc_data({ 154 adc_data[5], adc_data[ 4], adc_data[3],155 adc_data[ 2], adc_data[1], adc_data[0]}));154 adc_data[5], adc_data[3], adc_data[2], // D3, D1, S2 155 adc_data[4], adc_data[1], adc_data[0]})); // D2, S1_S, S1_F 156 156 157 157 wire [15:0] cfg_bits [63:0]; … … 198 198 begin : MUX_DATA 199 199 assign int_mux_data[j] = { 200 {6'd0, cls_data},201 {4'd0, cls_flag, 7'd0},202 //{4'd0, amp_flag[j][0], 7'd0},200 // {6'd0, cls_data}, 201 // {4'd0, cls_flag, 7'd0}, 202 {4'd0, amp_flag[j][0], 7'd0}, 203 203 amp_data[j][11:0], 204 clp_data[j][11:0] 205 //sys_data[j]204 clp_data[j][11:0], 205 sys_data[j] 206 206 }; 207 207 end … … 295 295 // .tau_data({16'd0, 16'd19835, 16'd19835, 16'd19835}), 296 296 // exp(-32/1000)*1024*20 297 .tau_data({16'd0, cfg_bits[3 3+6*j], cfg_bits[32+6*j], cfg_bits[30+6*j]}),297 .tau_data({16'd0, cfg_bits[34+6*j], cfg_bits[32+6*j], cfg_bits[30+6*j]}), 298 298 .inp_data({ 299 299 19'd0, cic_data[j*3+2][18:0], cic_data[j*3+1][18:0], cic_data[j*3+0][18:0]}), … … 343 343 cfg_bits[23][11:0], cfg_bits[22][11:0], cfg_bits[21][11:0], cfg_bits[20][11:0], 344 344 cfg_bits[19][11:0], cfg_bits[18][11:0], cfg_bits[17][11:0], cfg_bits[16][11:0]}), 345 .inp_data({amp_data[5][11:0], amp_data[4][11:0], amp_data[ 0][11:0],346 amp_data[ 0][11:0], amp_data[1][11:0], amp_data[0][11:0]}),347 .inp_flag({amp_flag[5][0], amp_flag[4][0], amp_flag[ 0][0],348 amp_flag[ 0][0], amp_flag[1][0], amp_flag[0][0]}),345 .inp_data({amp_data[5][11:0], amp_data[4][11:0], amp_data[3][11:0], 346 amp_data[2][11:0], amp_data[1][11:0], amp_data[0][11:0]}), 347 .inp_flag({amp_flag[5][0], amp_flag[4][0], amp_flag[3][0], 348 amp_flag[2][0], amp_flag[1][0], amp_flag[0][0]}), 349 349 .out_flag(cls_flag), 350 350 .out_data(cls_data)); -
trunk/3DEES/UserInterface.tcl
r181 r182 69 69 variable cfgThrs 70 70 array set cfgThrs { 71 0 2072 6 200073 1 2074 7 200075 2 2076 8 20077 9 200078 10 300079 3 2080 11 20081 12 200082 13 300083 4 2 084 14 20085 15 200086 16 300087 5 2088 17 20089 18 200090 19 300071 0 8 72 6 50 73 1 8 74 7 50 75 2 10 76 8 31 77 9 52 78 10 79 79 3 60 80 11 135 81 12 171 82 13 233 83 4 249 84 14 348 85 15 495 86 16 693 87 5 505 88 17 606 89 18 707 90 19 808 91 91 } 92 92 … … 97 97 array set inpCodes { 98 98 0 {r} 99 1 { f}100 2 { d}101 3 { c}99 1 {c} 100 2 {a} 101 3 {f} 102 102 } 103 103 … … 351 351 set column [expr {$num + 1}] 352 352 set value $cfgCodes(${ch}_${num}) 353 puts "${ch} ${num} ${value}"354 353 spinbox ${config(thrs)}.thrs_${value} -from 0 -to 4095 \ 355 354 -increment 10 -width 10 -textvariable [myvar thrs($value)] \ … … 376 375 set column [expr {$num + 1}] 377 376 set value $cfgCodes(${ch}_${num}) 378 puts "${ch} ${num} ${value}"379 377 spinbox ${config(bins)}.thrs_${value} -from 0 -to 4095 \ 380 378 -increment 10 -width 10 -textvariable [myvar thrs($value)] \ … … 511 509 $config(4).chan_0_4 select 512 510 $config(5).chan_0_5 select 513 $config(6).chan_ 0_1 select511 $config(6).chan_2_1 select 514 512 515 513 foreach {ch dummy} [array get adcCodes] { … … 564 562 grid $config(key).r -row 0 -column 0 -sticky news 565 563 566 label $config(key).f -text " f - filtered signal"564 label $config(key).f -text "c - filtered and clipped signal" 567 565 grid $config(key).f -row 0 -column 1 -sticky news 568 566 569 label $config(key).d -text " d - deconvoluted signal"567 label $config(key).d -text "a - amplitude" 570 568 grid $config(key).d -row 0 -column 2 -sticky news 571 569 572 label $config(key).c -text " c - clipped signal"570 label $config(key).c -text "f - amplitude flag" 573 571 grid $config(key).c -row 0 -column 3 -sticky news 574 572 … … 983 981 984 982 ${config}.thrs_check select 985 ${config}.thrs_field set 100983 ${config}.thrs_field set 30 986 984 } 987 985
Note:
See TracChangeset
for help on using the changeset viewer.