Merge branch 'main' into shaders

Author: sathworld

info.yaml

@@ -40,6 +40,7 @@ project:
     - "bg_line.v"
     - "priority_encoder.v"
     - "color_decoder.v"
+    - "ai_controller.v"
 
 
 # The pinout of your project. Leave unused pins blank. DO NOT delete or add any pins.

src/ai_controller.v

@@ -0,0 +1,54 @@
+`default_nettype none
+
+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,
+  output reg button_up,
+  output reg crash_out
+);
+
+localparam RESTART_DELAY = 60; // Clock cycles to wait after crash to restart
+
+// reg [9:CONV] obstacle_threshold; // When an obstacle reaches this xpos, set button_up signal
+reg [7:0] restart_counter; 
+
+always @(posedge clk) begin
+  if (!rst_n) begin
+    button_up <= 1'b0;
+    crash_out <= 1'b0;
+    restart_counter <= 'b0;
+  end else begin
+    if (gamepad_is_present) begin
+      button_up <= gamepad_up;
+      crash_out <= crash;
+    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
+    end
+  end
+end
+
+
+
+endmodule

src/dino_game_top.v

@@ -20,27 +20,11 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
     wire [1:0] game_tick_20hz; // two consecutive pulses generated ([0] and then [1]), enabling pipelining
 
     wire debounce_countdown_en; // pulse on rising edge of 5th vpos bit
-    wire button_up; 
-    wire button_down; 
 
-    button_debounce button_up_debounce (
-        .clk(clk),
-        .rst_n(rst_n),
-        .countdown_en(debounce_countdown_en),
-        .button_in(ui_in[0]),
-        .button_out(button_up)
-    );
-    
-    button_debounce button_down_debounce (
-      .clk(clk),
-      .rst_n(rst_n),
-      .countdown_en(debounce_countdown_en),
-      .button_in(ui_in[1]),
-      .button_out(button_down)
-    );
 
     // 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;
@@ -63,14 +47,58 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
         .lfsr_data(rng)
     );
 
+    // Gamepad Pmod support
+    wire gamepad_pmod_latch = ui_in[4];
+    wire gamepad_pmod_clk = ui_in[5];
+    wire gamepad_pmod_data = ui_in[6];
+    wire gamepad_is_present;  // HIGH when gamepad is connected
+    wire gamepad_up;
+    wire gamepad_down;
+    wire gamepad_start;   // Can leverage start, select from SNES
+    wire gamepad_b;
+    wire gamepad_y;
+    wire gamepad_select;
+    wire gamepad_left;
+    wire gamepad_right;
+    wire gamepad_a;
+    wire gamepad_x;
+    wire gamepad_l;
+    wire gamepad_r;
+
+    // Synchronizes pmod_data, pmod_clk, pmod_latch signals to system clock
+    // domain.
+    gamepad_pmod_single gamepad_pmod (
+        // Inputs:
+        .clk(clk),
+        .rst_n(rst_n),
+        .pmod_latch(gamepad_pmod_latch),
+        .pmod_clk(gamepad_pmod_clk),
+        .pmod_data(gamepad_pmod_data),
+
+        // Outputs:
+        .is_present(gamepad_is_present),
+        .up(gamepad_up),
+        .down(gamepad_down),
+        .start(gamepad_up),
+        .b(gamepad_b),
+        .y(gamepad_y),
+        .select(gamepad_select),
+        .left(gamepad_left),
+        .right(gamepad_right),
+        .a(gamepad_a),
+        .x(gamepad_x),
+        .l(gamepad_l),
+        .r(gamepad_r)
+    );
+
     player_controller player_constroller_inst (
         .clk(clk),
         .rst_n(rst_n),
         .game_tick(game_tick_20hz),
         .button_start(button_up),
         .button_up(button_up),
-        .button_down(button_down),
-        .crash(crash),
+        .button_down(gamepad_down),
+        .crash(crash_out),
         .player_position(player_position),
         .game_frozen(game_frozen),
         .game_start_pulse(game_start_pulse),
@@ -79,7 +107,7 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
         .game_state(game_state)
     );
 
- obstacles #(.GEN_LINE(71), .CONV(CONV)) obstacles_inst (
+    obstacles #(.GEN_LINE(71), .CONV(CONV)) obstacles_inst (
         .clk(clk),
         .rst_n(rst_n),
         .game_frozen(game_frozen),
@@ -243,7 +271,7 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
     ScoreModule score_module_inst (
         .game_start(game_start_pulse),     
         .game_frozen(game_frozen),      
-        .game_tick(game_tick_20hz[0]),     
+        .game_tick(game_tick_60hz),     
         .clk(clk),            // clock
         .rst_n(rst_n),          // reset_n - low to reset
         .score(score)    
@@ -256,6 +284,18 @@ module tt_um_uwasic_dinogame #(parameter CONV = 2) (
         .jump_pulse(jump_pulse),
         .sound(uio_out[7])
     );
+
+    ai_controller #(.CONV(CONV)) ai_controller_inst(
+        .clk(clk),
+        .rst_n(rst_n),
+        .gamepad_is_present(gamepad_is_present),
+        .gamepad_up(gamepad_up),
+        .obstacle1_pos(obstacle1_pos),
+        .obstacle2_pos(obstacle2_pos),
+        .crash(crash),
+        .button_up(button_up),
+        .crash_out(crash_out)
+    );
 
     // TinyVGA PMOD
     assign uo_out = {hsync, B[0], G[0], R[0], vsync, B[1], G[1], R[1]};