Skip to content

Commit 449f369

Browse files
committed
Fixup after bilsef's fix, revert SanityCheck for LINEAR_AXES >=5
1 parent 09bb7ef commit 449f369

File tree

4 files changed

+12
-16
lines changed

4 files changed

+12
-16
lines changed

Marlin/Configuration.h

+9-9
Original file line numberDiff line numberDiff line change
@@ -833,18 +833,18 @@
833833
* Override with M92
834834
* X, Y, Z, [I ,[J ,[K ,]]] E0 [, E1[, E2...]]
835835
*/
836-
#define DEFAULT_AXIS_STEPS_PER_UNIT {LIST_N(LINEAR_AXES, 80, 80, 4000, 80, 80, 80), 500}
836+
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 }
837837

838838
/**
839839
* Default Max Feed Rate (mm/s)
840840
* Override with M203
841841
* X, Y, Z, [I ,[J ,[K ,]]] E0 [, E1[, E2...]]
842842
*/
843-
#define DEFAULT_MAX_FEEDRATE {LIST_N(LINEAR_AXES, 300, 300, 5, 300, 300, 300), 25 }
843+
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 }
844844

845845
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
846846
#if ENABLED(LIMITED_MAX_FR_EDITING)
847-
#define MAX_FEEDRATE_EDIT_VALUES {LIST_N(LINEAR_AXES, 600, 600, 10, 600, 600, 600), 50 } // ...or, set your own edit limits
847+
#define MAX_FEEDRATE_EDIT_VALUES { 600, 600, 10, 50 } // ...or, set your own edit limits
848848
#endif
849849

850850
/**
@@ -853,11 +853,11 @@
853853
* Override with M201
854854
* X, Y, Z, [I ,[J ,[K ,]]] E0 [, E1[, E2...]]
855855
*/
856-
#define DEFAULT_MAX_ACCELERATION {LIST_N(LINEAR_AXES, 3000, 3000, 100, 3000, 3000, 3000), 10000 }
856+
#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 }
857857

858858
//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
859859
#if ENABLED(LIMITED_MAX_ACCEL_EDITING)
860-
#define MAX_ACCEL_EDIT_VALUES {LIST_N(LINEAR_AXES, 6000, 6000, 200, 6000, 6000, 6000), 20000 } // ...or, set your own edit limits
860+
#define MAX_ACCEL_EDIT_VALUES { 6000, 6000, 200, 20000 } // ...or, set your own edit limits
861861
#endif
862862

863863
/**
@@ -885,15 +885,15 @@
885885
#define DEFAULT_XJERK 10.0
886886
#define DEFAULT_YJERK 10.0
887887
#define DEFAULT_ZJERK 0.3
888-
#define DEFAULT_IJERK 10.0
889-
#define DEFAULT_JJERK 10.0
890-
#define DEFAULT_KJERK 10.0
888+
//#define DEFAULT_IJERK 0.3
889+
//#define DEFAULT_JJERK 0.3
890+
//#define DEFAULT_KJERK 0.3
891891

892892
//#define TRAVEL_EXTRA_XYJERK 0.0 // Additional jerk allowance for all travel moves
893893

894894
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
895895
#if ENABLED(LIMITED_JERK_EDITING)
896-
#define MAX_JERK_EDIT_VALUES {LIST_N(LINEAR_AXES, 20, 20, 0.6, 20, 20, 20), 10 } // ...or, set your own edit limits
896+
#define MAX_JERK_EDIT_VALUES { 20, 20, 0.6, 10 } // ...or, set your own edit limits
897897
#endif
898898
#endif
899899

Marlin/src/inc/SanityCheck.h

-4
Original file line numberDiff line numberDiff line change
@@ -1186,10 +1186,6 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
11861186
#error "Please enable only one of DELTA, MORGAN_SCARA, COREXY, COREYX, COREXZ, COREZX, COREYZ, COREZY, ASYNC_SECONDARY_AXES or FOAMCUTTER_XYUV."
11871187
#endif
11881188

1189-
#if LINEAR_AXES >= 5
1190-
#error "LINEAR AXES >= 5 not yet supported, it causes unsafe movements. Developers should have a kill switch installed to stop movement before removing this check."
1191-
#endif
1192-
11931189
/**
11941190
* Delta requirements
11951191
*/

Marlin/src/module/motion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ const feedRate_t homing_feedrate_mm_s[LINEAR_AXES] PROGMEM = {
152152
#endif
153153
MMM_TO_MMS(HOMING_FEEDRATE_Z)
154154
#if LINEAR_AXES >= 4
155-
, MMM_TO_MMS(HOMING_FEEDRATE_I) // FIXME (DerAndere): Multiply with 4 as work-around for issue with internal feedrate
155+
, MMM_TO_MMS(HOMING_FEEDRATE_I)
156156
#endif
157157
#if LINEAR_AXES >= 5
158158
, MMM_TO_MMS(HOMING_FEEDRATE_J)

Marlin/src/module/settings.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ void MarlinSettings::postprocess() {
752752
// Unified Bed Leveling
753753
//
754754
{
755-
_FIELD_TEST(planner_leveling_active);
755+
_FIELD_TEST(planner_leveling_active); // FIXME (DerAndere): Too much data written to EEPROM since last _FIELD_TEST() causes Error: Field planner_leveling_active mismatch
756756
const bool ubl_active = TERN(AUTO_BED_LEVELING_UBL, planner.leveling_active, false);
757757
const int8_t storage_slot = TERN(AUTO_BED_LEVELING_UBL, ubl.storage_slot, -1);
758758
EEPROM_WRITE(ubl_active);
@@ -1648,7 +1648,7 @@ void MarlinSettings::postprocess() {
16481648
// Unified Bed Leveling active state
16491649
//
16501650
{
1651-
_FIELD_TEST(planner_leveling_active);
1651+
_FIELD_TEST(planner_leveling_active); // FIXME (DerAndere): Too much data written to EEPROM since last _FIELD_TEST() causes Error: Field planner_leveling_active mismatch
16521652
#if ENABLED(AUTO_BED_LEVELING_UBL)
16531653
const bool &planner_leveling_active = planner.leveling_active;
16541654
const int8_t &ubl_storage_slot = ubl.storage_slot;

0 commit comments

Comments
 (0)