Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Games, for fun (and stress-testing) #13464

Merged
merged 4 commits into from
Apr 1, 2019
Merged

Games, for fun (and stress-testing) #13464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3024b90
Add game options to example configs
thinkyhead Mar 23, 2019
369d6d2
Offer some games in the Marlin menu
thinkyhead Mar 23, 2019
5bcd727
Start of a maze game
thinkyhead Mar 24, 2019
03fd3e5
Revert maze… for now
thinkyhead Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -960,6 +960,11 @@
//#define STATUS_FAN_FRAMES 3 // :[0,1,2,3,4] Number of fan animation frames
//#define STATUS_HEAT_PERCENT // Show heating in a progress bar

// Frivolous Game Options
//#define MARLIN_BRICKOUT
//#define MARLIN_INVADERS
//#define MARLIN_SNAKE

#endif // HAS_GRAPHICAL_LCD

// @section safety
Expand Down
1 change: 1 addition & 0 deletions Marlin/src/inc/Conditionals_LCD.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,7 @@
#define Z_MULTI_STEPPER_DRIVERS EITHER(Z_DUAL_STEPPER_DRIVERS, Z_TRIPLE_STEPPER_DRIVERS)
#define Z_MULTI_ENDSTOPS EITHER(Z_DUAL_ENDSTOPS, Z_TRIPLE_ENDSTOPS)
#define HAS_EXTRA_ENDSTOPS (EITHER(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS) || Z_MULTI_ENDSTOPS)
#define HAS_GAME_MENU (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE))

#define IS_SCARA EITHER(MORGAN_SCARA, MAKERARM_SCARA)
#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
Expand Down
12 changes: 12 additions & 0 deletions Marlin/src/lcd/language/language_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1277,6 +1277,18 @@
#ifndef MSG_END_Z
#define MSG_END_Z _UxGT(" End Z")
#endif
#ifndef MSG_BRICKOUT
#define MSG_BRICKOUT _UxGT("Brickout")
#endif
#ifndef MSG_INVADERS
#define MSG_INVADERS _UxGT("Invaders")
#endif
#ifndef MSG_SNAKE
#define MSG_SNAKE _UxGT("Sn4k3")
#endif
#ifndef MSG_MAZE
#define MSG_MAZE _UxGT("Maze")
#endif

//
// Filament Change screens show up to 3 lines on a 4-line display
Expand Down
Loading