Merge branch 'master' of https://github.com/iforgetmyname/CSC258-project

Author: platers

.gitignore

@@ -0,0 +1,6 @@
+c5_pin_model_dump.txt
+greybox_tmp/*
+db/*
+incremental_db/*
+simulation/*
+output_files/*

decoder.v

@@ -42,7 +42,7 @@ set_global_assignment -name DEVICE 5CSEMA5F31C6
 set_global_assignment -name TOP_LEVEL_ENTITY hangman
 set_global_assignment -name ORIGINAL_QUARTUS_VERSION 17.0.0
 set_global_assignment -name PROJECT_CREATION_TIME_DATE "15:13:25  MARCH 25, 2019"
-set_global_assignment -name LAST_QUARTUS_VERSION "18.0.0 Standard Edition"
+set_global_assignment -name LAST_QUARTUS_VERSION "17.0.0 Lite Edition"
 set_global_assignment -name PROJECT_OUTPUT_DIRECTORY output_files
 set_global_assignment -name MIN_CORE_JUNCTION_TEMP 0
 set_global_assignment -name MAX_CORE_JUNCTION_TEMP 85
@@ -698,18 +698,21 @@ set_instance_assignment -name IO_STANDARD "3.3-V LVTTL" -to HPS_USB_STP -entity
 set_global_assignment -name PARTITION_NETLIST_TYPE SOURCE -section_id Top
 set_global_assignment -name PARTITION_FITTER_PRESERVATION_LEVEL PLACEMENT_AND_ROUTING -section_id Top
 set_global_assignment -name PARTITION_COLOR 16764057 -section_id Top
-set_global_assignment -name VERILOG_FILE vga_adapter/vga_pll.v
-set_global_assignment -name VERILOG_FILE vga_adapter/vga_controller.v
-set_global_assignment -name VERILOG_FILE vga_adapter/vga_address_translator.v
-set_global_assignment -name VERILOG_FILE vga_adapter/vga_adapter.v
-set_global_assignment -name VERILOG_FILE vga.v
-set_global_assignment -name VERILOG_FILE keyboard_driver/keyboard_scancoderaw_driver.v
-set_global_assignment -name VERILOG_FILE keyboard_driver/keyboard_press_driver.v
-set_global_assignment -name VERILOG_FILE keyboard_driver/keyboard_inner_driver.v
-set_global_assignment -name QIP_FILE ram.qip
-set_global_assignment -name VERILOG_FILE level_select.v
-set_global_assignment -name VERILOG_FILE hex_decoder.v
-set_global_assignment -name VERILOG_FILE hangman.v
-set_global_assignment -name VERILOG_FILE game_state.v
-set_global_assignment -name VERILOG_FILE decoder.v
+set_global_assignment -name VERILOG_FILE keyboard_driver/keyboard_scancoderaw_driver.v
+set_global_assignment -name VERILOG_FILE keyboard_driver/keyboard_press_driver.v
+set_global_assignment -name VERILOG_FILE keyboard_driver/keyboard_inner_driver.v
+set_global_assignment -name VERILOG_FILE vga_adapter/vga_pll.v
+set_global_assignment -name VERILOG_FILE vga_adapter/vga_controller.v
+set_global_assignment -name VERILOG_FILE vga_adapter/vga_address_translator.v
+set_global_assignment -name VERILOG_FILE vga_adapter/vga_adapter.v
+set_global_assignment -name QIP_FILE letter_ram.qip
+set_global_assignment -name QIP_FILE word_ram.qip
+set_global_assignment -name VERILOG_FILE word_ram.v
+set_global_assignment -name VERILOG_FILE hangman.v
+set_global_assignment -name VERILOG_FILE hex_decoder.v
+set_global_assignment -name VERILOG_FILE vga.v
+set_global_assignment -name VERILOG_FILE game_state.v
+set_global_assignment -name VERILOG_FILE level_select.v
+set_global_assignment -name VERILOG_FILE keyboard_handler.v
+set_global_assignment -name VERILOG_FILE letter_ram.v
 set_instance_assignment -name PARTITION_HIERARCHY root_partition -to | -section_id Top

display.v

@@ -10,38 +10,33 @@ module hangman(
 	output [9:0] VGA_R, VGA_G, VGA_B);
 
 	wire clk, reset;
+	wire [3:0] word_select;
 	assign clk = CLOCK_50;
 	assign reset = ~KEY[0];
+	assign word_select[3:0] = SW[3:0];
 
-	wire valid, makeBreak;
-	wire [7:0] outCode;
-	wire [4:0] outLetter;
-	wire [29:0] word;
-	wire [25:0] mask;
 	wire load;
-	reg [3:0] wrong_time;
-	assign load = (makeBreak == 1'b1);
-	assign LEDR[7] = load;
-	
-	keyboard_press_driver k0(
-		.CLOCK_50(CLOCK_50),
-		.valid(valid),
-		.makeBreak(makeBreak),
-		.outCode(outCode),
-		
+	wire [4:0] pressedLetter;
+	keyboard_handler k0(
+		.clk(clk),
+		.reset(reset),
 		.PS2_DAT(PS2_DAT),
 		.PS2_CLK(PS2_CLK),
-		
-		.reset(reset)
-		);
-	
-	assign LEDR[9] = valid;
-	assign LEDR[8] = makeBreak;
 
-	decoder d0(
-		.inCode(outCode),
-		.outLetter(outLetter)
-		);
+		.pressed(load),
+		.inputLetter(pressedLetter[4:0])
+	);
+
+	wire [29:0] word;
+	wire [25:0] mask;
+	word_ram wr0(
+		.address(word_select[3:0]),
+		.clock(clk),
+		.data(56'd0),
+		.wren(1'b0),
+		.q({word[29:0], mask[25:0]})
+	);
+	reg [3:0] wrong_time;
 
 	wire win_game, lost_game;
 
@@ -51,13 +46,9 @@ module hangman(
 		.clk(clk),
 		.reset(reset),
 
-		.start_game(((outLetter == 5'd26) && load)),
+		.start_game(((pressedLetter == 5'd26) && load)),
 		.win_game(win_game),
 		.lost_game((wrong_time == 1'b0)),
-		.select(SW[3:0]),
-		
-		.word(word),
-		.mask(mask),
 
 		.current_state(level_state)
 		);
@@ -68,7 +59,7 @@ module hangman(
 		.clk(clk),
 		.reset(reset),
 		.load(((level_state == 2'd1) && load)),
-		.load_x(outLetter),
+		.load_x(pressedLetter),
 
 		.mask(mask),
 
@@ -89,6 +80,8 @@ module hangman(
 		.clk(clk),
 		.reset(reset),
 		.state(level_state[3:0]),
+		.word(word),
+		.mask(state),
 
 		.VGA_CLK(VGA_CLK),
 		.VGA_HS(VGA_HS),
@@ -101,12 +94,12 @@ module hangman(
 		);
 
 	hex_decoder h0(
-		.hex_digit(outLetter[3:0]),
+		.hex_digit(pressedLetter[3:0]),
 		.segments(HEX0[6:0])
 		);
 
 	hex_decoder h1(
-		.hex_digit({3'b000, outLetter[4:4]}),
+		.hex_digit({3'b000, pressedLetter[4]}),
 		.segments(HEX1[6:0])
 		);
 
@@ -124,4 +117,6 @@ module hangman(
 		.hex_digit(wrong_time),
 		.segments(HEX4[6:0])
 		);
+	
+	assign LEDR[9] = load;
 endmodule

greybox_tmp/cbx_args.txt

@@ -0,0 +1,55 @@
+module keyboard_handler(
+    input clk, reset,
+    input PS2_DAT, PS2_CLK,
+
+    output pressed,
+    output reg [4:0] inputLetter
+);
+
+    wire [7:0] keyboardOutCode;
+
+    keyboard_press_driver kDriver0(
+        .CLOCK_50(clk),
+        .makeBreak(pressed),
+        .outCode(keyboardOutCode[7:0]),
+
+        .PS2_DAT(PS2_DAT),
+        .PS2_CLK(PS2_CLK),
+
+        .reset(reset)
+    );
+
+    always @(*) begin
+		case (keyboardOutCode[7:0])
+			8'h1C: inputLetter[4:0] = 5'd0;   // A
+			8'h32: inputLetter[4:0] = 5'd1;
+			8'h21: inputLetter[4:0] = 5'd2;
+			8'h23: inputLetter[4:0] = 5'd3;
+			8'h24: inputLetter[4:0] = 5'd4;
+			8'h2B: inputLetter[4:0] = 5'd5;
+			8'h34: inputLetter[4:0] = 5'd6;
+			8'h33: inputLetter[4:0] = 5'd7;
+			8'h43: inputLetter[4:0] = 5'd8;
+			8'h3B: inputLetter[4:0] = 5'd9;
+			8'h42: inputLetter[4:0] = 5'd10;
+			8'h4B: inputLetter[4:0] = 5'd11;
+			8'h3A: inputLetter[4:0] = 5'd12;
+			8'h31: inputLetter[4:0] = 5'd13;
+			8'h44: inputLetter[4:0] = 5'd14;
+			8'h4D: inputLetter[4:0] = 5'd15;
+			8'h15: inputLetter[4:0] = 5'd16;
+			8'h2D: inputLetter[4:0] = 5'd17;
+			8'h1B: inputLetter[4:0] = 5'd18;
+			8'h2C: inputLetter[4:0] = 5'd19;
+			8'h3C: inputLetter[4:0] = 5'd20;
+			8'h2A: inputLetter[4:0] = 5'd21;
+			8'h1D: inputLetter[4:0] = 5'd22;
+			8'h22: inputLetter[4:0] = 5'd23;
+			8'h35: inputLetter[4:0] = 5'd24;
+			8'h1A: inputLetter[4:0] = 5'd25;  // Z
+			8'h5A: inputLetter[4:0] = 5'd26;  // Enter
+			default : inputLetter [4:0] = 5'd27;
+		endcase
+	end
+
+endmodule

hangman.qsf

@@ -0,0 +1,4 @@
+set_global_assignment -name IP_TOOL_NAME "RAM: 1-PORT"
+set_global_assignment -name IP_TOOL_VERSION "17.0"
+set_global_assignment -name IP_GENERATED_DEVICE_FAMILY "{Cyclone V}"
+set_global_assignment -name VERILOG_FILE [file join $::quartus(qip_path) "letter_ram.v"]