Implemented scrolling when text reaches bottom of screen

This commit is contained in:
Dreaded_X 2020-04-16 22:11:41 +02:00
parent c1f88398e1
commit bd9a0f03d8
4 changed files with 169 additions and 87 deletions

View File

@ -17,7 +17,8 @@
<component>cclk_detector.luc</component>
<component>tmds_encoder.luc</component>
<constraint lib="true">mojo.ucf</constraint>
<constraint lib="true">hdmi.ucf</constraint>
<constraint>hdmi2.ucf</constraint>
<constraint>z80.ucf</constraint>
<core name="clk_wiz_v3_6">
<src>..\clk_wiz_v3_6.v</src>
</core>

8
constraint/hdmi2.ucf Normal file
View File

@ -0,0 +1,8 @@
NET "hdmi1_tmds(3)" LOC = "P144" |IOSTANDARD = TMDS_33 | CLOCK_DEDICATED_ROUTE = FALSE ; # Clock
NET "hdmi1_tmdsb(3)" LOC = "P143" |IOSTANDARD = TMDS_33 | CLOCK_DEDICATED_ROUTE = FALSE ;
NET "hdmi1_tmds(2)" LOC = "P138" |IOSTANDARD = TMDS_33 ; # Red
NET "hdmi1_tmdsb(2)" LOC = "P137" |IOSTANDARD = TMDS_33 ;
NET "hdmi1_tmds(1)" LOC = "P140" |IOSTANDARD = TMDS_33 ; # Green
NET "hdmi1_tmdsb(1)" LOC = "P139" |IOSTANDARD = TMDS_33 ;
NET "hdmi1_tmds(0)" LOC = "P142" |IOSTANDARD = TMDS_33 ; # Blue
NET "hdmi1_tmdsb(0)" LOC = "P141" |IOSTANDARD = TMDS_33 ;

20
constraint/z80.ucf Normal file
View File

@ -0,0 +1,20 @@
NET "z80_clk" LOC = P23 | IOSTANDARD = LVTTL;
NET "z80_data(2)" LOC = P114 | IOSTANDARD = LVTTL;
NET "z80_data(3)" LOC = P115 | IOSTANDARD = LVTTL;
NET "z80_data(1)" LOC = P116 | IOSTANDARD = LVTTL;
NET "z80_data(0)" LOC = P117 | IOSTANDARD = LVTTL;
NET "z80_data(4)" LOC = P118 | IOSTANDARD = LVTTL;
NET "z80_data(5)" LOC = P119 | IOSTANDARD = LVTTL;
NET "z80_data(6)" LOC = P120 | IOSTANDARD = LVTTL;
NET "z80_data(7)" LOC = P121 | IOSTANDARD = LVTTL;
// NET "z80_address(0)" LOC = P9 | IOSTANDARD = LVTTL;
// NET "z80_address(1)" LOC = P10 | IOSTANDARD = LVTTL;
// NET "z80_address(2)" LOC = P11 | IOSTANDARD = LVTTL;
// NET "z80_address(3)" LOC = P12 | IOSTANDARD = LVTTL;
// NET "z80_address(4)" LOC = P13 | IOSTANDARD = LVTTL;
// NET "z80_address(5)" LOC = P14 | IOSTANDARD = LVTTL;
// NET "z80_address(6)" LOC = P15 | IOSTANDARD = LVTTL;
// NET "z80_address(7)" LOC = P16 | IOSTANDARD = LVTTL;
NET "z80_ioreq" LOC = P24 | IOSTANDARD = LVTTL;
NET "z80_wr" LOC = P21 | IOSTANDARD = LVTTL;
NET "z80_m1" LOC = P22 | IOSTANDARD = LVTTL;

View File

@ -19,7 +19,13 @@ module mojo_top(
output avr_rx, // AVR Rx => FPGA Tx
input avr_rx_busy, // AVR Rx buffer full
output[3:0] hdmi1_tmds,
output[3:0] hdmi1_tmdsb
output[3:0] hdmi1_tmdsb,
input z80_clk,
input[7:0] z80_data,
// input[7:0] z80_address,
input z80_ioreq,
input z80_wr,
input z80_m1
);
wire rst = ~rst_n; // make reset active high
@ -167,6 +173,8 @@ module mojo_top(
wire tx_busy;
wire[7:0] rx_data;
wire new_rx_data;
reg[5:0] char_color;
reg char_attribute;
assign led[7:0] = rx_data;
@ -194,6 +202,7 @@ module mojo_top(
);
reg [13:0] addr_q, addr_d;
reg [6:0] scroll_q, scroll_d;
reg[7:0] write_data;
reg write_enable;
wire[7:0] sram_read_data;
@ -213,12 +222,17 @@ module mojo_top(
charx = (hdmix >> (SCALE-1)) % 8;
chary = (hdmiy >> (SCALE-1)) % 8;
char_index_d = ((hdmix >> (SCALE+2)) + CHAR_HMAX*(hdmiy >> (SCALE+2)));
char_index_d = ((hdmix >> (SCALE+2)) + CHAR_HMAX*(hdmiy >> (SCALE+2)) + CHAR_HMAX*scroll_q) % (CHAR_HMAX*CHAR_VMAX);
if (char_index_d[6] == 1) begin
hdmired = 8'h55 * char_index_d[1:0];
hdmigreen = 8'h55 * char_index_d[3:2];
hdmiblue = 8'h55 * char_index_d[5:4];
//char_color = char_index_d[5:0];
char_color = 6'b111111;
//char_attribute = char_index_d[6];
char_attribute = 1'b0;
if (char_attribute == 1) begin
hdmired = 8'h55 * char_color[1:0];
hdmigreen = 8'h55 * char_color[3:2];
hdmiblue = 8'h55 * char_color[5:4];
end else begin
hdmired = 1'b0;
hdmigreen = 1'b0;
@ -226,14 +240,14 @@ module mojo_top(
end
if (charx > 0 && charx < 6 && chary > 0 && chary < 7 && char_data[sram_read_data][29 - (charx - 1) - 5*(chary - 1)] == 1) begin
if (char_index_d[6] == 1) begin
if (char_attribute == 1) begin
hdmired = 1'b0;
hdmigreen = 1'b0;
hdmiblue = 1'b0;
end else begin
hdmired = 8'h55 * char_index_d[1:0];
hdmigreen = 8'h55 * char_index_d[3:2];
hdmiblue = 8'h55 * char_index_d[5:4];
hdmired = 8'h55 * char_color[1:0];
hdmigreen = 8'h55 * char_color[3:2];
hdmiblue = 8'h55 * char_color[5:4];
end
end
@ -243,24 +257,57 @@ module mojo_top(
frame_d = frame_q + 1'b1;
end
new_tx_data = 1'b0;
// new_tx_data = 1'b0;
// write_enable = 1'b0;
// write_data = 1'b0;
// addr_d = addr_q;
// if (new_rx_data) begin
// new_tx_data = 1'b1;
// tx_data = rx_data;
//
// if (rx_data == "\r") begin
// end else if (rx_data == "\n") begin
// addr_d = addr_q - (addr_q % CHAR_HMAX) + CHAR_HMAX;
// end else if (rx_data == 8) begin
// addr_d = addr_q - 1'b1;
// end else begin
// write_enable = 1'b1;
// write_data = rx_data - 32;
// addr_d = addr_q + 1'b1;
// end
// end
end
reg bottom_of_screen_q, bottom_of_screen_d;
always @(posedge z80_clk) begin
write_enable = 1'b0;
write_data = 1'b0;
addr_d = addr_q;
if (new_rx_data) begin
new_tx_data = 1'b1;
tx_data = rx_data;
scroll_d = scroll_q;
bottom_of_screen_d = bottom_of_screen_q;
if (rx_data == "\r") begin
end else if (rx_data == "\n") begin
addr_d = addr_q - (addr_q % CHAR_HMAX) + CHAR_HMAX;
end else if (rx_data == 8) begin
addr_d = addr_q - 1'b1;
// if (z80_ioreq != 1 && z80_m1 != 0 && z80_address[7:0] == 8'h10) begin
if (z80_ioreq != 1 && z80_m1 != 0 && z80_wr != 1) begin
if (z80_data == "\r") begin
addr_d = addr_q - (addr_q % CHAR_HMAX);
end else if (z80_data == "\n") begin
addr_d = addr_q + CHAR_HMAX;
end else begin
write_enable = 1'b1;
write_data = rx_data - 32;
write_data = z80_data - 32;
addr_d = addr_q + 1'b1;
end
if (bottom_of_screen_d == 1 && addr_d >= CHAR_HMAX*scroll_q) begin
scroll_d = (scroll_q + 1'b1) % CHAR_VMAX;
end
if (addr_d >= CHAR_HMAX*CHAR_VMAX) begin
bottom_of_screen_d = 1'b1;
addr_d = addr_d - CHAR_HMAX*CHAR_VMAX;
end
end
end
@ -269,8 +316,14 @@ module mojo_top(
frame_q <= 1'b0;
char_index_q <= 1'b0;
addr_q <= 1'b0;
scroll_q <= 1'b0;
bottom_of_screen_q <= 1'b0;
end else begin
if (z80_ioreq == 1) begin
addr_q <= addr_d;
scroll_q <= scroll_d;
bottom_of_screen_q <= bottom_of_screen_d;
end
frame_q <= frame_d;
char_index_q <= char_index_d;
end