瀏覽代碼

Remove deprecated SCARA option

Scott Lahteine 6 年之前
父節點
當前提交
371969b531
共有 3 個文件被更改,包括 3 次插入8 次删除
  1. 1
    1
      Marlin/src/inc/Conditionals_LCD.h
  2. 1
    2
      Marlin/src/inc/SanityCheck.h
  3. 1
    5
      config/examples/SCARA/Configuration.h

+ 1
- 1
Marlin/src/inc/Conditionals_LCD.h 查看文件

544
 #define HAS_GAMES     ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
544
 #define HAS_GAMES     ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE)
545
 #define HAS_GAME_MENU (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
545
 #define HAS_GAME_MENU (1 < ENABLED(MARLIN_BRICKOUT) + ENABLED(MARLIN_INVADERS) + ENABLED(MARLIN_SNAKE) + ENABLED(MARLIN_MAZE))
546
 
546
 
547
-#define IS_SCARA     EITHER(MORGAN_SCARA, MAKERARM_SCARA)
547
+#define IS_SCARA     ENABLED(MORGAN_SCARA)
548
 #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
548
 #define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
549
 #define IS_CARTESIAN !IS_KINEMATIC
549
 #define IS_CARTESIAN !IS_KINEMATIC
550
 
550
 

+ 1
- 2
Marlin/src/inc/SanityCheck.h 查看文件

964
 #if 1 < 0 \
964
 #if 1 < 0 \
965
   + ENABLED(DELTA) \
965
   + ENABLED(DELTA) \
966
   + ENABLED(MORGAN_SCARA) \
966
   + ENABLED(MORGAN_SCARA) \
967
-  + ENABLED(MAKERARM_SCARA) \
968
   + ENABLED(COREXY) \
967
   + ENABLED(COREXY) \
969
   + ENABLED(COREXZ) \
968
   + ENABLED(COREXZ) \
970
   + ENABLED(COREYZ) \
969
   + ENABLED(COREYZ) \
971
   + ENABLED(COREYX) \
970
   + ENABLED(COREYX) \
972
   + ENABLED(COREZX) \
971
   + ENABLED(COREZX) \
973
   + ENABLED(COREZY)
972
   + ENABLED(COREZY)
974
-  #error "Please enable only one of DELTA, MORGAN_SCARA, MAKERARM_SCARA, COREXY, COREYX, COREXZ, COREZX, COREYZ, or COREZY."
973
+  #error "Please enable only one of DELTA, MORGAN_SCARA, COREXY, COREYX, COREXZ, COREZX, COREYZ, or COREZY."
975
 #endif
974
 #endif
976
 
975
 
977
 /**
976
 /**

+ 1
- 5
config/examples/SCARA/Configuration.h 查看文件

61
 /**
61
 /**
62
  * MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013.
62
  * MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013.
63
  * Implemented and slightly reworked by JCERNY in June, 2014.
63
  * Implemented and slightly reworked by JCERNY in June, 2014.
64
- *
65
- * MAKERARM_SCARA is in development, included as an alternate example.
66
- * Other SCARA models may be added, or SCARA may be unified in the future.
67
  */
64
  */
68
 
65
 
69
 // Specify the specific SCARA model
66
 // Specify the specific SCARA model
70
 #define MORGAN_SCARA
67
 #define MORGAN_SCARA
71
-//#define MAKERARM_SCARA
72
 
68
 
73
-#if EITHER(MORGAN_SCARA, MAKERARM_SCARA)
69
+#if ENABLED(MORGAN_SCARA)
74
 
70
 
75
   //#define DEBUG_SCARA_KINEMATICS
71
   //#define DEBUG_SCARA_KINEMATICS
76
   #define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly
72
   #define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly

Loading…
取消
儲存