Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff -Naurb Sprinter.ori/Sd2Card.cpp Sprinter/Sd2Card.cpp
- --- Sprinter.ori/Sd2Card.cpp 2012-03-15 18:30:25.826041237 +0100
- +++ Sprinter/Sd2Card.cpp 2012-03-15 18:30:40.978962004 +0100
- @@ -17,7 +17,7 @@
- * along with the Arduino Sd2Card Library. If not, see
- * <http://www.gnu.org/licenses/>.
- */
- -#include <WProgram.h>
- +#include <Arduino.h>
- #include "Sd2Card.h"
- //------------------------------------------------------------------------------
- #ifndef SOFTWARE_SPI
- diff -Naurb Sprinter.ori/SdFat.h Sprinter/SdFat.h
- --- Sprinter.ori/SdFat.h 2012-03-15 18:30:25.826041237 +0100
- +++ Sprinter/SdFat.h 2012-03-15 18:30:40.978962004 +0100
- @@ -283,7 +283,7 @@
- }
- /** \return SdVolume that contains this file. */
- SdVolume* volume(void) const {return vol_;}
- - void write(uint8_t b);
- + size_t write(uint8_t b);
- int16_t write(const void* buf, uint16_t nbyte);
- void write(const char* str);
- void write_P(PGM_P str);
- diff -Naurb Sprinter.ori/SdFile.cpp Sprinter/SdFile.cpp
- --- Sprinter.ori/SdFile.cpp 2012-03-15 18:30:25.829374480 +0100
- +++ Sprinter/SdFile.cpp 2012-03-15 18:30:40.978962004 +0100
- @@ -19,7 +19,7 @@
- */
- #include "SdFat.h"
- #include <avr/pgmspace.h>
- -#include <WProgram.h>
- +#include <Arduino.h>
- //------------------------------------------------------------------------------
- // callback function for date/time
- void (*SdFile::dateTime_)(uint16_t* date, uint16_t* time) = NULL;
- @@ -1219,7 +1219,7 @@
- *
- * Use SdFile::writeError to check for errors.
- */
- -void SdFile::write(uint8_t b) {
- +size_t SdFile::write(uint8_t b) {
- write(&b, 1);
- }
- //------------------------------------------------------------------------------
- diff -Naurb Sprinter.ori/Sprinter.h Sprinter/Sprinter.h
- --- Sprinter.ori/Sprinter.h 2012-03-15 18:30:25.829374480 +0100
- +++ Sprinter/Sprinter.h 2012-03-15 18:30:40.982295246 +0100
- @@ -7,7 +7,7 @@
- void get_command();
- void process_commands();
- -void manage_inactivity(byte debug);
- +void manage_inactivity(int debug);
- void setup_acceleration();
- void manage_heater();
- @@ -85,5 +85,5 @@
- void prepare_move();
- void linear_move(unsigned long steps_remaining[]);
- void do_step(int axis);
- -void kill(byte debug);
- +void kill(int debug);
- diff -Naurb Sprinter.ori/Sprinter.pde Sprinter/Sprinter.pde
- --- Sprinter.ori/Sprinter.pde 2012-03-15 18:30:25.829374480 +0100
- +++ Sprinter/Sprinter.pde 2012-03-15 18:30:40.982295246 +0100
- @@ -1724,7 +1724,7 @@
- }
- -inline void manage_inactivity(byte debug) {
- +inline void manage_inactivity(int debug) {
- if( (millis()-previous_millis_cmd) > max_inactive_time ) if(max_inactive_time) kill();
- if( (millis()-previous_millis_cmd) > stepper_inactive_time ) if(stepper_inactive_time) { disable_x(); disable_y(); disable_z(); disable_e(); }
- }
Advertisement
Add Comment
Please, Sign In to add comment