change digital pins to avoid collisions with pin13 for L Led on the board

.github/workflows/ci.yml

@@ -7,6 +7,8 @@ on:
       - 'arduino_pong.ino'
       - 'Makefile'
       - '.github/workflows/ci.yml'
+      - 'src/*.cpp'
+      - 'src/*.h'
 
 jobs:
   build:

README.md

@@ -8,7 +8,7 @@ A classic implementation of the Pong game developed specifically for the Arduino
 
 # 📹 Preview
 
-![Pong](preview.png)
+![Pong](assets/preview.png)
 
 Youtube: https://youtu.be/ouLBTDjpKqc
 

arduino_pong.ino

@@ -1,20 +1,20 @@
 #include "Arduino_LED_Matrix.h"
 
-#include "config.h"
-#include "pong_render.h"
-#include "pong_player.h"
-#include "pong_ball.h"
+#include "src/config.h"
+#include "src/pong_render.h"
+#include "src/pong_player.h"
+#include "src/pong_ball.h"
 
 // create LED matrix object
 ArduinoLEDMatrix matrix;
 
-// initial pong frame
+// initial pong frame matrix
 byte frame[MATRIX_HEIGHT][MATRIX_WIDTH] = {
   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
   { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
   { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
-  { 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0 },
-  { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
+  { 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
+  { 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1 },
   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1 },
   { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
@@ -30,32 +30,35 @@ int ball_y= BALL_RESET_Y;
 
 int need_refresh= 1;
 
-int loop_delay= INITIAL_LOOP_DELAY;
+int ball_delay= INITIAL_BALL_DELAY;
 
 long exec_t2= millis();
 
+
 void setup() {
-  //Serial.begin(115200);
   Serial.begin(9600);
-  // stard LED matrix
+  // start LED matrix
   matrix.begin();
   pinMode(P1_BTN_UP, INPUT_PULLUP);
   pinMode(P1_BTN_BOTTOM, INPUT_PULLUP);
   pinMode(P2_BTN_UP, INPUT_PULLUP);
   pinMode(P2_BTN_BOTTOM, INPUT_PULLUP);
 
-  randomSeed(analogRead(0));
+  randomSeed(millis());
 }
 
 void loop() {
   long exec_t1= millis();
   pong_move_p1(p1_start, need_refresh);
   pong_move_p2(p2_start, need_refresh);
-  render_matrix(frame, p1_start, p2_start, need_refresh, ball_x, ball_y);
-  if (exec_t1 - exec_t2 > loop_delay) {
-    move_ball(ball_x, ball_y, loop_delay, p1_start, p2_start, need_refresh);
+  if (exec_t1 - exec_t2 > ball_delay) {
+    move_ball(ball_x, ball_y, ball_delay, p1_start, p2_start, need_refresh);
     exec_t2= exec_t1;
   }
-  matrix.renderBitmap(frame, MATRIX_HEIGHT, MATRIX_WIDTH);
+  if (need_refresh) {
+    render_matrix(frame, p1_start, p2_start, ball_x, ball_y);
+    matrix.renderBitmap(frame, MATRIX_HEIGHT, MATRIX_WIDTH);
+    need_refresh= 0;
+  }
   delay(50);
 }

src/config.h

@@ -1,11 +1,11 @@
-#define P1_BTN_UP 13
-#define P1_BTN_BOTTOM 12
-#define P2_BTN_UP 11
-#define P2_BTN_BOTTOM 10
+#define P1_BTN_UP 12
+#define P1_BTN_BOTTOM 11
+#define P2_BTN_UP 10
+#define P2_BTN_BOTTOM 9
 
 #define MATRIX_WIDTH 12
 #define MATRIX_HEIGHT 8
 #define BALL_RESET_X (MATRIX_WIDTH / 2)
 #define BALL_RESET_Y (MATRIX_HEIGHT / 2)
 #define BAR_LENGTH 3
-#define INITIAL_LOOP_DELAY 200
+#define INITIAL_BALL_DELAY 200

src/pong_ball.cpp

@@ -13,7 +13,7 @@ int p2_score= 0;
 int ball_move_x= 0;
 int ball_move_y= 0;
 
-void point_scored(int &ball_x, int &ball_y, int &loop_delay) {
+void point_scored(int &ball_x, int &ball_y, int &ball_delay) {
   ball_x= BALL_RESET_X;
   ball_y= BALL_RESET_Y;
   Serial.print("P1: ");
@@ -24,10 +24,10 @@ void point_scored(int &ball_x, int &ball_y, int &loop_delay) {
   Serial.println();
 
   hits= 0;
-  loop_delay= INITIAL_LOOP_DELAY;
+  ball_delay= INITIAL_BALL_DELAY;
 }
 
-void move_ball(int &ball_x, int &ball_y, int &loop_delay, int p1_start, int p2_start, int &need_refresh) {
+void move_ball(int &ball_x, int &ball_y, int &ball_delay, int p1_start, int p2_start, int &need_refresh) {
   need_refresh= 1;
   if (ball_x < 0 || ball_x > MATRIX_WIDTH-1 || ball_y < 0 || ball_y > MATRIX_HEIGHT-1) {
     // ball out of matrix limits
@@ -52,7 +52,7 @@ void move_ball(int &ball_x, int &ball_y, int &loop_delay, int p1_start, int p2_s
       // else p2 score, reset board
       p2_score += 1;
       Serial.println("Player 2 Scores");
-      point_scored(ball_x, ball_y, loop_delay);
+      point_scored(ball_x, ball_y, ball_delay);
     }
     else {
       hits += 1;
@@ -64,7 +64,7 @@ void move_ball(int &ball_x, int &ball_y, int &loop_delay, int p1_start, int p2_s
       // else p1 score, reset board
       p1_score += 1;
       Serial.println("Player 1 Scores");
-      point_scored(ball_x, ball_y, loop_delay);
+      point_scored(ball_x, ball_y, ball_delay);
     }
     else {
       hits += 1;
@@ -77,10 +77,10 @@ void move_ball(int &ball_x, int &ball_y, int &loop_delay, int p1_start, int p2_s
     ball_move_y= ball_move_y * -1;
   }
 
-  if (hits >= 6 && loop_delay >= 80) {
+  if (hits >= 6 && ball_delay >= 80) {
     // increase ball speed
     hits = 0;
-    loop_delay -= 20;
+    ball_delay -= 20;
   }
 
   ball_x+= ball_move_x;

src/pong_render.cpp

@@ -1,9 +1,7 @@
 #include <Arduino.h>
 #include "config.h"
 
-void render_matrix(byte frame[MATRIX_HEIGHT][MATRIX_WIDTH], int p1_start, int p2_start, int &need_refresh, int ball_x, int ball_y) {
-  if (!need_refresh) return;
-  need_refresh= 0;
+void render_matrix(byte frame[MATRIX_HEIGHT][MATRIX_WIDTH], int p1_start, int p2_start, int ball_x, int ball_y) {
   // clear
   for (int x=0; x < MATRIX_WIDTH; x++) {
     for (int y=0; y < MATRIX_HEIGHT; y++) {

src/pong_render.h

@@ -4,6 +4,6 @@
 #include <Arduino.h>
 #include "Arduino_LED_Matrix.h"
 
-void render_matrix(byte frame[MATRIX_HEIGHT][MATRIX_WIDTH], int p1_start, int p2_start, int &need_refresh, int ball_x, int ball_y);
+void render_matrix(byte frame[MATRIX_HEIGHT][MATRIX_WIDTH], int p1_start, int p2_start, int ball_x, int ball_y);
 
 #endif