pingu_98/Sprinter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into experimental

Browse source
This commit is contained in:
Kliment Yanev 2011-09-03 19:00:43 +02:00
commit 9e711e9e19
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Sprinter/Sprinter.pde
View file

@ -1242,8 +1242,8 @@ inline void linear_move(unsigned long axis_steps_remaining[]) // make linear mov
if (acceleration_enabled && steps_done == 0) { if (acceleration_enabled && steps_done == 0) {
interval = max_interval; interval = max_interval;
} else if (acceleration_enabled && steps_done <= plateau_steps) { } else if (acceleration_enabled && steps_done <= plateau_steps) {
long current_speed = (long) ((((long) steps_per_sqr_second) / 10000) long current_speed = (long) ((((long) steps_per_sqr_second) / 100)
* ((micros() - start_move_micros) / 100) + (long) min_speed_steps_per_second); * ((micros() - start_move_micros) / 100)/100 + (long) min_speed_steps_per_second);
interval = 100000000 / current_speed; interval = 100000000 / current_speed;
if (interval < full_interval) { if (interval < full_interval) {
accelerating = false; accelerating = false;

3
Sprinter/pins.h
View file

@ -436,7 +436,8 @@
// SPI for Max6675 Thermocouple // SPI for Max6675 Thermocouple
#ifndef SDSUPPORT #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 MISO_PIN 50
#define MOSI_PIN 51 #define MOSI_PIN 51
#define MAX6675_SS 53 #define MAX6675_SS 53