Add conditionals for kinematics, leveling
This commit is contained in:
@@ -61,12 +61,16 @@
|
||||
#define NORMAL_AXIS X_AXIS
|
||||
#endif
|
||||
|
||||
#define IS_SCARA (ENABLED(MORGAN_SCARA) || ENABLED(MAKERARM_SCARA))
|
||||
#define IS_KINEMATIC (ENABLED(DELTA) || IS_SCARA)
|
||||
#define IS_CARTESIAN !IS_KINEMATIC
|
||||
|
||||
/**
|
||||
* SCARA
|
||||
* SCARA cannot use SLOWDOWN and requires QUICKHOME
|
||||
*/
|
||||
#if ENABLED(SCARA)
|
||||
#if IS_SCARA
|
||||
#undef SLOWDOWN
|
||||
#define QUICK_HOME //SCARA needs Quickhome
|
||||
#define QUICK_HOME
|
||||
#endif
|
||||
|
||||
/**
|
||||
@@ -132,12 +136,6 @@
|
||||
|
||||
#define HOMING_Z_WITH_PROBE (HAS_BED_PROBE && Z_HOME_DIR < 0 && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN))
|
||||
|
||||
// Boundaries for probing based on set limits
|
||||
#define MIN_PROBE_X (max(X_MIN_POS, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
||||
#define MAX_PROBE_X (min(X_MAX_POS, X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
||||
#define MIN_PROBE_Y (max(Y_MIN_POS, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
||||
#define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
||||
|
||||
#define HAS_Z_SERVO_ENDSTOP (defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)
|
||||
|
||||
/**
|
||||
@@ -657,18 +655,28 @@
|
||||
#ifndef DELTA_DIAGONAL_ROD_TRIM_TOWER_3
|
||||
#define DELTA_DIAGONAL_ROD_TRIM_TOWER_3 0.0
|
||||
#endif
|
||||
#if ENABLED(AUTO_BED_LEVELING_GRID)
|
||||
#define DELTA_BED_LEVELING_GRID
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/**
|
||||
* When not using other bed leveling...
|
||||
* Specify the exact style of auto bed leveling
|
||||
*
|
||||
* 3POINT - 3 Point Probing with the least-squares solution.
|
||||
* LINEAR - Grid Probing with the least-squares solution.
|
||||
* NONLINEAR - Grid Probing with a mesh solution. Best for large beds.
|
||||
*/
|
||||
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(AUTO_BED_LEVELING_GRID) && DISABLED(DELTA_BED_LEVELING_GRID)
|
||||
#define AUTO_BED_LEVELING_3POINT
|
||||
#if ENABLED(AUTO_BED_LEVELING_FEATURE)
|
||||
#if DISABLED(AUTO_BED_LEVELING_GRID)
|
||||
#define AUTO_BED_LEVELING_LINEAR
|
||||
#define AUTO_BED_LEVELING_3POINT
|
||||
#elif IS_KINEMATIC
|
||||
#define AUTO_BED_LEVELING_NONLINEAR
|
||||
#else
|
||||
#define AUTO_BED_LEVELING_LINEAR
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define PLANNER_LEVELING (ENABLED(MESH_BED_LEVELING) || ENABLED(AUTO_BED_LEVELING_LINEAR))
|
||||
|
||||
/**
|
||||
* Buzzer/Speaker
|
||||
*/
|
||||
@@ -702,4 +710,18 @@
|
||||
#define Z_PROBE_TRAVEL_HEIGHT Z_HOMING_HEIGHT
|
||||
#endif
|
||||
|
||||
#if IS_KINEMATIC
|
||||
// Check for this in the code instead
|
||||
#define MIN_PROBE_X X_MIN_POS
|
||||
#define MAX_PROBE_X X_MAX_POS
|
||||
#define MIN_PROBE_Y Y_MIN_POS
|
||||
#define MAX_PROBE_Y Y_MAX_POS
|
||||
#else
|
||||
// Boundaries for probing based on set limits
|
||||
#define MIN_PROBE_X (max(X_MIN_POS, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
||||
#define MAX_PROBE_X (min(X_MAX_POS, X_MAX_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
|
||||
#define MIN_PROBE_Y (max(Y_MIN_POS, Y_MIN_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
||||
#define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
||||
#endif
|
||||
|
||||
#endif // CONDITIONALS_POST_H
|
||||
|
Reference in New Issue
Block a user