@@ -811,8 +811,10 @@ static_assert(COUNT(arm) == LOGICAL_AXES, "AXIS_RELATIVE_MODES must contain " _L
811
811
/* *
812
812
* Validate that the bed size fits
813
813
*/
814
- static_assert (X_MAX_LENGTH >= X_BED_SIZE, " Movement bounds (X_MIN_POS, X_MAX_POS) are too narrow to contain X_BED_SIZE." );
815
- static_assert (Y_MAX_LENGTH >= Y_BED_SIZE, " Movement bounds (Y_MIN_POS, Y_MAX_POS) are too narrow to contain Y_BED_SIZE." );
814
+ #if !JYENHANCED
815
+ static_assert (X_MAX_LENGTH >= X_BED_SIZE, " Movement bounds (X_MIN_POS, X_MAX_POS) are too narrow to contain X_BED_SIZE." );
816
+ static_assert (Y_MAX_LENGTH >= Y_BED_SIZE, " Movement bounds (Y_MIN_POS, Y_MAX_POS) are too narrow to contain Y_BED_SIZE." );
817
+ #endif
816
818
817
819
/* *
818
820
* Granular software endstops (Marlin >= 1.1.7)
@@ -1087,7 +1089,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
1087
1089
#endif
1088
1090
#endif
1089
1091
1090
- #if ENABLED(NOZZLE_PARK_FEATURE)
1092
+ #if ENABLED(NOZZLE_PARK_FEATURE) && !JYENHANCED
1091
1093
constexpr float npp[] = NOZZLE_PARK_POINT;
1092
1094
static_assert (COUNT(npp) == XYZ, "NOZZLE_PARK_POINT requires X, Y, and Z values.");
1093
1095
constexpr xyz_pos_t npp_xyz = NOZZLE_PARK_POINT;
@@ -1811,21 +1813,23 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
1811
1813
#if ENABLED(NOZZLE_AS_PROBE)
1812
1814
static_assert (sanity_nozzle_to_probe_offset.x == 0 && sanity_nozzle_to_probe_offset.y == 0 ,
1813
1815
" NOZZLE_AS_PROBE requires the XY offsets in NOZZLE_TO_PROBE_OFFSET to both be 0." );
1814
- #elif !IS_KINEMATIC
1816
+ #elif !( IS_KINEMATIC || JYENHANCED)
1815
1817
static_assert (PROBING_MARGIN >= 0 , " PROBING_MARGIN must be >= 0." );
1816
1818
static_assert (PROBING_MARGIN_BACK >= 0 , " PROBING_MARGIN_BACK must be >= 0." );
1817
1819
static_assert (PROBING_MARGIN_FRONT >= 0 , " PROBING_MARGIN_FRONT must be >= 0." );
1818
1820
static_assert (PROBING_MARGIN_LEFT >= 0 , " PROBING_MARGIN_LEFT must be >= 0." );
1819
1821
static_assert (PROBING_MARGIN_RIGHT >= 0 , " PROBING_MARGIN_RIGHT must be >= 0." );
1820
1822
#endif
1821
1823
1824
+ #if !JYENHANCED
1822
1825
#define _MARGIN (A ) TERN(IS_SCARA, SCARA_PRINTABLE_RADIUS, TERN(DELTA, DELTA_PRINTABLE_RADIUS, ((A##_BED_SIZE) / 2 )))
1823
1826
static_assert (PROBING_MARGIN < _MARGIN(X), "PROBING_MARGIN is too large.");
1824
1827
static_assert (PROBING_MARGIN_BACK < _MARGIN(Y), "PROBING_MARGIN_BACK is too large.");
1825
1828
static_assert (PROBING_MARGIN_FRONT < _MARGIN(Y), "PROBING_MARGIN_FRONT is too large.");
1826
1829
static_assert (PROBING_MARGIN_LEFT < _MARGIN(X), "PROBING_MARGIN_LEFT is too large.");
1827
1830
static_assert (PROBING_MARGIN_RIGHT < _MARGIN(X), "PROBING_MARGIN_RIGHT is too large.");
1828
1831
#undef _MARGIN
1832
+ #endif
1829
1833
1830
1834
/* *
1831
1835
* Make sure Z raise values are set
@@ -2063,7 +2067,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2063
2067
/* *
2064
2068
* Make sure Z_SAFE_HOMING point is reachable
2065
2069
*/
2066
- #if ENABLED(Z_SAFE_HOMING)
2070
+ #if ENABLED(Z_SAFE_HOMING) && !JYENHANCED
2067
2071
static_assert (WITHIN(Z_SAFE_HOMING_X_POINT, X_MIN_POS, X_MAX_POS), "Z_SAFE_HOMING_X_POINT can't be reached by the nozzle.");
2068
2072
static_assert (WITHIN(Z_SAFE_HOMING_Y_POINT, Y_MIN_POS, Y_MAX_POS), "Z_SAFE_HOMING_Y_POINT can't be reached by the nozzle.");
2069
2073
#endif
0 commit comments