Fixed final things in lab, works fine

jcoc611 · Apr 5, 2016 · eb0dd5f · eb0dd5f
1 parent 04f8d5a
commit eb0dd5f
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 22 deletions.
diff --git a/src/constants.v b/src/constants.v
@@ -15,7 +15,7 @@
  */
 `define FONT_WIDTH 8'd8
 `define FONT_HEIGHT 8'd16
-`define FONT_KERNING 8'd2
+`define FONT_KERNING 8'd1
 
 /**
  * The number of bites required to represent

diff --git a/src/parsing/html.v b/src/parsing/html.v
@@ -224,7 +224,7 @@ module html_parser(
 							text_x <= 0;
 							text_y <= text_y + (text_size * `FONT_HEIGHT);
 							rect_x <= rect_margin;
-							rect_y <= text_y + rect_margin[`Y_BITES];
+							rect_y <= text_y + + (text_size * `FONT_HEIGHT) + rect_margin[`Y_BITES];
 
 							text_color <= 0;
 							text_size <= 1;
@@ -273,7 +273,7 @@ module html_parser(
 				element_reset <= 1;
 			end else if(text_enable && text_out_finished) begin
 				text_enable <= 0;
-				text_x = text_x + `FONT_WIDTH + `FONT_KERNING;
+				text_x <= text_x + (text_size * `FONT_WIDTH) + `FONT_KERNING;
 				idle_next_char <= 1;
 			end else if(!idle_next_char) begin
 				if(char == "<") begin

diff --git a/src/reading/dummy.v b/src/reading/dummy.v
@@ -11,7 +11,7 @@ module dummy_reader(
 	output reg [`CHAR_BITES] char
 );
 	// <body><p color=1 size=2 >test</p></body>
-	wire [`CHAR_BITES] foo [0:53];
+	wire [`CHAR_BITES] foo [0:109];
 
 	assign foo[0]  = "<"; // Not actually used
 	assign foo[1]  = "b";
@@ -51,25 +51,81 @@ module dummy_reader(
 	assign foo[35]  = "2";
 	assign foo[36]  = " ";
 	assign foo[37]  = ">";
-	assign foo[38]  = "t";
-	assign foo[39]  = "e";
-	assign foo[40]  = "s";
-	assign foo[41]  = "t";
-	assign foo[42]  = "<";
-	assign foo[43]  = "/";
-	assign foo[44]  = "p";
-	assign foo[45]  = ">";
-	assign foo[46]  = "<";
-	assign foo[47]  = "/";
-	assign foo[48]  = "b";
-	assign foo[49]  = "o";
-	assign foo[50]  = "d";
-	assign foo[51]  = "y";
-	assign foo[52]  = ">";
-	assign foo[53]  = "\0";
+	assign foo[38]  = "T";
+	assign foo[39]  = "H";
+	assign foo[40]  = "A";
+	assign foo[41]  = "N";
+	assign foo[42]  = "K";
+	assign foo[43]  = "S";
+	assign foo[44]  = "<";
+	assign foo[45]  = "/";
+	assign foo[46]  = "p";
+	assign foo[47]  = ">";
+	assign foo[48]  = "<";
+	assign foo[49]  = "p";
+	assign foo[50]  = " ";
+	assign foo[51]  = "c";
+	assign foo[52]  = "o";
+	assign foo[53]  = "l";
+	assign foo[54]  = "o";
+	assign foo[55]  = "r";
+	assign foo[56]  = "=";
+	assign foo[57]  = "2";
+	assign foo[58]  = ">";
+	assign foo[59]  = "B";
+	assign foo[60]  = "E";
+	assign foo[61]  = "S";
+	assign foo[62]  = "T";
+	assign foo[63]  = " ";
+	assign foo[64]  = "T";
+	assign foo[65]  = "A";
+	assign foo[66]  = "<";
+	assign foo[67]  = "/";
+	assign foo[68]  = "p";
+	assign foo[69]  = ">";
+	assign foo[70]  = "<";
+	assign foo[71]  = "p";
+	assign foo[72]  = " ";
+	assign foo[73]  = "c";
+	assign foo[74]  = "o";
+	assign foo[75]  = "l";
+	assign foo[76]  = "o";
+	assign foo[77]  = "r";
+	assign foo[78]  = "=";
+	assign foo[79]  = "3";
+	assign foo[80]  = " ";
+	assign foo[81]  = "s";
+	assign foo[82]  = "i";
+	assign foo[83]  = "z";
+	assign foo[84]  = "e";
+	assign foo[85]  = "=";
+	assign foo[86]  = "1";
+	assign foo[87]  = " ";
+	assign foo[88]  = ">";
+	assign foo[89]  = "S";
+	assign foo[90]  = "R";
+	assign foo[91]  = " ";
+	assign foo[92]  = "a";
+	assign foo[93]  = "n";
+	assign foo[94]  = "d";
+	assign foo[95]  = " ";
+	assign foo[96]  = "J";
+	assign foo[97]  = "C";
+	assign foo[98]  = "<";
+	assign foo[99]  = "/";
+	assign foo[100]  = "p";
+	assign foo[101]  = ">";	
+	assign foo[102]  = "<";
+	assign foo[103]  = "/";
+	assign foo[104]  = "b";
+	assign foo[105]  = "o";
+	assign foo[106]  = "d";
+	assign foo[107]  = "y";
+	assign foo[108]  = ">";
+	assign foo[109]  = "\0";
 
 
-	reg [5:0] char_index = 0;
+	reg [10:0] char_index = 0;
 	reg has_char = 0;
 
 	initial char = 0;
@@ -79,7 +135,7 @@ module dummy_reader(
 		if(state_enable == 1 && has_char == 0) begin
 			has_char <= 1;
 
-			if(char_index == 53) begin
+			if(char_index == 109) begin
 				has_finished <= 1;
 			end else begin				
 				char <= foo[char_index];