Skip to content

X
x393
Commit 94c59260 authored by Andrey Filippov's avatar Andrey Filippov
Browse files
Options

Now from sof to first HACT is safe to change lens_flat parameters (by sequencer), was not so in 353

parent 0651004e
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 22 deletions
sensor/lens_flat393.v
View file @ 94c59260
...@@ -112,10 +112,10 @@ module lens_flat393 #( ...@@ -112,10 +112,10 @@ module lens_flat393 #(
reg [3:0] sub_frame_late_d; // add extra stages if needed reg [3:0] sub_frame_late_d; // add extra stages if needed
reg pre_first_line; reg pre_first_line;
reg inc_sub_frame; reg inc_sub_frame;
reg [ 9:0] hact_d; // lens_corr_out; /// lens correction out valid (first clock from column0 ) reg [13:0] hact_d; // lens_corr_out; /// lens correction out valid (first clock from column0 )
wire [15:0] pxd_d; // pxd_in delayed buy 4 clocks wire [15:0] pxd_d; // pxd_in delayed buy 4 clocks
reg [ 2:0] newline; reg [ 2:0] newline;
wire sof_d; // delayed sof_in by 5 clocks to init first lens_flat393_line reg sosf; // start of subframe
reg we_AX,we_BX,we_AY,we_BY,we_C; reg we_AX,we_BX,we_AY,we_BY,we_C;
reg we_scales;/// write additional individual per-color scales (17 bits each) reg we_scales;/// write additional individual per-color scales (17 bits each)
reg we_fatzero_in,we_fatzero_out; /// reg we_fatzero_in,we_fatzero_out; ///
...@@ -156,7 +156,8 @@ module lens_flat393 #( ...@@ -156,7 +156,8 @@ module lens_flat393 #(
// wire sync_bayer=linerun && ~lens_corr_out[0]; // wire sync_bayer=linerun && ~lens_corr_out[0];
wire sync_bayer=hact_d[2] && ~hact_d[3]; // wire sync_bayer=hact_d[2] && ~hact_d[3];
wire sync_bayer=hact_d[6] && ~hact_d[7];
// sub_frame_late_d[3:2] sets 1 cycle ahead of needed, OK to ease timing (there is always >=1 hact gap) // sub_frame_late_d[3:2] sets 1 cycle ahead of needed, OK to ease timing (there is always >=1 hact gap)
wire [17:0] pix_zero = {2'b0,pxd_d[15:0]}-{{2{fatzero_in_ram[sub_frame_late_d[3:2]][15]}},fatzero_in_ram[sub_frame_late_d[3:2]][15:0]}; wire [17:0] pix_zero = {2'b0,pxd_d[15:0]}-{{2{fatzero_in_ram[sub_frame_late_d[3:2]][15]}},fatzero_in_ram[sub_frame_late_d[3:2]][15:0]};
...@@ -168,7 +169,7 @@ module lens_flat393 #( ...@@ -168,7 +169,7 @@ module lens_flat393 #(
assign subchannel = sub_frame ; assign subchannel = sub_frame ;
assign last_in_sub = inc_sub_frame; assign last_in_sub = inc_sub_frame;
assign hact_out = hact_d[9]; assign hact_out = hact_d[13];
always @(posedge mclk) begin always @(posedge mclk) begin
cmd_data_r <= cmd_data; cmd_data_r <= cmd_data;
...@@ -197,8 +198,9 @@ module lens_flat393 #( ...@@ -197,8 +198,9 @@ module lens_flat393 #(
end end
always @ (posedge pclk) begin always @ (posedge pclk) begin
hact_d <= {hact_d[8:0],hact_in}; hact_d <= {hact_d[12:0],hact_in};
newline <= {newline[1:0], hact_in && !hact_d[0]}; // newline <= {newline[1:0], hact_in && !hact_d[0]};
newline <= {newline[1:0], hact_d[3] && !hact_d[4]};
// line_start <= newline; // make it SR? // line_start <= newline; // make it SR?
if (sof_in) pre_first_line <= 1; if (sof_in) pre_first_line <= 1;
...@@ -207,22 +209,28 @@ module lens_flat393 #( ...@@ -207,22 +209,28 @@ module lens_flat393 #(
if (pre_first_line || newline[0]) inc_sub_frame <= (sub_frame != (SENS_NUM_SUBCHN - 1)) && (line_cntr == 0); if (pre_first_line || newline[0]) inc_sub_frame <= (sub_frame != (SENS_NUM_SUBCHN - 1)) && (line_cntr == 0);
sub_frame_early <= sub_frame + inc_sub_frame; sub_frame_early <= sub_frame + inc_sub_frame;
if (pre_first_line) sub_frame <= 0; if (pre_first_line) sub_frame <= 0;
else if (newline[0]) sub_frame <= sub_frame_early; else if (newline[0]) sub_frame <= sub_frame_early;
// adjust when to switch?
if (pre_first_line || (newline[1] && inc_sub_frame)) line_cntr <= heights_m1_ram[sub_frame]; if (pre_first_line || (newline[1] && inc_sub_frame)) line_cntr <= heights_m1_ram[sub_frame];
else if (newline[1] ) line_cntr <= line_cntr - 1;
// if (newline[2]) sub_frame_late <= sub_frame; // if (newline[2]) sub_frame_late <= sub_frame;
if (newline[1]) sub_frame_late <= sub_frame; if (newline[1]) sub_frame_late <= sub_frame;
sub_frame_late_d <= {sub_frame_late_d[1:0],sub_frame_late}; // valid @ hact_d[3], use @hact_d[4] as there is always >= 1 clock HACT gap sub_frame_late_d <= {sub_frame_late_d[1:0],sub_frame_late}; // valid @ hact_d[3], use @hact_d[4] as there is always >= 1 clock HACT gap
sosf <= (hact_in && ~hact_d[0]) && (pre_first_line || inc_sub_frame);
end end
//reg color[1:0] //reg color[1:0]
always @ (posedge pclk) begin always @ (posedge pclk) begin
bayer_nset <= !sof_in && (bayer_nset || hact_d[1]); // bayer_nset <= !sof_in && (bayer_nset || hact_d[1]);
bayer_nset <= !sof_in && (bayer_nset || hact_d[5]);
bayer0_latched<= bayer_nset? bayer0_latched:bayer[0]; bayer0_latched<= bayer_nset? bayer0_latched:bayer[0];
color[1:0] <= { bayer_nset? (sync_bayer ^ color[1]):bayer[1] , color[1:0] <= { bayer_nset? (sync_bayer ^ color[1]):bayer[1] ,
(bayer_nset &&(~sync_bayer))?~color[0]:bayer0_latched }; (bayer_nset &&(~sync_bayer))?~color[0]:bayer0_latched };
...@@ -239,7 +247,7 @@ module lens_flat393 #( ...@@ -239,7 +247,7 @@ module lens_flat393 #(
3'h7:mult_first_scaled[17:0]<= (~mult_first_res[35] & |mult_first_res[34:26]) ? 18'h1ffff:mult_first_res[26: 9]; 3'h7:mult_first_scaled[17:0]<= (~mult_first_res[35] & |mult_first_res[34:26]) ? 18'h1ffff:mult_first_res[26: 9];
endcase endcase
if (hact_d[8]) pxd_out[15:0] <= pre_pixdo_with_zero[20]? 16'h0: /// negative - use 0 if (hact_d[12]) pxd_out[15:0] <= pre_pixdo_with_zero[20]? 16'h0: /// negative - use 0
((|pre_pixdo_with_zero[19:16])?16'hffff: ///>0xffff - limit by 0xffff ((|pre_pixdo_with_zero[19:16])?16'hffff: ///>0xffff - limit by 0xffff
pre_pixdo_with_zero[15:0]); pre_pixdo_with_zero[15:0]);
end end
...@@ -253,13 +261,13 @@ module lens_flat393 #( ...@@ -253,13 +261,13 @@ module lens_flat393 #(
// wire [17:0] mul2_b = mult_first_scaled[17:0]; // TODO - delay to have a register! // wire [17:0] mul2_b = mult_first_scaled[17:0]; // TODO - delay to have a register!
reg [35:0] mul2_p; reg [35:0] mul2_p;
always @ (posedge pclk) begin always @ (posedge pclk) begin
if (hact_d[3]) mul1_a <= (FXY[18]==FXY[17])?FXY[17:0]:(FXY[18]?18'h20000:18'h1ffff); if (hact_d[7]) mul1_a <= (FXY[18]==FXY[17])?FXY[17:0]:(FXY[18]?18'h20000:18'h1ffff);
if (hact_d[3]) mul1_b <= {1'b0,scales_ram[{sub_frame_late,~color[1:0]}]}; if (hact_d[7]) mul1_b <= {1'b0,scales_ram[{sub_frame_late,~color[1:0]}]};
if (hact_d[4]) mul1_p <= mul1_a * mul1_b; if (hact_d[8]) mul1_p <= mul1_a * mul1_b;
if (hact_d[6]) mul2_a <= pix_zero[17:0]; // adjust sub_frame delay if (hact_d[10]) mul2_a <= pix_zero[17:0]; // adjust sub_frame delay
if (hact_d[6]) mul2_b <= mult_first_scaled[17:0]; // 18-bit multiplier input - always positive if (hact_d[10]) mul2_b <= mult_first_scaled[17:0]; // 18-bit multiplier input - always positive
if (hact_d[7]) mul2_p <= mul2_a * mul2_b; if (hact_d[11]) mul2_p <= mul2_a * mul2_b;
end end
assign mult_first_res = mul1_p; assign mult_first_res = mul1_p;
assign mult_second_res = mul2_p; assign mult_second_res = mul2_p;
...@@ -287,7 +295,7 @@ module lens_flat393 #( ...@@ -287,7 +295,7 @@ module lens_flat393 #(
) dly_16_sof_eof_i ( ) dly_16_sof_eof_i (
.clk (pclk), // input .clk (pclk), // input
.rst (prst), // input .rst (prst), // input
.dly (4'd8), // input[3:0] .dly (4'd12), // input[3:0]
.din ({sof_in,eof_in}), // input[0:0] .din ({sof_in,eof_in}), // input[0:0]
.dout ({sof_out,eof_out}) // output[0:0] .dout ({sof_out,eof_out}) // output[0:0]
); );
...@@ -297,21 +305,21 @@ module lens_flat393 #( ...@@ -297,21 +305,21 @@ module lens_flat393 #(
) dly_16_pxd_i ( ) dly_16_pxd_i (
.clk (pclk), // input .clk (pclk), // input
.rst (prst), // input .rst (prst), // input
.dly (4'd6), // input[3:0] .dly (4'd10), // input[3:0]
.din (pxd_in), // input[0:0] .din (pxd_in), // input[0:0]
.dout (pxd_d) // output[0:0] .dout (pxd_d) // output[0:0]
); );
/*
dly_16 #( dly_16 #(
.WIDTH(1) .WIDTH(1)
) dly_16_sof_d_i ( ) dly_16_sof_d_i (
.clk (pclk), // input .clk (pclk), // input
.rst (prst), // input .rst (prst), // input
.dly (4'd4), // input[3:0] .dly (4'd8), // input[3:0]
.din (sof_in), // input[0:0] .din (sof_in), // input[0:0]
.dout (sof_d) // output[0:0] .dout (sosf) // output[0:0]
); );
*/
lens_flat393_line #( lens_flat393_line #(
.F_WIDTH (SENS_LENS_F_WIDTH), // number of bits in the output result (signed) .F_WIDTH (SENS_LENS_F_WIDTH), // number of bits in the output result (signed)
.F_SHIFT (SENS_LENS_F_SHIFT), // shift ~2*log2(width/2), for 4K width .F_SHIFT (SENS_LENS_F_SHIFT), // shift ~2*log2(width/2), for 4K width
...@@ -320,7 +328,8 @@ module lens_flat393 #( ...@@ -320,7 +328,8 @@ module lens_flat393 #(
.B_WIDTH (SENS_LENS_B_WIDTH)) // number of bits in b-coefficient (signed). .B_WIDTH (SENS_LENS_B_WIDTH)) // number of bits in b-coefficient (signed).
i_fy( i_fy(
.pclk (pclk), // pixel clock .pclk (pclk), // pixel clock
.first (sof_d), // initialize running parameters from the inputs (first column). Should be at least 1-cycle gap between "first" and first "next" // wrong - need to restart for each sub-frame
.first (sosf), // initialize running parameters from the inputs (first column). Should be at least 1-cycle gap between "first" and first "next"
.next (newline[0]), // calcualte next pixel .next (newline[0]), // calcualte next pixel
.F0 (C_ram[sub_frame_early]), // value of the output in the first column (before saturation), 18 bit, unsigned .F0 (C_ram[sub_frame_early]), // value of the output in the first column (before saturation), 18 bit, unsigned
.ERR0 (24'b0), // initial value of the running error (-2.0<err<+2.0), scaled by 2^22, so 24 bits .ERR0 (24'b0), // initial value of the running error (-2.0<err<+2.0), scaled by 2^22, so 24 bits
...@@ -338,7 +347,7 @@ module lens_flat393 #( ...@@ -338,7 +347,7 @@ module lens_flat393 #(
i_fxy( i_fxy(
.pclk (pclk), // pixel clock .pclk (pclk), // pixel clock
.first (newline[0]), // initialize running parameters from the inputs (first column). Should be at least 1-cycle gap between "first" and first "next" .first (newline[0]), // initialize running parameters from the inputs (first column). Should be at least 1-cycle gap between "first" and first "next"
.next (hact_d[2]), // calcualte next pixel .next (hact_d[6]), // calcualte next pixel
.F0 (FY), // value of the output in the first column (before saturation), 18 bit, unsigned .F0 (FY), // value of the output in the first column (before saturation), 18 bit, unsigned
.ERR0 (ERR_Y), // initial value of the running error (-2.0<err<+2.0), scaled by 2^22, so 24 bits .ERR0 (ERR_Y), // initial value of the running error (-2.0<err<+2.0), scaled by 2^22, so 24 bits
.A0 (AX_ram[sub_frame_early]), // Ax(Y), signed .A0 (AX_ram[sub_frame_early]), // Ax(Y), signed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment