Merge remote-tracking branch 'refs/remotes/origin/master' into dev

180b51cd · MagoKimbra · 7bcab335 · f37b56ef · 180b51cd · 180b51cd
Commit 180b51cd authored May 27, 2016 by MagoKimbra
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

MK.ino MK/MK.ino +2 -2

stepper.cpp MK/module/motion/stepper.cpp +1 -1

No files found.
--- a/MK/MK.ino
+++ b/MK/MK.ino
--- a/MK/module/motion/stepper.cpp
+++ b/MK/module/motion/stepper.cpp
@@ -297,7 +297,7 @@ FORCE_INLINE unsigned short calc_timer(unsigned short step_rate) {
  NOMORE(step_rate, MAX_STEP_FREQUENCY);

  if(step_rate > (2 * DOUBLE_STEP_FREQUENCY)) { // If steprate > 2*DOUBLE_STEP_FREQUENCY >> step 4 times
-    sstep_rate >>= 2;
+    step_rate >>= 2;
    step_loops = 4;
  }
  else if(step_rate > DOUBLE_STEP_FREQUENCY) { // If steprate > DOUBLE_STEP_FREQUENCY >> step 2 times