|
@@ -165,8 +165,7 @@ module S5443Top
|
|
|
wire gatingPulse;
|
|
wire gatingPulse;
|
|
|
wire sampleStrobe;
|
|
wire sampleStrobe;
|
|
|
wire [ChNum-1:0] measStartBus;
|
|
wire [ChNum-1:0] measStartBus;
|
|
|
- // wire measStart = &measStartBus;
|
|
|
|
|
- reg measStart;
|
|
|
|
|
|
|
+ wire measStart;
|
|
|
|
|
|
|
|
//spi signals for adc init
|
|
//spi signals for adc init
|
|
|
wire adcInitRst;
|
|
wire adcInitRst;
|
|
@@ -1024,60 +1023,18 @@ generate
|
|
|
end
|
|
end
|
|
|
endgenerate
|
|
endgenerate
|
|
|
|
|
|
|
|
-always @(*) begin
|
|
|
|
|
- if (!initRst) begin
|
|
|
|
|
- case(gainAutoEn)
|
|
|
|
|
- 4'd0: begin
|
|
|
|
|
- measStart = &measStartBus;
|
|
|
|
|
- end
|
|
|
|
|
- 4'd1: begin
|
|
|
|
|
- measStart = measStartBus[0];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd2: begin
|
|
|
|
|
- measStart = measStartBus[1];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd3: begin
|
|
|
|
|
- measStart = measStartBus[0]&measStartBus[1];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd4: begin
|
|
|
|
|
- measStart = &measStartBus[2];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd5: begin
|
|
|
|
|
- measStart = measStartBus[0]&measStartBus[2];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd6: begin
|
|
|
|
|
- measStart = measStartBus[1]&measStartBus[2];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd7: begin
|
|
|
|
|
- measStart = measStartBus[0]&measStartBus[1]&measStartBus[2];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd8: begin
|
|
|
|
|
- measStart = measStartBus[3];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd9: begin
|
|
|
|
|
- measStart = measStartBus[0]&measStartBus[3];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd10: begin
|
|
|
|
|
- measStart = measStartBus[1]&measStartBus[3];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd11: begin
|
|
|
|
|
- measStart = measStartBus[0]&measStartBus[1]&measStartBus[3];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd12: begin
|
|
|
|
|
- measStart = measStartBus[2]&measStartBus[3];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd13: begin
|
|
|
|
|
- measStart = measStartBus[0]&measStartBus[2]&measStartBus[3];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd14: begin
|
|
|
|
|
- measStart = measStartBus[1]&measStartBus[2]&measStartBus[3];
|
|
|
|
|
- end
|
|
|
|
|
- 4'd15: begin
|
|
|
|
|
- measStart = &measStartBus;
|
|
|
|
|
- end
|
|
|
|
|
- endcase
|
|
|
|
|
- end
|
|
|
|
|
-end
|
|
|
|
|
|
|
+StartAfterGainSel
|
|
|
|
|
+#(
|
|
|
|
|
+ .ChNum (ChNum)
|
|
|
|
|
+)
|
|
|
|
|
+StartAfterGainSelInst
|
|
|
|
|
+(
|
|
|
|
|
+ .Rst_i (initRst),
|
|
|
|
|
+ .GainCtrl_i (gainAutoEn),
|
|
|
|
|
+ .MeasStart_i (measStartBus),
|
|
|
|
|
+
|
|
|
|
|
+ .MeasStart_o (measStart)
|
|
|
|
|
+);
|
|
|
//--------------------------------------------------------------------------------
|
|
//--------------------------------------------------------------------------------
|
|
|
// Trig TO/FROM DSP
|
|
// Trig TO/FROM DSP
|
|
|
//--------------------------------------------------------------------------------
|
|
//--------------------------------------------------------------------------------
|
|
@@ -1240,7 +1197,8 @@ PulseGen
|
|
|
)
|
|
)
|
|
|
PulseGenerator
|
|
PulseGenerator
|
|
|
(
|
|
(
|
|
|
- .Rst_i (initRst|pGenRst[j]|pGenMeasRst[j]),
|
|
|
|
|
|
|
+ // .Rst_i (initRst|pGenRst[j]|pGenMeasRst[j]),
|
|
|
|
|
+ .Rst_i (initRst|pGenMeasRst[j]),
|
|
|
.Clk_i (gclk),
|
|
.Clk_i (gclk),
|
|
|
.EnPulse_i (pgMuxedOut[j]),
|
|
.EnPulse_i (pgMuxedOut[j]),
|
|
|
|
|
|