Skip to content

Baby-stepping show millimeters on LCD #4028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
edwilliams16 wants to merge 6 commits into from
Closed

Baby-stepping show millimeters on LCD #4028

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
780725f
Update ultralcd.cpp
edwilliams16 Jun 13, 2016
44d1903
Update ultralcd.cpp
edwilliams16 Jun 13, 2016
5fd480c
Update ultralcd.cpp
edwilliams16 Jun 13, 2016
4c141b2
Update ultralcd.cpp
edwilliams16 Jun 13, 2016
ff7d869
Update ultralcd.cpp
edwilliams16 Jun 14, 2016
9ff3bde
put back file
edwilliams16 Jun 15, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions Marlin/ultralcd.cpp
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,18 +575,22 @@ static void lcd_status_screen() {

#if ENABLED(BABYSTEPPING)

int babysteps_done = 0;
long babysteps_done = 0;

static void _lcd_babystep(const AxisEnum axis, const char* msg) {
ENCODER_DIRECTION_NORMAL();
if (encoderPosition) {
int distance = (int32_t)encoderPosition * BABYSTEP_MULTIPLICATOR;
int babystep_increment = (int32_t)encoderPosition * BABYSTEP_MULTIPLICATOR;
encoderPosition = 0;
lcdDrawUpdate = LCDVIEW_REDRAW_NOW;
thermalManager.babystep_axis(axis, distance);
babysteps_done += distance;
thermalManager.babystep_axis(axis, babystep_increment);
babysteps_done += babystep_increment;
}
if (lcdDrawUpdate) lcd_implementation_drawedit(msg, itostr3sign(babysteps_done));
// 1000 to print 3 Dec Places
if (lcdDrawUpdate)
lcd_implementation_drawedit(msg, ftostr43sign(
((1000 * babysteps_done) / planner.axis_steps_per_mm[axis]) * 0.001f
));
if (LCD_CLICKED) lcd_goto_previous_menu(true);
}

Expand Down Expand Up @@ -2592,6 +2596,7 @@ char* ftostr41sign(const float& x) {
return conv;
}


// Convert signed float to string with 023.45 / -23.45 format
char *ftostr32(const float& x) {
long xx = abs(x * 100);
Expand Down