Guest User

Sprinter on Arduino 1.0

a guest
Mar 15th, 2012
275
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C++ 2.75 KB | None | 0 0
  1.  
  2. diff -Naurb Sprinter.ori/Sd2Card.cpp Sprinter/Sd2Card.cpp
  3. --- Sprinter.ori/Sd2Card.cpp    2012-03-15 18:30:25.826041237 +0100
  4. +++ Sprinter/Sd2Card.cpp    2012-03-15 18:30:40.978962004 +0100
  5. @@ -17,7 +17,7 @@
  6.   * along with the Arduino Sd2Card Library.  If not, see
  7.   * <http://www.gnu.org/licenses/>.
  8.   */
  9. -#include <WProgram.h>
  10. +#include <Arduino.h>
  11.  #include "Sd2Card.h"
  12.  //------------------------------------------------------------------------------
  13.  #ifndef SOFTWARE_SPI
  14. diff -Naurb Sprinter.ori/SdFat.h Sprinter/SdFat.h
  15. --- Sprinter.ori/SdFat.h    2012-03-15 18:30:25.826041237 +0100
  16. +++ Sprinter/SdFat.h    2012-03-15 18:30:40.978962004 +0100
  17. @@ -283,7 +283,7 @@
  18.    }
  19.    /** \return SdVolume that contains this file. */
  20.    SdVolume* volume(void) const {return vol_;}
  21. -  void write(uint8_t b);
  22. +  size_t write(uint8_t b);
  23.    int16_t write(const void* buf, uint16_t nbyte);
  24.    void write(const char* str);
  25.    void write_P(PGM_P str);
  26. diff -Naurb Sprinter.ori/SdFile.cpp Sprinter/SdFile.cpp
  27. --- Sprinter.ori/SdFile.cpp 2012-03-15 18:30:25.829374480 +0100
  28. +++ Sprinter/SdFile.cpp 2012-03-15 18:30:40.978962004 +0100
  29. @@ -19,7 +19,7 @@
  30.   */
  31.  #include "SdFat.h"
  32.  #include <avr/pgmspace.h>
  33. -#include <WProgram.h>
  34. +#include <Arduino.h>
  35.  //------------------------------------------------------------------------------
  36.  // callback function for date/time
  37.  void (*SdFile::dateTime_)(uint16_t* date, uint16_t* time) = NULL;
  38. @@ -1219,7 +1219,7 @@
  39.   *
  40.   * Use SdFile::writeError to check for errors.
  41.   */
  42. -void SdFile::write(uint8_t b) {
  43. +size_t SdFile::write(uint8_t b) {
  44.    write(&b, 1);
  45.  }
  46.  //------------------------------------------------------------------------------
  47. diff -Naurb Sprinter.ori/Sprinter.h Sprinter/Sprinter.h
  48. --- Sprinter.ori/Sprinter.h 2012-03-15 18:30:25.829374480 +0100
  49. +++ Sprinter/Sprinter.h 2012-03-15 18:30:40.982295246 +0100
  50. @@ -7,7 +7,7 @@
  51.  void get_command();
  52.  void process_commands();
  53.  
  54. -void manage_inactivity(byte debug);
  55. +void manage_inactivity(int debug);
  56.  void setup_acceleration();
  57.  
  58.  void manage_heater();
  59. @@ -85,5 +85,5 @@
  60.  void prepare_move();
  61.  void linear_move(unsigned long steps_remaining[]);
  62.  void do_step(int axis);
  63. -void kill(byte debug);
  64. +void kill(int debug);
  65.  
  66. diff -Naurb Sprinter.ori/Sprinter.pde Sprinter/Sprinter.pde
  67. --- Sprinter.ori/Sprinter.pde   2012-03-15 18:30:25.829374480 +0100
  68. +++ Sprinter/Sprinter.pde   2012-03-15 18:30:40.982295246 +0100
  69. @@ -1724,7 +1724,7 @@
  70.    
  71.  }
  72.  
  73. -inline void manage_inactivity(byte debug) {
  74. +inline void manage_inactivity(int debug) {
  75.  if( (millis()-previous_millis_cmd) >  max_inactive_time ) if(max_inactive_time) kill();
  76.  if( (millis()-previous_millis_cmd) >  stepper_inactive_time ) if(stepper_inactive_time) { disable_x(); disable_y(); disable_z(); disable_e(); }
  77.  }
Advertisement
Add Comment
Please, Sign In to add comment