Refactor gamepad input handling in dino_game_top and ai_controller modules

Author: sathworld

src/ai_controller.v

@@ -3,15 +3,18 @@
 module ai_controller
     #(    parameter CONV = 0, parameter GEN_LINE = 250, parameter PLAYER_OFFSET = 6, parameter OBSTACLE_TRESHOLD = 30 )
 (
-  input clk,
-  input rst_n,
-  input gamepad_is_present,
-  input gamepad_up,
-  input [9:CONV] obstacle1_pos,
-  input [9:CONV] obstacle2_pos,
-  input crash,
+  input wire clk,
+  input wire rst_n,
+  input wire gamepad_is_present,
+  input wire gamepad_start,
+  input wire gamepad_up,
+  input wire gamepad_down,
+  input wire [9:CONV] obstacle1_pos,
+  input wire [9:CONV] obstacle2_pos,
+  input wire crash,
+  output reg button_start,
   output reg button_up,
-  output reg crash_out
+  output reg button_down
 );
 
 localparam RESTART_DELAY = 60; // Clock cycles to wait after crash to restart
@@ -21,30 +24,23 @@ reg [7:0] restart_counter;
 
 always @(posedge clk) begin
   if (!rst_n) begin
+    button_start <= 1'b0;
     button_up <= 1'b0;
-    crash_out <= 1'b0;
-    restart_counter <= 'b0;
+    button_down <= 1'b0;
+    restart_counter <= 8'b00000000;
   end else begin
     if (gamepad_is_present) begin
+      button_start <= gamepad_start;
       button_up <= gamepad_up;
-      crash_out <= crash;
+      button_down <= gamepad_down;
+    end else if (crash) begin
+      button_start <= 1'b1;
+      button_up <= 1'b0;
+      button_down <= 1'b0;
+    end else if ((obstacle1_pos <= OBSTACLE_TRESHOLD && obstacle1_pos > PLAYER_OFFSET) || (obstacle2_pos <= OBSTACLE_TRESHOLD && obstacle2_pos > PLAYER_OFFSET)) begin
+      button_up <= 1'b1;
     end else begin
-      if (crash_out) begin
-        restart_counter <= restart_counter + 1;
-        if (restart_counter == RESTART_DELAY) begin
-          crash_out <= 1'b0;
-          button_up <= 1'b1;
-          restart_counter <= 'b0;
-        end
-      end else if (crash) begin
-        crash_out <= 1'b1;
-      end else begin
-        if ((obstacle1_pos <= OBSTACLE_TRESHOLD && obstacle1_pos > PLAYER_OFFSET) || (obstacle2_pos <= OBSTACLE_TRESHOLD && obstacle2_pos > PLAYER_OFFSET)) begin
-          button_up <= 1'b1;
-        end else begin
-          button_up <= 1'b0;
-        end
-      end
+      button_up <= 1'b0;
     end
   end
 end

src/dino_game_top.v

@@ -24,7 +24,6 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
 
     // GAME STATE SIGNALS
     wire crash; // set to 1'b1 by rendering when collision occurs
-    wire crash_out;
     wire [5:0] player_position;
     wire game_start_pulse;
     wire game_over_pulse;
@@ -65,6 +64,10 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
     wire gamepad_l;
     wire gamepad_r;
 
+    wire button_start;
+    wire button_up;
+    wire button_down;
+
     // Synchronizes pmod_data, pmod_clk, pmod_latch signals to system clock
     // domain.
     gamepad_pmod_single gamepad_pmod (
@@ -79,7 +82,7 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
         .is_present(gamepad_is_present),
         .up(gamepad_up),
         .down(gamepad_down),
-        .start(gamepad_up),
+        .start(gamepad_start),
         .b(gamepad_b),
         .y(gamepad_y),
         .select(gamepad_select),
@@ -95,10 +98,10 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
         .clk(clk),
         .rst_n(rst_n),
         .game_tick(game_tick_20hz),
-        .button_start(button_up),
+        .button_start(button_start),
         .button_up(button_up),
-        .button_down(gamepad_down),
-        .crash(crash_out),
+        .button_down(button_down),
+        .crash(crash),
         .player_position(player_position),
         .game_frozen(game_frozen),
         .game_start_pulse(game_start_pulse),
@@ -289,12 +292,15 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
         .clk(clk),
         .rst_n(rst_n),
         .gamepad_is_present(gamepad_is_present),
+        .gamepad_start(gamepad_start),
         .gamepad_up(gamepad_up),
+        .gamepad_down(gamepad_down),
         .obstacle1_pos(obstacle1_pos),
         .obstacle2_pos(obstacle2_pos),
         .crash(crash),
+        .button_start(button_start),
         .button_up(button_up),
-        .crash_out(crash_out)
+        .button_down(button_down)
     );
 
     // TinyVGA PMOD