fix conflicts

when someone scores a point, speed is resetted to the initial speed

.github/workflows/cd.yml

@@ -0,0 +1,37 @@
+name: Arduino Pong CD
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Arduino CLI
+        run: |
+          curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh
+          echo "./bin" >> $GITHUB_PATH
+
+      - name: Install Board Core and Libs
+        run: |
+          arduino-cli core update-index
+          arduino-cli core install arduino:renesas_uno
+
+      - name: Build Binary
+        run: make compile
+
+      - name: Create Release
+        uses: softprops/action-gh-release@v2
+        with:
+          files: |
+            build/*.bin
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -0,0 +1,39 @@
+name: Arduino Pong CI
+
+on:
+  push:
+    branches: [ master ]
+    paths:
+      - 'arduino_pong.ino'
+      - 'Makefile'
+      - '.github/workflows/ci.yml'
+      - 'src/*.cpp'
+      - 'src/*.h'
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v6
+
+      - name: Setup Arduino CLI
+        #uses: arduino/setup-arduino-cli@v2
+        shell: bash
+        run: |
+          curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | sh
+          echo "./bin" >> $GITHUB_PATH
+
+      - name: Install UNO R4 Core
+        run: |
+          arduino-cli core update-index
+          arduino-cli core install arduino:renesas_uno
+          
+      - name: Compile Sketch (via Makefile)
+        shell: bash
+        run: make prepare_and_compile

.gitignore

@@ -0,0 +1,4 @@
+.arduino_cache/
+bin/
+build/
+src/secrets.h

Makefile

@@ -1,16 +1,63 @@
+PORT ?= /dev/ttyACM0
+BOARD = arduino:renesas_uno:unor4wifi
+SKETCH = arduino_pong.ino
+CACHE_DIR = $(shell pwd)/.arduino_cache
+BIN_DIR = $(shell pwd)/bin
+CLI = $(BIN_DIR)/arduino-cli --config-file $(CACHE_DIR)/arduino-cli.yaml
+
+YELLOW := \033[0;33m
+GREEN  := \033[0;32m
+CLEAR  := \033[0m
+
+prepare:
+	@mkdir -p $(BIN_DIR)
+	@mkdir -p $(CACHE_DIR)
+	@if [ ! -f $(BIN_DIR)/arduino-cli ]; then \
+		echo -e "📥 $(YELLOW)Downloading arduino-cli...$(CLEAR)"; \
+		curl -fsSL https://raw.githubusercontent.com/arduino/arduino-cli/master/install.sh | BINDIR=$(BIN_DIR) sh; \
+	fi
+	@if [ ! -f $(CACHE_DIR)/arduino-cli.yaml ]; then \
+		echo -e "⚙️ $(YELLOW)Initializing local config...$(CLEAR)"; \
+		$(CLI) config init --dest-dir $(CACHE_DIR); \
+		$(CLI) config set directories.data $(CACHE_DIR)/data; \
+		$(CLI) config set directories.downloads $(CACHE_DIR)/downloads; \
+		$(CLI) config set directories.user $(CACHE_DIR)/user; \
+	fi
+	@if ! $(CLI) core list | grep -q "arduino:renesas_uno"; then \
+		echo -e "$(YELLOW)📥 Installing board core...$(CLEAR)"; \
+		$(CLI) core update-index; \
+		$(CLI) core install arduino:renesas_uno; \
+	fi
+
 compile:
-	arduino-cli compile -b arduino:renesas_uno:unor4wifi ./arduino_pong.ino
+	@mkdir -p build
+	@echo -e "$(GREEN)🛠️  Compiling $(SKETCH)...$(CLEAR)"
+	@$(CLI) compile -b $(BOARD) --output-dir build $(SKETCH)
+
+clean:
+	@echo -e "$(GREEN)🛠️  Removing build files...$(CLEAR)"
+	@rm -rf build/
+
+prepare_and_compile:
+	make prepare --no-print-directory
+	make compile --no-print-directory
 
 upload:
-	arduino-cli upload -b arduino:renesas_uno:unor4wifi -p /dev/ttyACM0
+	@echo -e "$(GREEN)🚀  Uploading $(SKETCH)...$(CLEAR)"
+	@$(CLI) upload -b $(BOARD) -p $(PORT)
 
 upload_verbose:
-	arduino-cli upload -b arduino:renesas_uno:unor4wifi -p /dev/ttyACM0 -v
+	@echo -e "$(GREEN)🚀  Uploading (Verbose) $(SKETCH)...$(CLEAR)"
+	@$(CLI) upload -b $(BOARD) -p $(PORT) -v
 
 monitor:
-	arduino-cli monitor -p /dev/ttyACM0
+	@$(CLI) monitor -p $(PORT)
 
 run:
-	make compile
-	make upload
-	make monitor
+	make compile --no-print-directory
+	make upload --no-print-directory
+	make monitor --no-print-directory
+
+run_init:
+	make prepare --no-print-directory
+	make run --no-print-directory

README.md

@@ -1,3 +1,68 @@
-# arduino_pong
+# 🏓 Arduino UNO R4 WiFi Pong
 
-Play Pong on Arduino UNO R4 WiFi LED Matrix
+A classic implementation of the Pong game developed specifically for the Arduino UNO R4 WiFi, utilizing its built-in 12×8 LED matrix as the game screen.
+
+[![Arduino Pong CI](https://github.com/Dea1993/arduino_pong/actions/workflows/ci.yml/badge.svg?branch=master)](https://github.com/Dea1993/arduino_pong/actions/workflows/ci.yml)
+[![Arduino Pong CD](https://github.com/Dea1993/arduino_pong/actions/workflows/cd.yml/badge.svg)](https://github.com/Dea1993/arduino_pong/actions/workflows/cd.yml)
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](LICENSE)
+
+# 📹 Preview
+
+![Pong](assets/preview.png)
+
+Youtube: https://youtu.be/ouLBTDjpKqc
+
+# 📝 Description
+
+This project transforms your Arduino board into a minimalist handheld console. By leveraging the Arduino_LED_Matrix library, the game manages ball physics, collision detection with walls and paddles, and a scoring system displayed via the Serial Monitor.
+
+Key Features:
+
+- Integrated Display: No external modules required; it uses the native 12×8 LED matrix.
+- Local Multiplayer: Two-player support using 4 external pushbuttons.
+- Dynamic Difficulty: The ball speed periodically increases to keep the gameplay challenging.
+- Real-time Scoring: Points are tracked and sent via Serial (9600 baud).
+
+# 🛠️ Hardware Requirements
+
+- Board: Arduino UNO R4 WiFi.
+- Buttons: 4x Momentary Pushbuttons.
+- Resistors: Not required (uses internal INPUT_PULLUP).
+- Breadboard & Jumper wires.
+
+# 🖮 Pinout Configuration
+
+Component	Arduino Pin	Function
+
+- P1 Button Up	D13	Moves Left Paddle Up
+- P1 Button Down	D12	Moves Left Paddle Down
+- P2 Button Up	D11	Moves Right Paddle Up
+- P2 Button Down	D10	Moves Right Paddle Down
+- Common GND	GND	Ground for all buttons
+
+# 🕹️ Game Logic
+
+- Bouncing: When the ball hits a paddle, the X direction is reversed and the hits counter increases.
+- Speed Scaling: Every 6 successful hits (hits >= 6), the loop_delay decreases by 20ms, speeding up the action until a minimum limit of 80ms is reached.
+- Scoring: If a player misses the ball, the opponent scores a point. The ball then resets to the center with a randomized direction.
+
+# 🛠️ Development
+
+This project includes a `Makefile` to automate the workflow using `arduino-cli`.
+
+### Prerequisites
+* [Arduino CLI](https://arduino.github.io/arduino-cli/latest/) installed.
+* Arduino UNO R4 core installed: 
+  `arduino-cli core install arduino:renesas_uno`
+
+### Commands
+| Command | Description |
+| :--- | :--- |
+| `make prepare` | Downloads arduino-cli locally and installs the UNO R4 core. |
+| `make compile` | Compiles the sketch without uploading. |
+| `make upload` | Uploads the compiled binary to `/dev/ttyACM0`. |
+| `make monitor` | Opens the Serial Monitor. |
+| `make run` | Full cycle: Compile + Upload + Monitor. |
+| `make run_init` | Full first-time setup: Prepare env + Compile + Upload + Monitor. |
+
+> **Note:** If your board is on a different port, edit the `Makefile` or override it: `make upload PORT=/dev/ttyUSB0`.

arduino_pong.ino

@@ -1,20 +1,21 @@
 #include "Arduino_LED_Matrix.h"
 
-#define P1_BTN_UP 13
-#define P1_BTN_BOTTOM 12
-#define P2_BTN_UP 11
-#define P2_BTN_BOTTOM 10
+#include "src/config.h"
+#include "src/pong_render.h"
+#include "src/pong_player.h"
+#include "src/pong_ball.h"
+#include "src/arduino_network.h"
 
 // create LED matrix object
 ArduinoLEDMatrix matrix;
 
-// initial pong frame
-byte frame[8][12] = {
+// 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 }
@@ -22,163 +23,47 @@ byte frame[8][12] = {
 
 // players coordinates
 int p1_start= 1;
-int p1_end= 3;
-
 int p2_start= 4;
-int p2_end= 6;
 
 // initials balls coordinates
-int ball_reset_x=6;
-int ball_reset_y=3;
-int ball_x= ball_reset_x;
-int ball_y= ball_reset_y;
+int ball_x= BALL_RESET_X;
+int ball_y= BALL_RESET_Y;
 
-// initially ball has no movements
-// once game/round starts, balls gets random x and y movements
-int ball_move_x= 0;
-int ball_move_y= 0;
+int need_refresh= 1;
 
-int bar_length= 3;
-int p1_score= 0;
-int p2_score= 0;
+int ball_delay= INITIAL_BALL_DELAY;
 
-int loop_delay= 220;
 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 render_matrix() {
-  // clear
-  for (int x=0; x < 12; x++) {
-    for (int y=0; y < 8; y++) {
-      frame[y][x]= 0;
-      frame[y][x]= 0;
-    }
-  }
-  
-  // players coords
-  for (int i= p1_start; i < p1_start+bar_length; i++) {
-    frame[i][0]= 1;
-  }
-  for (int i= p2_start; i < p2_start+bar_length; i++) {
-    frame[i][11]= 1;
-  }
-  
-  // ball coords
-  frame[ball_y][ball_x]= 1;
-
-  matrix.renderBitmap(frame, 8, 12);
-}
-
-void pong_move_p1() {
-  if (digitalRead(P1_BTN_UP) == LOW && p1_start > 0) {
-    p1_start -= 1;
-    Serial.print("P1 up: ");
-    Serial.println(p1_start);
-   }
-  else if (digitalRead(P1_BTN_BOTTOM) == LOW && p1_start < 5) {
-    p1_start += 1;
-    Serial.print("P1 down: ");
-    Serial.println(p1_start);
-  }
-}
-
-void pong_move_p2() {
-  if (digitalRead(P2_BTN_UP) == LOW && p2_start > 0) {
-    p2_start -= 1;
-    Serial.print("P2 up: ");
-    Serial.println(p2_start);
-  }
-  else if (digitalRead(P2_BTN_BOTTOM) == LOW && p2_start < 5) {
-    p2_start += 1;
-    Serial.print("P2 down: ");
-    Serial.println(p2_start);
-  }
-}
-
-void move_ball() {
-  if (ball_move_x == 0 || ball_move_y == 0) {
-    // extract random number between 0 or 1 to select the directions
-    if (random(2) == 0) ball_move_x= 1;
-    else ball_move_x= -1;
-    if (random(2) == 0) ball_move_y= 1;
-    else ball_move_y= -1;
-  }
-
-  else if (ball_x == 0) {
-    // if p1 collision: reverse x, go left
-    int hit= 0;
-    for (int p1= p1_start; p1 < p1_start + bar_length; p1++) {
-      if (ball_y == p1) {
-        ball_move_x= ball_move_x * -1;
-        hit= 1;
-        break;
-      }
-    }
-
-    if (!hit) {
-      // else p2 score, reset board
-      ball_x= ball_reset_x;
-      ball_y= ball_reset_y;
-      p2_score += 1;
-
-      Serial.print("Player 2 score: ");
-      Serial.println(p2_score);
-      Serial.print("Player 1 score: ");
-      Serial.println(p1_score);
-    }
-  }
-  else if (ball_x == 11) {
-    int hit= 0;
-    for (int p2= p2_start; p2 < p2_start + bar_length; p2++) {
-    // if p2 collision: reverse x, go left
-      if (ball_y == p2) {
-        ball_move_x= ball_move_x * -1;
-        hit= 1;
-        break;
-      }
-    }
-    
-    if (!hit) {
-      // else p1 score, reset board
-      ball_x= ball_reset_x;
-      ball_y= ball_reset_y;
-      p1_score += 1;
-      Serial.print("Player 2: ");
-      Serial.println(p2_score);
-      Serial.print("Player 1: ");
-      Serial.println(p1_score);
-    }
-  }
-
-  else if (ball_y == 0 || ball_y == 7) {
-    // reverse y, go down
-    ball_move_y= ball_move_y * -1;
-  }
-
-  ball_x+= ball_move_x;
-  ball_y+= ball_move_y;
+  setup_network();
 }
 
 void loop() {
   long exec_t1= millis();
-  pong_move_p1();
-  pong_move_p2();
-  render_matrix();
-  if (exec_t1 - exec_t2 > loop_delay) {
-    move_ball();
+  pong_move_p1(p1_start, need_refresh);
+  pong_move_p2(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;
   }
-  delay(10);
+  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);
+
+  web_server();
 }

src/arduino_network.cpp

@@ -0,0 +1,141 @@
+#include "config.h"
+#include "Arduino.h"
+#include "WiFiS3.h"
+
+char ssid[]= SECRET_SSID;
+char pass[]= SECRET_PASS;
+int status= WL_IDLE_STATUS;
+WiFiServer server(80);
+
+
+void printMacAddress(byte mac[]) {
+  for (int i = 0; i < 6; i++) {
+    if (i > 0) {
+      Serial.print(":");
+    }
+    if (mac[i] < 16) {
+      Serial.print("0");
+    }
+    Serial.print(mac[i], HEX);
+  }
+  Serial.println();
+}
+
+void printWifiData() {
+  // print your board's IP address:
+  IPAddress ip = WiFi.localIP();
+  Serial.print("IP Address: ");
+
+  Serial.println(ip);
+
+  // print your MAC address:
+  byte mac[6];
+  WiFi.macAddress(mac);
+  Serial.print("MAC address: ");
+  printMacAddress(mac);
+}
+
+void printCurrentNet() {
+  // print the SSID of the network you're attached to:
+  Serial.print("SSID: ");
+  Serial.println(WiFi.SSID());
+
+  // print the MAC address of the router you're attached to:
+  byte bssid[6];
+  WiFi.BSSID(bssid);
+  Serial.print("BSSID: ");
+  printMacAddress(bssid);
+
+  // print the received signal strength:
+  long rssi = WiFi.RSSI();
+  Serial.print("signal strength (RSSI):");
+  Serial.println(rssi);
+
+  // print the encryption type:
+  byte encryption = WiFi.encryptionType();
+  Serial.print("Encryption Type:");
+  Serial.println(encryption, HEX);
+  Serial.println();
+}
+
+void setup_network() {
+  // check for the WiFi module:
+  if (WiFi.status() == WL_NO_MODULE) {
+    Serial.println("Communication with WiFi module failed!");
+    // don't continue
+    while (true);
+  }
+  String fv = WiFi.firmwareVersion();
+  Serial.print("Firmware version: ");
+  Serial.println(fv);
+  if (fv < WIFI_FIRMWARE_LATEST_VERSION) {
+    Serial.println("Please upgrade the firmware");
+  }
+
+  // attempt to connect to WiFi network:
+  // Definisci i parametri di rete prima del loop di connessione
+  IPAddress local_IP(192, 168, 1, 200);
+  IPAddress gateway(192, 168, 1, 1);
+  IPAddress subnet(255, 255, 255, 0);
+  IPAddress dns(9,9,9,9);
+  WiFi.config(local_IP, gateway, subnet, dns);
+  while (status != WL_CONNECTED) {
+    Serial.print("Attempting to connect to WPA SSID: ");
+    Serial.println(ssid);
+    // Connect to WPA/WPA2 network:
+    status = WiFi.begin(ssid, pass);
+
+    // wait 10 seconds for connection:
+    delay(10000);
+  }
+
+  // you're connected now, so print out the data:
+  Serial.println("You're connected to the network");
+  printCurrentNet();
+  printWifiData();
+  server.begin();
+}
+
+void web_server() {
+  WiFiClient client = server.available();
+
+  if (client) {                             // if you get a client,
+    Serial.println("new client");           // print a message out the serial port
+    String currentLine = "";                // make a String to hold incoming data from the client
+    while (client.connected()) {            // loop while the client's connected
+      if (client.available()) {             // if there's bytes to read from the client,
+        char c = client.read();             // read a byte, then
+        Serial.write(c);                    // print it out to the serial monitor
+        if (c == '\n') {                    // if the byte is a newline character
+
+          // if the current line is blank, you got two newline characters in a row.
+          // that's the end of the client HTTP request, so send a response:
+          if (currentLine.length() == 0) {
+            // HTTP headers always start with a response code (e.g. HTTP/1.1 200 OK)
+            // and a content-type so the client knows what's coming, then a blank line:
+            client.println("HTTP/1.1 200 OK");
+            client.println("Content-type:text/html");
+            client.println();
+
+            // the content of the HTTP response follows the header:
+            client.print("<p style=\"font-size:7vw;\">Click <a href=\"/H\">here</a> turn the LED on<br></p>");
+            client.print("<p style=\"font-size:7vw;\">Click <a href=\"/L\">here</a> turn the LED off<br></p>");
+
+            // The HTTP response ends with another blank line:
+            client.println();
+            // break out of the while loop:
+            break;
+          } else {    // if you got a newline, then clear currentLine:
+            currentLine = "";
+          }
+        } else if (c != '\r') {  // if you got anything else but a carriage return character,
+          currentLine += c;      // add it to the end of the currentLine
+        }
+      }
+
+    }
+    // close the connection:
+    client.stop();
+    Serial.println("client disconnected");
+  }
+}

src/arduino_network.h

@@ -0,0 +1,11 @@
+#ifndef PONG_NETWORK_H
+#define PONG_NETWORK_H
+#include "Arduino.h"
+
+void setup_network();
+void printMacAddress(byte mac[]);
+void printWifiData();
+void printCurrentNet();
+void web_server();
+
+#endif

src/config.h

@@ -0,0 +1,19 @@
+#if __has_include("secrets.h")
+  #include "secrets.h"
+#else
+  #define SECRET_SSID "Fallback_SSID"
+  #define SECRET_PASS "Fallback_PASS"
+  #warning "⚠️ secrets.h not found"
+#endif
+
+#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_BALL_DELAY 200

src/pong_ball.cpp

@@ -0,0 +1,88 @@
+#include <Arduino.h>
+#include "config.h"
+#include "pong_player.h"
+
+// used to increase speed when game is too easy
+int hits= 0;
+
+int p1_score= 0;
+int p2_score= 0;
+
+// initially ball has no movements
+// once game/round starts, balls gets random x and y movements
+int ball_move_x= 0;
+int ball_move_y= 0;
+
+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: ");
+  Serial.print(p1_score);
+  Serial.print(" - ");
+  Serial.print("P2: ");
+  Serial.print(p2_score);
+  Serial.println();
+
+  hits= 0;
+  ball_delay= INITIAL_BALL_DELAY;
+}
+
+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
+    ball_x= BALL_RESET_X;
+    ball_y= BALL_RESET_Y;
+    return;
+  }
+  
+  // if ball is not moving, get random direction
+  // this is the initial position
+  if (ball_move_x == 0 || ball_move_y == 0) {
+    // extract random number between 0 or 1 to select the directions
+    if (random(2) == 0) ball_move_x= 1;
+    else ball_move_x= -1;
+    if (random(2) == 0) ball_move_y= 1;
+    else ball_move_y= -1;
+  }
+
+  else if (ball_x == 0) {
+    // if p1 collision: reverse x, go left
+    if (!ball_player_collision(p1_start, ball_y)) {
+      // else p2 score, reset board
+      p2_score += 1;
+      Serial.println("Player 2 Scores");
+      point_scored(ball_x, ball_y, ball_delay);
+    }
+    else {
+      hits += 1;
+      ball_move_x= ball_move_x * -1;
+    }
+  }
+  else if (ball_x == MATRIX_WIDTH-1) {
+    if (!ball_player_collision(p2_start, ball_y)) {
+      // else p1 score, reset board
+      p1_score += 1;
+      Serial.println("Player 1 Scores");
+      point_scored(ball_x, ball_y, ball_delay);
+    }
+    else {
+      hits += 1;
+      ball_move_x= ball_move_x * -1;
+    }
+  }
+
+  if (ball_y == 0 || ball_y == MATRIX_HEIGHT-1) {
+    // reverse y, go down
+    ball_move_y= ball_move_y * -1;
+  }
+
+  if (hits >= 6 && ball_delay >= 80) {
+    // increase ball speed
+    hits = 0;
+    ball_delay -= 20;
+  }
+
+  ball_x+= ball_move_x;
+  ball_y+= ball_move_y;
+}

src/pong_ball.h

@@ -0,0 +1,7 @@
+#ifndef PONG_BALL_H
+#define PONG_BALL_H
+
+void point_scored();
+void move_ball(int &ball_x, int &ball_y, int &loop_delay, int p1_start, int p2_start, int &need_refresh);
+
+#endif

src/pong_player.cpp

@@ -0,0 +1,33 @@
+#include <Arduino.h>
+#include "config.h"
+
+int ball_player_collision(int player, int ball_y) {
+  for (int p= player; p < player + BAR_LENGTH; p++) {
+    if (ball_y == p) {
+      return 1;
+    }
+  }
+  return 0;
+}
+
+int pong_move_p1(int &p1_start, int &need_refresh) {
+  if (digitalRead(P1_BTN_UP) == LOW && p1_start > 0) {
+    p1_start -= 1;
+    need_refresh= 1;
+  }
+  else if (digitalRead(P1_BTN_BOTTOM) == LOW && p1_start < 5) {
+    p1_start += 1;
+    need_refresh= 1;
+  }
+}
+
+int pong_move_p2(int &p2_start, int &need_refresh) {
+  if (digitalRead(P2_BTN_UP) == LOW && p2_start > 0) {
+    p2_start -= 1;
+    need_refresh= 1;
+  }
+  else if (digitalRead(P2_BTN_BOTTOM) == LOW && p2_start < 5) {
+    p2_start += 1;
+    need_refresh= 1;
+  }
+}

src/pong_player.h

@@ -0,0 +1,8 @@
+#ifndef PONG_PLAYER_H
+#define PONG_PLAYER_H
+
+int ball_player_collision(int player, int ball_y);
+int pong_move_p1(int &p1_start, int &need_refresh);
+int pong_move_p2(int &p2_start, int &need_refresh);
+
+#endif

src/pong_render.cpp

@@ -0,0 +1,22 @@
+#include <Arduino.h>
+#include "config.h"
+
+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++) {
+      frame[y][x]= 0;
+    }
+  }
+  
+  // players coords
+  for (int i= p1_start; i < p1_start+BAR_LENGTH; i++) {
+    frame[i][0]= 1;
+  }
+  for (int i= p2_start; i < p2_start+BAR_LENGTH; i++) {
+    frame[i][MATRIX_WIDTH-1]= 1;
+  }
+  
+  // ball coords
+  frame[ball_y][ball_x]= 1;
+}

src/pong_render.h

@@ -0,0 +1,9 @@
+#ifndef PONG_RENDER_H
+#define PONG_RENDER_H
+
+#include <Arduino.h>
+#include "Arduino_LED_Matrix.h"
+
+void render_matrix(byte frame[MATRIX_HEIGHT][MATRIX_WIDTH], int p1_start, int p2_start, int ball_x, int ball_y);
+
+#endif