From ea59e634a7cd6a871b5305bb206a941fd886a677 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Sun, 24 Mar 2013 00:19:01 +0100 Subject: [PATCH] Bring LOOKAHEAD into the config templates. --- config.default.h | 37 ++++++++++++++++++++++++++++++++++--- config.gen3.h | 37 ++++++++++++++++++++++++++++++++++--- config.gen6.h | 37 ++++++++++++++++++++++++++++++++++--- config.gen7-v1.1-v1.3.h | 37 ++++++++++++++++++++++++++++++++++--- config.gen7-v1.4.h | 37 ++++++++++++++++++++++++++++++++++--- config.ramps-v1.2.h | 37 ++++++++++++++++++++++++++++++++++--- config.ramps-v1.3.h | 37 ++++++++++++++++++++++++++++++++++--- config.sanguinololu-v1.1.h | 37 ++++++++++++++++++++++++++++++++++--- config.sanguinololu-v1.2.h | 37 ++++++++++++++++++++++++++++++++++--- config.teensy.h | 37 ++++++++++++++++++++++++++++++++++--- config.teensypp.h | 37 ++++++++++++++++++++++++++++++++++--- 11 files changed, 374 insertions(+), 33 deletions(-) diff --git a/config.default.h b/config.default.h index d3fbe3c..2c46f73 100644 --- a/config.default.h +++ b/config.default.h @@ -124,9 +124,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -162,6 +168,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.gen3.h b/config.gen3.h index 1be5c41..5c646c6 100644 --- a/config.gen3.h +++ b/config.gen3.h @@ -125,9 +125,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -164,6 +170,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.gen6.h b/config.gen6.h index 70b3613..cbb2685 100644 --- a/config.gen6.h +++ b/config.gen6.h @@ -126,9 +126,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -164,6 +170,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.gen7-v1.1-v1.3.h b/config.gen7-v1.1-v1.3.h index 78b1d19..b2a87fa 100644 --- a/config.gen7-v1.1-v1.3.h +++ b/config.gen7-v1.1-v1.3.h @@ -132,9 +132,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -170,6 +176,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.gen7-v1.4.h b/config.gen7-v1.4.h index 65eb359..3f90aa7 100644 --- a/config.gen7-v1.4.h +++ b/config.gen7-v1.4.h @@ -132,9 +132,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -170,6 +176,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.ramps-v1.2.h b/config.ramps-v1.2.h index 7ad2140..255e3f9 100644 --- a/config.ramps-v1.2.h +++ b/config.ramps-v1.2.h @@ -127,9 +127,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -165,6 +171,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.ramps-v1.3.h b/config.ramps-v1.3.h index e4da563..690212e 100644 --- a/config.ramps-v1.3.h +++ b/config.ramps-v1.3.h @@ -126,9 +126,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -164,6 +170,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.sanguinololu-v1.1.h b/config.sanguinololu-v1.1.h index 224f93d..9c04f10 100644 --- a/config.sanguinololu-v1.1.h +++ b/config.sanguinololu-v1.1.h @@ -126,9 +126,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -164,6 +170,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.sanguinololu-v1.2.h b/config.sanguinololu-v1.2.h index fdc3a84..3f93653 100644 --- a/config.sanguinololu-v1.2.h +++ b/config.sanguinololu-v1.2.h @@ -126,9 +126,15 @@ * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -164,6 +170,31 @@ */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.teensy.h b/config.teensy.h index 03f0b8e..322d46a 100644 --- a/config.teensy.h +++ b/config.teensy.h @@ -139,9 +139,15 @@ MXL 2.032 mm/tooth, 29 * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -177,6 +183,31 @@ MXL 2.032 mm/tooth, 29 */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\ diff --git a/config.teensypp.h b/config.teensypp.h index 86e5929..f4a44b8 100644 --- a/config.teensypp.h +++ b/config.teensypp.h @@ -139,9 +139,15 @@ MXL 2.032 mm/tooth, 29 * * * 2. ACCELERATION * * * -* IMPORTANT: choose only one! These algorithms choose when to step, trying * -* to use more than one will have undefined and probably * -* disastrous results! * +* Choose optionally one of ACCELERATION_REPRAP, ACCELERATION_RAMPING or * +* ACCELERATION_TEMPORAL. With none of them defined, movements are done * +* without acceleration. Recommended is ACCELERATION_RAMPING. * +* * +* LOOKAHEAD is experimental for now and works in conjunction with * +* ACCELERATION_RAMPING, only. That's why it's off by default. * +* * +* Also don't forget to adjust ACCELERATION to the capabilities of your * +* printer. The default is very moderate to be on the safe side. * * * \***************************************************************************/ @@ -177,6 +183,31 @@ MXL 2.032 mm/tooth, 29 */ // #define ACCELERATION_TEMPORAL +/** \def LOOKAHEAD + Define this to enable look-ahead during *ramping* acceleration to smoothly + transition between moves instead of performing a dead stop every move. + Enabling look-ahead requires about 3600 bytes of flash memory. +*/ +// #define LOOKAHEAD + +/** \def LOOKAHEAD_MAX_JERK_XY + When performing look-ahead, we need to decide what an acceptable jerk to the + mechanics is when we (instantly) change direction. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_XY 10 + +/** \def LOOKAHEAD_MAX_JERK_E + When joining moves with different extrusion rates, define the maximum jerk + for the extruder. + + Units: micrometers + Sane values: 5 to 200 +*/ +#define LOOKAHEAD_MAX_JERK_E 10 + /***************************************************************************\