Skip to content

Commit

Permalink
Games, for fun (and stress-testing) (#13464)
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead authored Apr 1, 2019
1 parent 4961d8a commit 5de7b5b
Show file tree
Hide file tree
Showing 78 changed files with 1,434 additions and 0 deletions.
5 changes: 5 additions & 0 deletions Marlin/Configuration_adv.h
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
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
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

1 comment on commit 5de7b5b

@Vertabreak
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wont compile after this commit error log below.

/tmp/arduino_build_890250/sketch/src/lcd/menu/menu_main.cpp:29:0: error: unterminated #if
#if HAS_LCD_MENU
^
/tmp/arduino_build_890250/sketch/src/lcd/menu/menu_main.cpp: In function 'void menu_main()':
/tmp/arduino_build_890250/sketch/src/lcd/menu/menu_main.cpp:274:5: error: expected '}' at end of input
}
^
/tmp/arduino_build_890250/sketch/src/lcd/menu/menu_main.cpp:274:5: error: expected '}'

Please sign in to comment.