Index: trunk/3DEES/Paella.qsf =================================================================== --- trunk/3DEES/Paella.qsf (revision 179) +++ trunk/3DEES/Paella.qsf (revision 180) @@ -97,13 +97,4 @@ set_location_assignment PIN_56 -to USB_PB[2] set_location_assignment PIN_57 -to USB_PB[3] -set_location_assignment PIN_78 -to PWM[0] -set_location_assignment PIN_80 -to PWM[1] -set_location_assignment PIN_81 -to PWM[2] -set_location_assignment PIN_82 -to PWM[3] -set_location_assignment PIN_114 -to SPI_SEL[0] -set_location_assignment PIN_117 -to ADC_RST -set_location_assignment PIN_118 -to SPI_CLK -set_location_assignment PIN_119 -to SPI_SDO -set_location_assignment PIN_120 -to SPI_SEL[1] set_location_assignment PIN_137 -to "ADC_D[0](n)" set_location_assignment PIN_139 -to ADC_D[0] @@ -191,13 +182,4 @@ set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to USB_SLWR set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to USB_IFCLK -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to PWM[0] -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to PWM[1] -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to PWM[2] -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to PWM[3] -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SPI_SEL[0] -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to ADC_RST -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SPI_CLK -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SPI_SDO -set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to SPI_SEL[1] set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to RAM_ADDR[0] set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to RAM_ADDR[1] @@ -242,8 +224,4 @@ set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to RAM_DQB[6] set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to RAM_DQB[7] -set_instance_assignment -name AUTO_OPEN_DRAIN_PINS ON -to PWM[0] -set_instance_assignment -name AUTO_OPEN_DRAIN_PINS ON -to PWM[1] -set_instance_assignment -name AUTO_OPEN_DRAIN_PINS ON -to PWM[2] -set_instance_assignment -name AUTO_OPEN_DRAIN_PINS ON -to PWM[3] set_global_assignment -name MISC_FILE "D:/altera/MultiChannelUSB/Paella.dpf" @@ -254,4 +232,5 @@ set_global_assignment -name VERILOG_FILE control.v set_global_assignment -name VERILOG_FILE analyser.v +set_global_assignment -name VERILOG_FILE classifier.v set_global_assignment -name VERILOG_FILE amplitude.v set_global_assignment -name VERILOG_FILE deconv.v @@ -261,11 +240,8 @@ set_global_assignment -name VERILOG_FILE counter.v set_global_assignment -name VERILOG_FILE histogram32.v -set_global_assignment -name VERILOG_FILE histogram16.v set_global_assignment -name VERILOG_FILE trigger.v set_global_assignment -name VERILOG_FILE oscilloscope.v set_global_assignment -name VERILOG_FILE configuration.v set_global_assignment -name VERILOG_FILE usb_fifo.v -set_global_assignment -name VERILOG_FILE i2c_fifo.v -set_global_assignment -name VERILOG_FILE spi_fifo.v set_global_assignment -name VERILOG_FILE test.v set_global_assignment -name MIF_FILE test.mif @@ -274,7 +250,7 @@ set_global_assignment -name VERILOG_FILE new_filter.v set_global_assignment -name VERILOG_FILE clip.v -set_global_assignment -name VERILOG_FILE pwm.v set_global_assignment -name MISC_FILE "D:/altera/3DEES-6ch/Paella.dpf" set_global_assignment -name FMAX_REQUIREMENT "100 MHz" -section_id "100 MHz Clock" set_instance_assignment -name CLOCK_SETTINGS "100 MHz Clock" -to CLK_100MHz +set_global_assignment -name MISC_FILE "D:/altera/3DEES/Paella.dpf" set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top Index: trunk/3DEES/Paella.v =================================================================== --- trunk/3DEES/Paella.v (revision 179) +++ trunk/3DEES/Paella.v (revision 180) @@ -7,11 +7,4 @@ input wire ADC_FCO, input wire [5:0] ADC_D, - - output wire [3:0] PWM, - - output wire [1:0] SPI_SEL, - output wire SPI_SDO, - output wire SPI_CLK, - output wire ADC_RST, output wire USB_SLRD, @@ -43,5 +36,4 @@ assign RAM_ADDR = 20'h00000; */ - assign ADC_RST = 1'b0; assign RAM_CLK = sys_clock; @@ -101,4 +93,7 @@ wire [12:0] amp_data [3*N-1:0]; + wire cls_flag; + wire [5:0] cls_data; + wire [1:0] amp_mux_flag [2:0]; wire [11:0] amp_mux_data [2:0]; @@ -125,5 +120,5 @@ wire i2c_reset; - assign tmp_data = 12'h000; + assign tmp_data = 12'd0; assign sys_clock = CLK_100MHz; /* @@ -167,15 +162,15 @@ wire cfg_reset; - wire [12:0] bus_ssel; + wire [2:0] bus_ssel; wire bus_wren; wire [31:0] bus_addr; wire [15:0] bus_mosi; - wire [15:0] bus_miso [10:0]; - wire [12:0] bus_busy; + wire [15:0] bus_miso [2:0]; + wire [2:0] bus_busy; wire [15:0] mrg_bus_miso; wire mrg_bus_busy; - wire [11*16-1:0] int_bus_miso; + wire [3*16-1:0] int_bus_miso; genvar j; @@ -203,8 +198,11 @@ begin : MUX_DATA assign int_mux_data[j] = { - {4'd0, amp_flag[j][0], 7'd0}, + {6'd0, cls_data}, + {4'd0, cls_flag, 7'd0}, +// {4'd0, amp_flag[j][0], 7'd0}, amp_data[j][11:0], - clp_data[j][11:0], - sys_data[j]}; + clp_data[j][11:0] +// sys_data[j] + }; end endgenerate @@ -288,14 +286,14 @@ begin : DECONV_CHAIN - clip #(.shift(22), .width(19), .widthr(12)) clip_unit ( + clip #(.shift(21), .width(19), .widthr(13)) clip_unit ( .clock(sys_clock), .frame(sys_frame), .reset(1'b0), .del_data({6'd0, 6'd32, 6'd32, 6'd32}), -// .del_data({6'd0, cfg_bits[37+6*j][5:0], cfg_bits[35+6*j][5:0], cfg_bits[33+6*j][5:0]}), +// .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}), // exp(-32/1000)*1024*20 -// .tau_data({16'd0, cfg_bits[36+6*j], cfg_bits[34+6*j], cfg_bits[32+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]}), @@ -324,7 +322,6 @@ .frame(sys_frame), .reset(1'b0), - .min_data({1'b0, cfg_bits[7][11:0]}), + .min_data(13'd20), .max_data(13'd4095), -// .cfg_data(cfg_bits[6+2*j][11:0]), .inp_data(clp_data[j]), .out_flag(amp_flag[j]), @@ -333,70 +330,35 @@ endgenerate +// {D3, D2, D1, S2, S1_S, S1_F} + classifier #(.width(12)) classifier_unit ( + .clock(sys_clock), + .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}), + .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]}), + .inp_flag({amp_flag[5][0], amp_flag[4][0], amp_flag[0][0], + amp_flag[0][0], amp_flag[1][0], amp_flag[0][0]}), + .out_flag(cls_flag), + .out_data(cls_data)); + histogram32 histogram32_unit ( .clock(sys_clock), .frame(sys_frame), .reset(cfg_bits[0][5]), - .hst_good((amp_flag[0][1]) & (cnt_good[0]) & (cfg_bits[13][1])), - .hst_data(amp_data[0]), + .hst_good(cls_flag & cfg_bits[6][0]), + .hst_data(cls_data), .bus_ssel(bus_ssel[2]), .bus_wren(bus_wren), - .bus_addr(bus_addr[12:0]), + .bus_addr(bus_addr[6:0]), .bus_mosi(bus_mosi), .bus_miso(bus_miso[2]), .bus_busy(bus_busy[2])); - counter hst_counter_unit ( - .clock(sys_clock), - .frame((sys_frame) & (~amp_flag[0][1])), -// .frame(sys_frame), - .reset(cfg_bits[0][8]), - .setup(cfg_bits[13][0]), - .count(cfg_bits[13][1]), - .bus_ssel(bus_ssel[5]), - .bus_wren(bus_wren), - .bus_addr(bus_addr[1:0]), - .bus_mosi(bus_mosi), - .bus_miso(bus_miso[5]), - .bus_busy(bus_busy[5]), - .cnt_good(cnt_good[0])); - - - i2c_fifo i2c_unit( - .clock(sys_clock), - .reset(i2c_reset), -/* - normal connection - .i2c_sda(I2C_SDA), - .i2c_scl(I2C_SCL), - - following is a cross wire connection for EPT -*/ - .i2c_sda(I2C_SCL), - .i2c_scl(I2C_SDA), - - .bus_ssel(bus_ssel[11]), - .bus_wren(bus_wren), - .bus_mosi(bus_mosi), - .bus_busy(bus_busy[11])); - - spi_fifo spi_unit( - .clock(sys_clock), - .reset(1'b0), - .spi_sel(SPI_SEL), - .spi_sdo(SPI_SDO), - .spi_clk(SPI_CLK), - - .bus_ssel(bus_ssel[12]), - .bus_wren(bus_wren), - .bus_mosi(bus_mosi), - .bus_busy(bus_busy[12])); - - pwm pwm_unit( - .clock(sys_clock), - .cfg_data({cfg_bits[31], cfg_bits[30], cfg_bits[29]}), - .out_data(PWM)); - - generate - for (j = 0; j < 11; j = j + 1) + + generate + for (j = 0; j < 3; j = j + 1) begin : BUS_OUTPUT assign int_bus_miso[j*16+15:j*16] = bus_miso[j]; @@ -405,26 +367,26 @@ lpm_mux #( - .lpm_size(11), + .lpm_size(3), .lpm_type("LPM_MUX"), .lpm_width(16), - .lpm_widths(4)) bus_miso_mux_unit ( - .sel(bus_addr[31:28]), + .lpm_widths(2)) bus_miso_mux_unit ( + .sel(bus_addr[29:28]), .data(int_bus_miso), .result(mrg_bus_miso)); lpm_mux #( - .lpm_size(13), + .lpm_size(3), .lpm_type("LPM_MUX"), .lpm_width(1), - .lpm_widths(4)) bus_busy_mux_unit ( - .sel(bus_addr[31:28]), + .lpm_widths(2)) bus_busy_mux_unit ( + .sel(bus_addr[29:28]), .data(bus_busy), .result(mrg_bus_busy)); lpm_decode #( - .lpm_decodes(13), + .lpm_decodes(3), .lpm_type("LPM_DECODE"), - .lpm_width(4)) lpm_decode_unit ( - .data(bus_addr[31:28]), + .lpm_width(2)) lpm_decode_unit ( + .data(bus_addr[29:28]), .eq(bus_ssel)); Index: trunk/3DEES/UserInterface.tcl =================================================================== --- trunk/3DEES/UserInterface.tcl (revision 179) +++ trunk/3DEES/UserInterface.tcl (revision 180) @@ -38,10 +38,4 @@ 5 {ADC 5} 6 {ADC 6} - 7 {ADC 7} - 8 {ADC 8} - 9 {ADC 9} - 10 {ADC 10} - 11 {ADC 11} - 12 {ADC 12} } @@ -114,6 +108,15 @@ # ------------------------------------------------------------------------- + UsbController instproc init {} { + + my set ignore false + + next + } + +# ------------------------------------------------------------------------- + UsbController instproc usbConnect {} { - my instvar handle + my instvar handle ignore puts usbConnect @@ -123,15 +126,18 @@ unset handle } -if {1} { - while {[catch {usb::connect 0x09FB 0x6001 1 1 0} result]} { - set answer [tk_messageBox -icon error -type retrycancel \ - -message {Cannot access USB device} -detail $result] -# puts $result - if {[string equal $answer cancel]} exit - } - - set handle $result - -} + if {!$ignore} { + while {[catch {usb::connect 0x09FB 0x6001 1 1 0} result]} { + set answer [tk_messageBox -icon error -type abortretryignore \ + -message {Cannot access USB device} -detail $result] + if {[string equal $answer abort]} exit + if {[string equal $answer ignore]} { + set ignore true + return + } + } + + set handle $result + + } } @@ -139,9 +145,9 @@ UsbController instproc usbHandle {} { - my instvar handle + my instvar handle ignore if {[my exists handle]} { return $handle - } else { + } elseif {!$ignore} { my usbConnect } @@ -223,5 +229,5 @@ # ------------------------------------------------------------------------- - Class SpiDisplay -parameter { + Class CfgDisplay -parameter { {master} {controller} @@ -230,5 +236,5 @@ # ------------------------------------------------------------------------- - SpiDisplay instproc init {} { + CfgDisplay instproc init {} { my setup @@ -239,5 +245,5 @@ # ------------------------------------------------------------------------- - SpiDisplay instproc destroy {} { + CfgDisplay instproc destroy {} { next } @@ -245,89 +251,137 @@ # ------------------------------------------------------------------------- - SpiDisplay instproc start {} { + CfgDisplay instproc start {} { + variable adcCodes my instvar config - trace add variable [myvar dac1] write [myproc dac1_update] - trace add variable [myvar dac2] write [myproc dac2_update] - - ${config(1)}.dac1 set 0 - ${config(1)}.dac2 set 0 - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc setup {} { + trace add variable [myvar decay] write [myproc decay_update] + trace add variable [myvar delay] write [myproc delay_update] + trace add variable [myvar thrs] write [myproc thrs_update] + + foreach {ch id} [array get adcCodes] { + ${config(clip)}.delay_${ch} set 32 + ${config(clip)}.decay_${ch} set 1000 + } + + for {set i 0} {$i <= 3} {incr i} { + ${config(thrs)}.thrs_${i} set 100 + } + + for {set i 4} {$i <= 19} {incr i} { + ${config(bins)}.thrs_${i} set 100 + } + } + +# ------------------------------------------------------------------------- + + CfgDisplay instproc setup {} { + variable adcCodes my instvar number master my instvar config - set config(1) [labelframe ${master}.cfg1 -borderwidth 1 -relief sunken -text {DAC}] - - frame ${config(1)}.limits - label ${config(1)}.limits.min -text {2.5V} - label ${config(1)}.limits.max -text {0.0V} - - scale ${config(1)}.dac1 -orient vertical -from 4095 -to 0 -tickinterval 0 -variable [myvar dac1] - scale ${config(1)}.dac2 -orient vertical -from 4095 -to 0 -tickinterval 0 -variable [myvar dac2] - - pack ${config(1)}.limits.min -anchor n -side top -pady 10 - pack ${config(1)}.limits.max -anchor s -side bottom -pady 9 - - grid ${config(1)}.dac1 ${config(1)}.dac2 ${config(1)}.limits -sticky ns -pady 7 - - - set config(2) [labelframe ${master}.cfg2 -borderwidth 1 -relief sunken -text {ADC}] - - frame ${config(2)}.spc1 -width 130 -height 10 - frame ${config(2)}.spc2 -width 130 -height 10 - frame ${config(2)}.spc3 -width 130 -height 10 - - button ${config(2)}.reset -text {Reset} -command [myproc adc_reset] - button ${config(2)}.pattern -text {Test pattern} -command [myproc adc_pattern] - button ${config(2)}.ramp -text {Test ramp} -command [myproc adc_ramp] - button ${config(2)}.100mV -text {Test 100 mV} -command [myproc adc_100mV] - button ${config(2)}.150mV -text {Test 150 mV} -command [myproc adc_150mV] - button ${config(2)}.fltr0 -text {Filter 14MHz} -command [myproc adc_fltr0] - button ${config(2)}.fltr1 -text {Filter 10MHz} -command [myproc adc_fltr1] - button ${config(2)}.fltr2 -text {Filter 7.5MHz} -command [myproc adc_fltr2] - - grid ${config(2)}.spc1 - grid ${config(2)}.reset -sticky ew -pady 3 -padx 5 - grid ${config(2)}.spc2 - grid ${config(2)}.pattern -sticky ew -pady 3 -padx 5 - grid ${config(2)}.ramp -sticky ew -pady 3 -padx 5 - grid ${config(2)}.100mV -sticky ew -pady 3 -padx 5 - grid ${config(2)}.150mV -sticky ew -pady 3 -padx 5 - grid ${config(2)}.spc3 - grid ${config(2)}.fltr0 -sticky ew -pady 3 -padx 5 - grid ${config(2)}.fltr1 -sticky ew -pady 3 -padx 5 - grid ${config(2)}.fltr2 -sticky ew -pady 3 -padx 5 - - grid ${config(1)} -row 1 -column 1 -sticky ns - grid ${config(2)} -row 1 -column 2 -sticky ns - - grid columnconfigure ${master} 0 -weight 1 - grid columnconfigure ${master} 1 -weight 1 - grid columnconfigure ${master} 2 -weight 1 - grid columnconfigure ${master} 3 -weight 1 - - grid rowconfigure ${master} 0 -weight 0 - grid rowconfigure ${master} 1 -weight 1 - grid rowconfigure ${master} 2 -weight 0 - - grid rowconfigure ${config(1)} 0 -weight 1 - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc dac1_update args { - my instvar controller dac1 - - set value [format {3%03x} $dac1] - - set prefix [format {%x} 12] + set thrs [frame ${master}.thrs] + set bins [frame ${master}.bins] + set clip [frame ${master}.clip] + + set config(thrs) [labelframe ${thrs}.frame -borderwidth 1 -relief sunken -text {Thresholds}] + + set column 0 + foreach {input} [list "ADC" "noise thrs" "e/p thrs"] { + label ${config(thrs)}.label_${column} -text "${input}" + grid ${config(thrs)}.label_${column} -row 0 -column ${column} -sticky ew -padx 5 -pady 7 + incr column + } + + foreach {ch id} [array get adcCodes {[1-2]}] { + label ${config(thrs)}.chan_${ch} -text "${ch} " + grid ${config(thrs)}.chan_${ch} -row ${ch} -column 0 -sticky ew -padx 5 -pady 7 + foreach {num} [list 0 1] { + set column [expr {$num + 1}] + set value [expr {2 * ($ch - 1) + $num}] + puts "${num} ${ch} ${value}" + spinbox ${config(thrs)}.thrs_${value} -from 0 -to 4095 \ + -increment 10 -width 10 -textvariable [myvar thrs($value)] \ + -validate all -vcmd {::mca::validate 4095 4 %P} + grid ${config(thrs)}.thrs_${value} -row ${ch} -column ${column} -sticky w -padx 5 -pady 7 + } + } + + grid $config(thrs) -row 0 -column 0 -sticky news -padx 10 + + set config(bins) [labelframe ${bins}.frame -borderwidth 1 -relief sunken -text {Thresholds}] + + set column 0 + foreach {input} [list "ADC" "thrs 1" "thrs 2" "thrs 3" "thrs 4"] { + label ${config(bins)}.label_${column} -text "${input}" + grid ${config(bins)}.label_${column} -row 0 -column ${column} -sticky ew -padx 5 -pady 7 + incr column + } + + foreach {ch id} [array get adcCodes {[3-6]}] { + label ${config(bins)}.chan_${ch} -text "${ch} " + grid ${config(bins)}.chan_${ch} -row ${ch} -column 0 -sticky ew -padx 5 -pady 7 + foreach {num} [list 0 1 2 3] { + set column [expr {$num + 1}] + set value [expr {4 * ($ch - 2) + $num}] + puts "${num} ${ch} ${value}" + spinbox ${config(bins)}.thrs_${value} -from 0 -to 4095 \ + -increment 10 -width 10 -textvariable [myvar thrs($value)] \ + -validate all -vcmd {::mca::validate 4095 4 %P} + grid ${config(bins)}.thrs_${value} -row ${ch} -column ${column} -sticky w -padx 5 -pady 7 + } + } + + grid $config(bins) -row 0 -column 0 -sticky news -padx 10 + + set config(clip) [labelframe ${clip}.frame -borderwidth 1 -relief sunken -text {Signal clipping}] + + set column 0 + foreach {input} [list "ADC" "delay" "decay"] { + label ${config(clip)}.label_${column} -text "${input}" + grid ${config(clip)}.label_${column} -row 0 -column ${column} -sticky ew -padx 5 -pady 7 + incr column + } + + foreach {ch id} [array get adcCodes] { + label ${config(clip)}.chan_${ch} -text "${ch} " + grid ${config(clip)}.chan_${ch} -row ${ch} -column 0 -sticky ew -padx 5 -pady 7 + spinbox ${config(clip)}.delay_${ch} -from 0 -to 62 \ + -increment 2 -width 10 -textvariable [myvar delay($ch)] \ + -validate all -vcmd {::mca::validate 63 5 %P} + grid ${config(clip)}.delay_${ch} -row ${ch} -column 1 -sticky w -padx 5 -pady 7 + spinbox ${config(clip)}.decay_${ch} -from 0 -to 65535 \ + -increment 10 -width 10 -textvariable [myvar decay($ch)] \ + -validate all -vcmd {::mca::validate 65535 5 %P} + grid ${config(clip)}.decay_${ch} -row ${ch} -column 2 -sticky w -padx 5 -pady 7 + } + + grid $config(clip) -row 0 -column 0 -sticky news -padx 10 + + grid ${thrs} -row 0 -column 2 -sticky news + grid ${bins} -row 0 -column 1 -sticky news + grid ${clip} -row 0 -column 0 -sticky news + + grid columnconfigure ${master} 0 -weight 1 + grid columnconfigure ${master} 1 -weight 1 + grid columnconfigure ${master} 2 -weight 1 + grid rowconfigure ${master} 0 -weight 1 + + grid rowconfigure ${thrs} 0 -weight 0 + grid rowconfigure ${bins} 0 -weight 0 + grid rowconfigure ${clip} 0 -weight 0 + } + +# ------------------------------------------------------------------------- + + CfgDisplay instproc decay_update args { + my instvar controller decay delay set command {} - append command 0001${prefix}00000020000000402[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 3]00 + for {set i 1} {$i <= 6} {incr i} { + set a $delay($i).0 + set b $decay($i).0 + set value [expr int(exp(-${a}/${b})*1024*17)] + append command [format {000200%02x0004%04x} [expr {30 + 2 * (${i} - 1)}] $value] + } $controller usbCmd $command @@ -336,146 +390,26 @@ # ------------------------------------------------------------------------- - SpiDisplay instproc dac2_update args { - my instvar controller dac2 - - set value [format {b%03x} $dac1] - - set prefix [format {%x} 12] + CfgDisplay instproc delay_update args { + my instvar controller delay set command {} - append command 0001${prefix}00000020000000402[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 3]00 + for {set i 1} {$i <= 6} {incr i} { + append command [format {000200%02x0004%04x} [expr {31 + 2 * (${i} - 1)}] $delay($i)] + } $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc adc_reset args { - my instvar controller - - set prefix [format {%x} 12] - + + my decay_update + } + +# ------------------------------------------------------------------------- + + CfgDisplay instproc thrs_update args { + my instvar controller thrs + set command {} - - set value {000001} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] - - set value {040008} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] - - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc adc_pattern args { - my instvar controller - - set value {022000} - - set prefix [format {%x} 12] - - set command {} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] - - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc adc_ramp args { - my instvar controller - - set value {02E000} - - set prefix [format {%x} 12] - - set command {} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] - - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc adc_100mV args { - my instvar controller - - set value {070080} - - set prefix [format {%x} 12] - - set command {} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] - - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc adc_150mV args { - my instvar controller - - set value {070180} - - set prefix [format {%x} 12] - - set command {} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] - - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc adc_fltr0 args { - my instvar controller - - set value {070000} - - set prefix [format {%x} 12] - - set command {} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] - - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc adc_fltr1 args { - my instvar controller - - set value {070004} - - set prefix [format {%x} 12] - - set command {} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] - - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - SpiDisplay instproc adc_fltr2 args { - my instvar controller - - set value {070008} - - set prefix [format {%x} 12] - - set command {} - append command 0001${prefix}00000020000000401[string range $value 0 1] - append command 0001${prefix}000000200000004[string range $value 2 5] + for {set i 0} {$i <= 19} {incr i} { + append command [format {000200%02x0004%04x} [expr {10 + ${i}}] $thrs($i)] + } $controller usbCmd $command @@ -549,5 +483,5 @@ set key [frame ${master}.key] set inv [frame ${master}.inv] - + foreach {osc title} $oscList { set config($osc) [labelframe ${mux}.$osc -borderwidth 1 -relief sunken -text $title] @@ -580,8 +514,8 @@ label $config(key).f -text "f - filtered signal" grid $config(key).f -row 0 -column 1 -sticky news - + label $config(key).d -text "d - deconvoluted signal" grid $config(key).d -row 0 -column 2 -sticky news - + label $config(key).c -text "c - clipped signal" grid $config(key).c -row 0 -column 3 -sticky news @@ -589,5 +523,5 @@ grid $config(key) -row 0 -column 0 -sticky news -padx 10 - + set config(inv) [labelframe ${inv}.frame -borderwidth 1 -relief sunken -text {polarity inversion}] label $config(inv).chan_label -text "channel " @@ -620,5 +554,5 @@ grid columnconfigure $config(key) 3 -weight 1 - + grid columnconfigure ${mux} 0 -weight 1 grid columnconfigure ${mux} 1 -weight 1 @@ -627,8 +561,5 @@ grid columnconfigure ${mux} 4 -weight 1 grid columnconfigure ${mux} 5 -weight 1 - - - } - + } # ------------------------------------------------------------------------ @@ -648,8 +579,8 @@ MuxDisplay instproc polar_update args { my instvar controller polar - + set value {0b} - for {set i 12} {$i >= 1} {incr i -1} { - append value $polar($i) + for {set i 6} {$i >= 1} {incr i -1} { + append value $polar($i) } @@ -673,9 +604,9 @@ my set data {} - vector create [myvar xvec](4096) - vector create [myvar yvec](4096) - - # fill one vector for the x axis with 4096 points - [myvar xvec] seq -0.5 4095.5 + vector create [myvar xvec](64) + vector create [myvar yvec](64) + + # fill one vector for the x axis with 64 points + [myvar xvec] seq -0.5 63.5 my setup @@ -696,34 +627,11 @@ trace add variable [myvar data] write [myproc data_update] - trace add variable [myvar cntr_val] write [myproc cntr_val_update] - trace add variable [myvar rate_val] write [myproc rate_val_update] trace add variable [myvar axis] write [myproc axis_update] - trace add variable [myvar thrs] write [myproc thrs_update] - trace add variable [myvar thrs_val] write [myproc thrs_update] - trace add variable [myvar base] write [myproc base_update] - trace add variable [myvar base_typ] write [myproc base_typ_update] - trace add variable [myvar base_val] write [myproc base_val_update] ${config}.axis_check select - ${config}.thrs_check select - ${config}.thrs_field set 25 - - ${config}.base_auto select - ${config}.base_field set 20 - ${config}.base_check select - - set cntr_tmp 1200000000 - my set cntr_val $cntr_tmp - my set cntr_bak $cntr_tmp - my set cntr_old $cntr_tmp my set yvec_bak 0.0 my set yvec_old 0.0 - - my set rate_val(inst) 0.0 - my set rate_val(mean) 0.0 - -# my cntr_reset } @@ -741,5 +649,5 @@ $graph grid configure -hide no $graph legend configure -hide yes - $graph axis configure x -min 0 -max 4096 + $graph axis configure x -min 0 -max 64 set config [frame ${master}.config -width 170] @@ -748,10 +656,4 @@ frame ${config}.spc1 -width 170 -height 30 - - frame ${config}.rate_frame -borderwidth 0 -width 170 - legendLabel ${config}.rate_frame 0 inst {Inst. rate, 1/s} - legendLabel ${config}.rate_frame 1 mean {Avg. rate, 1/s} - - frame ${config}.spc2 -width 170 -height 30 frame ${config}.chan_frame -borderwidth 0 -width 170 @@ -759,22 +661,5 @@ legendLabel ${config}.chan_frame 1 axisx {Bin number} - frame ${config}.spc3 -width 170 -height 30 - - frame ${config}.cntr_frame -borderwidth 0 -width 170 - - label ${config}.cntr_frame.h -width 3 -anchor w -text {h} - entry ${config}.cntr_frame.h_field -width 3 -textvariable [myvar cntr_h] \ - -validate all -vcmd {::mca::validate 999 3 %P} - label ${config}.cntr_frame.m -width 3 -anchor w -text {m} - entry ${config}.cntr_frame.m_field -width 3 -textvariable [myvar cntr_m] \ - -validate all -vcmd {::mca::validate 59 2 %P} - label ${config}.cntr_frame.s -width 3 -anchor w -text {s} - entry ${config}.cntr_frame.s_field -width 6 -textvariable [myvar cntr_s] \ - -validate all -vcmd {::mca::doublevalidate 59.999 %P} - - grid ${config}.cntr_frame.h_field ${config}.cntr_frame.h \ - ${config}.cntr_frame.m_field ${config}.cntr_frame.m ${config}.cntr_frame.s_field ${config}.cntr_frame.s - - frame ${config}.spc4 -width 170 -height 10 + frame ${config}.spc2 -width 170 -height 30 button ${config}.start -text Start \ @@ -783,21 +668,5 @@ -bg red -activebackground red -command [myproc cntr_reset] - frame ${config}.spc5 -width 170 -height 30 - - checkbutton ${config}.thrs_check -text threshold -variable [myvar thrs] - spinbox ${config}.thrs_field -from 1 -to 4095 \ - -increment 5 -width 10 -textvariable [myvar thrs_val] \ - -validate all -vcmd {::mca::validate 4095 4 %P} - - frame ${config}.spc6 -width 170 -height 30 - - checkbutton ${config}.base_check -text baseline -variable [myvar base] - radiobutton ${config}.base_auto -text automatic -variable [myvar base_typ] -value 1 - radiobutton ${config}.base_const -text constant -variable [myvar base_typ] -value 0 - spinbox ${config}.base_field -from 1 -to 4095 \ - -increment 5 -width 10 -textvariable [myvar base_val] \ - -validate all -vcmd {::mca::validate 4095 4 %P} - - frame ${config}.spc7 -width 170 -height 30 + frame ${config}.spc3 -width 170 -height 30 button ${config}.register -text Register \ @@ -806,21 +675,9 @@ grid ${config}.axis_check -sticky w grid ${config}.spc1 - grid ${config}.rate_frame -sticky ew -padx 5 + grid ${config}.chan_frame -sticky ew -padx 5 grid ${config}.spc2 - grid ${config}.chan_frame -sticky ew -padx 5 - grid ${config}.spc3 - grid ${config}.cntr_frame -sticky ew -padx 5 - grid ${config}.spc4 grid ${config}.start -sticky ew -pady 3 -padx 5 grid ${config}.reset -sticky ew -pady 3 -padx 5 - grid ${config}.spc5 - grid ${config}.thrs_check -sticky w - grid ${config}.thrs_field -sticky ew -pady 1 -padx 5 - grid ${config}.spc6 - grid ${config}.base_check -sticky w - grid ${config}.base_auto -sticky w - grid ${config}.base_const -sticky w - grid ${config}.base_field -sticky ew -pady 1 -padx 5 - grid ${config}.spc7 + grid ${config}.spc3 grid ${config}.register -sticky ew -pady 3 -padx 5 @@ -832,5 +689,4 @@ grid columnconfigure ${master} 1 -weight 0 -minsize 80 - grid columnconfigure ${config}.rate_frame 1 -weight 1 grid columnconfigure ${config}.chan_frame 1 -weight 1 @@ -886,123 +742,6 @@ # ------------------------------------------------------------------------- - HstDisplay instproc thrs_update args { - my instvar controller config number thrs thrs_val - - if {[string equal $thrs_val {}]} { - set thrs_val 0 - } - - set val_addr [format %02x [expr {6 + 2 * ${number}}]] - - if {$thrs} { - ${config}.thrs_field configure -state normal - set value [format %03x $thrs_val] - } else { - ${config}.thrs_field configure -state disabled - set value 000 - } - - $controller usbCmd 000200${val_addr}00040${value} - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc base_update args { - my instvar controller config number base base_typ - - set val_addr [format %02x [expr {7 + 2 * ${number}}]] - - if {$base} { - ${config}.base_auto configure -state normal - ${config}.base_const configure -state normal - my base_typ_update - } else { - ${config}.base_auto configure -state disabled - ${config}.base_const configure -state disabled - ${config}.base_field configure -state disabled - $controller usbCmd 000200${val_addr}0004${base_typ}000 - } - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc base_typ_update args { - my instvar config base_typ - - switch -- $base_typ { - 1 { - ${config}.base_field configure -state disabled - } - 0 { - ${config}.base_field configure -state normal - } - } - - my base_val_update - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc base_val_update args { - my instvar controller number base_typ base_val - - if {[string equal $base_val {}]} { - set base_val 0 - } - - set val_addr [format %02x [expr {7 + 2 * ${number}}]] - set value [format %03x $base_val] - - $controller usbCmd 000200${val_addr}0004${base_typ}${value} - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc rate_val_update {name key op} { - my instvar config rate_val - - ${config}.rate_frame.${key}_value configure -text [format {%.2e} $rate_val(${key})] - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc cntr_val_update args { - my instvar cntr_val cntr_h cntr_m cntr_s - - set cntr_tmp [expr {${cntr_val}/20000}] - set cntr_h [expr {${cntr_tmp}/3600000}] - set cntr_m [expr {${cntr_tmp}%3600000/60000}] - set cntr_s [expr {${cntr_tmp}%3600000%60000/1000.0}] - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc cntr_setup {} { - my instvar controller number cntr_val - - set word0 [format %08x [expr {${cntr_val} & 0xFFFFFFFF}]] - set word1 [format %08x [expr {${cntr_val} >> 32}]] - - set prefix [format %x [expr {5 + ${number}}]] - - set command {} - append command 0001${prefix}000000200000004[string range $word0 4 7] - append command 0001${prefix}000000200010004[string range $word0 0 3] - append command 0001${prefix}000000200020004[string range $word1 4 7] - append command 0001${prefix}000000200030004[string range $word1 0 3] - - # send counter value - $controller usbCmd $command - - # load counter value -# set val_addr [format %02x [expr {12 + ${number}}]] -# $controller usbCmd 000200${val_addr}00040001000200${val_addr}00040000 - } - -# ------------------------------------------------------------------------- - HstDisplay instproc cntr_reset {} { - my instvar controller number after_handle - my instvar cntr_val cntr_bak cntr_old yvec_bak yvec_old + my instvar controller number my cntr_stop @@ -1011,29 +750,5 @@ $controller usbCmd 000200000004${value}0002000000040000 - set cntr_val $cntr_bak - my cntr_setup - - set cntr_old $cntr_bak - set yvec_bak 0.0 - set yvec_old 0.0 - my acquire - - my cntr_ready - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc cntr_ready {} { - my instvar config cntr_val cntr_bak - - set cntr_val $cntr_bak - - ${config}.start configure -text Start -command [myproc cntr_start] - ${config}.reset configure -state active - - ${config}.cntr_frame.h_field configure -state normal - ${config}.cntr_frame.m_field configure -state normal - ${config}.cntr_frame.s_field configure -state normal } @@ -1041,65 +756,12 @@ HstDisplay instproc cntr_start {} { - my instvar config - my instvar cntr_h cntr_m cntr_s - my instvar cntr_val cntr_bak cntr_old yvec_bak yvec_old - - set h $cntr_h - set m $cntr_m - set s $cntr_s - - if {[string equal $h {}]} { - set h 0 - } - if {[string equal $m {}]} { - set m 0 - } - if {[string equal $s {}]} { - set s 0 - } - - set cntr_tmp [expr {${h}*3600000 + ${m}*60000 + ${s}*1000}] - set cntr_tmp [expr {entier(20000 * ${cntr_tmp})}] - - if {$cntr_tmp > 0} { - ${config}.cntr_frame.h_field configure -state disabled - ${config}.cntr_frame.m_field configure -state disabled - ${config}.cntr_frame.s_field configure -state disabled - - set cntr_val $cntr_tmp - set cntr_bak $cntr_tmp - set cntr_old $cntr_tmp - set yvec_bak [usb::integrateBlt [myvar yvec] 0] - set yvec_old $yvec_bak - - my cntr_setup - - my cntr_resume - } - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc cntr_pause {} { - my instvar config - - my cntr_stop - - ${config}.start configure -text Resume -command [myproc cntr_resume] -# ${config}.reset configure -state active - - } - -# ------------------------------------------------------------------------- - - HstDisplay instproc cntr_resume {} { my instvar controller config number auto - set val_addr [format %02x [expr {13 + ${number}}]] - - ${config}.start configure -text Pause -command [myproc cntr_pause] + set val_addr [format %02x [expr {6 + ${number}}]] + + ${config}.start configure -text Stop -command [myproc cntr_stop] # ${config}.reset configure -state disabled - $controller usbCmd 000200${val_addr}00040002 + $controller usbCmd 000200${val_addr}00040001 set auto 1 @@ -1113,9 +775,13 @@ my instvar controller config number auto - set val_addr [format %02x [expr {13 + ${number}}]] + set val_addr [format %02x [expr {6 + ${number}}]] + + ${config}.start configure -text Start -command [myproc cntr_start] $controller usbCmd 000200${val_addr}00040000 set auto 0 + + my acquire } @@ -1134,8 +800,5 @@ my acquire - if {$cntr_val == 0} { - my cntr_stop - my cntr_ready - } elseif {$auto} { + if {$auto} { after 1000 [myproc acquire_loop] } @@ -1146,7 +809,6 @@ HstDisplay instproc acquire {} { my instvar controller config number - my instvar cntr_val cntr_bak cntr_old yvec_bak yvec_old rate_val - - set size 4096 + + set size 64 set prefix [format {%x} [expr {$number + 2}]] @@ -1157,18 +819,4 @@ $controller usbCmdReadRaw $command [expr {$size * 4}] [myvar data] - set yvec_new [usb::integrateBlt [myvar yvec]] - - set prefix [format {%x} [expr {$number + 5}]] - set command 0001${prefix}000000200000003000400050000 - - $controller usbCmdReadHex $command 8 1 [myvar cntr_val] - set cntr_new $cntr_val - - if {$cntr_new < $cntr_old} { - set rate_val(inst) [expr {($yvec_new - $yvec_old)*20000000/($cntr_old - $cntr_new)}] - set rate_val(mean) [expr {($yvec_new - $yvec_bak)*20000000/($cntr_bak - $cntr_new)}] - set yvec_old $yvec_new - set cntr_old $cntr_new - } } @@ -1209,10 +857,10 @@ HstDisplay instproc register {} { - my save_data [join [[myvar yvec] range 0 4095] \n] - } - -# ------------------------------------------------------------------------- - - Class CntDisplay -parameter { + my save_data [join [[myvar yvec] range 0 63] \n] + } + +# ------------------------------------------------------------------------- + + Class OscDisplay -parameter { {master} {controller} @@ -1221,15 +869,25 @@ # ------------------------------------------------------------------------- - CntDisplay instproc init {} { - - my set data {} - my set cntr 0 - my set recs 0 - - vector create [myvar xvec](16384) - vector create [myvar yvec](16384) - - # fill one vector for the x axis with 16384 points - [myvar xvec] seq -0.5 16384.5 + OscDisplay instproc init {} { + my instvar sequence data xvec yvec + + set data {} + + set sequence 0 + +# set xvec [vector create #auto(262144)] +# set xvec [vector create #auto(10000)] + set xvec [vector create #auto(60000)] + + for {set i 1} {$i <= 9} {incr i} { +# dict set yvec $i [vector create #auto(262144)] +# dict set yvec $i [vector create #auto(10000)] + dict set yvec $i [vector create #auto(60000)] + } + + # fill one vector for the x axis +# $xvec seq 0 262143 +# $xvec seq 0 10000 + $xvec seq 0 60000 my setup @@ -1240,5 +898,5 @@ # ------------------------------------------------------------------------- - CntDisplay instproc destroy {} { + OscDisplay instproc destroy {} { next } @@ -1246,35 +904,40 @@ # ------------------------------------------------------------------------- - CntDisplay instproc start {} { + OscDisplay instproc start {} { my instvar config + my instvar recs_val directory + + set directory $::env(HOME) + set recs_val 100 + + trace add variable [myvar chan] write [myproc chan_update] trace add variable [myvar data] write [myproc data_update] - trace add variable [myvar thrs_val] write [myproc thrs_val_update] - - trace add variable [myvar cntr] write [myproc cntr_update] - trace add variable [myvar recs] write [myproc recs_update] - - trace add variable [myvar axis] write [myproc axis_update] - - ${config}.axis_check select - - my set thrs_val 100 - - my set cntr_val 100 - my set cntr_bak 100 - my set recs_val 100 - my set recs_bak 100 - -# my cntr_reset - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc setup {} { + trace add variable [myvar auto] write [myproc auto_update] + + trace add variable [myvar thrs] write [myproc thrs_update 0] + trace add variable [myvar thrs_val] write [myproc thrs_update 0] + + trace add variable [myvar recs_val] write [myproc recs_val_update] + + trace add variable [myvar last] write [myproc last_update] + + for {set i 1} {$i <= 6} {incr i} { + ${config}.chan_frame.chan${i}_check select + ${config}.chan_frame.chan${i}_value configure -text 0.0 + } + ${config}.chan_frame.axisx_value configure -text 0.0 + + ${config}.thrs_check select + ${config}.thrs_field set 100 + } + +# ------------------------------------------------------------------------- + + OscDisplay instproc setup {} { my instvar master my instvar xvec yvec graph my instvar config - my instvar cntr_ms # create a graph widget and show a grid @@ -1283,467 +946,5 @@ $graph grid configure -hide no $graph legend configure -hide yes - $graph axis configure x -min 0 -max 16384 - - set config [frame ${master}.config -width 170] - - checkbutton ${config}.axis_check -text {log scale} -variable [myvar axis] - - frame ${config}.spc1 -width 170 -height 30 - - frame ${config}.chan_frame -borderwidth 0 -width 170 - legendLabel ${config}.chan_frame 0 mean {Mean value} - legendLabel ${config}.chan_frame 1 entr {Total entries} - legendLabel ${config}.chan_frame 2 empty {} - legendLabel ${config}.chan_frame 3 axisy {Bin entries} - legendLabel ${config}.chan_frame 4 axisx {Bin number} - - frame ${config}.spc3 -width 170 -height 30 - - label ${config}.thrs -text {amplitude threshold} - spinbox ${config}.thrs_field -from 1 -to 4095 \ - -increment 5 -width 10 -textvariable [myvar thrs_val] \ - -validate all -vcmd {::mca::validate 4095 4 %P} - - frame ${config}.spc4 -width 170 -height 30 - - label ${config}.cntr -text {time of exposure (s)} - spinbox ${config}.cntr_field -from 0 -to 9999 \ - -increment 10 -width 10 -textvariable [myvar cntr_val] \ - -validate all -vcmd {::mca::validate 9999 4 %P} - - frame ${config}.spc5 -width 170 -height 10 - - label ${config}.recs -text {number of exposures} - spinbox ${config}.recs_field -from 0 -to 99999 \ - -increment 10 -width 10 -textvariable [myvar recs_val] \ - -validate all -vcmd {::mca::validate 99999 5 %P} - - frame ${config}.spc6 -width 170 -height 10 - - button ${config}.start -text {Start} \ - -bg yellow -activebackground yellow -command [myproc recs_start] - - button ${config}.reset -text Reset \ - -bg red -activebackground red -command [myproc cntr_reset] - - frame ${config}.spc7 -width 170 -height 30 - - button ${config}.register -text Register \ - -bg lightblue -activebackground lightblue -command [myproc register] - - grid ${config}.axis_check -sticky w - grid ${config}.spc1 - grid ${config}.chan_frame -sticky ew -padx 5 - grid ${config}.spc3 - grid ${config}.thrs -sticky w -pady 1 -padx 3 - grid ${config}.thrs_field -sticky ew -pady 1 -padx 5 - grid ${config}.spc4 - grid ${config}.cntr -sticky w -pady 1 -padx 3 - grid ${config}.cntr_field -sticky ew -pady 1 -padx 5 - grid ${config}.spc5 - grid ${config}.recs -sticky w -pady 1 -padx 3 - grid ${config}.recs_field -sticky ew -pady 1 -padx 5 - grid ${config}.spc6 - grid ${config}.start -sticky ew -pady 3 -padx 5 - grid ${config}.reset -sticky ew -pady 3 -padx 5 - grid ${config}.spc7 - grid ${config}.register -sticky ew -pady 3 -padx 5 - - grid ${graph} -row 0 -column 0 -sticky news - grid ${config} -row 0 -column 1 - - grid rowconfigure ${master} 0 -weight 1 - grid columnconfigure ${master} 0 -weight 1 - grid columnconfigure ${master} 1 -weight 0 -minsize 80 - - grid columnconfigure ${config}.chan_frame 1 -weight 1 - - # enable zooming - Blt_ZoomStack $graph - - my crosshairs $graph - - #bind .graph {%W crosshairs configure -position @%x,%y} - - # create one element with data for the x and y axis, no dots - $graph element create Spectrum1 -color blue -linewidth 2 -symbol none -smooth step -xdata [myvar xvec] -ydata [myvar yvec] - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc coor_update {W x y} { - my instvar config graph - - $W crosshairs configure -position @${x},${y} - - set index [$W axis invtransform x $x] - set index [::tcl::mathfunc::round $index] - catch { - ${config}.chan_frame.axisy_value configure -text [[myvar yvec] index $index] - ${config}.chan_frame.axisx_value configure -text ${index}.0 - } - } -# ------------------------------------------------------------------------- - - CntDisplay instproc crosshairs {graph} { - set method [myproc coor_update] - bind $graph [list [self] coor_update %W %x %y] - bind $graph { - %W crosshairs off - } - bind $graph { - %W crosshairs on - } - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc thrs_val_update args { - my instvar controller config thrs_val - - if {[string equal $thrs_val {}]} { - set thrs_val 0 - } - - set val_addr [format %02x 12] - - ${config}.thrs_field configure -state normal - set value [format %03x $thrs_val] - - $controller usbCmd 000200${val_addr}00040${value} - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc cntr_update args { - my instvar cntr cntr_val - set cntr_val [expr {${cntr}/20000000}] - - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc recs_update args { - my instvar recs recs_val - set recs_val [expr {${recs}*1}] - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc cntr_setup {} { - my instvar controller cntr_val - - set cntr_tmp [expr {${cntr_val} * 20000000}] - set word0 [format {%08x} [expr {${cntr_tmp} & 0xFFFFFFFF}]] - set word1 [format {%08x} [expr {${cntr_tmp} >> 32}]] - - set prefix [format {%x} 9] - - set command {} - append command 0001${prefix}000000200000004[string range $word0 4 7] - append command 0001${prefix}000000200010004[string range $word0 0 3] - append command 0001${prefix}000000200020004[string range $word1 4 7] - append command 0001${prefix}000000200030004[string range $word1 0 3] - - # send counter value - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc recs_setup {} { - my instvar controller recs_val - - set word0 [format {%08x} [expr {${recs_val} & 0xFFFFFFFF}]] - set word1 [format {%08x} [expr {${recs_val} >> 32}]] - - set prefix [format {%x} 10] - - set command {} - append command 0001${prefix}000000200000004[string range $word0 4 7] - append command 0001${prefix}000000200010004[string range $word0 0 3] - append command 0001${prefix}000000200020004[string range $word1 4 7] - append command 0001${prefix}000000200030004[string range $word1 0 3] - - # send counter value - $controller usbCmd $command - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc cntr_reset {} { - my instvar controller after_handle - my instvar cntr_val cntr_bak recs_val recs_bak - - my cntr_stop - - set value [format {%04x} [expr {1 << 11}]] - $controller usbCmd 000200000004${value}0002000000040000 - - my recs_stop - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc cntr_ready {} { - my instvar config cntr_val cntr_bak recs_val recs_bak - - set cntr_val $cntr_bak - set recs_val $recs_bak - - ${config}.start configure -text Start -command [myproc recs_start] - ${config}.reset configure -state active - - ${config}.start configure -state active - ${config}.cntr_field configure -state normal - ${config}.recs_field configure -state normal - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc recs_start {} { - my instvar controller config auto - my instvar cntr_val cntr_bak recs_val recs_bak - - if {$cntr_val > 0 && $recs_val > 0} { - ${config}.start configure -text {Stop} -command [myproc recs_stop] - ${config}.cntr_field configure -state disabled - ${config}.recs_field configure -state disabled - - set cntr_bak $cntr_val - set recs_bak $recs_val - - my cntr_setup - my recs_setup - - set val_addr [format {%02x} 16] - - $controller usbCmd 000200${val_addr}00040002 - - set auto 1 - - after 100 [myproc acquire_loop] - } - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc recs_stop {} { - my instvar cntr_val cntr_bak recs_val recs_bak - - my cntr_stop - - set cntr_val $cntr_bak - my cntr_setup - - set recs_val $recs_bak - my recs_setup - - my acquire - - my cntr_ready - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc cntr_stop {} { - my instvar controller config auto - - set val_addr [format {%02x} 16] - - $controller usbCmd 000200${val_addr}00040000 - - set auto 0 - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc acquire_loop {} { - my instvar recs_val auto - - my acquire - - if {$recs_val == 0} { - my cntr_stop - my cntr_ready - } elseif {$auto} { - after 1000 [myproc acquire_loop] - } - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc data_update args { - my instvar config data - usb::convertBlt $data 2 [myvar yvec] - - ${config}.chan_frame.mean_value configure \ - -text [format {%.2e} [usb::integrateBlt [myvar yvec] 1]] - ${config}.chan_frame.entr_value configure \ - -text [usb::integrateBlt [myvar yvec] 0] - - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc axis_update args { - my instvar axis graph - if {$axis} { - $graph axis configure y -min 1 -max 1E5 -logscale yes - } else { - $graph axis configure y -min {} -max {} -logscale no - } - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc acquire {} { - my instvar controller config - my instvar cntr cntr_val recs recs_val - - set size 16384 - - set prefix [format {%x} 8] - - set value [format {%08x} $size] - - set command 0001${prefix}000000200000001[string range $value 0 3]0003[string range $value 4 7]00050000 - - $controller usbCmdReadRaw $command [expr {$size * 2}] [myvar data] - - set prefix [format {%x} 9] - set command 0001${prefix}000000200000003000400050000 - - $controller usbCmdReadHex $command 8 1 [myvar cntr] - - set prefix [format {%x} 10] - set command 0001${prefix}000000200000003000400050000 - - $controller usbCmdReadHex $command 8 1 [myvar recs] - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc save_data {data} { - - set types { - {{Data Files} {.dat} } - {{All Files} * } - } - - set stamp [clock format [clock seconds] -format %Y%m%d_%H%M%S] - set fname counts_${stamp}.dat - - set fname [tk_getSaveFile -filetypes $types -initialfile $fname] - if {[string equal $fname {}]} { - return - } - - set x [catch { - set fid [open $fname w+] - puts $fid $data - close $fid - }] - - if { $x || ![file exists $fname] || ![file isfile $fname] || ![file readable $fname] } { - tk_messageBox -icon error \ - -message "An error occurred while writing to \"$fname\"" - } else { - tk_messageBox -icon info \ - -message "File \"$fname\" written successfully" - } - } - -# ------------------------------------------------------------------------- - - CntDisplay instproc register {} { - my save_data [join [[myvar yvec] range 0 16383] \n] - } - -# ------------------------------------------------------------------------- - - Class OscDisplay -parameter { - {master} - {controller} - } - -# ------------------------------------------------------------------------- - - OscDisplay instproc init {} { - my instvar sequence data xvec yvec - - set data {} - - set sequence 0 - -# set xvec [vector create #auto(262144)] - set xvec [vector create #auto(10000)] - - for {set i 1} {$i <= 9} {incr i} { -# dict set yvec $i [vector create #auto(262144)] - dict set yvec $i [vector create #auto(10000)] - } - - # fill one vector for the x axis -# $xvec seq 0 262143 - $xvec seq 0 10000 - - my setup - - next - } - -# ------------------------------------------------------------------------- - - OscDisplay instproc destroy {} { - next - } - -# ------------------------------------------------------------------------- - - OscDisplay instproc start {} { - my instvar config - my instvar recs_val directory - - set directory $::env(HOMEPATH) - set recs_val 100 - - trace add variable [myvar chan] write [myproc chan_update] - - trace add variable [myvar data] write [myproc data_update] - - trace add variable [myvar auto] write [myproc auto_update] - - trace add variable [myvar thrs] write [myproc thrs_update 0] - trace add variable [myvar thrs_val] write [myproc thrs_update 0] - - trace add variable [myvar recs_val] write [myproc recs_val_update] - - trace add variable [myvar last] write [myproc last_update] - - ${config}.chan_frame.chan1_check select - ${config}.chan_frame.chan2_check select - ${config}.chan_frame.chan3_check select - ${config}.chan_frame.chan4_check select - ${config}.chan_frame.chan5_check select - ${config}.chan_frame.chan6_check select - - ${config}.thrs_check select - ${config}.thrs_field set 100 - } - -# ------------------------------------------------------------------------- - - OscDisplay instproc setup {} { - my instvar master - my instvar xvec yvec graph - my instvar config - - # create a graph widget and show a grid - set graph [graph ${master}.graph -height 250 -leftmargin 80] - $graph crosshairs configure -hide no -linewidth 1 -color darkblue -dashes {2 2} - $graph grid configure -hide no - $graph legend configure -hide yes - $graph axis configure x -min 0 -max 10000 + $graph axis configure x -min 0 -max 60000 $graph axis configure y -min 0 -max 4100 @@ -1791,5 +992,5 @@ -bg yellow -activebackground yellow - frame ${config}.spc6 -width 170 -height 10 + frame ${config}.spc6 -width 170 -height 30 button ${config}.recover -text {Read file} \ @@ -1920,5 +1121,5 @@ if {$thrs} { ${config}.thrs_field configure -state normal - set value [format %03x $thrs_val] + set value [format {%03x} $thrs_val] } else { ${config}.thrs_field configure -state disabled @@ -1979,10 +1180,11 @@ # set size 262144 - set size 10000 +# set size 10000 + set size 60000 set value [format {%08x} [expr {$size * 4}]] set command 00011000000200000001[string range $value 0 3]0003[string range $value 4 7]00050000 - + $controller usbCmdReadRaw $command [expr {$size * 8}] [myvar data] @@ -2071,5 +1273,5 @@ } - set stamp [clock format [clock seconds] -format %Y%m%d_%H%M%S] + set stamp [clock format [clock seconds] -format {%Y%m%d_%H%M%S}] set fname oscillogram_${stamp}.dat @@ -2078,5 +1280,5 @@ return } - + if {[catch {my save_data $fname} result]} { tk_messageBox -icon error \ @@ -2115,5 +1317,5 @@ ${config}.register configure -state disabled ${config}.recover configure -state disabled - + set recs_bak $recs_val @@ -2140,5 +1342,5 @@ return } - + my sequence_stop } @@ -2150,5 +1352,5 @@ set sequence 0 - + set recs_val $recs_bak @@ -2164,5 +1366,5 @@ namespace export MuxDisplay namespace export HstDisplay - namespace export CntDisplay + namespace export CfgDisplay namespace export OscDisplay } @@ -2176,9 +1378,4 @@ ::mca::UsbController usb -usb usbCmd 00000000 - -set window [frame ${notebook}.spi] -$notebook insert end -text "DAC & ADC control" -window $window -fill both -::mca::SpiDisplay spi -master $window -controller usb set window [frame ${notebook}.mux] @@ -2186,4 +1383,12 @@ ::mca::MuxDisplay mux -master $window -controller usb +set window [frame ${notebook}.cfg] +$notebook insert end -text "Configuration" -window $window -fill both +::mca::CfgDisplay cfg -master $window -controller usb + +set window [frame ${notebook}.hst] +$notebook insert end -text "Histogram" -window $window -fill both +::mca::HstDisplay hst -number 0 -master $window -controller usb + set window [frame ${notebook}.ept] $notebook insert end -text "Oscilloscope" -window $window -fill both @@ -2192,9 +1397,9 @@ update -spi start +cfg start mux start +hst start + osc start - -spi adc_reset Index: trunk/3DEES/amplitude.v =================================================================== --- trunk/3DEES/amplitude.v (revision 179) +++ trunk/3DEES/amplitude.v (revision 180) @@ -19,10 +19,11 @@ reg [width-1:0] inp_data_reg [1:0], inp_data_next [1:0]; - wire int_comp_wire; + wire [1:0] int_comp_wire; reg int_comp_reg, int_comp_next; reg [5:0] int_cntr_reg, int_cntr_next; - assign int_comp_wire = (inp_data_reg[1] < inp_data); + assign int_comp_wire[0] = (inp_data_reg[1] < inp_data); + assign int_comp_wire[1] = (inp_data_reg[1] < max_data); always @(posedge clock) @@ -73,9 +74,9 @@ inp_data_next[0] = inp_data; inp_data_next[1] = inp_data_reg[0]; - int_comp_next = int_comp_wire; + int_comp_next = int_comp_wire[0]; out_data_next = {(width){1'b0}}; out_flag_next = 1'b0; // minimum - if ((~int_comp_reg) & (int_comp_wire) & int_cntr_reg[5]) + if ((~int_comp_reg) & (int_comp_wire[0]) & int_cntr_reg[5]) begin int_mini_next = inp_data_reg[0]; @@ -83,8 +84,8 @@ end // maximum after minimum - else if ((int_comp_reg) & (~int_comp_wire) & (int_flag_reg)) + else if ((int_comp_reg) & (~int_comp_wire[0]) & (int_flag_reg)) begin out_data_next = inp_data_reg[0] - int_mini_reg; - int_flag_next = 1'b0; +// int_flag_next = 1'b0; int_case_next = 1'b1; end @@ -102,5 +103,6 @@ int_cntr_next = 6'b0; // out_flag_next = 1'b1; - out_flag_next = (inp_data_reg[1] < max_data); + out_flag_next = int_comp_wire[1]; + int_flag_next = ~int_comp_wire[1]; end int_case_next = 1'b0; Index: trunk/3DEES/classifier.v =================================================================== --- trunk/3DEES/classifier.v (revision 180) +++ trunk/3DEES/classifier.v (revision 180) @@ -0,0 +1,186 @@ +module classifier + #( + parameter width = 12 // bit width of the input data (unsigned) + ) + ( + input wire clock, frame, reset, + input wire [14*width-1:0] cfg_data, + input wire [6*width-1:0] inp_data, // {D3, D2, D1, S2, S1_S, S1_F} + input wire [5:0] inp_flag, + output wire [5:0] out_data, + output wire out_flag + ); + + reg int_case_reg, int_case_next; + reg out_flag_reg, out_flag_next; + reg [5:0] out_data_reg, out_data_next; + reg [width-1:0] inp_data_reg [5:0], inp_data_next [5:0]; + reg [15:0] int_pipe_reg [19:0], int_pipe_next [19:0]; + reg [1:0] int_data_reg [3:0], int_data_next [3:0]; + + wire [width-1:0] inp_data_wire [5:0]; + wire [3:0] int_pipe_wire [5:0]; + wire [13:0] int_comp_wire; + + integer i; + genvar j; + + generate + for (j = 0; j < 6; j = j + 1) + begin : CLASSIFIER_INPUT_DATA + assign inp_data_wire[j] = inp_data[j*width+width-1:j*width]; + end + endgenerate + + generate + assign int_comp_wire[0] = (inp_data_reg[0] > cfg_data[width-1:0]); + assign int_comp_wire[1] = (inp_data_reg[1] > cfg_data[2*width-1:width]); + for (j = 0; j < 4; j = j + 1) + begin : CLASSIFIER_COMPARTORS + assign int_comp_wire[j*3+0+2] = (inp_data_reg[j+2] > cfg_data[(j*3+0+2)*width+width-1:(j*3+0+2)*width]); + assign int_comp_wire[j*3+1+2] = (inp_data_reg[j+2] > cfg_data[(j*3+1+2)*width+width-1:(j*3+1+2)*width]); + assign int_comp_wire[j*3+2+2] = (inp_data_reg[j+2] > cfg_data[(j*3+2+2)*width+width-1:(j*3+2+2)*width]); + end + endgenerate + + generate + for (j = 0; j < 4; j = j + 1) + begin : CLASSIFIER_PIPELINE + assign int_pipe_wire[0][j] = (|int_pipe_reg[j]); + assign int_pipe_wire[1][j] = (|int_pipe_reg[j+4]); + assign int_pipe_wire[j+2][0] = (|int_pipe_reg[j*3+0+8]); + assign int_pipe_wire[j+2][1] = (|int_pipe_reg[j*3+1+8]); + assign int_pipe_wire[j+2][2] = (|int_pipe_reg[j*3+2+8]); + assign int_pipe_wire[j+2][3] = 1'b0; + end + endgenerate + + always @(posedge clock) + begin + if (reset) + begin + out_data_reg <= {(6){1'b0}}; + out_flag_reg <= 1'b0; + for (i = 0; i < 6; i = i + 1) + begin + inp_data_reg[i] <= {(width){1'b0}}; + end + for (i = 0; i < 20; i = i + 1) + begin + int_pipe_reg[i] <= {(16){1'b0}}; + end + for (i = 0; i < 4; i = i + 1) + begin + int_data_reg[i] <= {(2){1'b0}}; + end + end + else + begin + out_data_reg <= out_data_next; + out_flag_reg <= out_flag_next; + for (i = 0; i < 6; i = i + 1) + begin + inp_data_reg[i] <= inp_data_next[i]; + end + for (i = 0; i < 20; i = i + 1) + begin + int_pipe_reg[i] <= int_pipe_next[i]; + end + for (i = 0; i < 4; i = i + 1) + begin + int_data_reg[i] <= int_data_next[i]; + end + end + end + + always @* + begin + out_data_next = out_data_reg; + out_flag_next = out_flag_reg; + for (i = 0; i < 6; i = i + 1) + begin + inp_data_next[i] = inp_data_reg[i]; + end + for (i = 0; i < 20; i = i + 1) + begin + int_pipe_next[i] = int_pipe_reg[i]; + end + for (i = 0; i < 4; i = i + 1) + begin + int_data_next[i] = int_data_reg[i]; + end + + if (frame) + begin + for (i = 0; i < 6; i = i + 1) + begin + inp_data_next[i] = inp_flag[i] ? inp_data_wire[i] : {(width){1'b0}}; + end + + if (out_flag_reg) + begin + out_flag_next = 1'b0; + for (i = 0; i < 20; i = i + 1) + begin + int_pipe_next[i] = {(16){1'b0}}; + end + out_data_next = {(6){1'b0}}; + end + else + begin + out_flag_next = 1'b1; + int_pipe_next[0] = {int_pipe_reg[0][14:0], int_comp_wire[0]}; + int_pipe_next[1] = {int_pipe_reg[1][14:0], int_comp_wire[1]}; + for (i = 2; i < 8; i = i + 1) + begin + int_pipe_next[i] = {int_pipe_reg[i][14:0], inp_flag[i-2]}; + end + for (i = 8; i < 20; i = i + 1) + begin + int_pipe_next[i] = {int_pipe_reg[i][14:0], int_comp_wire[i-6]}; + end + + for (i = 0; i < 4; i = i + 1) + begin + case (int_pipe_wire[i+2][2:0]) + 3'b000: int_data_next[i] = 2'd0; + 3'b001: int_data_next[i] = 2'd1; + 3'b011: int_data_next[i] = 2'd2; + 3'b111: int_data_next[i] = 2'd3; + default: int_data_next[i] = 2'd0; + endcase + end + + case ({int_pipe_wire[1], int_pipe_wire[0][3]^int_pipe_wire[0][2]}) + 5'b00011: out_data_next[3:0] = {2'd0, int_data_next[0]}; + 5'b00111: out_data_next[3:0] = {2'd1, int_data_next[1]}; + 5'b01111: out_data_next[3:0] = {2'd2, int_data_next[2]}; + 5'b11111: out_data_next[3:0] = {2'd3, int_data_next[3]}; + default: out_flag_next = 1'b0; + endcase + + case (int_pipe_wire[0]) + // S1_F, electron + 4'b0001: out_data_next[5:4] = 2'd0; + + // S1_F, proton + 4'b0101: out_data_next[5:4] = 2'd1; + + // S1_S, electron + 4'b0010: out_data_next[5:4] = 2'd2; + + // S1_S, proton + 4'b1010: out_data_next[5:4] = 2'd3; + + default: out_flag_next = 1'b0; + endcase + end + end + end + +// assign out_data = {2'd0, int_data_reg[1]}; +// assign out_data = {2'd0, int_pipe_wire[7:4]}; + assign out_data = out_data_reg; + assign out_flag = out_flag_reg; + +endmodule Index: trunk/3DEES/histogram16.v =================================================================== --- trunk/3DEES/histogram16.v (revision 179) +++ (revision ) @@ -1,199 +1,0 @@ -module histogram16 - ( - input wire clock, frame, reset, - - input wire hst_good, - input wire [13:0] hst_data, - - input wire bus_ssel, bus_wren, - input wire [13:0] bus_addr, - input wire [15:0] bus_mosi, - - output wire [15:0] bus_miso, - output wire bus_busy - ); - - // signal declaration - reg [3:0] int_case_reg, int_case_next; - reg int_wren_reg, int_wren_next; - reg [13:0] int_addr_reg, int_addr_next; - reg [15:0] int_data_reg, int_data_next; - - reg [13:0] bus_addr_reg, bus_addr_next; - reg [15:0] bus_miso_reg, bus_miso_next; - - reg bus_wren_reg, bus_wren_next; - reg [15:0] bus_mosi_reg, bus_mosi_next; - - wire [15:0] q_a_wire; - wire [15:0] q_b_wire; - - altsyncram #( - .address_reg_b("CLOCK0"), - .clock_enable_input_a("BYPASS"), - .clock_enable_input_b("BYPASS"), - .clock_enable_output_a("BYPASS"), - .clock_enable_output_b("BYPASS"), - .indata_reg_b("CLOCK0"), - .intended_device_family("Cyclone III"), - .lpm_type("altsyncram"), - .numwords_a(10000), - .numwords_b(10000), - .operation_mode("BIDIR_DUAL_PORT"), - .outdata_aclr_a("NONE"), - .outdata_aclr_b("NONE"), - .outdata_reg_a("CLOCK0"), - .outdata_reg_b("CLOCK0"), - .power_up_uninitialized("FALSE"), - .read_during_write_mode_mixed_ports("OLD_DATA"), - .read_during_write_mode_port_a("NEW_DATA_NO_NBE_READ"), - .read_during_write_mode_port_b("NEW_DATA_NO_NBE_READ"), - .widthad_a(14), - .widthad_b(14), - .width_a(16), - .width_b(16), - .width_byteena_a(1), - .width_byteena_b(1), - .wrcontrol_wraddress_reg_b("CLOCK0")) hst_ram_unit( - .wren_a(int_wren_reg), - .clock0(clock), - .wren_b(bus_wren_reg), - .address_a(int_addr_reg), - .address_b(bus_addr_reg), - .data_a(int_data_reg), - .data_b(bus_mosi_reg), - .q_a(q_a_wire), - .q_b(q_b_wire), - .aclr0(1'b0), - .aclr1(1'b0), - .addressstall_a(1'b0), - .addressstall_b(1'b0), - .byteena_a(1'b1), - .byteena_b(1'b1), - .clock1(1'b1), - .clocken0(1'b1), - .clocken1(1'b1), - .clocken2(1'b1), - .clocken3(1'b1), - .eccstatus(), - .rden_a(1'b1), - .rden_b(1'b1)); - - // body - always @(posedge clock) - begin - if (reset) - begin - int_wren_reg <= 1'b1; - int_addr_reg <= 14'd0; - int_data_reg <= 16'd0; - int_case_reg <= 4'b0; - bus_addr_reg <= 14'd0; - bus_miso_reg <= 16'd0; - bus_wren_reg <= 1'b0; - bus_mosi_reg <= 16'd0; - end - else - begin - int_wren_reg <= int_wren_next; - int_addr_reg <= int_addr_next; - int_data_reg <= int_data_next; - int_case_reg <= int_case_next; - bus_addr_reg <= bus_addr_next; - bus_miso_reg <= bus_miso_next; - bus_wren_reg <= bus_wren_next; - bus_mosi_reg <= bus_mosi_next; - end - end - - always @* - begin - bus_addr_next = bus_addr_reg; - bus_miso_next = bus_miso_reg; - - bus_wren_next = 1'b0; - bus_mosi_next = bus_mosi_reg; - - if (bus_ssel) - begin - bus_miso_next = q_b_wire; - bus_addr_next = bus_addr; - bus_wren_next = bus_wren; - if (bus_wren) - begin - bus_mosi_next = bus_mosi; - end - end - end - - always @* - begin - int_wren_next = int_wren_reg; - int_addr_next = int_addr_reg; - int_data_next = int_data_reg; - int_case_next = int_case_reg; - - case (int_case_reg) - - 0: - begin - // write zeros - int_addr_next = int_addr_reg + 14'd1; - if (&int_addr_reg) - begin - int_wren_next = 1'b0; - int_case_next = 4'd1; - end - end - - 1: - begin - int_wren_next = 1'b0; -/* - if (&int_data_reg) - begin - int_case_next = 4'd0; - end - else if (frame & hst_good) -*/ - if (frame & hst_good) - begin - int_addr_next = hst_data; - int_case_next = 4'd2; - end - end - - 2: - begin - int_case_next = 4'd3; - end - - 3: - begin - int_case_next = 4'd4; - end - - 4: - begin - int_case_next = 4'd1; - if (~&q_a_wire) - begin - int_wren_next = 1'b1; - int_data_next = q_a_wire + 16'd1; - end - end - - default: - begin - int_wren_next = 1'b0; - int_addr_next = 14'd0; - int_data_next = 16'd0; - int_case_next = 4'd0; - end - endcase - end - - // output logic - assign bus_miso = bus_miso_reg; - assign bus_busy = 1'b0; -endmodule Index: trunk/3DEES/histogram32.v =================================================================== --- trunk/3DEES/histogram32.v (revision 179) +++ trunk/3DEES/histogram32.v (revision 180) @@ -4,8 +4,8 @@ input wire hst_good, - input wire [11:0] hst_data, + input wire [5:0] hst_data, input wire bus_ssel, bus_wren, - input wire [12:0] bus_addr, + input wire [6:0] bus_addr, input wire [15:0] bus_mosi, @@ -17,8 +17,8 @@ reg [3:0] int_case_reg, int_case_next; reg int_wren_reg, int_wren_next; - reg [11:0] int_addr_reg, int_addr_next; + reg [5:0] int_addr_reg, int_addr_next; reg [31:0] int_data_reg, int_data_next; - reg [12:0] bus_addr_reg, bus_addr_next; + reg [6:0] bus_addr_reg, bus_addr_next; reg [15:0] bus_miso_reg, bus_miso_next; @@ -38,6 +38,6 @@ .intended_device_family("Cyclone III"), .lpm_type("altsyncram"), - .numwords_a(4096), - .numwords_b(8192), + .numwords_a(64), + .numwords_b(128), .operation_mode("BIDIR_DUAL_PORT"), .outdata_aclr_a("NONE"), @@ -49,6 +49,6 @@ .read_during_write_mode_port_a("NEW_DATA_NO_NBE_READ"), .read_during_write_mode_port_b("NEW_DATA_NO_NBE_READ"), - .widthad_a(12), - .widthad_b(13), + .widthad_a(6), + .widthad_b(7), .width_a(32), .width_b(16), @@ -86,8 +86,8 @@ begin int_wren_reg <= 1'b1; - int_addr_reg <= 12'd0; + int_addr_reg <= 6'd0; int_data_reg <= 32'd0; int_case_reg <= 4'b0; - bus_addr_reg <= 13'd0; + bus_addr_reg <= 7'd0; bus_miso_reg <= 16'd0; bus_wren_reg <= 1'b0; @@ -139,5 +139,5 @@ begin // write zeros - int_addr_next = int_addr_reg + 12'd1; + int_addr_next = int_addr_reg + 6'd1; if (&int_addr_reg) begin @@ -187,5 +187,5 @@ begin int_wren_next = 1'b0; - int_addr_next = 12'd0; + int_addr_next = 6'd0; int_data_next = 32'd0; int_case_next = 4'd0; Index: trunk/3DEES/i2c_fifo.v =================================================================== --- trunk/3DEES/i2c_fifo.v (revision 179) +++ (revision ) @@ -1,219 +1,0 @@ -module i2c_fifo - ( - input wire clock, reset, - - input wire bus_ssel, bus_wren, - input wire [15:0] bus_mosi, - - output wire bus_busy, - - inout wire i2c_sda, - inout wire i2c_scl - ); - - wire int_rdempty, int_wrfull, i2c_clk, start, stop; - wire [15:0] int_q; - - reg int_bus_busy; - reg int_rdreq, int_wrreq, int_clken, int_sdo, int_scl, int_ack; - reg [15:0] int_bus_mosi; - reg [15:0] int_data; - reg [9:0] counter; - reg [4:0] state; - - assign i2c_sda = int_sdo ? 1'bz : 1'b0; - assign i2c_scl = int_scl | (int_clken ? counter[9] : 1'b0); - - assign start = int_data[8]; - assign stop = int_data[9]; - - scfifo #( - .add_ram_output_register("OFF"), - .intended_device_family("Cyclone III"), - .lpm_numwords(16), - .lpm_showahead("ON"), - .lpm_type("scfifo"), - .lpm_width(16), - .lpm_widthu(4), - .overflow_checking("ON"), - .underflow_checking("ON"), - .use_eab("OFF")) fifo_tx ( - .rdreq((~int_rdempty) & (int_rdreq) & (&counter)), - .aclr(1'b0), - .clock(clock), - .wrreq(int_wrreq), - .data(int_bus_mosi), - .empty(int_rdempty), - .q(int_q), - .full(int_wrfull), - .almost_empty(), - .almost_full(), - .sclr(), - .usedw()); - - always @ (posedge clock) - begin - int_bus_busy <= int_wrfull; - - if (bus_ssel) - begin - if (~int_wrfull & bus_wren) - begin - int_bus_mosi <= bus_mosi; - int_wrreq <= 1'b1; - end - end - - if (~int_wrfull & int_wrreq) - begin - int_wrreq <= 1'b0; - end - - end - - always @ (posedge clock) - begin - counter <= counter + 10'd1; - if (&counter) - begin - case (state) - 0: - begin - int_ack <= 1'b0; - int_sdo <= 1'b1; - int_scl <= 1'b1; - int_rdreq <= 1'b1; - state <= 5'd1; - end - - 1: - begin - if (~int_rdempty) - begin - int_data <= int_q; - int_rdreq <= 1'b0; - state <= 5'd2; - end - end - - 2: - begin - if (start) - begin - int_sdo <= 1'b1; - int_scl <= 1'b1; - state <= 5'd3; - end - else - begin - state <= 5'd5; - end - end - - 3: - begin // start - int_sdo <= 1'b0; - state <= 5'd4; - end - - 4: - begin - int_scl <= 1'b0; - state <= 5'd5; - end - - 5: - begin // data - int_clken <= 1'b1; - int_sdo <= int_data[7]; - state <= 5'd6; - end - - 6: - begin - int_sdo <= int_data[6]; - state <= 5'd7; - end - - 7: - begin - int_sdo <= int_data[5]; - state <= 5'd8; - end - - 8: - begin - int_sdo <= int_data[4]; - state <= 5'd9; - end - - 9: - begin - int_sdo <= int_data[3]; - state <= 5'd10; - end - - 10: - begin - int_sdo <= int_data[2]; - state <= 5'd11; - end - - 11: - begin - int_sdo <= int_data[1]; - state <= 5'd12; - end - - 12: - begin - int_sdo <= int_data[0]; - state <= 5'd13; - end - - 13: - begin // ack - int_sdo <= 1'b1; - int_rdreq <= 1'b1; - state <= 5'd14; - end - - 14: - begin - int_ack <= i2c_sda; - int_rdreq <= 1'b0; - if (stop | int_rdempty) - begin - int_clken <= 1'b0; - int_sdo <= 1'b0; - int_scl <= 1'b0; - state <= 5'd15; - end - else if (~int_rdempty) - begin - int_data <= int_q; - int_sdo <= int_q[7]; - state <= 5'd6; - end - end - - 15: - begin // stop - int_scl <= 1'b1; - state <= 5'd16; - end - - 16: - begin - int_sdo <= 1'b1; - state <= 5'd0; - end - - endcase - end - end - - // output logic - assign bus_busy = int_bus_busy; - -endmodule Index: trunk/3DEES/pwm.v =================================================================== --- trunk/3DEES/pwm.v (revision 179) +++ (revision ) @@ -1,31 +1,0 @@ -module pwm - ( - input wire clock, - input wire [47:0] cfg_data, - output wire [3:0] out_data - - ); - - reg [12:0] int_data_reg [3:0]; - wire [11:0] cfg_data_wire [3:0]; - - integer i; - genvar j; - - always @ (posedge clock) - begin - for(i = 0; i <= 3; i = i + 1) - begin - int_data_reg[i] <= {1'b0, int_data_reg[i][11:0]} + {1'b0, cfg_data_wire[i]}; - end - end - - generate - for (j = 0; j <= 3; j = j + 1) - begin : PWM_DATA - assign cfg_data_wire[j] = cfg_data[j*12+11:j*12]; - assign out_data[j] = int_data_reg[j][12] ? 1'bz : 1'b0; - end - endgenerate - -endmodule Index: trunk/3DEES/spi_fifo.v =================================================================== --- trunk/3DEES/spi_fifo.v (revision 179) +++ (revision ) @@ -1,128 +1,0 @@ -module spi_fifo - ( - input wire clock, reset, - - input wire bus_ssel, bus_wren, - input wire [15:0] bus_mosi, - - output wire bus_busy, - - output wire [1:0] spi_sel, - output wire spi_sdo, - output wire spi_clk - ); - - wire int_rdempty, int_wrfull; - wire [31:0] int_q; - - reg int_bus_busy; - reg int_rdreq, int_wrreq; - reg int_clken, int_sdo; - reg [1:0] int_sel; - reg [15:0] int_bus_mosi; - reg [31:0] int_data; - reg [2:0] clk_cntr; - reg [4:0] bit_cntr; - reg [1:0] state; - - dcfifo_mixed_widths #( - .intended_device_family("Cyclone III"), - .lpm_numwords(16), - .lpm_showahead("ON"), - .lpm_type("dcfifo"), - .lpm_width(16), - .lpm_widthu(4), - .lpm_width_r(32), - .lpm_widthu_r(3), - .rdsync_delaypipe(4), - .wrsync_delaypipe(4), - .overflow_checking("ON"), - .underflow_checking("ON"), - .use_eab("ON")) fifo_tx ( - .data(int_bus_mosi), - .rdclk(clock), - .rdreq((~int_rdempty) & (int_rdreq) & (&clk_cntr)), - .wrclk(clock), - .wrreq(int_wrreq), - .q(int_q), - .rdempty(int_rdempty), - .wrfull(int_wrfull)); - - always @ (posedge clock) - begin - int_bus_busy <= int_wrfull; - - if (bus_ssel) - begin - if (~int_wrfull & bus_wren) - begin - int_bus_mosi <= bus_mosi; - int_wrreq <= 1'b1; - end - end - - if (~int_wrfull & int_wrreq) - begin - int_wrreq <= 1'b0; - end - - end - - always @ (posedge clock) - begin - clk_cntr <= clk_cntr + 3'd1; - if (&clk_cntr) - begin - case (state) - 0: - begin - int_sdo <= 1'b0; - int_sel <= 2'b11; - int_clken <= 1'b0; - int_rdreq <= 1'b1; - state <= 2'd1; - end - - 1: - begin - if (~int_rdempty) - begin - int_rdreq <= 1'b0; - int_data <= {int_q[15:0], int_q[31:16]}; - bit_cntr <= 5'd0; - state <= 2'd2; - end - end - - - 2: - begin // data - int_clken <= 1'b1; - int_sel <= int_data[25:24]; - int_sdo <= int_data[23]; - int_data[23:0] <= {int_data[22:0], 1'b0}; - bit_cntr <= bit_cntr + 5'd1; - if (bit_cntr == 5'd23) - begin - state <= 2'd3; - end - end - - 3: - begin - int_sdo <= 1'b0; - int_clken <= 1'b0; - state <= 2'd0; - end - - endcase - end - end - - // output logic - assign bus_busy = int_bus_busy; - assign spi_clk = (int_clken ? clk_cntr[2] : 1'b1); - assign spi_sdo = int_sdo; - assign spi_sel = int_sel; - -endmodule