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

Enable junction deviation by default (#15481)

Browse source
This commit is contained in:
Scott Lahteine 2019-10-08 19:42:18 -05:00 committed by GitHub
parent 1df6c7a46c
commit c0005e939c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
144 changed files with 1930 additions and 2164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

231
Marlin/Configuration.h
View file

@ -54,19 +54,46 @@
* http://www.thingiverse.com/thing:298812 * http://www.thingiverse.com/thing:298812
*/ */
//===========================================================================
//============================= DELTA Printer ===============================
//===========================================================================
// For a Delta printer start with one of the configuration files in the
// config/examples/delta directory and customize for your machine.
//
//=========================================================================== //===========================================================================
//============================= SCARA Printer =============================== //============================= SCARA Printer ===============================
//=========================================================================== //===========================================================================
// For a SCARA printer start with the configuration files in
// config/examples/SCARA and customize for your machine. /**
// * MORGAN_SCARA was developed by QHARLEY in South Africa in 2012-2013.
* Implemented and slightly reworked by JCERNY in June, 2014.
*/
// Specify the specific SCARA model
#define MORGAN_SCARA
#if ENABLED(MORGAN_SCARA)
//#define DEBUG_SCARA_KINEMATICS
#define SCARA_FEEDRATE_SCALING // Convert XY feedrate from mm/s to degrees/s on the fly
// If movement is choppy try lowering this value
#define SCARA_SEGMENTS_PER_SECOND 200
// Length of inner and outer support arms. Measure arm lengths precisely.
#define SCARA_LINKAGE_1 150 //mm
#define SCARA_LINKAGE_2 150 //mm
// SCARA tower offset (position of Tower relative to bed zero position)
// This needs to be reasonably accurate as it defines the printbed position in the SCARA space.
#define SCARA_OFFSET_X 100 //mm
#define SCARA_OFFSET_Y -56 //mm
// Radius around the center where the arm cannot reach
#define MIDDLE_DEAD_ZONE_R 0 //mm
#define THETA_HOMING_OFFSET 0 //calculatated from Calibration Guide and command M360 / M114 see picture in http://reprap.harleystudio.co.za/?page_id=1073
#define PSI_HOMING_OFFSET 0 //calculatated from Calibration Guide and command M364 / M114 see picture in http://reprap.harleystudio.co.za/?page_id=1073
#endif
//===========================================================================
//==================== END ==== SCARA Printer ==== END ======================
//===========================================================================
// @section info // @section info
@ -133,7 +160,7 @@
#endif #endif
// Name displayed in the LCD "Ready" message and Info menu // Name displayed in the LCD "Ready" message and Info menu
//#define CUSTOM_MACHINE_NAME "3D Printer" #define CUSTOM_MACHINE_NAME "SCARA"
// Printer's unique ID, used by some programs to differentiate between machines. // Printer's unique ID, used by some programs to differentiate between machines.
// Choose your own or use a service like http://www.uuidgenerator.net/version4 // Choose your own or use a service like http://www.uuidgenerator.net/version4
@ -320,7 +347,7 @@
* Enable and connect the power supply to the PS_ON_PIN. * Enable and connect the power supply to the PS_ON_PIN.
* Specify whether the power supply is active HIGH or active LOW. * Specify whether the power supply is active HIGH or active LOW.
*/ */
//#define PSU_CONTROL #define PSU_CONTROL
//#define PSU_NAME "Power Supply" //#define PSU_NAME "Power Supply"
#if ENABLED(PSU_CONTROL) #if ENABLED(PSU_CONTROL)
@ -409,7 +436,7 @@
#define TEMP_SENSOR_3 0 #define TEMP_SENSOR_3 0
#define TEMP_SENSOR_4 0 #define TEMP_SENSOR_4 0
#define TEMP_SENSOR_5 0 #define TEMP_SENSOR_5 0
#define TEMP_SENSOR_BED 0 #define TEMP_SENSOR_BED 1
#define TEMP_SENSOR_CHAMBER 0 #define TEMP_SENSOR_CHAMBER 0
// Dummy thermistor constant temperature readings, for use with 998 and 999 // Dummy thermistor constant temperature readings, for use with 998 and 999
@ -421,11 +448,11 @@
//#define TEMP_SENSOR_1_AS_REDUNDANT //#define TEMP_SENSOR_1_AS_REDUNDANT
#define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10 #define MAX_REDUNDANT_TEMP_SENSOR_DIFF 10
#define TEMP_RESIDENCY_TIME 10 // (seconds) Time to wait for hotend to "settle" in M109 #define TEMP_RESIDENCY_TIME 3 // (seconds) Time to wait for hotend to "settle" in M109
#define TEMP_HYSTERESIS 2 // (°C) Temperature proximity considered "close enough" to the target
#define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer #define TEMP_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
#define TEMP_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
#define TEMP_BED_RESIDENCY_TIME 10 // (seconds) Time to wait for bed to "settle" in M190 #define TEMP_BED_RESIDENCY_TIME 0 // (seconds) Time to wait for bed to "settle" in M190
#define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer #define TEMP_BED_WINDOW 1 // (°C) Temperature proximity for the "temperature reached" timer
#define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target #define TEMP_BED_HYSTERESIS 3 // (°C) Temperature proximity considered "close enough" to the target
@ -468,25 +495,13 @@
//#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay //#define SLOW_PWM_HEATERS // PWM with very low frequency (roughly 0.125Hz=8s) and minimum state time of approximately 1s useful for heaters driven by a relay
//#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders) //#define PID_PARAMS_PER_HOTEND // Uses separate PID parameters for each extruder (useful for mismatched extruders)
// Set/get with gcode: M301 E[extruder number, 0-2] // Set/get with gcode: M301 E[extruder number, 0-2]
#define PID_FUNCTIONAL_RANGE 10 // If the temperature difference between the target temperature and the actual temperature #define PID_FUNCTIONAL_RANGE 20 // If the temperature difference between the target temperature and the actual temperature
// is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max. // is more than PID_FUNCTIONAL_RANGE then the PID will be shut off and the heater will be set to min/max.
// If you are using a pre-configured hotend then you can use one of the value sets by uncommenting it // Merlin Hotend: From Autotune
#define DEFAULT_Kp 24.5
// Ultimaker #define DEFAULT_Ki 1.72
#define DEFAULT_Kp 22.2 #define DEFAULT_Kd 87.73
#define DEFAULT_Ki 1.08
#define DEFAULT_Kd 114
// MakerGear
//#define DEFAULT_Kp 7.0
//#define DEFAULT_Ki 0.1
//#define DEFAULT_Kd 12
// Mendel Parts V9 on 12V
//#define DEFAULT_Kp 63.0
//#define DEFAULT_Ki 2.25
//#define DEFAULT_Kd 440
#endif // PIDTEMP #endif // PIDTEMP
@ -507,7 +522,7 @@
* heater. If your configuration is significantly different than this and you don't understand * heater. If your configuration is significantly different than this and you don't understand
* the issues involved, don't use bed PID until someone else verifies that your hardware works. * the issues involved, don't use bed PID until someone else verifies that your hardware works.
*/ */
//#define PIDTEMPBED #define PIDTEMPBED
//#define BED_LIMIT_SWITCHING //#define BED_LIMIT_SWITCHING
@ -523,17 +538,11 @@
//#define MIN_BED_POWER 0 //#define MIN_BED_POWER 0
//#define PID_BED_DEBUG // Sends debug data to the serial port. //#define PID_BED_DEBUG // Sends debug data to the serial port.
//120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+) //12v Heatbed Mk3 12V in parallel
//from FOPDT model - kp=.39 Tp=405 Tdead=66, Tc set to 79.2, aggressive factor of .15 (vs .1, 1, 10)
#define DEFAULT_bedKp 10.00
#define DEFAULT_bedKi .023
#define DEFAULT_bedKd 305.4
//120V 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
//from pidautotune //from pidautotune
//#define DEFAULT_bedKp 97.1 #define DEFAULT_bedKp 630.14
//#define DEFAULT_bedKi 1.41 #define DEFAULT_bedKi 121.71
//#define DEFAULT_bedKd 1675.16 #define DEFAULT_bedKd 815.64
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
#endif // PIDTEMPBED #endif // PIDTEMPBED
@ -602,23 +611,23 @@
// Specify here all the endstop connectors that are connected to any endstop or probe. // Specify here all the endstop connectors that are connected to any endstop or probe.
// Almost all printers will be using one per axis. Probes will use one or more of the // Almost all printers will be using one per axis. Probes will use one or more of the
// extra connectors. Leave undefined any used for non-endstop and non-probe purposes. // extra connectors. Leave undefined any used for non-endstop and non-probe purposes.
#define USE_XMIN_PLUG //#define USE_XMIN_PLUG
#define USE_YMIN_PLUG //#define USE_YMIN_PLUG
#define USE_ZMIN_PLUG #define USE_ZMIN_PLUG
//#define USE_XMAX_PLUG #define USE_XMAX_PLUG
//#define USE_YMAX_PLUG #define USE_YMAX_PLUG
//#define USE_ZMAX_PLUG //#define USE_ZMAX_PLUG
// Enable pullup for all endstops to prevent a floating state // Enable pullup for all endstops to prevent a floating state
#define ENDSTOPPULLUPS //#define ENDSTOPPULLUPS
#if DISABLED(ENDSTOPPULLUPS) #if DISABLED(ENDSTOPPULLUPS)
// Disable ENDSTOPPULLUPS to set pullups individually // Disable ENDSTOPPULLUPS to set pullups individually
//#define ENDSTOPPULLUP_XMAX #define ENDSTOPPULLUP_XMAX
//#define ENDSTOPPULLUP_YMAX #define ENDSTOPPULLUP_YMAX
//#define ENDSTOPPULLUP_ZMAX //#define ENDSTOPPULLUP_ZMAX // open pin, inverted
//#define ENDSTOPPULLUP_XMIN //#define ENDSTOPPULLUP_XMIN // open pin, inverted
//#define ENDSTOPPULLUP_YMIN //#define ENDSTOPPULLUP_YMIN // open pin, inverted
//#define ENDSTOPPULLUP_ZMIN #define ENDSTOPPULLUP_ZMIN
//#define ENDSTOPPULLUP_ZMIN_PROBE //#define ENDSTOPPULLUP_ZMIN_PROBE
#endif #endif
@ -636,13 +645,13 @@
#endif #endif
// Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup). // Mechanical endstop with COM to ground and NC to Signal uses "false" here (most common setup).
#define X_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define X_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
#define Y_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define Y_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
#define Z_MIN_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define Z_MIN_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
#define X_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define X_MAX_ENDSTOP_INVERTING false
#define Y_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define Y_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
#define Z_MAX_ENDSTOP_INVERTING false // Set to true to invert the logic of the endstop. #define Z_MAX_ENDSTOP_INVERTING true // Set to true to invert the logic of the endstop.
#define Z_MIN_PROBE_ENDSTOP_INVERTING false // Set to true to invert the logic of the probe. #define Z_MIN_PROBE_ENDSTOP_INVERTING true // Set to true to invert the logic of the probe.
/** /**
* Stepper Drivers * Stepper Drivers
@ -659,14 +668,14 @@
* TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE * TMC5130, TMC5130_STANDALONE, TMC5160, TMC5160_STANDALONE
* :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE'] * :['A4988', 'A5984', 'DRV8825', 'LV8729', 'L6470', 'TB6560', 'TB6600', 'TMC2100', 'TMC2130', 'TMC2130_STANDALONE', 'TMC2160', 'TMC2160_STANDALONE', 'TMC2208', 'TMC2208_STANDALONE', 'TMC2209', 'TMC2209_STANDALONE', 'TMC26X', 'TMC26X_STANDALONE', 'TMC2660', 'TMC2660_STANDALONE', 'TMC5130', 'TMC5130_STANDALONE', 'TMC5160', 'TMC5160_STANDALONE']
*/ */
//#define X_DRIVER_TYPE A4988 #define X_DRIVER_TYPE TMC2209
//#define Y_DRIVER_TYPE A4988 #define Y_DRIVER_TYPE TMC2130
//#define Z_DRIVER_TYPE A4988 #define Z_DRIVER_TYPE TMC2130
//#define X2_DRIVER_TYPE A4988 //#define X2_DRIVER_TYPE A4988
//#define Y2_DRIVER_TYPE A4988 //#define Y2_DRIVER_TYPE A4988
//#define Z2_DRIVER_TYPE A4988 //#define Z2_DRIVER_TYPE A4988
//#define Z3_DRIVER_TYPE A4988 //#define Z3_DRIVER_TYPE A4988
//#define E0_DRIVER_TYPE A4988 #define E0_DRIVER_TYPE TMC2660
//#define E1_DRIVER_TYPE A4988 //#define E1_DRIVER_TYPE A4988
//#define E2_DRIVER_TYPE A4988 //#define E2_DRIVER_TYPE A4988
//#define E3_DRIVER_TYPE A4988 //#define E3_DRIVER_TYPE A4988
@ -716,14 +725,14 @@
* Override with M92 * Override with M92
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] * X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
*/ */
#define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 4000, 500 } #define DEFAULT_AXIS_STEPS_PER_UNIT { 103.69, 106.65, 200/1.25, 1000 } // default steps per unit for SCARA
/** /**
* Default Max Feed Rate (mm/s) * Default Max Feed Rate (mm/s)
* Override with M203 * Override with M203
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] * X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
*/ */
#define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } #define DEFAULT_MAX_FEEDRATE { 300, 300, 30, 25 }
//#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2 //#define LIMITED_MAX_FR_EDITING // Limit edit via M203 or LCD to DEFAULT_MAX_FEEDRATE * 2
#if ENABLED(LIMITED_MAX_FR_EDITING) #if ENABLED(LIMITED_MAX_FR_EDITING)
@ -736,7 +745,7 @@
* Override with M201 * Override with M201
* X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]] * X, Y, Z, E0 [, E1[, E2[, E3[, E4[, E5]]]]]
*/ */
#define DEFAULT_MAX_ACCELERATION { 3000, 3000, 100, 10000 } #define DEFAULT_MAX_ACCELERATION { 300, 300, 20, 1000 }
//#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2 //#define LIMITED_MAX_ACCEL_EDITING // Limit edit via M201 or LCD to DEFAULT_MAX_ACCELERATION * 2
#if ENABLED(LIMITED_MAX_ACCEL_EDITING) #if ENABLED(LIMITED_MAX_ACCEL_EDITING)
@ -751,35 +760,22 @@
* M204 R Retract Acceleration * M204 R Retract Acceleration
* M204 T Travel Acceleration * M204 T Travel Acceleration
*/ */
#define DEFAULT_ACCELERATION 3000 // X, Y, Z and E acceleration for printing moves #define DEFAULT_ACCELERATION 400 // X, Y, Z and E acceleration for printing moves
#define DEFAULT_RETRACT_ACCELERATION 3000 // E acceleration for retracts #define DEFAULT_RETRACT_ACCELERATION 2000 // E acceleration for retracts
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) #define CLASSIC_JERK
#define DEFAULT_XJERK 10.0 #if ENABLED(CLASSIC_JERK)
#define DEFAULT_YJERK 10.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
//#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2 //#define LIMITED_JERK_EDITING // Limit edit via M205 or LCD to DEFAULT_aJERK * 2
@ -788,7 +784,18 @@
#endif #endif
#endif #endif
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 3.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
@ -853,7 +860,7 @@
* A Fix-Mounted Probe either doesn't deploy or needs manual deployment. * A Fix-Mounted Probe either doesn't deploy or needs manual deployment.
* (e.g., an inductive probe or a nozzle-based probe-switch.) * (e.g., an inductive probe or a nozzle-based probe-switch.)
*/ */
//#define FIX_MOUNTED_PROBE #define FIX_MOUNTED_PROBE
/** /**
* Z Servo Probe, such as an endstop switch on a rotating arm. * Z Servo Probe, such as an endstop switch on a rotating arm.
@ -921,7 +928,7 @@
* *
* Specify a Probe position as { X, Y, Z } * Specify a Probe position as { X, Y, Z }
*/ */
#define NOZZLE_TO_PROBE_OFFSET { 10, 10, 0 } #define NOZZLE_TO_PROBE_OFFSET { -25, -29, -12.35 }
// Certain types of probes need to stay away from edges // Certain types of probes need to stay away from edges
#define MIN_PROBE_EDGE 10 #define MIN_PROBE_EDGE 10
@ -961,7 +968,7 @@
* Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle. * Example: `M851 Z-5` with a CLEARANCE of 4 => 9mm from bed to nozzle.
* But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle. * But: `M851 Z+1` with a CLEARANCE of 2 => 2mm from bed to nozzle.
*/ */
#define Z_CLEARANCE_DEPLOY_PROBE 10 // Z Clearance for Deploy/Stow #define Z_CLEARANCE_DEPLOY_PROBE 15 // Z Clearance for Deploy/Stow
#define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points #define Z_CLEARANCE_BETWEEN_PROBES 5 // Z Clearance between probe points
#define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes #define Z_CLEARANCE_MULTI_PROBE 5 // Z Clearance between multiple probes
//#define Z_AFTER_PROBING 5 // Z position after probing is done //#define Z_AFTER_PROBING 5 // Z position after probing is done
@ -976,7 +983,7 @@
//#define Z_MIN_PROBE_REPEATABILITY_TEST //#define Z_MIN_PROBE_REPEATABILITY_TEST
// Before deploy/stow pause for user confirmation // Before deploy/stow pause for user confirmation
//#define PAUSE_BEFORE_DEPLOY_STOW #define PAUSE_BEFORE_DEPLOY_STOW
#if ENABLED(PAUSE_BEFORE_DEPLOY_STOW) #if ENABLED(PAUSE_BEFORE_DEPLOY_STOW)
//#define PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED // For Manual Deploy Allenkey Probe //#define PAUSE_PROBE_DEPLOY_WHEN_TRIGGERED // For Manual Deploy Allenkey Probe
#endif #endif
@ -1021,8 +1028,8 @@
// Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way. // Invert the stepper direction. Change (or reverse the motor connector) if an axis goes the wrong way.
#define INVERT_X_DIR false #define INVERT_X_DIR false
#define INVERT_Y_DIR true #define INVERT_Y_DIR false
#define INVERT_Z_DIR false #define INVERT_Z_DIR true
// @section extruder // @section extruder
@ -1045,8 +1052,8 @@
// Direction of endstops when homing; 1=MAX, -1=MIN // Direction of endstops when homing; 1=MAX, -1=MIN
// :[-1,1] // :[-1,1]
#define X_HOME_DIR -1 #define X_HOME_DIR 1
#define Y_HOME_DIR -1 #define Y_HOME_DIR 1
#define Z_HOME_DIR -1 #define Z_HOME_DIR -1
// @section machine // @section machine
@ -1058,10 +1065,10 @@
// Travel limits (mm) after homing, corresponding to endstop positions. // Travel limits (mm) after homing, corresponding to endstop positions.
#define X_MIN_POS 0 #define X_MIN_POS 0
#define Y_MIN_POS 0 #define Y_MIN_POS 0
#define Z_MIN_POS 0 #define Z_MIN_POS MANUAL_Z_HOME_POS
#define X_MAX_POS X_BED_SIZE #define X_MAX_POS X_BED_SIZE
#define Y_MAX_POS Y_BED_SIZE #define Y_MAX_POS Y_BED_SIZE
#define Z_MAX_POS 200 #define Z_MAX_POS 225
/** /**
* Software Endstops * Software Endstops
@ -1164,7 +1171,7 @@
*/ */
//#define AUTO_BED_LEVELING_3POINT //#define AUTO_BED_LEVELING_3POINT
//#define AUTO_BED_LEVELING_LINEAR //#define AUTO_BED_LEVELING_LINEAR
//#define AUTO_BED_LEVELING_BILINEAR #define AUTO_BED_LEVELING_BILINEAR
//#define AUTO_BED_LEVELING_UBL //#define AUTO_BED_LEVELING_UBL
//#define MESH_BED_LEVELING //#define MESH_BED_LEVELING
@ -1302,9 +1309,9 @@
// Manually set the home position. Leave these undefined for automatic settings. // Manually set the home position. Leave these undefined for automatic settings.
// For DELTA this is the top-center of the Cartesian print volume. // For DELTA this is the top-center of the Cartesian print volume.
//#define MANUAL_X_HOME_POS 0 #define MANUAL_X_HOME_POS -22
//#define MANUAL_Y_HOME_POS 0 #define MANUAL_Y_HOME_POS -52
//#define MANUAL_Z_HOME_POS 0 #define MANUAL_Z_HOME_POS 0.1
// Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area. // Use "Z Safe Homing" to avoid homing with a Z probe outside the bed area.
// //
@ -1323,8 +1330,8 @@
#endif #endif
// Homing speeds (mm/m) // Homing speeds (mm/m)
#define HOMING_FEEDRATE_XY (50*60) #define HOMING_FEEDRATE_XY (40*60)
#define HOMING_FEEDRATE_Z (4*60) #define HOMING_FEEDRATE_Z (10*60)
// Validate that endstops are triggered on homing moves // Validate that endstops are triggered on homing moves
#define VALIDATE_HOMING_ENDSTOPS #define VALIDATE_HOMING_ENDSTOPS
@ -1401,7 +1408,7 @@
* M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes) * M501 - Read settings from EEPROM. (i.e., Throw away unsaved changes)
* M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.) * M502 - Revert settings to "factory" defaults. (Follow with M500 to init the EEPROM.)
*/ */
//#define EEPROM_SETTINGS // Persistent storage with M500 and M501 #define EEPROM_SETTINGS // Persistent storage with M500 and M501
//#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release! //#define DISABLE_M503 // Saves ~2700 bytes of PROGMEM. Disable for release!
#define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM. #define EEPROM_CHITCHAT // Give feedback on EEPROM commands. Disable to save PROGMEM.
#if ENABLED(EEPROM_SETTINGS) #if ENABLED(EEPROM_SETTINGS)
@ -1439,12 +1446,12 @@
#define PREHEAT_1_LABEL "PLA" #define PREHEAT_1_LABEL "PLA"
#define PREHEAT_1_TEMP_HOTEND 180 #define PREHEAT_1_TEMP_HOTEND 180
#define PREHEAT_1_TEMP_BED 70 #define PREHEAT_1_TEMP_BED 70
#define PREHEAT_1_FAN_SPEED 0 // Value from 0 to 255 #define PREHEAT_1_FAN_SPEED 255 // Value from 0 to 255
#define PREHEAT_2_LABEL "ABS" #define PREHEAT_2_LABEL "ABS"
#define PREHEAT_2_TEMP_HOTEND 240 #define PREHEAT_2_TEMP_HOTEND 240
#define PREHEAT_2_TEMP_BED 110 #define PREHEAT_2_TEMP_BED 100
#define PREHEAT_2_FAN_SPEED 0 // Value from 0 to 255 #define PREHEAT_2_FAN_SPEED 255 // Value from 0 to 255
/** /**
* Nozzle Park * Nozzle Park
@ -1740,7 +1747,7 @@
// //
// ULTIMAKER Controller. // ULTIMAKER Controller.
// //
//#define ULTIMAKERCONTROLLER #define ULTIMAKERCONTROLLER
// //
// ULTIPANEL as seen on Thingiverse. // ULTIPANEL as seen on Thingiverse.

34
Marlin/Configuration_adv.h
View file

@ -114,7 +114,7 @@
#endif #endif
#if DISABLED(PIDTEMPBED) #if DISABLED(PIDTEMPBED)
#define BED_CHECK_INTERVAL 5000 // ms between checks in bang-bang control #define BED_CHECK_INTERVAL 3000 // ms between checks in bang-bang control
#if ENABLED(BED_LIMIT_SWITCHING) #if ENABLED(BED_LIMIT_SWITCHING)
#define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS #define BED_HYSTERESIS 2 // Only disable heating if T>target+BED_HYSTERESIS and enable heating if T>target-BED_HYSTERESIS
#endif #endif
@ -215,7 +215,7 @@
#endif #endif
// Show extra position information with 'M114 D' // Show extra position information with 'M114 D'
//#define M114_DETAIL #define M114_DETAIL
// Show Temperature ADC value // Show Temperature ADC value
// Enable for M105 to include ADC values read from temperature sensors. // Enable for M105 to include ADC values read from temperature sensors.
@ -257,7 +257,7 @@
#if ENABLED(EXTRUDER_RUNOUT_PREVENT) #if ENABLED(EXTRUDER_RUNOUT_PREVENT)
#define EXTRUDER_RUNOUT_MINTEMP 190 #define EXTRUDER_RUNOUT_MINTEMP 190
#define EXTRUDER_RUNOUT_SECONDS 30 #define EXTRUDER_RUNOUT_SECONDS 30
#define EXTRUDER_RUNOUT_SPEED 1500 // (mm/m) #define EXTRUDER_RUNOUT_SPEED 180 // (mm/m)
#define EXTRUDER_RUNOUT_EXTRUDE 5 // (mm) #define EXTRUDER_RUNOUT_EXTRUDE 5 // (mm)
#endif #endif
@ -516,9 +516,9 @@
// @section homing // @section homing
// Homing hits each endstop, retracts by these distances, then does a slower bump. // Homing hits each endstop, retracts by these distances, then does a slower bump.
#define X_HOME_BUMP_MM 5 #define X_HOME_BUMP_MM 3
#define Y_HOME_BUMP_MM 5 #define Y_HOME_BUMP_MM 3
#define Z_HOME_BUMP_MM 2 #define Z_HOME_BUMP_MM 3
#define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate) #define HOMING_BUMP_DIVISOR { 2, 2, 4 } // Re-Bump Speed Divisor (Divides the Homing Feedrate)
//#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially //#define QUICK_HOME // If homing includes X and Y, do a diagonal move initially
//#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing //#define HOMING_BACKOFF_MM { 2, 2, 2 } // (mm) Move away from the endstops after homing
@ -635,7 +635,7 @@
// Default stepper release if idle. Set to 0 to deactivate. // Default stepper release if idle. Set to 0 to deactivate.
// Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true. // Steppers will shut down DEFAULT_STEPPER_DEACTIVE_TIME seconds after the last move when DISABLE_INACTIVE_? is true.
// Time can be set by M18 and M84. // Time can be set by M18 and M84.
#define DEFAULT_STEPPER_DEACTIVE_TIME 120 #define DEFAULT_STEPPER_DEACTIVE_TIME 240
#define DISABLE_INACTIVE_X true #define DISABLE_INACTIVE_X true
#define DISABLE_INACTIVE_Y true #define DISABLE_INACTIVE_Y true
#define DISABLE_INACTIVE_Z true // Set to false if the nozzle will fall down on your printed part when print has finished. #define DISABLE_INACTIVE_Z true // Set to false if the nozzle will fall down on your printed part when print has finished.
@ -650,7 +650,7 @@
#define DEFAULT_MINSEGMENTTIME 20000 // (ms) #define DEFAULT_MINSEGMENTTIME 20000 // (ms)
// If defined the movements slow down when the look ahead buffer is only half full // If defined the movements slow down when the look ahead buffer is only half full
#define SLOWDOWN //#define SLOWDOWN
// Frequency limit // Frequency limit
// See nophead's blog for more info // See nophead's blog for more info
@ -824,7 +824,7 @@
// @section lcd // @section lcd
#if EITHER(ULTIPANEL, EXTENSIBLE_UI) #if EITHER(ULTIPANEL, EXTENSIBLE_UI)
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel #define MANUAL_FEEDRATE { 50*60, 50*60, 10*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
#define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm) #define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position" #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
@ -919,7 +919,7 @@
//#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files //#define MENU_ADDAUTOSTART // Add a menu option to run auto#.g files
#define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27") //#define EVENT_GCODE_SD_STOP "G28XY" // G-code to run on Stop Print (e.g., "G28XY" or "G27")
/** /**
* Continue after Power-Loss (Creality3D) * Continue after Power-Loss (Creality3D)
@ -1587,7 +1587,7 @@
#endif #endif
#define RETRACT_LENGTH 3 // (mm) Default retract length (positive value) #define RETRACT_LENGTH 3 // (mm) Default retract length (positive value)
#define RETRACT_LENGTH_SWAP 13 // (mm) Default swap retract length (positive value) #define RETRACT_LENGTH_SWAP 13 // (mm) Default swap retract length (positive value)
#define RETRACT_FEEDRATE 45 // (mm/s) Default feedrate for retracting #define RETRACT_FEEDRATE 35 // (mm/s) Default feedrate for retracting
#define RETRACT_ZRAISE 0 // (mm) Default retract Z-raise #define RETRACT_ZRAISE 0 // (mm) Default retract Z-raise
#define RETRACT_RECOVER_LENGTH 0 // (mm) Default additional recover length (added to retract length on recover) #define RETRACT_RECOVER_LENGTH 0 // (mm) Default additional recover length (added to retract length on recover)
#define RETRACT_RECOVER_LENGTH_SWAP 0 // (mm) Default additional swap recover length (added to retract length on recover from toolchange) #define RETRACT_RECOVER_LENGTH_SWAP 0 // (mm) Default additional swap recover length (added to retract length on recover from toolchange)
@ -1983,7 +1983,7 @@
* M912 - Clear stepper driver overtemperature pre-warn condition flag. * M912 - Clear stepper driver overtemperature pre-warn condition flag.
* M122 - Report driver parameters (Requires TMC_DEBUG) * M122 - Report driver parameters (Requires TMC_DEBUG)
*/ */
//#define MONITOR_DRIVER_STATUS #define MONITOR_DRIVER_STATUS
#if ENABLED(MONITOR_DRIVER_STATUS) #if ENABLED(MONITOR_DRIVER_STATUS)
#define CURRENT_STEP_DOWN 50 // [mA] #define CURRENT_STEP_DOWN 50 // [mA]
@ -1998,7 +1998,7 @@
* STEALTHCHOP_(XY|Z|E) must be enabled to use HYBRID_THRESHOLD. * STEALTHCHOP_(XY|Z|E) must be enabled to use HYBRID_THRESHOLD.
* M913 X/Y/Z/E to live tune the setting * M913 X/Y/Z/E to live tune the setting
*/ */
//#define HYBRID_THRESHOLD #define HYBRID_THRESHOLD
#define X_HYBRID_THRESHOLD 100 // [mm/s] #define X_HYBRID_THRESHOLD 100 // [mm/s]
#define X2_HYBRID_THRESHOLD 100 #define X2_HYBRID_THRESHOLD 100
@ -2037,7 +2037,7 @@
* IMPROVE_HOMING_RELIABILITY tunes acceleration and jerk when * IMPROVE_HOMING_RELIABILITY tunes acceleration and jerk when
* homing and adds a guard period for endstop triggering. * homing and adds a guard period for endstop triggering.
*/ */
//#define SENSORLESS_HOMING // StallGuard capable drivers only #define SENSORLESS_HOMING // StallGuard capable drivers only
/** /**
* Use StallGuard2 to probe the bed with the nozzle. * Use StallGuard2 to probe the bed with the nozzle.
@ -2061,7 +2061,7 @@
* Beta feature! * Beta feature!
* Create a 50/50 square wave step pulse optimal for stepper drivers. * Create a 50/50 square wave step pulse optimal for stepper drivers.
*/ */
//#define SQUARE_WAVE_STEPPING #define SQUARE_WAVE_STEPPING
/** /**
* Enable M122 debugging command for TMC stepper drivers. * Enable M122 debugging command for TMC stepper drivers.
@ -2511,8 +2511,8 @@
#define USER_DESC_4 "Heat Bed/Home/Level" #define USER_DESC_4 "Heat Bed/Home/Level"
#define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29" #define USER_GCODE_4 "M140 S" STRINGIFY(PREHEAT_2_TEMP_BED) "\nG28\nG29"
#define USER_DESC_5 "Home & Info" //#define USER_DESC_5 "Home & Info"
#define USER_GCODE_5 "G28\nM503" //#define USER_GCODE_5 "G28\nM503"
#endif #endif
/** /**

8
Marlin/src/gcode/config/M200-M205.cpp
View file

@ -117,10 +117,10 @@ void GcodeSuite::M204() {
* Y = Max Y Jerk (units/sec^2) * Y = Max Y Jerk (units/sec^2)
* Z = Max Z Jerk (units/sec^2) * Z = Max Z Jerk (units/sec^2)
* E = Max E Jerk (units/sec^2) * E = Max E Jerk (units/sec^2)
* J = Junction Deviation (mm) (Requires JUNCTION_DEVIATION) * J = Junction Deviation (mm) (If not using CLASSIC_JERK)
*/ */
void GcodeSuite::M205() { void GcodeSuite::M205() {
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
#define J_PARAM "J" #define J_PARAM "J"
#else #else
#define J_PARAM #define J_PARAM
@ -136,7 +136,7 @@ void GcodeSuite::M205() {
if (parser.seen('B')) planner.settings.min_segment_time_us = parser.value_ulong(); if (parser.seen('B')) planner.settings.min_segment_time_us = parser.value_ulong();
if (parser.seen('S')) planner.settings.min_feedrate_mm_s = parser.value_linear_units(); if (parser.seen('S')) planner.settings.min_feedrate_mm_s = parser.value_linear_units();
if (parser.seen('T')) planner.settings.min_travel_feedrate_mm_s = parser.value_linear_units(); if (parser.seen('T')) planner.settings.min_travel_feedrate_mm_s = parser.value_linear_units();
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
if (parser.seen('J')) { if (parser.seen('J')) {
const float junc_dev = parser.value_linear_units(); const float junc_dev = parser.value_linear_units();
if (WITHIN(junc_dev, 0.01f, 0.3f)) { if (WITHIN(junc_dev, 0.01f, 0.3f)) {
@ -159,7 +159,7 @@ void GcodeSuite::M205() {
SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses."); SERIAL_ECHOLNPGM("WARNING! Low Z Jerk may lead to unwanted pauses.");
#endif #endif
} }
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_CLASSIC_E_JERK
if (parser.seen('E')) planner.set_max_jerk(E_AXIS, parser.value_linear_units()); if (parser.seen('E')) planner.set_max_jerk(E_AXIS, parser.value_linear_units());
#endif #endif
#endif #endif

2
Marlin/src/gcode/config/M92.cpp
View file

@ -76,7 +76,7 @@ void GcodeSuite::M92() {
const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder))); const float value = parser.value_per_axis_units((AxisEnum)(E_AXIS_N(target_extruder)));
if (value < 20) { if (value < 20) {
float factor = planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] / value; // increase e constants if M92 E14 is given for netfab. float factor = planner.settings.axis_steps_per_mm[E_AXIS_N(target_extruder)] / value; // increase e constants if M92 E14 is given for netfab.
#if HAS_CLASSIC_JERK && !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_CLASSIC_E_JERK
planner.max_jerk.e *= factor; planner.max_jerk.e *= factor;
#endif #endif
planner.settings.max_feedrate_mm_s[E_AXIS_N(target_extruder)] *= factor; planner.settings.max_feedrate_mm_s[E_AXIS_N(target_extruder)] *= factor;

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

@ -564,3 +564,5 @@
#define IS_RE_ARM_BOARD (MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_14_RE_ARM_EEB) || MB(RAMPS_14_RE_ARM_EFF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_14_RE_ARM_SF)) #define IS_RE_ARM_BOARD (MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_14_RE_ARM_EEB) || MB(RAMPS_14_RE_ARM_EFF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_14_RE_ARM_SF))
#define HAS_SDCARD_CONNECTION EITHER(TARGET_LPC1768, ADAFRUIT_GRAND_CENTRAL_M4) #define HAS_SDCARD_CONNECTION EITHER(TARGET_LPC1768, ADAFRUIT_GRAND_CENTRAL_M4)
#define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))

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

@ -43,7 +43,8 @@
#define NOT_A_PIN 0 // For PINS_DEBUGGING #define NOT_A_PIN 0 // For PINS_DEBUGGING
#endif #endif
#define HAS_CLASSIC_JERK (IS_KINEMATIC || DISABLED(JUNCTION_DEVIATION)) #define HAS_CLASSIC_JERK (ENABLED(CLASSIC_JERK) || IS_KINEMATIC)
#define HAS_CLASSIC_E_JERK (HAS_CLASSIC_JERK && DISABLED(LIN_ADVANCE))
/** /**
* Axis lengths and center * Axis lengths and center

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

@ -310,7 +310,7 @@
#error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h." #error "LEVEL_BED_CORNERS requires a LEVEL_CORNERS_INSET value. Please update your Configuration.h."
#elif defined(BEZIER_JERK_CONTROL) #elif defined(BEZIER_JERK_CONTROL)
#error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION. Please update your configuration." #error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION. Please update your configuration."
#elif defined(JUNCTION_DEVIATION_FACTOR) #elif DISABLED(CLASSIC_JERK) && defined(JUNCTION_DEVIATION_FACTOR)
#error "JUNCTION_DEVIATION_FACTOR is now JUNCTION_DEVIATION_MM. Please update your configuration." #error "JUNCTION_DEVIATION_FACTOR is now JUNCTION_DEVIATION_MM. Please update your configuration."
#elif defined(JUNCTION_ACCELERATION_FACTOR) #elif defined(JUNCTION_ACCELERATION_FACTOR)
#error "JUNCTION_ACCELERATION_FACTOR is obsolete. Delete it from Configuration_adv.h." #error "JUNCTION_ACCELERATION_FACTOR is obsolete. Delete it from Configuration_adv.h."
@ -404,6 +404,8 @@
#error "(MIN|MAX)_PROBE_[XY] are now calculated at runtime. Please remove them from Configuration.h." #error "(MIN|MAX)_PROBE_[XY] are now calculated at runtime. Please remove them from Configuration.h."
#elif defined(Z_STEPPER_ALIGN_X) || defined(Z_STEPPER_ALIGN_X) #elif defined(Z_STEPPER_ALIGN_X) || defined(Z_STEPPER_ALIGN_X)
#error "Z_STEPPER_ALIGN_X and Z_STEPPER_ALIGN_Y are now combined as Z_STEPPER_ALIGN_XY. Please update your Configuration_adv.h." #error "Z_STEPPER_ALIGN_X and Z_STEPPER_ALIGN_Y are now combined as Z_STEPPER_ALIGN_XY. Please update your Configuration_adv.h."
#elif defined(JUNCTION_DEVIATION)
#error "JUNCTION_DEVIATION is no longer required. (See CLASSIC_JERK). Please remove it from Configuration.h."
#endif #endif
#define BOARD_MKS_13 -1000 #define BOARD_MKS_13 -1000
@ -1040,10 +1042,10 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif #endif
/** /**
* Junction deviation is not compatible with kinematic systems. * Junction deviation is incompatible with kinematic systems.
*/ */
#if ENABLED(JUNCTION_DEVIATION) && IS_KINEMATIC #if DISABLED(CLASSIC_JERK) && IS_KINEMATIC
#error "Junction deviation is only compatible with Cartesians." #error "CLASSIC_JERK is required for DELTA and SCARA."
#endif #endif
/** /**
@ -1270,7 +1272,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#endif #endif
#if HAS_MESH #if HAS_MESH
#if DISABLED(JUNCTION_DEVIATION) #if HAS_CLASSIC_JERK
static_assert(DEFAULT_ZJERK > 0.1, "Low DEFAULT_ZJERK values are incompatible with mesh-based leveling."); static_assert(DEFAULT_ZJERK > 0.1, "Low DEFAULT_ZJERK values are incompatible with mesh-based leveling.");
#endif #endif
#elif ENABLED(G26_MESH_VALIDATION) #elif ENABLED(G26_MESH_VALIDATION)

6
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/advanced_settings_menu.cpp
View file

@ -82,7 +82,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(10).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(RESTORE_DEFAULTS)) .tag(10).button( BTN_POS(1,8), BTN_SIZE(2,1), GET_TEXT_F(RESTORE_DEFAULTS))
.tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY)) .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY))
.tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION)) .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION)) .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION))
#else #else
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JERK)) .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JERK))
@ -135,7 +135,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(12).button( BTN_POS(3,4), BTN_SIZE(1,1), GET_TEXT_F(ENDSTOPS)) .tag(12).button( BTN_POS(3,4), BTN_SIZE(1,1), GET_TEXT_F(ENDSTOPS))
.tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY)) .tag(5) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY))
.tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION)) .tag(6) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION)) .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION))
#else #else
.tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JERK)) .tag(7) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JERK))
@ -163,7 +163,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
case 5: GOTO_SCREEN(MaxVelocityScreen); break; case 5: GOTO_SCREEN(MaxVelocityScreen); break;
case 6: GOTO_SCREEN(DefaultAccelerationScreen); break; case 6: GOTO_SCREEN(DefaultAccelerationScreen); break;
case 7: case 7:
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
GOTO_SCREEN(JunctionDeviationScreen); GOTO_SCREEN(JunctionDeviationScreen);
#else #else
GOTO_SCREEN(JerkScreen); GOTO_SCREEN(JerkScreen);

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/bio_advanced_settings.cpp
View file

@ -68,7 +68,7 @@ void AdvancedSettingsMenu::onRedraw(draw_mode_t what) {
.tag(7) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(STEPS_PER_MM)) .tag(7) .button( BTN_POS(2,1), BTN_SIZE(1,1), GET_TEXT_F(STEPS_PER_MM))
.tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY)) .tag(8) .button( BTN_POS(2,2), BTN_SIZE(1,1), GET_TEXT_F(VELOCITY))
.tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION)) .tag(9) .button( BTN_POS(2,3), BTN_SIZE(1,1), GET_TEXT_F(ACCELERATION))
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
.tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION)) .tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JUNC_DEVIATION))
#else #else
.tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JERK)) .tag(10) .button( BTN_POS(2,4), BTN_SIZE(1,1), GET_TEXT_F(JERK))
@ -113,7 +113,7 @@ bool AdvancedSettingsMenu::onTouchEnd(uint8_t tag) {
case 8: GOTO_SCREEN(MaxVelocityScreen); break; case 8: GOTO_SCREEN(MaxVelocityScreen); break;
case 9: GOTO_SCREEN(DefaultAccelerationScreen); break; case 9: GOTO_SCREEN(DefaultAccelerationScreen); break;
case 10: case 10:
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
GOTO_SCREEN(JunctionDeviationScreen); GOTO_SCREEN(JunctionDeviationScreen);
#else #else
GOTO_SCREEN(JerkScreen); GOTO_SCREEN(JerkScreen);

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/jerk_screen.cpp
View file

@ -22,7 +22,7 @@
#include "../config.h" #include "../config.h"
#if ENABLED(LULZBOT_TOUCH_UI) && DISABLED(JUNCTION_DEVIATION) #if BOTH(LULZBOT_TOUCH_UI, CLASSIC_JERK)
#include "screens.h" #include "screens.h"
@ -62,4 +62,4 @@ bool JerkScreen::onTouchHeld(uint8_t tag) {
return true; return true;
} }
#endif // LULZBOT_TOUCH_UI #endif // LULZBOT_TOUCH_UI && CLASSIC_JERK

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/junction_deviation_screen.cpp
View file

@ -22,7 +22,7 @@
#include "../config.h" #include "../config.h"
#if BOTH(LULZBOT_TOUCH_UI, JUNCTION_DEVIATION) #if ENABLED(LULZBOT_TOUCH_UI) && DISABLED(CLASSIC_JERK)
#include "screens.h" #include "screens.h"
@ -51,4 +51,4 @@ bool JunctionDeviationScreen::onTouchHeld(uint8_t tag) {
return true; return true;
} }
#endif // LULZBOT_TOUCH_UI #endif // LULZBOT_TOUCH_UI && !CLASSIC_JERK

2
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.cpp
View file

@ -75,7 +75,7 @@ SCREEN_TABLE {
DECL_SCREEN(MaxVelocityScreen), DECL_SCREEN(MaxVelocityScreen),
DECL_SCREEN(MaxAccelerationScreen), DECL_SCREEN(MaxAccelerationScreen),
DECL_SCREEN(DefaultAccelerationScreen), DECL_SCREEN(DefaultAccelerationScreen),
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
DECL_SCREEN(JunctionDeviationScreen), DECL_SCREEN(JunctionDeviationScreen),
#else #else
DECL_SCREEN(JerkScreen), DECL_SCREEN(JerkScreen),

4
Marlin/src/lcd/extensible_ui/lib/lulzbot/screens/screens.h
View file

@ -55,7 +55,7 @@ enum {
MAX_VELOCITY_SCREEN_CACHE, MAX_VELOCITY_SCREEN_CACHE,
MAX_ACCELERATION_SCREEN_CACHE, MAX_ACCELERATION_SCREEN_CACHE,
DEFAULT_ACCELERATION_SCREEN_CACHE, DEFAULT_ACCELERATION_SCREEN_CACHE,
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
JUNC_DEV_SCREEN_CACHE, JUNC_DEV_SCREEN_CACHE,
#else #else
JERK_SCREEN_CACHE, JERK_SCREEN_CACHE,
@ -503,7 +503,7 @@ class DefaultAccelerationScreen : public BaseNumericAdjustmentScreen, public Cac
static bool onTouchHeld(uint8_t tag); static bool onTouchHeld(uint8_t tag);
}; };
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
class JunctionDeviationScreen : public BaseNumericAdjustmentScreen, public CachedScreen<JUNC_DEV_SCREEN_CACHE> { class JunctionDeviationScreen : public BaseNumericAdjustmentScreen, public CachedScreen<JUNC_DEV_SCREEN_CACHE> {
public: public:
static void onRedraw(draw_mode_t); static void onRedraw(draw_mode_t);

2
Marlin/src/lcd/extensible_ui/ui_api.cpp
View file

@ -622,7 +622,7 @@ namespace ExtUI {
} }
#endif #endif
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
float getJunctionDeviation_mm() { float getJunctionDeviation_mm() {
return planner.junction_deviation_mm; return planner.junction_deviation_mm;

2
Marlin/src/lcd/extensible_ui/ui_api.h
View file

@ -179,7 +179,7 @@ namespace ExtUI {
void setLinearAdvance_mm_mm_s(const float, const extruder_t); void setLinearAdvance_mm_mm_s(const float, const extruder_t);
#endif #endif
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
float getJunctionDeviation_mm(); float getJunctionDeviation_mm();
void setJunctionDeviation_mm(const float); void setJunctionDeviation_mm(const float);
#else #else

4
Marlin/src/lcd/menu/menu_advanced.cpp
View file

@ -486,7 +486,7 @@ void menu_backlash();
START_MENU(); START_MENU();
BACK_ITEM(MSG_ADVANCED_SETTINGS); BACK_ITEM(MSG_ADVANCED_SETTINGS);
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.01f, 0.3f, planner.recalculate_max_e_jerk); EDIT_ITEM(float43, MSG_JUNCTION_DEVIATION, &planner.junction_deviation_mm, 0.01f, 0.3f, planner.recalculate_max_e_jerk);
#else #else
@ -511,7 +511,7 @@ void menu_backlash();
#else #else
EDIT_ITEM_FAST(float52sign, MSG_VC_JERK, &planner.max_jerk.c, 0.1f, max_jerk_edit.c); EDIT_ITEM_FAST(float52sign, MSG_VC_JERK, &planner.max_jerk.c, 0.1f, max_jerk_edit.c);
#endif #endif
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_CLASSIC_E_JERK
EDIT_ITEM_FAST(float52sign, MSG_VE_JERK, &planner.max_jerk.e, 0.1f, max_jerk_edit.e); EDIT_ITEM_FAST(float52sign, MSG_VE_JERK, &planner.max_jerk.e, 0.1f, max_jerk_edit.e);
#endif #endif
#endif #endif

12
Marlin/src/module/configuration_store.cpp
View file

@ -398,7 +398,7 @@ void MarlinSettings::postprocess() {
fwretract.refresh_autoretract(); fwretract.refresh_autoretract();
#endif #endif
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
planner.recalculate_max_e_jerk(); planner.recalculate_max_e_jerk();
#endif #endif
@ -516,7 +516,7 @@ void MarlinSettings::postprocess() {
#if HAS_CLASSIC_JERK #if HAS_CLASSIC_JERK
EEPROM_WRITE(planner.max_jerk); EEPROM_WRITE(planner.max_jerk);
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
dummy = float(DEFAULT_EJERK); dummy = float(DEFAULT_EJERK);
EEPROM_WRITE(dummy); EEPROM_WRITE(dummy);
#endif #endif
@ -1316,7 +1316,7 @@ void MarlinSettings::postprocess() {
#if HAS_CLASSIC_JERK #if HAS_CLASSIC_JERK
EEPROM_READ(planner.max_jerk); EEPROM_READ(planner.max_jerk);
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
EEPROM_READ(dummy); EEPROM_READ(dummy);
#endif #endif
#else #else
@ -2230,7 +2230,7 @@ void MarlinSettings::reset() {
#define DEFAULT_ZJERK 0 #define DEFAULT_ZJERK 0
#endif #endif
planner.max_jerk.set(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK); planner.max_jerk.set(DEFAULT_XJERK, DEFAULT_YJERK, DEFAULT_ZJERK);
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_CLASSIC_E_JERK
planner.max_jerk.e = DEFAULT_EJERK; planner.max_jerk.e = DEFAULT_EJERK;
#endif #endif
#endif #endif
@ -2749,7 +2749,7 @@ void MarlinSettings::reset() {
#endif #endif
#if HAS_CLASSIC_JERK #if HAS_CLASSIC_JERK
SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>"); SERIAL_ECHOPGM(" X<max_x_jerk> Y<max_y_jerk> Z<max_z_jerk>");
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_CLASSIC_E_JERK
SERIAL_ECHOPGM(" E<max_e_jerk>"); SERIAL_ECHOPGM(" E<max_e_jerk>");
#endif #endif
#endif #endif
@ -2767,7 +2767,7 @@ void MarlinSettings::reset() {
, " X", LINEAR_UNIT(planner.max_jerk.x) , " X", LINEAR_UNIT(planner.max_jerk.x)
, " Y", LINEAR_UNIT(planner.max_jerk.y) , " Y", LINEAR_UNIT(planner.max_jerk.y)
, " Z", LINEAR_UNIT(planner.max_jerk.z) , " Z", LINEAR_UNIT(planner.max_jerk.z)
#if !BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_CLASSIC_E_JERK
, " E", LINEAR_UNIT(planner.max_jerk.e) , " E", LINEAR_UNIT(planner.max_jerk.e)
#endif #endif
#endif #endif

4
Marlin/src/module/motion.cpp
View file

@ -1287,13 +1287,13 @@ void do_homing_move(const AxisEnum axis, const float distance, const feedRate_t
planner.set_machine_position_mm(target); planner.set_machine_position_mm(target);
target[axis] = distance; target[axis] = distance;
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
const xyze_float_t delta_mm_cart{0}; const xyze_float_t delta_mm_cart{0};
#endif #endif
// Set delta/cartesian axes directly // Set delta/cartesian axes directly
planner.buffer_segment(target planner.buffer_segment(target
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, delta_mm_cart , delta_mm_cart
#endif #endif
, real_fr_mm_s, active_extruder , real_fr_mm_s, active_extruder

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

@ -125,7 +125,7 @@ uint32_t Planner::max_acceleration_steps_per_s2[XYZE_N]; // (steps/s^2) Derived
float Planner::steps_to_mm[XYZE_N]; // (mm) Millimeters per step float Planner::steps_to_mm[XYZE_N]; // (mm) Millimeters per step
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
float Planner::junction_deviation_mm; // (mm) M205 J float Planner::junction_deviation_mm; // (mm) M205 J
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
#if ENABLED(DISTINCT_E_FACTORS) #if ENABLED(DISTINCT_E_FACTORS)
@ -136,7 +136,7 @@ float Planner::steps_to_mm[XYZE_N]; // (mm) Millimeters per step
#endif #endif
#endif #endif
#if HAS_CLASSIC_JERK #if HAS_CLASSIC_JERK
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
xyz_pos_t Planner::max_jerk; // (mm/s^2) M205 XYZ - The largest speed change requiring no acceleration. xyz_pos_t Planner::max_jerk; // (mm/s^2) M205 XYZ - The largest speed change requiring no acceleration.
#else #else
xyze_pos_t Planner::max_jerk; // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration. xyze_pos_t Planner::max_jerk; // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration.
@ -1564,7 +1564,7 @@ bool Planner::_buffer_steps(const xyze_long_t &target
#if HAS_POSITION_FLOAT #if HAS_POSITION_FLOAT
, const xyze_pos_t &target_float , const xyze_pos_t &target_float
#endif #endif
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, const xyze_float_t &delta_mm_cart , const xyze_float_t &delta_mm_cart
#endif #endif
, feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters
@ -1582,7 +1582,7 @@ bool Planner::_buffer_steps(const xyze_long_t &target
#if HAS_POSITION_FLOAT #if HAS_POSITION_FLOAT
, target_float , target_float
#endif #endif
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, delta_mm_cart , delta_mm_cart
#endif #endif
, fr_mm_s, extruder, millimeters , fr_mm_s, extruder, millimeters
@ -1628,7 +1628,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if HAS_POSITION_FLOAT #if HAS_POSITION_FLOAT
, const xyze_pos_t &target_float , const xyze_pos_t &target_float
#endif #endif
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, const xyze_float_t &delta_mm_cart , const xyze_float_t &delta_mm_cart
#endif #endif
, feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/ , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/
@ -2164,7 +2164,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
#if ENABLED(DISTINCT_E_FACTORS) #if ENABLED(DISTINCT_E_FACTORS)
#define MAX_E_JERK max_e_jerk[extruder] #define MAX_E_JERK max_e_jerk[extruder]
#else #else
@ -2252,7 +2252,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
float vmax_junction_sqr; // Initial limit on the segment entry velocity (mm/s)^2 float vmax_junction_sqr; // Initial limit on the segment entry velocity (mm/s)^2
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
/** /**
* Compute maximum allowable entry speed at junction by centripetal acceleration approximation. * Compute maximum allowable entry speed at junction by centripetal acceleration approximation.
* Let a circle be tangent to both previous and current path line segments, where the junction * Let a circle be tangent to both previous and current path line segments, where the junction
@ -2291,7 +2291,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
static xyze_float_t prev_unit_vec; static xyze_float_t prev_unit_vec;
xyze_float_t unit_vec = xyze_float_t unit_vec =
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
delta_mm_cart delta_mm_cart
#else #else
{ delta_mm.x, delta_mm.y, delta_mm.z, delta_mm.e } { delta_mm.x, delta_mm.y, delta_mm.z, delta_mm.e }
@ -2299,7 +2299,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
; ;
unit_vec *= inverse_millimeters; unit_vec *= inverse_millimeters;
#if IS_CORE && ENABLED(JUNCTION_DEVIATION) #if IS_CORE && DISABLED(CLASSIC_JERK)
/** /**
* On CoreXY the length of the vector [A,B] is SQRT(2) times the length of the head movement vector [X,Y]. * On CoreXY the length of the vector [A,B] is SQRT(2) times the length of the head movement vector [X,Y].
* So taking Z and E into account, we cannot scale to a unit vector with "inverse_millimeters". * So taking Z and E into account, we cannot scale to a unit vector with "inverse_millimeters".
@ -2369,7 +2369,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
float safe_speed = nominal_speed; float safe_speed = nominal_speed;
uint8_t limited = 0; uint8_t limited = 0;
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
LOOP_XYZ(i) LOOP_XYZ(i)
#else #else
LOOP_XYZE(i) LOOP_XYZE(i)
@ -2406,7 +2406,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
// Now limit the jerk in all axes. // Now limit the jerk in all axes.
const float smaller_speed_factor = vmax_junction / previous_nominal_speed; const float smaller_speed_factor = vmax_junction / previous_nominal_speed;
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
LOOP_XYZ(axis) LOOP_XYZ(axis)
#else #else
LOOP_XYZE(axis) LOOP_XYZE(axis)
@ -2444,7 +2444,7 @@ bool Planner::_populate_block(block_t * const block, bool split_move,
previous_safe_speed = safe_speed; previous_safe_speed = safe_speed;
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
vmax_junction_sqr = _MIN(vmax_junction_sqr, sq(vmax_junction)); vmax_junction_sqr = _MIN(vmax_junction_sqr, sq(vmax_junction));
#else #else
vmax_junction_sqr = sq(vmax_junction); vmax_junction_sqr = sq(vmax_junction);
@ -2538,7 +2538,7 @@ void Planner::buffer_sync_block() {
* millimeters - the length of the movement, if known * millimeters - the length of the movement, if known
*/ */
bool Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e bool Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, const xyze_float_t &delta_mm_cart , const xyze_float_t &delta_mm_cart
#endif #endif
, const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/ , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters/*=0.0*/
@ -2610,7 +2610,7 @@ bool Planner::buffer_segment(const float &a, const float &b, const float &c, con
#if HAS_POSITION_FLOAT #if HAS_POSITION_FLOAT
, target_float , target_float
#endif #endif
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, delta_mm_cart , delta_mm_cart
#endif #endif
, fr_mm_s, extruder, millimeters , fr_mm_s, extruder, millimeters
@ -2644,7 +2644,7 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con
#if IS_KINEMATIC #if IS_KINEMATIC
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
const xyze_pos_t delta_mm_cart = { const xyze_pos_t delta_mm_cart = {
rx - position_cart.x, ry - position_cart.y, rx - position_cart.x, ry - position_cart.y,
rz - position_cart.z, e - position_cart.e rz - position_cart.z, e - position_cart.e
@ -2668,7 +2668,7 @@ bool Planner::buffer_line(const float &rx, const float &ry, const float &rz, con
const feedRate_t feedrate = fr_mm_s; const feedRate_t feedrate = fr_mm_s;
#endif #endif
if (buffer_segment(delta.a, delta.b, delta.c, machine.e if (buffer_segment(delta.a, delta.b, delta.c, machine.e
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
, delta_mm_cart , delta_mm_cart
#endif #endif
, feedrate, extruder, mm , feedrate, extruder, mm
@ -2769,7 +2769,7 @@ void Planner::reset_acceleration_rates() {
if (AXIS_CONDITION) NOLESS(highest_rate, max_acceleration_steps_per_s2[i]); if (AXIS_CONDITION) NOLESS(highest_rate, max_acceleration_steps_per_s2[i]);
} }
cutoff_long = 4294967295UL / highest_rate; // 0xFFFFFFFFUL cutoff_long = 4294967295UL / highest_rate; // 0xFFFFFFFFUL
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
recalculate_max_e_jerk(); recalculate_max_e_jerk();
#endif #endif
} }

20
Marlin/src/module/planner.h
View file

@ -245,7 +245,7 @@ class Planner {
static uint32_t max_acceleration_steps_per_s2[XYZE_N]; // (steps/s^2) Derived from mm_per_s2 static uint32_t max_acceleration_steps_per_s2[XYZE_N]; // (steps/s^2) Derived from mm_per_s2
static float steps_to_mm[XYZE_N]; // Millimeters per step static float steps_to_mm[XYZE_N]; // Millimeters per step
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
static float junction_deviation_mm; // (mm) M205 J static float junction_deviation_mm; // (mm) M205 J
#if ENABLED(LIN_ADVANCE) #if ENABLED(LIN_ADVANCE)
static float max_e_jerk // Calculated from junction_deviation_mm static float max_e_jerk // Calculated from junction_deviation_mm
@ -257,7 +257,7 @@ class Planner {
#endif #endif
#if HAS_CLASSIC_JERK #if HAS_CLASSIC_JERK
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
static xyz_pos_t max_jerk; // (mm/s^2) M205 XYZ - The largest speed change requiring no acceleration. static xyz_pos_t max_jerk; // (mm/s^2) M205 XYZ - The largest speed change requiring no acceleration.
#else #else
static xyze_pos_t max_jerk; // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration. static xyze_pos_t max_jerk; // (mm/s^2) M205 XYZE - The largest speed change requiring no acceleration.
@ -579,7 +579,7 @@ class Planner {
#if HAS_POSITION_FLOAT #if HAS_POSITION_FLOAT
, const xyze_pos_t &target_float , const xyze_pos_t &target_float
#endif #endif
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, const xyze_float_t &delta_mm_cart , const xyze_float_t &delta_mm_cart
#endif #endif
, feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
@ -602,7 +602,7 @@ class Planner {
#if HAS_POSITION_FLOAT #if HAS_POSITION_FLOAT
, const xyze_pos_t &target_float , const xyze_pos_t &target_float
#endif #endif
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, const xyze_float_t &delta_mm_cart , const xyze_float_t &delta_mm_cart
#endif #endif
, feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 , feedRate_t fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
@ -634,20 +634,20 @@ class Planner {
* millimeters - the length of the movement, if known * millimeters - the length of the movement, if known
*/ */
static bool buffer_segment(const float &a, const float &b, const float &c, const float &e static bool buffer_segment(const float &a, const float &b, const float &c, const float &e
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, const xyze_float_t &delta_mm_cart , const xyze_float_t &delta_mm_cart
#endif #endif
, const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
); );
FORCE_INLINE static bool buffer_segment(abce_pos_t &abce FORCE_INLINE static bool buffer_segment(abce_pos_t &abce
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, const xyze_float_t &delta_mm_cart , const xyze_float_t &delta_mm_cart
#endif #endif
, const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0 , const feedRate_t &fr_mm_s, const uint8_t extruder, const float &millimeters=0.0
) { ) {
return buffer_segment(abce.a, abce.b, abce.c, abce.e return buffer_segment(abce.a, abce.b, abce.c, abce.e
#if IS_KINEMATIC && ENABLED(JUNCTION_DEVIATION) #if IS_KINEMATIC && DISABLED(CLASSIC_JERK)
, delta_mm_cart , delta_mm_cart
#endif #endif
, fr_mm_s, extruder, millimeters); , fr_mm_s, extruder, millimeters);
@ -865,7 +865,7 @@ class Planner {
static void autotemp_M104_M109(); static void autotemp_M104_M109();
#endif #endif
#if BOTH(JUNCTION_DEVIATION, LIN_ADVANCE) #if HAS_LINEAR_E_JERK
FORCE_INLINE static void recalculate_max_e_jerk() { FORCE_INLINE static void recalculate_max_e_jerk() {
#define GET_MAX_E_JERK(N) SQRT(SQRT(0.5) * junction_deviation_mm * (N) * RECIPROCAL(1.0 - SQRT(0.5))) #define GET_MAX_E_JERK(N) SQRT(SQRT(0.5) * junction_deviation_mm * (N) * RECIPROCAL(1.0 - SQRT(0.5)))
#if ENABLED(DISTINCT_E_FACTORS) #if ENABLED(DISTINCT_E_FACTORS)
@ -937,7 +937,7 @@ class Planner {
static void recalculate(); static void recalculate();
#if ENABLED(JUNCTION_DEVIATION) #if DISABLED(CLASSIC_JERK)
FORCE_INLINE static void normalize_junction_vector(xyze_float_t &vector) { FORCE_INLINE static void normalize_junction_vector(xyze_float_t &vector) {
float magnitude_sq = 0; float magnitude_sq = 0;
@ -952,7 +952,7 @@ class Planner {
return limit_value; return limit_value;
} }
#endif // JUNCTION_DEVIATION #endif // !CLASSIC_JERK
}; };
#define PLANNER_XY_FEEDRATE() (_MIN(planner.settings.max_feedrate_mm_s[X_AXIS], planner.settings.max_feedrate_mm_s[Y_AXIS])) #define PLANNER_XY_FEEDRATE() (_MIN(planner.settings.max_feedrate_mm_s[X_AXIS], planner.settings.max_feedrate_mm_s[Y_AXIS]))

2
buildroot/share/tests/megaatmega2560-tests
View file

@ -61,7 +61,7 @@ opt_enable AUTO_BED_LEVELING_UBL RESTORE_LEVELING_AFTER_G28 DEBUG_LEVELING_FEATU
REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING BOOT_MARLIN_LOGO_SMALL \ REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LIGHTWEIGHT_UI STATUS_MESSAGE_SCROLLING BOOT_MARLIN_LOGO_SMALL \
SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT SCROLL_LONG_FILENAMES \ SDSUPPORT SDCARD_SORT_ALPHA USB_FLASH_DRIVE_SUPPORT SCROLL_LONG_FILENAMES \
EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_USER_MENUS \ EEPROM_SETTINGS EEPROM_CHITCHAT GCODE_MACROS CUSTOM_USER_MENUS \
MULTI_NOZZLE_DUPLICATION JUNCTION_DEVIATION LIN_ADVANCE QUICK_HOME \ MULTI_NOZZLE_DUPLICATION CLASSIC_JERK LIN_ADVANCE QUICK_HOME \
BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL BABYSTEPPING BABYSTEP_XY NANODLP_Z_SYNC I2C_POSITION_ENCODERS M114_DETAIL
exec_test $1 $2 "Azteeg X3 Pro with 5 extruders, RRDFGSC, probeless UBL, Linear Advance, and more" exec_test $1 $2 "Azteeg X3 Pro with 5 extruders, RRDFGSC, probeless UBL, Linear Advance, and more"

30
config/default/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/3DFabXYZ/Migbot/Configuration.h
View file

@ -762,28 +762,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1590 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1590 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0 #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -796,6 +783,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/ADIMLab/Gantry v1/Configuration.h
View file

@ -746,28 +746,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 20.0 #define DEFAULT_XJERK 20.0
#define DEFAULT_YJERK 20.0 #define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -775,6 +762,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/ADIMLab/Gantry v2/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/AlephObjects/TAZ4/Configuration.h
View file

@ -776,28 +776,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0 #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -810,6 +797,17 @@
#define DEFAULT_EJERK 10.0 // May be used by Linear Advance #define DEFAULT_EJERK 10.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Alfawise/U20-bltouch/Configuration.h
View file

@ -810,28 +810,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 200 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 200 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -839,6 +826,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Alfawise/U20/Configuration.h
View file

@ -810,28 +810,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 200 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 200 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -839,6 +826,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/AliExpress/CL-260/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/AliExpress/UM2pExt/Configuration.h
View file

@ -767,28 +767,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -801,6 +788,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Anet/A2/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Anet/A2plus/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

34
config/examples/Anet/A6/Configuration.h
View file

@ -801,30 +801,17 @@
//#define DEFAULT_TRAVEL_ACCELERATION 4000 // X, Y, Z acceleration for travel (non printing) moves //#define DEFAULT_TRAVEL_ACCELERATION 4000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
// ANET A6 Firmware V2.0 defaults (jerk): //#define CLASSIC_JERK
// Vxy-jerk: 10, Vz-jerk: +000.30, Ve-jerk: 5 #if ENABLED(CLASSIC_JERK)
#if DISABLED(JUNCTION_DEVIATION) // ANET A6 Firmware V2.0 defaults:
// XY: 10, Z: +000.30, E: 5
#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
@ -837,6 +824,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Anet/A8/Configuration.h
View file

@ -769,28 +769,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -803,6 +790,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Anet/A8plus/Configuration.h
View file

@ -767,28 +767,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -801,6 +788,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Anet/E16/Configuration.h
View file

@ -768,28 +768,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -802,6 +789,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.08 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/AnyCubic/i3/Configuration.h
View file

@ -766,28 +766,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 5.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_YJERK 2.0 #define DEFAULT_YJERK 2.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -800,6 +787,17 @@
#define DEFAULT_EJERK 2.0 // May be used by Linear Advance #define DEFAULT_EJERK 2.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/ArmEd/Configuration.h
View file

@ -757,28 +757,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0 #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -791,6 +778,17 @@
#define DEFAULT_EJERK 1.5 // May be used by Linear Advance #define DEFAULT_EJERK 1.5 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Azteeg/X5GT/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/BIBO/TouchX/cyclops/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 7.0 #define DEFAULT_XJERK 7.0
#define DEFAULT_YJERK 7.0 #define DEFAULT_YJERK 7.0
#define DEFAULT_ZJERK 0.65 #define DEFAULT_ZJERK 0.65
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/BIBO/TouchX/default/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1100 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 7.0 #define DEFAULT_XJERK 7.0
#define DEFAULT_YJERK 7.0 #define DEFAULT_YJERK 7.0
#define DEFAULT_ZJERK 0.65 #define DEFAULT_ZJERK 0.65
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/BQ/Hephestos/Configuration.h
View file

@ -744,28 +744,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -778,6 +765,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/BQ/Hephestos_2/Configuration.h
View file

@ -757,28 +757,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 5.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_YJERK 5.0 #define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -791,6 +778,17 @@
#define DEFAULT_EJERK 10.0 // May be used by Linear Advance #define DEFAULT_EJERK 10.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/BQ/WITBOX/Configuration.h
View file

@ -744,28 +744,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -778,6 +765,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Cartesio/Configuration.h
View file

@ -755,28 +755,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -789,6 +776,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/CR-10/Configuration.h
View file

@ -766,28 +766,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 2.7 #define DEFAULT_ZJERK 2.7
@ -800,6 +787,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/CR-10S/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 800 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/CR-10_5S/Configuration.h
View file

@ -757,28 +757,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 5.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_YJERK 5.0 #define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -791,6 +778,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/CR-10mini/Configuration.h
View file

@ -775,28 +775,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -809,6 +796,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/CR-20 Pro/Configuration.h
View file

@ -760,28 +760,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -794,6 +781,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/CR-20/Configuration.h
View file

@ -760,28 +760,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -794,6 +781,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/CR-8/Configuration.h
View file

@ -766,28 +766,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -800,6 +787,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/Ender-2/Configuration.h
View file

@ -760,28 +760,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -794,6 +781,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/Ender-3/Configuration.h
View file

@ -760,28 +760,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -794,6 +781,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/Ender-4/Configuration.h
View file

@ -766,28 +766,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 2.4 #define DEFAULT_ZJERK 2.4
@ -800,6 +787,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Creality/Ender-5/Configuration.h
View file

@ -760,28 +760,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -794,6 +781,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Dagoma/Disco Ultimate/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 20 #define DEFAULT_XJERK 20
#define DEFAULT_YJERK 20 #define DEFAULT_YJERK 20
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/EVNOVO (Artillery)/Sidewinder X1/Configuration.h
View file

@ -761,28 +761,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0 #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -795,6 +782,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Einstart-S/Configuration.h
View file

@ -766,28 +766,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -800,6 +787,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/FYSETC/AIO_II/Configuration.h
View file

@ -761,28 +761,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -795,6 +782,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/FYSETC/Cheetah 1.2/BLTouch/Configuration.h
View file

@ -761,28 +761,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -795,6 +782,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/FYSETC/Cheetah 1.2/base/Configuration.h
View file

@ -761,28 +761,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -795,6 +782,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/FYSETC/Cheetah/BLTouch/Configuration.h
View file

@ -761,28 +761,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -795,6 +782,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/FYSETC/Cheetah/base/Configuration.h
View file

@ -761,28 +761,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -795,6 +782,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/FYSETC/F6_13/Configuration.h
View file

@ -758,28 +758,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -792,6 +779,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Felix/DUAL/Configuration.h
View file

@ -738,28 +738,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -772,6 +759,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Felix/Single/Configuration.h
View file

@ -738,28 +738,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -772,6 +759,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/FlashForge/CreatorPro/Configuration.h
View file

@ -748,28 +748,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 20.0 #define DEFAULT_XJERK 20.0
#define DEFAULT_YJERK 20.0 #define DEFAULT_YJERK 20.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -782,6 +769,17 @@
#define DEFAULT_EJERK 2.0 // May be used by Linear Advance #define DEFAULT_EJERK 2.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/FolgerTech/i3-2020/Configuration.h
View file

@ -762,28 +762,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 8.5 #define DEFAULT_XJERK 8.5
#define DEFAULT_YJERK 8.5 #define DEFAULT_YJERK 8.5
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -796,6 +783,17 @@
#define DEFAULT_EJERK 4.0 // May be used by Linear Advance #define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Formbot/Raptor/Configuration.h
View file

@ -831,28 +831,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#if ENABLED(X_SPREADCYCLE) || DISABLED(X_2208) #if ENABLED(X_SPREADCYCLE) || DISABLED(X_2208)
#define DEFAULT_XJERK 20.0 #define DEFAULT_XJERK 20.0
#else #else
@ -873,6 +860,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Formbot/T_Rex_2+/Configuration.h
View file

@ -785,28 +785,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 12.0 // More conservative numbers. #define DEFAULT_XJERK 12.0 // More conservative numbers.
#define DEFAULT_YJERK 8.0 #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -819,6 +806,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Formbot/T_Rex_3/Configuration.h
View file

@ -772,28 +772,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 12.0 // More conservative numbers. #define DEFAULT_XJERK 12.0 // More conservative numbers.
#define DEFAULT_YJERK 8.0 #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -806,6 +793,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/A10/Configuration.h
View file

@ -739,28 +739,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -773,6 +760,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/A10M/Configuration.h
View file

@ -739,28 +739,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -773,6 +760,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/A20M/Configuration.h
View file

@ -739,28 +739,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK 10.0 #define DEFAULT_YJERK 10.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -773,6 +760,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/GT2560/Configuration.h
View file

@ -771,28 +771,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -805,6 +792,17 @@
#define DEFAULT_EJERK 4.0 // May be used by Linear Advance #define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 5.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_YJERK 5.0 #define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 4.0 // May be used by Linear Advance #define DEFAULT_EJERK 4.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/MeCreator2/Configuration.h
View file

@ -763,28 +763,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 2000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 0 #define DEFAULT_XJERK 0
#define DEFAULT_YJERK 0 #define DEFAULT_YJERK 0
#define DEFAULT_ZJERK 0.6 #define DEFAULT_ZJERK 0.6
@ -797,6 +784,17 @@
#define DEFAULT_EJERK 50.0 // May be used by Linear Advance #define DEFAULT_EJERK 50.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
View file

@ -776,28 +776,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -810,6 +797,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
View file

@ -776,28 +776,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -810,6 +797,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/HMS434/Configuration.h
View file

@ -743,28 +743,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -777,6 +764,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Infitary/i3-M508/Configuration.h
View file

@ -760,28 +760,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -794,6 +781,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/JGAurora/A1/Configuration.h
View file

@ -753,28 +753,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 13.0 #define DEFAULT_XJERK 13.0
#define DEFAULT_YJERK 5.0 #define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -782,6 +769,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/JGAurora/A5/Configuration.h
View file

@ -768,28 +768,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 3.0 #define DEFAULT_YJERK 3.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -802,6 +789,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/JGAurora/A5S/Configuration.h
View file

@ -753,28 +753,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 500 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 13.0 #define DEFAULT_XJERK 13.0
#define DEFAULT_YJERK 5.0 #define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -782,6 +769,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/MakerParts/Configuration.h
View file

@ -776,28 +776,15 @@
#define DEFAULT_TRAVEL_ACCELERATION MAX_XYAXIS_ACCEL // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION MAX_XYAXIS_ACCEL // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 2.0 #define DEFAULT_XJERK 2.0
#define DEFAULT_YJERK 2.0 #define DEFAULT_YJERK 2.0
#define DEFAULT_ZJERK 0.4 #define DEFAULT_ZJERK 0.4
@ -810,6 +797,17 @@
#define DEFAULT_EJERK 8.0 // May be used by Linear Advance #define DEFAULT_EJERK 8.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Malyan/M150/Configuration.h
View file

@ -776,28 +776,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 700 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 700 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0 #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -810,6 +797,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Malyan/M200/Configuration.h
View file

@ -766,28 +766,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -800,6 +787,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Micromake/C1/basic/Configuration.h
View file

@ -760,28 +760,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK DEFAULT_XJERK #define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
@ -794,6 +781,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Micromake/C1/enhanced/Configuration.h
View file

@ -760,28 +760,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 10.0 #define DEFAULT_XJERK 10.0
#define DEFAULT_YJERK DEFAULT_XJERK #define DEFAULT_YJERK DEFAULT_XJERK
#define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta #define DEFAULT_ZJERK DEFAULT_XJERK // Must be same as XY for delta
@ -794,6 +781,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Mks/Robin/Configuration.h
View file

@ -757,28 +757,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -791,6 +778,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Mks/Sbase/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/Printrbot/PrintrboardG2/Configuration.h
View file

@ -764,28 +764,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 100 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 100 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 1.0 #define DEFAULT_XJERK 1.0
#define DEFAULT_YJERK 1.0 #define DEFAULT_YJERK 1.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -798,6 +785,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/RapideLite/RL200/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/RepRapPro/Huxley/Configuration.h
View file

@ -796,28 +796,15 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
#define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 1000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -830,6 +817,17 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/RepRapWorld/Megatronics/Configuration.h
View file

@ -756,28 +756,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#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
@ -790,6 +777,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

30
config/examples/RigidBot/Configuration.h
View file

@ -754,28 +754,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 3000 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) //#define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 8.0 #define DEFAULT_XJERK 8.0
#define DEFAULT_YJERK 8.0 #define DEFAULT_YJERK 8.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -788,6 +775,17 @@
#define DEFAULT_EJERK 5.0 // May be used by Linear Advance #define DEFAULT_EJERK 5.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

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

@ -765,28 +765,15 @@
#define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves #define DEFAULT_TRAVEL_ACCELERATION 400 // X, Y, Z acceleration for travel (non printing) moves
/** /**
* Junction Deviation * Default Jerk limits (mm/s)
*
* Use Junction Deviation instead of traditional Jerk Limiting
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
//#define JUNCTION_DEVIATION
#if ENABLED(JUNCTION_DEVIATION)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/**
* Default Jerk (mm/s)
* Override with M205 X Y Z E * Override with M205 X Y Z E
* *
* "Jerk" specifies the minimum speed change that requires acceleration. * "Jerk" specifies the minimum speed change that requires acceleration.
* When changing speed and direction, if the difference is less than the * When changing speed and direction, if the difference is less than the
* value set here, it may happen instantaneously. * value set here, it may happen instantaneously.
*/ */
#if DISABLED(JUNCTION_DEVIATION) #define CLASSIC_JERK
#if ENABLED(CLASSIC_JERK)
#define DEFAULT_XJERK 5.0 #define DEFAULT_XJERK 5.0
#define DEFAULT_YJERK 5.0 #define DEFAULT_YJERK 5.0
#define DEFAULT_ZJERK 0.3 #define DEFAULT_ZJERK 0.3
@ -799,6 +786,17 @@
#define DEFAULT_EJERK 3.0 // May be used by Linear Advance #define DEFAULT_EJERK 3.0 // May be used by Linear Advance
/**
* Junction Deviation Factor
*
* See:
* https://reprap.org/forum/read.php?1,739819
* http://blog.kyneticcnc.com/2018/10/computing-junction-deviation-for-marlin.html
*/
#if DISABLED(CLASSIC_JERK)
#define JUNCTION_DEVIATION_MM 0.02 // (mm) Distance from real junction edge
#endif
/** /**
* S-Curve Acceleration * S-Curve Acceleration
* *

Some files were not shown because too many files have changed in this diff Show more