From ebc6596dce4397f08b6e2b7c3f38ffd778c0d864 Mon Sep 17 00:00:00 2001
From: andrea <andrea.deangelis93@gmail.com>
Date: Sat, 14 Mar 2026 21:35:19 +0100
Subject: [PATCH] move players and ball

---
 Makefile         |   1 +
 arduino_pong.ino | 112 ++++++++++++++++++++++++++++++++++++++++++-----
 2 files changed, 103 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 6f44a0b..baa07ca 100644
--- a/Makefile
+++ b/Makefile
@@ -11,5 +11,6 @@ monitor:
 	arduino-cli monitor -p /dev/ttyACM0
 
 run:
+	make compile
 	make upload
 	make monitor
diff --git a/arduino_pong.ino b/arduino_pong.ino
index 8da57ae..4a9f469 100644
--- a/arduino_pong.ino
+++ b/arduino_pong.ino
@@ -13,26 +13,38 @@ byte frame[8][12] = {
   { 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, 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 },
   { 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 }
 };
 
+// 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;
+
+// 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;
+
 const uint32_t frame_game_over[] = {
   0x20410809,
   0x600600,
   0x90108204,
 };
 
-
+int bar_length= 3;
 int p1_score= 0;
 int p2_score= 0;
 
@@ -53,20 +65,100 @@ void setup() {
   randomSeed(analogRead(0));
 }
 
-void pong_controls() {
-  if      (digitalRead(P1_BTN_UP) == LOW) Serial.println("P1 up");
-  else if (digitalRead(P1_BTN_BOTTOM) == LOW) Serial.println("P1 down");
-  else if (digitalRead(P2_BTN_UP) == LOW) Serial.println("P2 up");
-  else if (digitalRead(P2_BTN_BOTTOM) == LOW) Serial.println("P2 down");
+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) {
+    // random balldirection
+    Serial.println("Ball is not moving");
+
+    // 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) {
+    // p2 score, reset board
+    ball_x= ball_reset_x;
+    ball_y= ball_reset_y;
+    p2_score += 1;
+  }
+  else if (ball_x == 11) {
+    // p1 score, reset board
+    ball_x= ball_reset_x;
+    ball_y= ball_reset_y;
+    p1_score += 1;
+  }
+
+  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;
 }
 
 void loop() {
   if (!running) return;
   long exec_t1= millis();
-  pong_controls();
+  pong_move_p1();
+  pong_move_p2();
   if (exec_t1 - exec_t2 > loop_delay) {
-    matrix.renderBitmap(frame, 8, 12);
+    render_matrix();
+
+    move_ball();
+
     exec_t2= exec_t1;
   }
   delay(10);
-}
\ No newline at end of file
+}