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

Make buildable using makefile

Browse source
This commit is contained in:
kliment 2011-07-07 15:44:08 +02:00
parent c5305fe923
commit eb70f504ad
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Sprinter/Sprinter.h
View file

@ -1,6 +1,8 @@
// Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware. // Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware.
// Licence: GPL // Licence: GPL
#include <WProgram.h> #include <WProgram.h>
extern "C" void __cxa_pure_virtual();
void __cxa_pure_virtual() {};
void get_command(); void get_command();
void process_commands(); void process_commands();

4
Sprinter/Sprinter.pde
View file

@ -1001,7 +1001,7 @@ void linear_move(unsigned long axis_steps_remaining[]) // make linear move with
//Define variables that are needed for the Bresenham algorithm. Please note that Z is not currently included in the Bresenham algorithm. //Define variables that are needed for the Bresenham algorithm. Please note that Z is not currently included in the Bresenham algorithm.
unsigned long delta[] = {axis_steps_remaining[0], axis_steps_remaining[1], axis_steps_remaining[2], axis_steps_remaining[3]}; //TODO: implement a "for" to support N axes unsigned long delta[] = {axis_steps_remaining[0], axis_steps_remaining[1], axis_steps_remaining[2], axis_steps_remaining[3]}; //TODO: implement a "for" to support N axes
long axis_error[NUM_AXIS]; long axis_error[NUM_AXIS];
unsigned int primary_axis; int primary_axis;
if(delta[1] > delta[0] && delta[1] > delta[2] && delta[1] > delta[3]) primary_axis = 1; if(delta[1] > delta[0] && delta[1] > delta[2] && delta[1] > delta[3]) primary_axis = 1;
else if (delta[0] >= delta[1] && delta[0] > delta[2] && delta[0] > delta[3]) primary_axis = 0; else if (delta[0] >= delta[1] && delta[0] > delta[2] && delta[0] > delta[3]) primary_axis = 0;
else if (delta[2] >= delta[0] && delta[2] >= delta[1] && delta[2] > delta[3]) primary_axis = 2; else if (delta[2] >= delta[0] && delta[2] >= delta[1] && delta[2] > delta[3]) primary_axis = 2;
@ -1070,7 +1070,7 @@ void linear_move(unsigned long axis_steps_remaining[]) // make linear move with
#ifdef RAMP_ACCELERATION #ifdef RAMP_ACCELERATION
plateau_steps *= 1.01; // This is to compensate we use discrete intervals plateau_steps *= 1.01; // This is to compensate we use discrete intervals
acceleration_enabled = true; acceleration_enabled = true;
long full_interval = interval; unsigned long full_interval = interval;
if(interval > max_interval) acceleration_enabled = false; if(interval > max_interval) acceleration_enabled = false;
boolean decelerating = false; boolean decelerating = false;
#endif #endif