SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix-2.0.x' of https://github.com/MarlinFirmware/Marlin into bugfix-2.0.x

Browse source
This commit is contained in:
Bob-the-Kuhn 2019-04-13 21:14:52 -05:00
commit 57aaa9110b
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/babystep.cpp
View file

@ -64,7 +64,7 @@ void Babystep::add_mm(const AxisEnum axis, const float &mm) {
add_steps(axis, mm * planner.settings.axis_steps_per_mm[axis]); add_steps(axis, mm * planner.settings.axis_steps_per_mm[axis]);
} }
void Babystep::add_steps(const AxisEnum axis, const int32_t distance) { void Babystep::add_steps(const AxisEnum axis, const int16_t distance) {
#if ENABLED(BABYSTEP_WITHOUT_HOMING) #if ENABLED(BABYSTEP_WITHOUT_HOMING)
#define CAN_BABYSTEP(AXIS) true #define CAN_BABYSTEP(AXIS) true

2
Marlin/src/feature/babystep.h
View file

@ -53,7 +53,7 @@ public:
} }
#endif #endif
#endif #endif
static void add_steps(const AxisEnum axis, const int32_t distance); static void add_steps(const AxisEnum axis, const int16_t distance);
static void add_mm(const AxisEnum axis, const float &mm); static void add_mm(const AxisEnum axis, const float &mm);
static void task(); static void task();
private: private: