From 371969b531f9ab26d40496623f520d6d724e9c21 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 3 Jul 2019 02:43:33 -0500
Subject: [PATCH] Remove deprecated SCARA option

---
 Marlin/src/inc/Conditionals_LCD.h     | 2 +-
 Marlin/src/inc/SanityCheck.h          | 3 +--
 config/examples/SCARA/Configuration.h | 6 +-----
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Marlin/src/inc/Conditionals_LCD.h b/Marlin/src/inc/Conditionals_LCD.h
index 21a1c53ae7..18713e462b 100644
--- a/Marlin/src/inc/Conditionals_LCD.h
+++ b/Marlin/src/inc/Conditionals_LCD.h
@@ -544,7 +544,7 @@
 #define HAS_GAMES     ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
 #define HAS_GAME_MENU (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
 
-#define IS_SCARA     EITHER(MORGAN_SCARA, MAKERARM_SCARA)
+#define IS_SCARA     ENABLED(MORGAN_SCARA)
 #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
 #define IS_CARTESIAN !IS_KINEMATIC
 
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 97b6087db5..b8b3ec5ec4 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -964,14 +964,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
 #if 1 < 0 \
   + ENABLED(DELTA) \
   + ENABLED(MORGAN_SCARA) \
-  + ENABLED(MAKERARM_SCARA) \
   + ENABLED(COREXY) \
   + ENABLED(COREXZ) \
   + ENABLED(COREYZ) \
   + ENABLED(COREYX) \
   + ENABLED(COREZX) \
   + ENABLED(COREZY)
-  #error "Please enable only one of DELTA, MORGAN_SCARA, MAKERARM_SCARA, COREXY, COREYX, COREXZ, COREZX, COREYZ, or COREZY."
+  #error "Please enable only one of DELTA, MORGAN_SCARA, COREXY, COREYX, COREXZ, COREZX, COREYZ, or COREZY."
 #endif
 
 /**
diff --git a/config/examples/SCARA/Configuration.h b/config/examples/SCARA/Configuration.h
index ad7cdb4478..4f069a670b 100644
--- a/config/examples/SCARA/Configuration.h
+++ b/config/examples/SCARA/Configuration.h
@@ -61,16 +61,12 @@
 /**
  * MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013.
  * Implemented and slightly reworked by JCERNY in June, 2014.
- *
- * MAKERARM_SCARA is in development, included as an alternate example.
- * Other SCARA models may be added, or SCARA may be unified in the future.
  */
 
 // Specify the specific SCARA model
 #define MORGAN_SCARA
-//#define MAKERARM_SCARA
 
-#if EITHER(MORGAN_SCARA, MAKERARM_SCARA)
+#if ENABLED(MORGAN_SCARA)
 
   //#define DEBUG_SCARA_KINEMATICS
   #define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly