Merge pull request #372 from MLB-LED-Scoreboard/dev

Release 5.1.0
MLB-LED-Scoreboard · May 12, 2022 · db89d72 · db89d72
2 parents 9ddfe6a + f77e02c
commit db89d72
Show file tree

Hide file tree

Showing 22 changed files with 295 additions and 64 deletions.
diff --git a/ISSUE_TEMPLATE.md b/ISSUE_TEMPLATE.md
@@ -0,0 +1,35 @@
+<!-- Before submitting a new issue, check that it is not already solved! (https://github.com/MLB-LED-Scoreboard/mlb-led-scoreboard/issues?q=is%3Aissue) -->
+
+## This issue is a
+
+- [ ] Bug Report
+- [ ] Feature Request
+
+<!-- Filling out your complete hardware and software configuration is more likely to help project maintainers resolve your issue. You may omit configuration sections as needed if you are submitting a feature request. -->
+
+## Hardware Configuration
+
+- Raspberry Pi Revision (4B+/3B+/Zero/etc.):
+- Operating System:
+- Matrix size:
+- Display adapter (HAT/Bonnet/etc.):
+  - Additional information:
+- Power source(s):
+
+<!-- Additional display adapter information could include E-address line mod, GPIO 4/18 performance mod, etc. Omit this section if you are unsure. -->
+
+## Software Configuration
+
+<!-- Scoreboard version can be found by running `python version.py` from the project directory. -->
+
+- MLB LED Scoreboard Version:
+- Commands/arguments used to start the scoreboard:
+
+## Expected behavior
+<!-- What should happen? -->
+
+## Actual behavior
+<!-- What happens instead? -->
+
+## Additional Information
+<!-- If you have a specific error message or code, PLEASE post with your issue so project maintainers can easily diagnose the problem. -->
diff --git a/README.md b/README.md
@@ -1,4 +1,5 @@
-# mlb-led-scoreboard [![Join Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://mlb-led-scoreboard.herokuapp.com/)
+# mlb-led-scoreboard 
+![Current Version](https://img.shields.io/github/v/release/MLB-LED-Scoreboard/MLB-LED-Scoreboard) [![Join Slack](https://img.shields.io/badge/slack-join-blue.svg)](https://mlb-led-scoreboard.herokuapp.com/)
 
 ---------------
 
@@ -104,6 +105,12 @@ It will also install the following python libraries that are required for certai
 
 That should be it! Your latest version should now be working with whatever new fangled features were just added.
 
+#### Version Information
+
+You can check the version information for your installation of mlb-led-scoreboard by running `python3 version.py`.
+
+The latest version of the software is available [here](https://github.com/MLB-LED-Scoreboard/mlb-led-scoreboard/releases).
+
 #### Time Zones
 Make sure your Raspberry Pi's timezone is configured to your local time zone. They'll often have London time on them by default. You can change the timezone of your raspberry pi by running `sudo raspi-config`.
 
@@ -161,6 +168,7 @@ A default `config.json.example` file is included for reference. Copy this file t
 "time_format"                  String  Sets the preferred hour format for displaying time. Accepted values are "12h" or "24h" depending on which you prefer.
 "end_of_day"                   String  A 24-hour time you wish to consider the end of the previous day before starting to display the current day's games. Uses local time from your pi.
 "full_team_names"              Bool    If true and on a 64-wide board, displays the full team name on the scoreboard instead of their abbreviation. This config option is ignored on 32-wide boards. Defaults to true when on a 64-wide board.
+"short_team_names_for_runs_hits" Bool If true and full_team_names is true and Runs Hits Errors is enabled, will use abreviated team names when Runs or Hits > 9
 "scrolling_speed"              Integer Supports an integer between 0 and 4. Sets how fast the scrolling text scrolls.
 "debug"                        Bool    Game and other debug data is written to your console.
 "demo_date"                    String  A date in the format YYYY-MM-DD from which to pull data to demonstrate the scoreboard. A value of `false` will disable demo mode.
@@ -169,6 +177,8 @@ A default `config.json.example` file is included for reference. Copy this file t
 ### Additional Features
 * Runs/Hits/Errors - Runs are always shown on the games screen, but you can enable or adjust spacing of a "runs, hits, errors" display.  Take a look at the [coordinates readme file](/coordinates/README.md) for details.
 
+* Pitch Data - Pitch data can be shown on the game screen, See the [coordinates readme file](/coordinates/README.md) for details. In addition, the Short and Long pitch description can be changed in data/pitches.py
+
 ### Flags
 
 You can configure your LED matrix with the same flags used in the [rpi-rgb-led-matrix](https://github.com/hzeller/rpi-rgb-led-matrix) library. More information on these arguments can be found in the library documentation.

diff --git a/colors/scoreboard.json.example b/colors/scoreboard.json.example
@@ -114,6 +114,11 @@
       "g": 235,
       "b": 59
     },
+    "pitch": {
+      "r": 255,
+      "g": 255,
+      "b": 255
+    },
     "strikeout": {
       "r": 255,
       "g": 235,

diff --git a/config.json.example b/config.json.example
@@ -42,6 +42,8 @@
 	"time_format": "12h",
 	"end_of_day": "00:00",
 	"full_team_names": true,
+	"short_team_names_for_runs_hits": true,
+	"pregame_weather": true,
 	"scrolling_speed": 2,
 	"debug": false,
 	"demo_date": false

diff --git a/coordinates/README.md b/coordinates/README.md
@@ -18,6 +18,11 @@ The layout can have a couple of different states where things are rendered diffe
   * `compress_digits` will reduce the space between digits when the number of runs or hits is > 9.
   * `spacing` is the number of pixels between the runs/hits and hits/errors.
 
+## Pitch Data
+* enabled (true/false) turn feature on/off
+* mph (true/false) When rendering pitch speed add mph after (99 mph)
+* desc_length (Short/Long) The short or long pitch type description, you can change both the short and long description to your liking in data/pitches as long as you do not change the index value.  
+
 ## Updates
 The software develops and releases features with full support for the default layouts, so custom layouts may look unsatisfactory if you update to later versions of the scoreboard. If you as a user decide to create a custom layout file, you are responsible for tweaking the coordinates to your liking with each update.
 

diff --git a/coordinates/w128h32.json.example b/coordinates/w128h32.json.example
@@ -167,6 +167,15 @@
       "y": 30,
       "width": 40
     },
+    "pitch": {
+      "font_name": "4x6",
+      "x": 1,
+      "y": 50,
+      "width": 41,
+      "enabled": false,
+      "mph": false,
+      "desc_length": "Short"
+    },
     "loop": 64,
     "strikeout": {
       "x": 84,

diff --git a/coordinates/w128h64.json.example b/coordinates/w128h64.json.example
@@ -1,22 +1,22 @@
 {
   "defaults": {
-    "font_name": "9x18B"
+    "font_name": "7x13"
   },
   "bases": {
     "1B": {
       "x": 112,
       "y": 42,
-      "size": 14
+      "size": 10
     },
     "2B": {
       "x": 103,
       "y": 33,
-      "size": 14
+      "size": 10
     },
     "3B": {
       "x": 94,
       "y": 42,
-      "size": 14
+      "size": 10
     }
   },
   "final": {
@@ -46,7 +46,7 @@
       },
       "due_up": {
         "due": {
-          "font_name": "7x13B",
+          "font_name": "5x7",
           "x": 38,
           "y": 44
         },
@@ -55,13 +55,13 @@
           "y": 56
         },
         "divider": {
-          "draw": true,
+          "draw": false,
           "x": 36,
           "y_start": 32,
           "y_end": 64
         },
         "leadoff": {
-          "font_name": "7x13B",
+          "font_name": "7x13",
           "x": 64,
           "y": 42
         },
@@ -76,8 +76,8 @@
       }
     },
     "number": {
-      "x": 93,
-      "y": 45,
+      "x": 87,
+      "y": 42,
       "nohit": {
         "x": 93,
         "y": 42
@@ -88,46 +88,55 @@
       }
     },
     "arrow": {
-      "size": 7,
+      "size": 6,
       "up": {
-        "x_offset": -12,
-        "y_offset": -10
+        "x_offset": -11,
+        "y_offset": -8
       },
       "down": {
-        "x_offset": -12,
-        "y_offset": -2
+        "x_offset": -11,
+        "y_offset": -4
       }
     }
   },
   "outs": {
     "1": {
-      "x": 102,
-      "y": 58,
-      "size": 4
+      "x": 95,
+      "y": 56,
+      "size": 5
     },
     "2": {
-      "x": 108,
-      "y": 58,
-      "size": 4
+      "x": 106,
+      "y": 56,
+      "size": 5
     },
     "3": {
-      "x": 114,
-      "y": 58,
-      "size": 4
+      "x": 118,
+      "y": 56,
+      "size": 5
     }
   },
   "atbat": {
     "batter": {
-      "font_name": "7x13B",
+      "font_name": "5x7",
       "x": 1,
       "y": 60,
       "width": 41
     },
     "pitcher": {
-      "font_name": "7x13B",
+      "font_name": "5x7",
       "x": 1,
-      "y": 44,
-      "width": 48
+      "y": 40,
+      "width": 41
+    },
+    "pitch": {
+      "font_name": "4x6",
+      "x": 1,
+      "y": 50,
+      "width": 41,
+      "enabled": true,
+      "mph": true,
+      "desc_length": "Long"
     },
     "loop": 68,
     "strikeout": {
@@ -137,7 +146,7 @@
   },
   "batter_count": {
     "x": 66,
-    "y": 60,
+    "y": 62,
     "nohit": {
       "x": 66,
       "y": 64
@@ -246,27 +255,31 @@
     },
     "name": {
       "away": {
+        "font_name": "9x18B",
         "x": 4,
-        "y": 12
+        "y": 13
       },
       "home": {
+        "font_name": "9x18B",    
         "x": 4,
-        "y": 28
+        "y": 29
       }
     },
     "runs": {
       "runs_hits_errors": {
-        "show": false,
-        "compress_digits": false,
-        "spacing": 3
-      },
+        "show": true,
+        "compress_digits": true,
+        "spacing": 5
+      },	    
       "away": {
-        "x": 120,
-        "y": 12
+        "font_name": "9x18B",
+        "x": 126,
+        "y": 13
       },
       "home": {
-        "x": 120,
-        "y": 28
+        "font_name": "9x18B",
+        "x": 126,
+        "y": 29
       }
     }
   },
@@ -321,4 +334,4 @@
       "y": 31
     }
   }
-}
+}
diff --git a/coordinates/w32h32.json.example b/coordinates/w32h32.json.example
@@ -147,6 +147,15 @@
       "y": 33,
       "width": 12
     },
+    "pitch": {
+      "font_name": "4x6",
+      "x": 1,
+      "y": 50,
+      "width": 41,
+      "enabled": false,
+      "mph": false,
+      "desc_length": "Short"
+    },
     "loop": 16,
     "strikeout": {
       "x": 33,

diff --git a/coordinates/w64h32.json.example b/coordinates/w64h32.json.example
@@ -125,6 +125,15 @@
       "y": 21,
       "width": 24
     },
+    "pitch": {
+      "font_name": "4x6",
+      "x": 1,
+      "y": 50,
+      "width": 41,
+      "enabled": false,
+      "mph": false,
+      "desc_length": "Short"
+    },
     "loop": 36,
     "strikeout": {
       "x": 15,

diff --git a/coordinates/w64h64.json.example b/coordinates/w64h64.json.example
@@ -123,6 +123,15 @@
       "y": 28,
       "width": 50
     },
+    "pitch": {
+      "font_name": "4x6",
+      "x": 1,
+      "y": 50,
+      "width": 41,
+      "enabled": false,
+      "mph": false,
+      "desc_length": "Short"
+    },
     "loop": 64,
     "strikeout": {
       "x": 31,

diff --git a/data/config/__init__.py b/data/config/__init__.py
@@ -62,6 +62,8 @@ def __init__(self, filename_base, width, height):
         self.time_format = json["time_format"]
         self.end_of_day = json["end_of_day"]
         self.full_team_names = json["full_team_names"]
+        self.short_team_names_for_runs_hits = json["short_team_names_for_runs_hits"]
+        self.pregame_weather = json["pregame_weather"]
         self.debug = json["debug"]
         self.demo_date = json["demo_date"]
         # Make sure the scrolling speed setting is in range so we don't crash