zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Remove deprecated SCARA option

Browse source
This commit is contained in:
Scott Lahteine 2019-07-03 02:43:33 -05:00
parent ae9232962e
commit 371969b531
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_LCD.h
View file

@ -544,7 +544,7 @@
#define HAS_GAMES ANY(MARLIN_BRICKOUT, MARLIN_INVADERS, MARLIN_SNAKE, MARLIN_MAZE) #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 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_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
#define IS_CARTESIAN !IS_KINEMATIC #define IS_CARTESIAN !IS_KINEMATIC

3
Marlin/src/inc/SanityCheck.h
View file

@ -964,14 +964,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#if 1 < 0 \ #if 1 < 0 \
+ ENABLED(DELTA) \ + ENABLED(DELTA) \
+ ENABLED(MORGAN_SCARA) \ + ENABLED(MORGAN_SCARA) \
+ ENABLED(MAKERARM_SCARA) \
+ ENABLED(COREXY) \ + ENABLED(COREXY) \
+ ENABLED(COREXZ) \ + ENABLED(COREXZ) \
+ ENABLED(COREYZ) \ + ENABLED(COREYZ) \
+ ENABLED(COREYX) \ + ENABLED(COREYX) \
+ ENABLED(COREZX) \ + ENABLED(COREZX) \
+ ENABLED(COREZY) + 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 #endif
/** /**

6
config/examples/SCARA/Configuration.h
View file

@ -61,16 +61,12 @@
/** /**
* MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013. * MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013.
* Implemented and slightly reworked by JCERNY in June, 2014. * 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 // Specify the specific SCARA model
#define MORGAN_SCARA #define MORGAN_SCARA
//#define MAKERARM_SCARA
#if EITHER(MORGAN_SCARA, MAKERARM_SCARA) #if ENABLED(MORGAN_SCARA)
//#define DEBUG_SCARA_KINEMATICS //#define DEBUG_SCARA_KINEMATICS
#define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly #define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly