0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

🔧 Adjust DEFAULT_EJERK settings (#26665)

Browse source
This commit is contained in:
Vovodroid 2024-01-20 00:38:25 +02:00 committed by GitHub
parent fb49645b32
commit da96607b65
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/Configuration.h
View file

@ -1291,6 +1291,7 @@
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
#define DEFAULT_EJERK 5.0
//#define DEFAULT_IJERK 0.3 //#define DEFAULT_IJERK 0.3
//#define DEFAULT_JJERK 0.3 //#define DEFAULT_JJERK 0.3
//#define DEFAULT_KJERK 0.3 //#define DEFAULT_KJERK 0.3
@ -1306,8 +1307,6 @@
#endif #endif
#endif #endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/** /**
* Junction Deviation Factor * Junction Deviation Factor
* *

4
Marlin/Configuration_adv.h
View file

@ -2320,7 +2320,9 @@
#endif #endif
//#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L. //#define ADVANCE_K_EXTRA // Add a second linear advance constant, configurable with M900 L.
//#define LA_DEBUG // Print debug information to serial during operation. Disable for production use. //#define LA_DEBUG // Print debug information to serial during operation. Disable for production use.
//#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends. #if ENABLED(CLASSIC_JERK)
//#define ALLOW_LOW_EJERK // Allow a DEFAULT_EJERK value of <10. Recommended for direct drive hotends.
#endif
//#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz. //#define EXPERIMENTAL_I2S_LA // Allow I2S_STEPPER_STREAM to be used with LA. Performance degrades as the LA step rate reaches ~20kHz.
#endif #endif

6
Marlin/src/gcode/host/M360.cpp
View file

@ -182,7 +182,11 @@ void GcodeSuite::M360() {
config_line(F("NumExtruder"), EXTRUDERS); config_line(F("NumExtruder"), EXTRUDERS);
#if HAS_EXTRUDERS #if HAS_EXTRUDERS
EXTRUDER_LOOP() { EXTRUDER_LOOP() {
config_line_e(e, JERK_STR, TERN(HAS_LINEAR_E_JERK, planner.max_e_jerk[E_INDEX_N(e)], TERN(CLASSIC_JERK, planner.max_jerk.e, DEFAULT_EJERK))); #if HAS_LINEAR_E_JERK
config_line_e(e, JERK_STR, planner.max_e_jerk[E_INDEX_N(e)]);
#elif ENABLED(CLASSIC_JERK)
config_line_e(e, JERK_STR, planner.max_jerk.e);
#endif
config_line_e(e, F("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]); config_line_e(e, F("MaxSpeed"), planner.settings.max_feedrate_mm_s[E_AXIS_N(e)]);
config_line_e(e, F("Acceleration"), planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]); config_line_e(e, F("Acceleration"), planner.settings.max_acceleration_mm_per_s2[E_AXIS_N(e)]);
config_line_e(e, F("Diameter"), TERN(NO_VOLUMETRICS, DEFAULT_NOMINAL_FILAMENT_DIA, planner.filament_size[e])); config_line_e(e, F("Diameter"), TERN(NO_VOLUMETRICS, DEFAULT_NOMINAL_FILAMENT_DIA, planner.filament_size[e]));

8
Marlin/src/module/planner.cpp
View file

@ -3386,8 +3386,12 @@ void Planner::set_max_feedrate(const AxisEnum axis, float inMaxFeedrateMMS) {
#ifdef MAX_JERK_EDIT_VALUES #ifdef MAX_JERK_EDIT_VALUES
MAX_JERK_EDIT_VALUES MAX_JERK_EDIT_VALUES
#else #else
{ (DEFAULT_XJERK) * 2, (DEFAULT_YJERK) * 2, LOGICAL_AXIS_ARRAY(
(DEFAULT_ZJERK) * 2, (DEFAULT_EJERK) * 2 } (DEFAULT_EJERK) * 2,
(DEFAULT_XJERK) * 2, (DEFAULT_YJERK) * 2, (DEFAULT_ZJERK) * 2,
(DEFAULT_IJERK) * 2, (DEFAULT_JJERK) * 2, (DEFAULT_KJERK) * 2,
(DEFAULT_UJERK) * 2, (DEFAULT_VJERK) * 2, (DEFAULT_WJERK) * 2
)
#endif #endif
; ;
limit_and_warn(inMaxJerkMMS, axis, F("Jerk"), max_jerk_edit); limit_and_warn(inMaxJerkMMS, axis, F("Jerk"), max_jerk_edit);

2
Marlin/src/module/settings.cpp
View file

@ -856,7 +856,7 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(dummyf); EEPROM_WRITE(dummyf);
#endif #endif
#else #else
const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(float(DEFAULT_EJERK), 10, 10, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4); const xyze_pos_t planner_max_jerk = LOGICAL_AXIS_ARRAY(5, 10, 10, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4, 0.4);
EEPROM_WRITE(planner_max_jerk); EEPROM_WRITE(planner_max_jerk);
#endif #endif