bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

XY/Z Babystep Multiplicators (#15691)

Browse Source
This commit is contained in:
studiodyne
2019-10-28 22:44:17 +01:00
committed by Scott Lahteine
parent abb44cf564
commit f139642e0f
109 changed files with 230 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/inc/SanityCheck.h
View File

@ -408,6 +408,8 @@
#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."
#elif defined(BABYSTEP_MULTIPLICATOR)
#error "BABYSTEP_MULTIPLICATOR is now BABYSTEP_MULTIPLICATOR_[XY|Z]. Please update Configuration_adv.h."
#endif
#define BOARD_MKS_13 -1000

2
Marlin/src/lcd/menu/menu.cpp
View File

@ -390,7 +390,7 @@ void scroll_screen(const uint8_t limit, const bool is_menu) {
constexpr bool do_probe = true;
#endif
if (ui.encoderPosition) {
const int16_t babystep_increment = int16_t(ui.encoderPosition) * (BABYSTEP_MULTIPLICATOR);
const int16_t babystep_increment = int16_t(ui.encoderPosition) * (BABYSTEP_MULTIPLICATOR_Z);
ui.encoderPosition = 0;
const float diff = planner.steps_to_mm[Z_AXIS] * babystep_increment,

7
Marlin/src/lcd/menu/menu_tune.cpp
View File

@ -53,7 +53,12 @@
void _lcd_babystep(const AxisEnum axis, PGM_P const msg) {
if (ui.use_click()) return ui.goto_previous_screen_no_defer();
if (ui.encoderPosition) {
const int16_t steps = int16_t(ui.encoderPosition) * (BABYSTEP_MULTIPLICATOR);
const int16_t steps = int16_t(ui.encoderPosition) * (
#if ENABLED(BABYSTEP_XY)
axis != Z_AXIS ? BABYSTEP_MULTIPLICATOR_XY :
#endif
BABYSTEP_MULTIPLICATOR_Z
);
ui.encoderPosition = 0;
ui.refresh(LCDVIEW_REDRAW_NOW);
babystep.add_steps(axis, steps);