X-Git-Url: http://git.joshuawise.com/fpgaboy.git/blobdiff_plain/ff7fd7f2e78ed70833e58cecc316d5c8d6603349..a6035e0c1b5785205c73dd6510e0b83631bda75b:/7seg.v?ds=sidebyside

diff --git a/7seg.v b/7seg.v
index ed4519a..11e26d4 100644
--- a/7seg.v
+++ b/7seg.v
@@ -1,12 +1,13 @@
 module AddrMon(
 	input [15:0] addr,
 	input clk,
+	input [3:0] periods,
 	output reg [3:0] digit,
-	output reg [7:0] out,
+	output wire [7:0] out,
 	input freeze
 	);
 
-	reg [12:0] clkdv;
+	reg [5:0] clkdv;
 	reg [1:0] dcount;
 	
 	reg [15:0] latch = 0;
@@ -15,44 +16,50 @@ module AddrMon(
 		(dcount == 2'b00) ? latch[3:0]  :
 		(dcount == 2'b01) ? latch[7:4]  :
 		(dcount == 2'b10) ? latch[11:8] :
-		                     latch[15:12];
-
-	always @ (negedge clk)
-	begin
-		clkdv <= clkdv + 1;
-		if (~freeze)
-			latch <= addr;
-	end
+		                    latch[15:12];
+	
+	reg [6:0] odigit;
+	assign out = {odigit,
+			~((dcount == 2'b00) ? periods[0] :
+			  (dcount == 2'b01) ? periods[1] :
+			  (dcount == 2'b10) ? periods[2] :
+			                      periods[3]) };
 
-	always @ (posedge clkdv[12])
-	begin
-		dcount <= dcount + 1;
+	always @ (posedge clk) begin
+		if (clkdv == 31) begin
+			clkdv <= 0;
+			dcount <= dcount + 1;
 
-		case(dcount)
-		2'b00: digit <= 4'b1110;
-		2'b01: digit <= 4'b1101;
-		2'b10: digit <= 4'b1011;
-		2'b11: digit <= 4'b0111;
-		endcase
+			case(dcount)
+			2'b00: digit <= 4'b1110;
+			2'b01: digit <= 4'b1101;
+			2'b10: digit <= 4'b1011;
+			2'b11: digit <= 4'b0111;
+			endcase
 
-		case(curval)
-		             /* ABCDEFGP */
-		4'h0: out <= ~8'b11111100;
-		4'h1: out <= ~8'b01100000;
-		4'h2: out <= ~8'b11011010;
-		4'h3: out <= ~8'b11110010;
-		4'h4: out <= ~8'b01100110;
-		4'h5: out <= ~8'b10110110;
-		4'h6: out <= ~8'b10111110;
-		4'h7: out <= ~8'b11100000;
-		4'h8: out <= ~8'b11111110;
-		4'h9: out <= ~8'b11110110;
-		4'hA: out <= ~8'b11101110;
-		4'hB: out <= ~8'b00111110;
-		4'hC: out <= ~8'b10011100;
-		4'hD: out <= ~8'b01111010;
-		4'hE: out <= ~8'b10011110;
-		4'hF: out <= ~8'b10001110;
-		endcase
+			case(curval)
+							/* ABCDEFGP */
+			4'h0: odigit <= ~8'b1111110;
+			4'h1: odigit <= ~8'b0110000;
+			4'h2: odigit <= ~8'b1101101;
+			4'h3: odigit <= ~8'b1111001;
+			4'h4: odigit <= ~8'b0110011;
+			4'h5: odigit <= ~8'b1011011;
+			4'h6: odigit <= ~8'b1011111;
+			4'h7: odigit <= ~8'b1110000;
+			4'h8: odigit <= ~8'b1111111;
+			4'h9: odigit <= ~8'b1111011;
+			4'hA: odigit <= ~8'b1110111;
+			4'hB: odigit <= ~8'b0011111;
+			4'hC: odigit <= ~8'b1001110;
+			4'hD: odigit <= ~8'b0111101;
+			4'hE: odigit <= ~8'b1001111;
+			4'hF: odigit <= ~8'b1000111;
+			endcase
+		end else
+			clkdv <= clkdv + 1;
+		
+		if (~freeze)
+			latch <= addr;
 	end
 endmodule