Guest User

Untitled

a guest
May 7th, 2012
57
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
C 1.78 KB | None | 0 0
  1. $ diff -u Marlin Marlin-new
  2. Common subdirectories: Marlin/Gen7 and Marlin-new/Gen7
  3. Common subdirectories: Marlin/hardware and Marlin-new/hardware
  4. diff -u Marlin/Marlin.pde Marlin-new/Marlin.pde
  5. --- Marlin/Marlin.pde   2012-04-30 04:37:50.000000000 -0700
  6. +++ Marlin-new/Marlin.pde       2012-05-07 13:28:34.631726700 -0700
  7. @@ -1257,6 +1257,11 @@
  8.        PID_autotune(temp);
  9.      }
  10.      break;
  11. +    case 304: //allong long extrude
  12. +    {
  13. +      allow_long_extrudes(true);
  14. +    }
  15. +    break;
  16.      case 400: // finish all moves
  17.      {
  18.        st_synchronize();
  19. diff -u Marlin/planner.cpp Marlin-new/planner.cpp
  20. --- Marlin/planner.cpp  2012-04-30 04:37:50.000000000 -0700
  21. +++ Marlin-new/planner.cpp      2012-05-07 13:27:34.118265500 -0700
  22. @@ -101,6 +101,7 @@
  23.  //===========================================================================
  24.  #ifdef PREVENT_DANGEROUS_EXTRUDE
  25.    bool allow_cold_extrude=false;
  26. +  bool allow_long_extrude=false;
  27.  #endif
  28.  #ifdef XY_FREQUENCY_LIMIT
  29.    // Used for the frequency limit
  30. @@ -495,7 +496,7 @@
  31.        SERIAL_ECHO_START;
  32.        SERIAL_ECHOLNPGM(MSG_ERR_COLD_EXTRUDE_STOP);
  33.      }
  34. -    if(labs(target[E_AXIS]-position[E_AXIS])>axis_steps_per_unit[E_AXIS]*EXTRUDE_MAXLENGTH)
  35. +    if(labs(target[E_AXIS]-position[E_AXIS])>axis_steps_per_unit[E_AXIS]*EXTRUDE_MAXLENGTH && !allow_long_extrude)
  36.      {
  37.        position[E_AXIS]=target[E_AXIS]; //behave as if the move really took place, but ignore E part
  38.        SERIAL_ECHO_START;
  39. @@ -806,6 +807,13 @@
  40.   return (block_buffer_head-block_buffer_tail + BLOCK_BUFFER_SIZE) & (BLOCK_BUFFER_SIZE - 1);
  41.  }
  42.  
  43. +void allow_long_extrudes(bool allow)
  44. +{
  45. +  #ifdef PREVENT_DANGEROUS_EXTRUDE
  46. +    allow_long_extrude=allow;
  47. +  #endif
  48. +}
  49. +
  50.  void allow_cold_extrudes(bool allow)
  51.  {
  52.    #ifdef PREVENT_DANGEROUS_EXTRUDE
Advertisement
Add Comment
Please, Sign In to add comment