From 356fb4429c9422cdcb93c76b7633d5e8b90a642b Mon Sep 17 00:00:00 2001
From: Markus Wirth <zweimal@markuswirth.eu>
Date: Tue, 23 Mar 2021 13:54:01 +0100
Subject: [PATCH 1/6] cherry picked commits between 729da886 (21 Apr 2018) and
 7a03ea0d (11 Oct 2020) to get a working copy based off 729da886, but with all
 the fixes and improvements made later. This master branch in raidlman's repo
 appears to be broken: Only reset button, but none of the player buttons are
 working. See
 https://github.com/raidlman/1d-pong/blob/7a03ea0de621e74a311400ab0a429472601f9a95/Pong.cpp#L28
 for comparison. The restart button is the only one being defined there.

---
 Pong.cpp                |  11 ++++++++---
 Pong.h                  |   1 +
 README.md               |  16 ++++++++++++++++
 schematic/schematic.png | Bin 0 -> 19167 bytes
 4 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 schematic/schematic.png

diff --git a/Pong.cpp b/Pong.cpp
index e59aa43..0baa76b 100644
--- a/Pong.cpp
+++ b/Pong.cpp
@@ -34,6 +34,7 @@ Pong::Pong(uint8_t player_1_pin, uint8_t player_2_pin, uint8_t lifes, uint16_t b
   auto_serve_timeout = 2000;
   position_is_allowed = false;
   waiting_time = millis();
+  isFirstRun = true;
   randomSeed(analogRead(random_seed_pin));
 }
 
@@ -48,7 +49,7 @@ void Pong::prepare_next_serve() {
 void Pong::choose_random_player() {
 	// randomly select active player to serve the first ball
 	active_player = random(0,2);
-	ball.set_position((active_player) ? -1 : 60);
+	ball.set_position((active_player) ? players[0]->hitbox_min -1 : players[1]->hitbox_max +1);
 	ball.set_direction((active_player) ? 1 : -1);
 }
 
@@ -73,14 +74,18 @@ void Pong::game_logic() {
   switch(state) {
     case WAITING:
       screen.show_score(player_1, player_2);
-      if (restart.is_pressed()) {
+      if (restart.is_pressed() || (isFirstRun && (millis() - waiting_time >= 5000))) {
         choose_random_player();
 
         player_1.reset_lifes();
         player_2.reset_lifes();
         screen.reset(player_1, player_2);
 
-        state = SERVE;  
+        if (isFirstRun) {
+          isFirstRun = false;
+        }
+
+        state = SERVE;
       }
       if (millis() - waiting_time >= 30000) {
         state = IDLE;
diff --git a/Pong.h b/Pong.h
index bc5d308..982b708 100644
--- a/Pong.h
+++ b/Pong.h
@@ -54,6 +54,7 @@ class Pong {
 		Player player_2;
 		Screen screen;
 		Ball ball;
+		bool isFirstRun;
 
     unsigned long autoserve_time;
     unsigned long autoserve_step_time;
diff --git a/README.md b/README.md
index bf38ecb..654174c 100644
--- a/README.md
+++ b/README.md
@@ -19,6 +19,22 @@ Hardware build instructons & wiring schemes will be published soon!
   - 1x 65x50x35mm IP 65 https://www.boxexpert.de/epages/79711065.sf/de_DE/?ObjectPath=/Shops/79711065/Products/BXPBABS655035-E01
 * 3x Sanwa OBSN-30 pushbutton 
 
+## Schematic
+
+![Schematic](/schematic/schematic.png?raw=true "Schematic")
+
+The wiring is pretty simple.
+
+All electronics are powered via the same 5V power supply.
+Make sure to use a supply that can deliver 2A.
+
+There are three push buttons that pull the pin to high when beeing pressed.
+Each button is connected to ground via a pull down resistor.
+
+The input pins of the LED strip are connected to the SPI interface of the arduino.
+CI (clock in) is connected to SCK and DI (data in) is connected to MOSI.
+The power lines are directly connected to the power source.
+
 ## Feature Requests / Ideas from "Lange nacht der Computerspiele / HTWK Leipzig"
 
 * Allow hits one off (+-1 outside of hit box)
diff --git a/schematic/schematic.png b/schematic/schematic.png
new file mode 100644
index 0000000000000000000000000000000000000000..ae55aed4f2a44d2833447b3657294b9a71c72510
GIT binary patch
literal 19167
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

literal 0
HcmV?d00001


From 0ef9abddbfda8b578e84fed6e201dc74d9714825 Mon Sep 17 00:00:00 2001
From: Markus Wirth <zweimal@markuswirth.eu>
Date: Tue, 23 Mar 2021 14:26:40 +0100
Subject: [PATCH 2/6] Add documentation for isFirstRun feature to start playing
 immediately after bootup without pressing the reset button.

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 654174c..0503238 100644
--- a/README.md
+++ b/README.md
@@ -35,6 +35,10 @@ The input pins of the LED strip are connected to the SPI interface of the arduin
 CI (clock in) is connected to SCK and DI (data in) is connected to MOSI.
 The power lines are directly connected to the power source.
 
+## Features
+* Game starts immediately after a few seconds
+  - You might not need a reset button, if you're willing to switch power off and on.
+
 ## Feature Requests / Ideas from "Lange nacht der Computerspiele / HTWK Leipzig"
 
 * Allow hits one off (+-1 outside of hit box)

From 91823bf7694b84c3afb245a2c9fa4acd5cd5d3b4 Mon Sep 17 00:00:00 2001
From: Markus Wirth <zweimal@markuswirth.eu>
Date: Tue, 23 Mar 2021 14:28:38 +0100
Subject: [PATCH 3/6] added low brightness and high speed mode

---
 Ball.cpp   | 4 ++++
 Ball.h     | 1 +
 Pong.cpp   | 6 ++++++
 README.md  | 3 +++
 Screen.cpp | 5 +++++
 Screen.h   | 1 +
 6 files changed, 20 insertions(+)

diff --git a/Ball.cpp b/Ball.cpp
index 95b331d..7999d90 100644
--- a/Ball.cpp
+++ b/Ball.cpp
@@ -93,6 +93,10 @@ void Ball::hit() {
   increase_speed();
 }
 
+void Ball::increase_initial_speed() {
+  this->initial_speed = 0.6;
+}
+
 void Ball::calc_speedup(Player &player) {
   speedup = distance_to_field_boundary(player)/10.0;
 }
diff --git a/Ball.h b/Ball.h
index e4b9bd0..4d01ef0 100644
--- a/Ball.h
+++ b/Ball.h
@@ -42,6 +42,7 @@ class Ball {
     void hit();
     void advance();
 
+    void increase_initial_speed();
     void calc_speedup(Player &player);
     void reset_speedup();
     void serve(Player player);
diff --git a/Pong.cpp b/Pong.cpp
index 0baa76b..9c2b0f9 100644
--- a/Pong.cpp
+++ b/Pong.cpp
@@ -83,6 +83,12 @@ void Pong::game_logic() {
 
         if (isFirstRun) {
           isFirstRun = false;
+          if (players[0]->button.is_pressed()) {
+            screen.lower_brightness();
+          }
+          if (players[1]->button.is_pressed()) {
+            ball.increase_initial_speed();
+          }
         }
 
         state = SERVE;
diff --git a/README.md b/README.md
index 0503238..602fbf0 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,9 @@ The power lines are directly connected to the power source.
 ## Features
 * Game starts immediately after a few seconds
   - You might not need a reset button, if you're willing to switch power off and on.
+* During first run:
+  - Press Player 1 button to enter low brightness mode for darker environments (late at night, living room, bar/club)
+  - Press Player 2 button to enable high speed mode. Every game starts with increased initial speed.
 
 ## Feature Requests / Ideas from "Lange nacht der Computerspiele / HTWK Leipzig"
 
diff --git a/Screen.cpp b/Screen.cpp
index a061558..782d2d0 100644
--- a/Screen.cpp
+++ b/Screen.cpp
@@ -55,6 +55,11 @@ void Screen::draw_player_score(Player p){
   }
 }
 
+void Screen::lower_brightness() {
+    FastLED.setBrightness( 5 );
+    FastLED.show();
+}
+
 Screen::Screen(uint8_t num_leds, uint8_t brightness) : leds(new CRGB[num_leds]) {
   //led_type = type;
   //led_color_order = order;
diff --git a/Screen.h b/Screen.h
index 4dd0483..5b2d7e3 100644
--- a/Screen.h
+++ b/Screen.h
@@ -36,6 +36,7 @@ class Screen {
   public:
     Screen(uint8_t num_leds, uint8_t brightness);
 
+    void lower_brightness();
     void show_score(Player &p1, Player &p2);
     void advance_ball(Ball &b, Player &p1, Player &p2);
     void draw(Player &player_1, Player &player_2, Ball &ball);

From c08b4c3de6fd6f34ee29f11093a4536c5e732e3a Mon Sep 17 00:00:00 2001
From: Markus Wirth <zweimal@markuswirth.eu>
Date: Tue, 23 Mar 2021 15:07:39 +0100
Subject: [PATCH 4/6] add gameplay documentation, more hardware instructions
 and comments

---
 Pong.cpp  |  9 ++++++++-
 README.md | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/Pong.cpp b/Pong.cpp
index 9c2b0f9..e3851f4 100644
--- a/Pong.cpp
+++ b/Pong.cpp
@@ -26,7 +26,7 @@ Pong::Pong(uint8_t player_1_pin, uint8_t player_2_pin, uint8_t lifes, uint16_t b
         player_2(lifes, num_leds-lifes, num_leds-1, player_2_pin, button_lock_time, CRGB::Blue, CRGB::Red),
         screen(num_leds, brightness),
         restart(restart_pin, restart_lock_time),
-        ball(0, 0, num_leds-1, 0.2, 1)
+        ball(0, 0, num_leds-1, 0.2, 1) // 0.2 is the inital speed. An option has been added in Ball.cpp to start with higher speed.
 {
 	players[0] = &player_1;
 	players[1] = &player_2;
@@ -74,6 +74,11 @@ void Pong::game_logic() {
   switch(state) {
     case WAITING:
       screen.show_score(player_1, player_2);
+      /* the game shall start after a few seconds after bootup of the Arduino.
+       * This makes using the reset pin optional,
+       * thus enables the game to be played without a separate reset button.
+       * Drawback: A restart of the game requires a reboot of the Arduino (takes only a few seconds).
+       */
       if (restart.is_pressed() || (isFirstRun && (millis() - waiting_time >= 5000))) {
         choose_random_player();
 
@@ -83,9 +88,11 @@ void Pong::game_logic() {
 
         if (isFirstRun) {
           isFirstRun = false;
+          // During first run one can lower the brightness to play in dark environments.
           if (players[0]->button.is_pressed()) {
             screen.lower_brightness();
           }
+          // During first run one can setup a high speed mode with increased initial_speed.
           if (players[1]->button.is_pressed()) {
             ball.increase_initial_speed();
           }
diff --git a/README.md b/README.md
index 602fbf0..94484b6 100644
--- a/README.md
+++ b/README.md
@@ -2,9 +2,19 @@
 
 Pong-like game run on an Arduino MCU and a LED light strip. Inspired by a game seen on 34C3.
 
+## Gameplay
+Two players at each end of the strip send the ball back and forth by pressing their player button. Each player has an area of several LED's at each end of the strip. The ball is represented by a single white LED and can only be sent to the opposing player, when it hit within ones own area.
+The base speed of the ball accelerates whenever the ball is hit by a player.
+A goal is attributed once the ball is behind a player's area, which means behind the end of the LED strip.
+The game is over once a player scores 8 goals.
+Player 1 is represented by 8 green LED's, nearest to the LED connector socket. Player 2 is represented by 8 blue LED's, farther from LED connector socket.
+Pro Tip for venturesome players: Hit the ball closer to your own goal to send it back to your opponent with much higher speed.
+
+After 30 seconds without activity the LED strip shows some colorful animations until the next game is being started.
+
 ## Required Arduino Libraries
 
-* FastLED (v3.1.6): http://fastled.io/
+* FastLED (tested with v3.1.6 and 3.4.0): http://fastled.io/
   - In Arduino IDE: Sketch > Include Library > Manage Libraries
 
 ## Used Hardware
@@ -12,6 +22,7 @@ Pong-like game run on an Arduino MCU and a LED light strip. Inspired by a game s
 Hardware build instructons & wiring schemes will be published soon!
 
 * 1x Arduino Pro Mini
+  - Adafruit Arduino Pro Mini 5V 16 MHz works, too, including USB power and data support. Separate power supply is not needed in that case. Separate FTDI programmer is not needed, too. The strip can be bus powered straight from the 'bus' pin, which supports 700 mA. This is enough to drive 60 LED's at 80% brightness.
 * 1x APA102-C LED light strip (1m) with 60 LEDs/m
 * 1x 5v power supply (max. 2A)
 * BOXEXPERT ABS casings
@@ -30,6 +41,7 @@ Make sure to use a supply that can deliver 2A.
 
 There are three push buttons that pull the pin to high when beeing pressed.
 Each button is connected to ground via a pull down resistor.
+Without the resistor each pin would be touch sensitive. Then the pin registers as being pressed, when any cable is attached to it or any finger or metal object touches it. For testing the pins in general, this is a quite useful behaviour.
 
 The input pins of the LED strip are connected to the SPI interface of the arduino.
 CI (clock in) is connected to SCK and DI (data in) is connected to MOSI.

From 2ffb7699af5809f1336bd43250f47d741789279c Mon Sep 17 00:00:00 2001
From: Markus Wirth <zweimal@markuswirth.eu>
Date: Tue, 23 Mar 2021 15:29:29 +0100
Subject: [PATCH 5/6] Party colours will be displayed for a longer period of
 time during inactivity for a quieter visual perception and attention by the
 LED's.

---
 Screen.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Screen.cpp b/Screen.cpp
index 782d2d0..e27db6e 100644
--- a/Screen.cpp
+++ b/Screen.cpp
@@ -142,8 +142,8 @@ void Screen::FillLEDsFromPaletteColors( uint8_t colorIndex)
 
 void Screen::ChangePalettePeriodically()
 {
-    uint8_t secondHand = (millis() / 1000) % 60;
-    static uint8_t lastSecond = 99;
+    uint8_t secondHand = (millis() / 1000) % 240;
+    static uint8_t lastSecond = 239;
     
     if( lastSecond != secondHand) {
         lastSecond = secondHand;
@@ -156,8 +156,8 @@ void Screen::ChangePalettePeriodically()
         if( secondHand == 35)  { SetupBlackAndWhiteStripedPalette();       currentBlending = LINEARBLEND; }
         if( secondHand == 40)  { currentPalette = CloudColors_p;           currentBlending = LINEARBLEND; }
         if( secondHand == 45)  { currentPalette = PartyColors_p;           currentBlending = LINEARBLEND; }
-        if( secondHand == 50)  { currentPalette = myRedWhiteBluePalette_p; currentBlending = NOBLEND;  }
-        if( secondHand == 55)  { currentPalette = myRedWhiteBluePalette_p; currentBlending = LINEARBLEND; }
+        if( secondHand == 230)  { currentPalette = myRedWhiteBluePalette_p; currentBlending = NOBLEND;  }
+        if( secondHand == 235)  { currentPalette = myRedWhiteBluePalette_p; currentBlending = LINEARBLEND; }
     }
 }
 

From e3d0cb011e4862f7535cbfc976d7eaf0337d1d81 Mon Sep 17 00:00:00 2001
From: Markus Wirth <zweimal@markuswirth.eu>
Date: Tue, 23 Mar 2021 15:42:37 +0100
Subject: [PATCH 6/6] added documentation from
 https://github.com/raidlman/1d-pong/issues/4#issuecomment-787542522

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 94484b6..3a17117 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ After 30 seconds without activity the LED strip shows some colorful animations u
 Hardware build instructons & wiring schemes will be published soon!
 
 * 1x Arduino Pro Mini
-  - Adafruit Arduino Pro Mini 5V 16 MHz works, too, including USB power and data support. Separate power supply is not needed in that case. Separate FTDI programmer is not needed, too. The strip can be bus powered straight from the 'bus' pin, which supports 700 mA. This is enough to drive 60 LED's at 80% brightness.
+  - Adafruit Pro Trinket 5V 16 MHz works, too, including USB support! Neither a separate power supply nor a Serial-to-USB-Adapter (FTDI programmer) are needed. The LED strip can be bus powered straight from the 'bus' pin, which supports 700 mA. This is enough to drive 60 LED's at 80% brightness. Beware, pin 7 is not available on this board, but Pins 3-6, Pin 8 and Pins A0-A5 are.
 * 1x APA102-C LED light strip (1m) with 60 LEDs/m
 * 1x 5v power supply (max. 2A)
 * BOXEXPERT ABS casings