summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Sprinter/Sprinter.pde8
-rw-r--r--Sprinter/pins.h3
2 files changed, 6 insertions, 5 deletions
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde
index 857d652..a941531 100644
--- a/Sprinter/Sprinter.pde
+++ b/Sprinter/Sprinter.pde
@@ -1205,8 +1205,8 @@ inline void linear_move(unsigned long axis_steps_remaining[]) // make linear mov
if (acceleration_enabled && steps_done == 0) {
interval = max_interval;
} else if (acceleration_enabled && steps_done <= plateau_steps) {
- long current_speed = (long) ((((long) steps_per_sqr_second) / 10000)
- * ((micros() - start_move_micros) / 100) + (long) min_speed_steps_per_second);
+ long current_speed = (long) ((((long) steps_per_sqr_second) / 100)
+ * ((micros() - start_move_micros) / 100)/100 + (long) min_speed_steps_per_second);
interval = 100000000 / current_speed;
if (interval < full_interval) {
accelerating = false;
@@ -1223,8 +1223,8 @@ inline void linear_move(unsigned long axis_steps_remaining[]) // make linear mov
accelerating = true;
decelerating = true;
}
- long current_speed = (long) ((long) max_speed_steps_per_second - ((((long) steps_per_sqr_second) / 10000)
- * ((micros() - start_move_micros) / 100)));
+ long current_speed = (long) ((long) max_speed_steps_per_second - ((((long) steps_per_sqr_second) / 100)
+ * ((micros() - start_move_micros) / 100)/100));
interval = 100000000 / current_speed;
if (interval > max_interval)
interval = max_interval;
diff --git a/Sprinter/pins.h b/Sprinter/pins.h
index 0d861cc..3cc92dc 100644
--- a/Sprinter/pins.h
+++ b/Sprinter/pins.h
@@ -436,7 +436,8 @@
// SPI for Max6675 Thermocouple
#ifndef SDSUPPORT
-// these pins are defined in the SD library if building with SD support #define SCK_PIN 52
+// these pins are defined in the SD library if building with SD support
+ #define SCK_PIN 52
#define MISO_PIN 50
#define MOSI_PIN 51
#define MAX6675_SS 53