From 55606f1bdc264a7b4b6b5e3f83867069d9538396 Mon Sep 17 00:00:00 2001 From: Kliment Yanev Date: Sat, 3 Sep 2011 18:51:27 +0200 Subject: Fix missing newline in pins.h that prevents max6675 support from working --- Sprinter/pins.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1 From 699a41290fa8ae0e8da3c3a6d229578c849a67bc Mon Sep 17 00:00:00 2001 From: Kliment Yanev Date: Sat, 3 Sep 2011 18:52:18 +0200 Subject: Fix underflow in steps per square second --- Sprinter/Sprinter.pde | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde index dde302c..eb354e1 100644 --- a/Sprinter/Sprinter.pde +++ b/Sprinter/Sprinter.pde @@ -1199,8 +1199,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; -- cgit v1.2.1