baulin.fa/reflectometer_fpga_project
2
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

sampler fix: made it beauty

Browse Source
This commit is contained in:
otroubi
2026-06-17 19:54:19 +03:00
parent 29e1541ffb
commit 45a57d57e4
1 changed files with 65 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

134
rtl/sampler/src/sampler.sv
View File

@ -18,10 +18,10 @@ module sampler
output logic m_axis_tvalid, output logic m_axis_tvalid,
output logic request output logic request
); );
(* MARK_DEBUG="true" *) logic [DATA_WIDTH-1:0] data_converted; logic [DATA_WIDTH-1:0] data_converted;
(* MARK_DEBUG="true" *) logic out_of_range_reg; logic out_of_range_reg;
(* MARK_DEBUG="true" *) logic [31:0] smp_num_reg, cnt_smp_num; logic [31:0] smp_num_reg, cnt_smp_num;
(* MARK_DEBUG="true" *) logic enable, enable_d; logic enable;
generate generate
if (PROCESS_MODE) begin if (PROCESS_MODE) begin
@ -53,42 +53,40 @@ module sampler
end end
endgenerate endgenerate
(* MARK_DEBUG="true" *) logic [DATA_WIDTH*PACK_FACTOR-1:0] buffer; logic [DATA_WIDTH*PACK_FACTOR-1:0] buffer;
(* MARK_DEBUG="true" *) logic buffer_ready; logic buffer_ready;
logic [$clog2(PACK_FACTOR):0] cnt; logic [$clog2(PACK_FACTOR):0] cnt;
generate generate
if (PACK_FACTOR == 1) begin if (PACK_FACTOR == 1) begin
always @(posedge clk_in) begin always @(posedge clk_in) begin
if (rst) begin if (rst) begin
buffer <= '0; buffer <= '0;
buffer_ready <= 0; buffer_ready <= 0;
cnt_smp_num <= '0; cnt_smp_num <= '0;
smp_num_reg <= '0; smp_num_reg <= '0;
enable <= 0; enable <= 0;
request <= 0; request <= 0;
end end
else begin else begin
buffer_ready <= 0; buffer_ready <= 0;
if (!enable) begin if (!enable) begin
if (request && done) begin if (request && done) begin
enable <= 1; enable <= 1;
request <= 0; request <= 0;
cnt_smp_num <= 0; cnt_smp_num <= 0;
smp_num_reg <= smp_num; smp_num_reg <= smp_num;
end else begin end else begin
request <= 1; request <= 1;
end
end else begin
if (cnt_smp_num != smp_num_reg) begin
cnt_smp_num <= cnt_smp_num +1;
buffer_ready <= 1;
if (!out_of_range_reg) begin
buffer <= data_converted;
end
end end
else begin end else begin
if (cnt_smp_num != smp_num_reg) begin
cnt_smp_num <= cnt_smp_num +1;
buffer_ready <= 1;
if (!out_of_range_reg) begin
buffer <= data_converted;
end
end else begin
cnt_smp_num <= '0; cnt_smp_num <= '0;
buffer_ready <= 0; buffer_ready <= 0;
enable <= 0; enable <= 0;
@ -97,44 +95,42 @@ module sampler
end end
end end
end end
end else begin end else begin
always @(posedge clk_in) begin always @(posedge clk_in) begin
if (rst) begin if (rst) begin
buffer <= '0; buffer <= '0;
cnt <= '0; // cnt <= '0;
buffer_ready <= 0; buffer_ready <= 0;
cnt_smp_num <= '0; cnt_smp_num <= '0;
smp_num_reg <= '0; smp_num_reg <= '0;
enable <= 0; enable <= 0;
request <= 0; request <= 0;
end
else begin
buffer_ready <= 0;
if (!enable) begin
if (request && done) begin
enable <= 1;
request <= 0;
cnt_smp_num <= 0;
smp_num_reg <= smp_num;
end else begin
request <= 1;
end
end else begin end else begin
if (cnt_smp_num != smp_num_reg) begin buffer_ready <= 0;
cnt_smp_num <= cnt_smp_num +1; if (!enable) begin
buffer_ready <= 1; if (request && done) begin
if (!out_of_range_reg) begin enable <= 1;
buffer <= {buffer[DATA_WIDTH*(PACK_FACTOR-1)-1:0], data_converted}; request <= 0;
if (cnt == PACK_FACTOR-1) begin cnt_smp_num <= 0;
cnt <= 0; smp_num_reg <= smp_num;
end else begin
request <= 1;
end
end else begin
if (cnt_smp_num != smp_num_reg) begin
cnt_smp_num <= cnt_smp_num +1;
buffer_ready <= 1;
if (!out_of_range_reg) begin
buffer <= {buffer[DATA_WIDTH*(PACK_FACTOR-1)-1:0], data_converted}; buffer <= {buffer[DATA_WIDTH*(PACK_FACTOR-1)-1:0], data_converted};
end if (cnt == PACK_FACTOR-1) begin
cnt <= 0;
buffer <= {buffer[DATA_WIDTH*(PACK_FACTOR-1)-1:0], data_converted};
end
else begin else begin
cnt <= cnt + 1; cnt <= cnt + 1;
end end
end end
end end else begin
else begin
cnt_smp_num <= '0; cnt_smp_num <= '0;
buffer_ready <= 0; buffer_ready <= 0;
enable <= 0; enable <= 0;
@ -142,8 +138,8 @@ module sampler
end end
end end
end end
end
end end
end
endgenerate endgenerate
assign m_axis_tdata = buffer; assign m_axis_tdata = buffer;