Framework Update 1/27/24

Updated framework and tested.
COCO3_Comp spreadsheet added.
This commit is contained in:
shodge12 committed 2024-01-27 01:10:55 -05:00
1 parent 9fe94bc5e7
commit 49428a29a7
7 files changed
+1873 -58

No files matched your search

BIN
View File
Binary file not shown.
+28 -4
View File
@@ -226,7 +226,7 @@ video_calc video_calc
.new_vmode(new_vmode), .new_vmode(new_vmode),
.video_rotated(video_rotated), .video_rotated(video_rotated),
.par_num(byte_cnt[3:0]), .par_num(byte_cnt[4:0]),
.dout(vc_dout) .dout(vc_dout)
); );
@@ -502,7 +502,7 @@ always@(posedge clk_sys) begin : uio_block
'h22: RTC[(byte_cnt-6'd1)<<4 +:16] <= io_din; 'h22: RTC[(byte_cnt-6'd1)<<4 +:16] <= io_din;
//Video res. //Video res.
'h23: if(!byte_cnt[MAX_W:4]) io_dout <= vc_dout; 'h23: if(!byte_cnt[MAX_W:5]) io_dout <= vc_dout;
//RTC //RTC
'h24: TIMESTAMP[(byte_cnt-6'd1)<<4 +:16] <= io_din; 'h24: TIMESTAMP[(byte_cnt-6'd1)<<4 +:16] <= io_din;
@@ -872,7 +872,7 @@ module video_calc
input new_vmode, input new_vmode,
input video_rotated, input video_rotated,
input [3:0] par_num, input [4:0] par_num,
output reg [15:0] dout output reg [15:0] dout
); );
@@ -893,6 +893,9 @@ always @(posedge clk_sys) begin
13: dout <= vid_vtime_hdmi[31:16]; 13: dout <= vid_vtime_hdmi[31:16];
14: dout <= vid_ccnt[15:0]; 14: dout <= vid_ccnt[15:0];
15: dout <= vid_ccnt[31:16]; 15: dout <= vid_ccnt[31:16];
16: dout <= vid_pixrep;
17: dout <= vid_de_h;
18: dout <= vid_de_v;
default dout <= 0; default dout <= 0;
endcase endcase
end end
@@ -902,24 +905,44 @@ reg [31:0] vid_vcnt = 0;
reg [31:0] vid_ccnt = 0; reg [31:0] vid_ccnt = 0;
reg [7:0] vid_nres = 0; reg [7:0] vid_nres = 0;
reg [1:0] vid_int = 0; reg [1:0] vid_int = 0;
reg [7:0] vid_pixrep;
reg [15:0] vid_de_h;
reg [7:0] vid_de_v;
always @(posedge clk_vid) begin always @(posedge clk_vid) begin
integer hcnt; integer hcnt;
integer vcnt; integer vcnt;
integer ccnt; integer ccnt;
reg old_vs= 0, old_de = 0, old_vmode = 0; reg [7:0] pcnt;
reg [7:0] de_v;
reg [15:0] de_h;
reg old_vs = 0, old_hs = 0, old_hs_vclk = 0, old_de = 0, old_de_vclk = 0, old_de1 = 0, old_vmode = 0;
reg [3:0] resto = 0; reg [3:0] resto = 0;
reg calch = 0; reg calch = 0;
if(calch & de) ccnt <= ccnt + 1; if(calch & de) ccnt <= ccnt + 1;
pcnt <= pcnt + 1'd1;
old_hs_vclk <= hs;
de_h <= de_h + 1'd1;
if(old_hs_vclk & ~hs) de_h <= 1;
old_de_vclk <= de;
if(calch & ~old_de_vclk & de) vid_de_h <= de_h;
if(ce_pix) begin if(ce_pix) begin
old_vs <= vs; old_vs <= vs;
old_hs <= hs;
old_de <= de; old_de <= de;
old_de1 <= old_de;
pcnt <= 1;
if(~vs & ~old_de & de) vcnt <= vcnt + 1; if(~vs & ~old_de & de) vcnt <= vcnt + 1;
if(calch & de) hcnt <= hcnt + 1; if(calch & de) hcnt <= hcnt + 1;
if(old_de & ~de) calch <= 0; if(old_de & ~de) calch <= 0;
if(~old_de1 & old_de) vid_pixrep <= pcnt;
if(old_hs & ~hs) de_v <= de_v + 1'd1;
if(calch & ~old_de & de) vid_de_v <= de_v;
if(old_vs & ~vs) begin if(old_vs & ~vs) begin
vid_int <= {vid_int[0],f1}; vid_int <= {vid_int[0],f1};
@@ -939,6 +962,7 @@ always @(posedge clk_vid) begin
hcnt <= 0; hcnt <= 0;
ccnt <= 0; ccnt <= 0;
calch <= 1; calch <= 1;
de_v <= 0;
end end
end end
end end
+1776
View File
File diff suppressed because it is too large. Load diff
+1
View File
@@ -4,3 +4,4 @@ set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) p
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg.v ] set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg.v ]
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg/altera_pll_reconfig_core.v ] set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg/altera_pll_reconfig_core.v ]
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg/altera_pll_reconfig_top.v ] set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg/altera_pll_reconfig_top.v ]
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg_hdmi.v ]
+1
View File
@@ -2,3 +2,4 @@ set_global_assignment -name QIP_FILE rtl/pll.qip
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_hdmi.qip ] set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_hdmi.qip ]
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_audio.qip ] set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_audio.qip ]
set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_cfg.qip ] set_global_assignment -name QIP_FILE [file join $::quartus(qip_path) pll_cfg.qip ]
set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) pll_cfg_hdmi.v ]
+47 -36
View File
@@ -124,12 +124,6 @@ module sys_top
inout [6:0] USER_IO inout [6:0] USER_IO
); );
`ifdef MISTER_DUAL_SDRAM
`ifndef MISTER_DISABLE_YC
`define MISTER_DISABLE_YC
`endif
`endif
////////////////////// Secondary SD /////////////////////////////////// ////////////////////// Secondary SD ///////////////////////////////////
wire SD_CS, SD_CLK, SD_MOSI; wire SD_CS, SD_CLK, SD_MOSI;
@@ -1020,13 +1014,11 @@ reg [5:0] adj_address;
reg [31:0] adj_data; reg [31:0] adj_data;
`ifndef MISTER_DEBUG_NOHDMI `ifndef MISTER_DEBUG_NOHDMI
pll_cfg pll_cfg pll_cfg_hdmi pll_cfg_hdmi
( (
.mgmt_clk(FPGA_CLK1_50), .mgmt_clk(FPGA_CLK1_50),
.mgmt_reset(reset_req), .mgmt_reset(reset_req),
.mgmt_waitrequest(cfg_waitrequest), .mgmt_waitrequest(cfg_waitrequest),
.mgmt_read(0),
.mgmt_readdata(),
.mgmt_write(cfg_write), .mgmt_write(cfg_write),
.mgmt_address(cfg_address), .mgmt_address(cfg_address),
.mgmt_writedata(cfg_data), .mgmt_writedata(cfg_data),
@@ -1191,11 +1183,12 @@ always @(posedge clk_vid) begin
end end
dv_de1 <= !{hss,dv_hs_osd} && vde; dv_de1 <= !{hss,dv_hs_osd} && vde;
dv_hs1 <= csync_en ? dv_cs_osd : dv_hs_osd;
dv_vs1 <= dv_vs_osd;
end end
dv_d1 <= dv_data_osd; dv_d1 <= dv_data_osd;
dv_hs1 <= csync_en ? dv_cs_osd : dv_hs_osd;
dv_vs1 <= dv_vs_osd;
dv_d2 <= dv_d1; dv_d2 <= dv_d1;
dv_de2 <= dv_de1; dv_de2 <= dv_de1;
dv_hs2 <= dv_hs1; dv_hs2 <= dv_hs1;
@@ -1330,6 +1323,33 @@ osd vga_osd
wire vga_cs_osd; wire vga_cs_osd;
csync csync_vga(clk_vid, vga_hs_osd, vga_vs_osd, vga_cs_osd); csync csync_vga(clk_vid, vga_hs_osd, vga_vs_osd, vga_cs_osd);
`ifndef MISTER_DISABLE_YC
reg pal_en;
reg yc_en;
reg cvbs;
reg [16:0] ColorBurst_Range;
reg [39:0] PhaseInc;
wire [23:0] yc_o;
wire yc_hs, yc_vs, yc_cs;
yc_out yc_out
(
.clk(clk_vid),
.PAL_EN(pal_en),
.CVBS(cvbs),
.PHASE_INC(PhaseInc),
.COLORBURST_RANGE(ColorBurst_Range),
.hsync(vga_hs_osd),
.vsync(vga_vs_osd),
.csync(vga_cs_osd),
.dout(yc_o),
.din(vga_data_osd),
.hsync_o(yc_hs),
.vsync_o(yc_vs),
.csync_o(yc_cs)
);
`endif
`ifndef MISTER_DUAL_SDRAM `ifndef MISTER_DUAL_SDRAM
wire VGA_DISABLE; wire VGA_DISABLE;
wire [23:0] vgas_o; wire [23:0] vgas_o;
@@ -1365,31 +1385,6 @@ csync csync_vga(clk_vid, vga_hs_osd, vga_vs_osd, vga_cs_osd);
); );
`ifndef MISTER_DISABLE_YC `ifndef MISTER_DISABLE_YC
reg pal_en;
reg yc_en;
reg cvbs;
reg [16:0] ColorBurst_Range;
reg [39:0] PhaseInc;
wire [23:0] yc_o;
wire yc_hs, yc_vs, yc_cs;
yc_out yc_out
(
.clk(clk_vid),
.PAL_EN(pal_en),
.CVBS(cvbs),
.PHASE_INC(PhaseInc),
.COLORBURST_RANGE(ColorBurst_Range),
.hsync(vga_hs_osd),
.vsync(vga_vs_osd),
.csync(vga_cs_osd),
.dout(yc_o),
.din(vga_data_osd),
.hsync_o(yc_hs),
.vsync_o(yc_vs),
.csync_o(yc_cs)
);
assign {vga_o, vga_hs, vga_vs, vga_cs } = ~yc_en ? {vga_o_t, vga_hs_t, vga_vs_t, vga_cs_t } : {yc_o, yc_hs, yc_vs, yc_cs }; assign {vga_o, vga_hs, vga_vs, vga_cs } = ~yc_en ? {vga_o_t, vga_hs_t, vga_vs_t, vga_cs_t } : {yc_o, yc_hs, yc_vs, yc_cs };
`else `else
assign {vga_o, vga_hs, vga_vs, vga_cs } = {vga_o_t, vga_hs_t, vga_vs_t, vga_cs_t } ; assign {vga_o, vga_hs, vga_vs, vga_cs } = {vga_o_t, vga_hs_t, vga_vs_t, vga_cs_t } ;
@@ -1770,6 +1765,21 @@ module sync_fix
assign sync_out = sync_in ^ pol; assign sync_out = sync_in ^ pol;
reg pol; reg pol;
always @(posedge clk) begin
reg [31:0] cnt;
reg s1,s2;
s1 <= sync_in;
s2 <= s1;
cnt <= s2 ? (cnt - 1) : (cnt + 1);
if(~s2 & s1) begin
cnt <= 0;
pol <= cnt[31];
end
end
/*
always @(posedge clk) begin always @(posedge clk) begin
integer pos = 0, neg = 0, cnt = 0; integer pos = 0, neg = 0, cnt = 0;
reg s1,s2; reg s1,s2;
@@ -1785,6 +1795,7 @@ always @(posedge clk) begin
pol <= pos > neg; pol <= pos > neg;
end end
*/
endmodule endmodule
+20 -18
View File
@@ -16,14 +16,16 @@ module vga_out
output reg csync_o output reg csync_o
); );
wire [5:0] red = din[23:18]; wire [7:0] red = din[23:16];
wire [5:0] green = din[15:10]; wire [7:0] green = din[15:8];
wire [5:0] blue = din[7:2]; wire [7:0] blue = din[7:0];
// http://marsee101.blog19.fc2.com/blog-entry-2311.html // http://marsee101.blog19.fc2.com/blog-entry-2311.html
// Y = 16 + 0.257*R + 0.504*G + 0.098*B (Y = 0.299*R + 0.587*G + 0.114*B)
// Pb = 128 - 0.148*R - 0.291*G + 0.439*B (Pb = -0.169*R - 0.331*G + 0.500*B)
// Pr = 128 + 0.439*R - 0.368*G - 0.071*B (Pr = 0.500*R - 0.419*G - 0.081*B) // Y = 0.301*R + 0.586*G + 0.113*B (Y = 0.299*R + 0.587*G + 0.114*B)
// Pb = 128 - 0.168*R - 0.332*G + 0.500*B (Pb = -0.169*R - 0.331*G + 0.500*B)
// Pr = 128 + 0.500*R - 0.418*G - 0.082*B (Pr = 0.500*R - 0.419*G - 0.081*B)
reg [7:0] y, pb, pr; reg [7:0] y, pb, pr;
reg [23:0] rgb; reg [23:0] rgb;
@@ -36,25 +38,25 @@ always @(posedge clk) begin
reg hsync2, vsync2, csync2; reg hsync2, vsync2, csync2;
reg hsync1, vsync1, csync1; reg hsync1, vsync1, csync1;
y_1r <= 19'd04096 + ({red, 8'd0} + {red, 3'd0}); y_1r <= {red, 6'd0} + {red, 3'd0} + {red, 2'd0} + red;
pb_1r <= 19'd32768 - ({red, 7'd0} + {red, 4'd0} + {red, 3'd0}); pb_1r <= 19'd32768 - ({red, 5'd0} + {red, 3'd0} + {red, 1'd0});
pr_1r <= 19'd32768 + ({red, 8'd0} + {red, 7'd0} + {red, 6'd0}); pr_1r <= 19'd32768 + {red, 7'd0};
y_1g <= {green, 9'd0} + {green, 2'd0}; y_1g <= {green, 7'd0} + {green, 4'd0} + {green, 2'd0} + {green, 1'd0};
pb_1g <= {green, 8'd0} + {green, 5'd0} + {green, 3'd0}; pb_1g <= {green, 6'd0} + {green, 4'd0} + {green, 2'd0} + green;
pr_1g <= {green, 8'd0} + {green, 6'd0} + {green, 5'd0} + {green, 4'd0} + {green, 3'd0}; pr_1g <= {green, 6'd0} + {green, 5'd0} + {green, 3'd0} + {green, 1'd0};
y_1b <= {blue, 6'd0} + {blue, 5'd0} + {blue, 2'd0}; y_1b <= {blue, 4'd0} + {blue, 3'd0} + {blue, 2'd0} + blue;
pb_1b <= {blue, 8'd0} + {blue, 7'd0} + {blue, 6'd0}; pb_1b <= {blue, 7'd0};
pr_1b <= {blue, 6'd0} + {blue, 3'd0}; pr_1b <= {blue, 4'd0} + {blue, 2'd0} + blue;
y_2 <= y_1r + y_1g + y_1b; y_2 <= y_1r + y_1g + y_1b;
pb_2 <= pb_1r - pb_1g + pb_1b; pb_2 <= pb_1r - pb_1g + pb_1b;
pr_2 <= pr_1r - pr_1g - pr_1b; pr_2 <= pr_1r - pr_1g - pr_1b;
y <= ( y_2[18] || !y_2[17:12]) ? 8'd16 : (y_2[17:8] > 235) ? 8'd235 : y_2[15:8]; y <= y_2[18] ? 8'd0 : y_2[16] ? 8'd255 : y_2[15:8];
pb <= (pb_2[18] || !pb_2[17:12]) ? 8'd16 : (&pb_2[17:12]) ? 8'd240 : pb_2[15:8]; pb <= pb_2[18] ? 8'd0 : pb_2[16] ? 8'd255 : pb_2[15:8];
pr <= (pr_2[18] || !pr_2[17:12]) ? 8'd16 : (&pr_2[17:12]) ? 8'd240 : pr_2[15:8]; pr <= pr_2[18] ? 8'd0 : pr_2[16] ? 8'd255 : pr_2[15:8];
hsync_o <= hsync2; hsync2 <= hsync1; hsync1 <= hsync; hsync_o <= hsync2; hsync2 <= hsync1; hsync1 <= hsync;
vsync_o <= vsync2; vsync2 <= vsync1; vsync1 <= vsync; vsync_o <= vsync2; vsync2 <= vsync1; vsync1 <= vsync;