Browse Source

Babystep Multiplier

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
AnHardt 9 years ago
parent
commit
c956b52c4a

+ 1
- 1
Marlin/Configuration_adv.h View File

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

+ 1
- 1
Marlin/configurator/config/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/Felix/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/Hephestos/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/K8200/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/RigidBot/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/SCARA/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/TAZ4/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/WITBOX/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/delta/biv2.5/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/delta/generic/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/makibox/Configuration_adv.h View File

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

+ 1
- 1
Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h View File

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

+ 1
- 1
Marlin/ultralcd.cpp View File

461
 
461
 
462
   static void _lcd_babystep(int axis, const char* msg) {
462
   static void _lcd_babystep(int axis, const char* msg) {
463
     if (encoderPosition != 0) {
463
     if (encoderPosition != 0) {
464
-      babystepsTodo[axis] += (int)encoderPosition;
464
+      babystepsTodo[axis] += BABYSTEP_MULTIPLICATOR * (int)encoderPosition;
465
       encoderPosition = 0;
465
       encoderPosition = 0;
466
       lcdDrawUpdate = 1;
466
       lcdDrawUpdate = 1;
467
     }
467
     }

Loading…
Cancel
Save