|
|
@@ -182,16 +182,16 @@ always @(posedge Clk_i) begin
|
|
|
case(PortSel_i)
|
|
|
0: begin
|
|
|
// currDataChannel <= testDataChannel;
|
|
|
- currDataChannel <= Adc2ChT2Data_i;
|
|
|
+ currDataChannel <= Adc2ChT2Data_i; //Device T3
|
|
|
end
|
|
|
1: begin
|
|
|
- currDataChannel <= Adc2ChR2Data_i;
|
|
|
+ currDataChannel <= Adc2ChR2Data_i; //Device R3
|
|
|
end
|
|
|
2: begin
|
|
|
- currDataChannel <= Adc1ChT1Data_i;
|
|
|
+ currDataChannel <= Adc1ChT1Data_i; //Device T4
|
|
|
end
|
|
|
3: begin
|
|
|
- currDataChannel <= Adc1ChR1Data_i;
|
|
|
+ currDataChannel <= Adc1ChR1Data_i; //Device R4
|
|
|
end
|
|
|
endcase
|
|
|
end else begin
|
|
|
@@ -229,39 +229,6 @@ DspSlaveSpi
|
|
|
.Miso_o (Miso_o)
|
|
|
);
|
|
|
|
|
|
-// DecimFilterWrapper DecimFilter
|
|
|
-// (
|
|
|
- // .Clk_i (Clk_i),
|
|
|
- // .Rst_i (Rst_i),
|
|
|
- // .OscWind_i (OscWind_i),
|
|
|
- // .DecimFactor_i (DecimFactor_i),
|
|
|
-
|
|
|
- // .IfFtwL_i (IfFtwL_i),
|
|
|
- // .IfFtwH_i (IfFtwH_i),
|
|
|
-
|
|
|
- // .AdcData_i (currDataChannel),
|
|
|
- // .TestData_o (testData),
|
|
|
-
|
|
|
- // .FilteredAdcDataI_o (filteredDecimDataI),
|
|
|
- // .FilteredAdcDataQ_o (filteredDecimDataQ),
|
|
|
- // .FilteredDataVal_o (filteredDecimDataVal)
|
|
|
-// );
|
|
|
-
|
|
|
-// FftDataFormer FftDataFormerInst
|
|
|
-// (
|
|
|
- // .Clk_i (Clk_i),
|
|
|
- // .Rst_i (Rst_i),
|
|
|
- // .OscWind_i (OscWind_i),
|
|
|
- // .MeasNum_i (MeasNum_i),
|
|
|
-
|
|
|
- // .AdcData_i ({filteredDecimDataI,filteredDecimDataQ}),
|
|
|
- // .AdcData_i ({testPatternData,testPatternData}),
|
|
|
- // .AdcDataVal_i (filteredDecimDataVal),
|
|
|
-
|
|
|
- // .OscDataBus_o (fftDataBus),
|
|
|
- // .OscDataBusVal_o (fftDataBusVal)
|
|
|
-// );
|
|
|
-
|
|
|
decimBlock
|
|
|
#(
|
|
|
.inOutDataWidth (14),
|