summaryrefslogtreecommitdiff
path: root/Sprinter
diff options
context:
space:
mode:
authorKliment Yanev <kliment.yanev@gmail.com>2011-09-03 19:00:43 +0200
committerKliment Yanev <kliment.yanev@gmail.com>2011-09-03 19:00:43 +0200
commit9e711e9e19db5f19644ff499054ac440ecd290bc (patch)
treec71069a7df6bd49b3998bf896073696fcd9b4387 /Sprinter
parentb882d80fea1798dbca64b73e4f61e6f7c07f3ce7 (diff)
parent699a41290fa8ae0e8da3c3a6d229578c849a67bc (diff)
Merge branch 'master' into experimental
Diffstat (limited to 'Sprinter')
-rw-r--r--Sprinter/Sprinter.pde4
-rw-r--r--Sprinter/pins.h3
2 files changed, 4 insertions, 3 deletions
diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde
index 99c1dce..8d3cf70 100644
--- a/Sprinter/Sprinter.pde
+++ b/Sprinter/Sprinter.pde
@@ -1242,8 +1242,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;
diff --git a/Sprinter/pins.h b/Sprinter/pins.h
index c0cd697..8571d20 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