diff options
| author | kliment <kliment.yanev@gmail.com> | 2011-07-07 15:44:08 +0200 |
|---|---|---|
| committer | kliment <kliment.yanev@gmail.com> | 2011-07-07 15:44:08 +0200 |
| commit | eb70f504adbaf011e43b124b30de1fb0e3c8a0f7 (patch) | |
| tree | 75efdb684deec24d284872f3d796c108bc3d3778 | |
| parent | c5305fe923bfbe315af501550db580a0c4a5ba50 (diff) | |
Make buildable using makefile
| -rw-r--r-- | Sprinter/Sprinter.h | 2 | ||||
| -rw-r--r-- | Sprinter/Sprinter.pde | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Sprinter/Sprinter.h b/Sprinter/Sprinter.h index 408bff9..23f4715 100644 --- a/Sprinter/Sprinter.h +++ b/Sprinter/Sprinter.h @@ -1,6 +1,8 @@ // Tonokip RepRap firmware rewrite based off of Hydra-mmm firmware. // Licence: GPL #include <WProgram.h> +extern "C" void __cxa_pure_virtual(); +void __cxa_pure_virtual() {}; void get_command(); void process_commands(); diff --git a/Sprinter/Sprinter.pde b/Sprinter/Sprinter.pde index 6b94c97..9bfc91a 100644 --- a/Sprinter/Sprinter.pde +++ b/Sprinter/Sprinter.pde @@ -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. 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]; - unsigned int primary_axis; + int primary_axis; 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[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 plateau_steps *= 1.01; // This is to compensate we use discrete intervals acceleration_enabled = true; - long full_interval = interval; + unsigned long full_interval = interval; if(interval > max_interval) acceleration_enabled = false; boolean decelerating = false; #endif |