andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

pull/1/head
Bob-the-Kuhn 6 years ago
parent
9dd4252b39 6a71df2925
commit
57aaa9110b
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Marlin/src/feature/babystep.cpp
  2. 2
      Marlin/src/feature/babystep.h

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:

Write Preview
Loading…
Cancel
Save