forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Babystep Multiplier

Browse Source 
Analog to https://github.com/MarlinFirmware/MarlinDev/pull/250 by
@RicardoGA

Restore the Babystep Multiplicator functionality and now it's available
for X/Y/Z
master
AnHardt 9 years ago committed by Richard Wackerbarth
parent 956418c674
commit c956b52c4a
16 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File

2
Marlin/Configuration_adv.h
Unescape View File

@ -363,7 +363,7 @@
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
//not implemented for CoreXY and deltabots! //not implemented for CoreXY and deltabots!
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/configurator/config/Configuration_adv.h
Unescape View File

@ -362,7 +362,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/Felix/Configuration_adv.h
Unescape View File

@ -371,7 +371,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/Hephestos/Configuration_adv.h
Unescape View File

@ -371,7 +371,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/K8200/Configuration_adv.h
Unescape View File

@ -371,7 +371,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/RigidBot/Configuration_adv.h
Unescape View File

@ -363,7 +363,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/SCARA/Configuration_adv.h
Unescape View File

@ -371,7 +371,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/TAZ4/Configuration_adv.h
Unescape View File

@ -371,7 +371,7 @@
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
//not implemented for CoreXY and deltabots! //not implemented for CoreXY and deltabots!
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/WITBOX/Configuration_adv.h
Unescape View File

@ -371,7 +371,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h
Unescape View File

@ -372,7 +372,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/delta/generic/Configuration_adv.h
Unescape View File

@ -373,7 +373,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
Unescape View File

@ -372,7 +372,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
Unescape View File

@ -376,7 +376,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/makibox/Configuration_adv.h
Unescape View File

@ -370,7 +370,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
Unescape View File

@ -371,7 +371,7 @@
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions #define BABYSTEP_XY //not only z, but also XY in the menu. more clutter, more functions
#define BABYSTEP_INVERT_Z false //true for inverse movements in Z #define BABYSTEP_INVERT_Z false //true for inverse movements in Z
#define BABYSTEP_Z_MULTIPLICATOR 2 //faster z movements #define BABYSTEP_MULTIPLICATOR 1 //faster movements
#endif #endif
// @section extruder // @section extruder

2
Marlin/ultralcd.cpp
Unescape View File

@ -461,7 +461,7 @@ void lcd_set_home_offsets() {
static void _lcd_babystep(int axis, const char* msg) { static void _lcd_babystep(int axis, const char* msg) {
if (encoderPosition != 0) { if (encoderPosition != 0) {
babystepsTodo[axis] += (int)encoderPosition; babystepsTodo[axis] += BABYSTEP_MULTIPLICATOR * (int)encoderPosition;
encoderPosition = 0; encoderPosition = 0;
lcdDrawUpdate = 1; lcdDrawUpdate = 1;
} }

Write Preview
Loading…
Cancel
Save