Browse Source

Merge pull request #1999 from paclema/Filrunout_configurable_script

Added configurable script for filrunout from configuration.h
pull/1/head
Scott Lahteine 10 years ago
parent
commit
7f3252eea9
  1. 7
      Marlin/Configuration.h
  2. 4
      Marlin/Marlin_main.cpp
  3. 7
      Marlin/configurator/config/Configuration.h
  4. 7
      Marlin/example_configurations/Felix/Configuration.h
  5. 7
      Marlin/example_configurations/Felix/Configuration_DUAL.h
  6. 7
      Marlin/example_configurations/Hephestos/Configuration.h
  7. 7
      Marlin/example_configurations/K8200/Configuration.h
  8. 7
      Marlin/example_configurations/SCARA/Configuration.h
  9. 7
      Marlin/example_configurations/WITBOX/Configuration.h
  10. 7
      Marlin/example_configurations/delta/generic/Configuration.h
  11. 7
      Marlin/example_configurations/delta/kossel_mini/Configuration.h
  12. 8
      Marlin/example_configurations/makibox/Configuration.h
  13. 7
      Marlin/example_configurations/tvrrug/Round2/Configuration.h

7
Marlin/Configuration.h

@ -411,8 +411,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

4
Marlin/Marlin_main.cpp

@ -6213,10 +6213,10 @@ void kill()
void filrunout() { void filrunout() {
if (!filrunoutEnqueued) { if (!filrunoutEnqueued) {
filrunoutEnqueued = true; filrunoutEnqueued = true;
enqueuecommand("M600"); enqueuecommands_P(PSTR(FILAMENT_RUNOUT_SCRIPT));
st_synchronize();
} }
} }
#endif #endif
void Stop() { void Stop() {

7
Marlin/configurator/config/Configuration.h

@ -410,8 +410,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

7
Marlin/example_configurations/Felix/Configuration.h

@ -349,8 +349,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

7
Marlin/example_configurations/Felix/Configuration_DUAL.h

@ -349,8 +349,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

7
Marlin/example_configurations/Hephestos/Configuration.h

@ -370,8 +370,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

7
Marlin/example_configurations/K8200/Configuration.h

@ -426,8 +426,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

7
Marlin/example_configurations/SCARA/Configuration.h

@ -401,8 +401,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

7
Marlin/example_configurations/WITBOX/Configuration.h

@ -369,8 +369,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

7
Marlin/example_configurations/delta/generic/Configuration.h

@ -399,8 +399,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

7
Marlin/example_configurations/delta/kossel_mini/Configuration.h

@ -399,8 +399,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

8
Marlin/example_configurations/makibox/Configuration.h

@ -369,9 +369,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================
//=========================================================================== //===========================================================================

7
Marlin/example_configurations/tvrrug/Round2/Configuration.h

@ -371,8 +371,11 @@ const bool Z_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the logic
// In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made. // In RAMPS uses servo pin 2. Can be changed in pins file. For other boards pin definition should be made.
// It is assumed that when logic high = filament available // It is assumed that when logic high = filament available
// when logic low = filament ran out // when logic low = filament ran out
//const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned #ifdef FILAMENT_RUNOUT_SENSOR
//#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined. const bool FIL_RUNOUT_INVERTING = true; // Should be uncommented and true or false should assigned
#define ENDSTOPPULLUP_FIL_RUNOUT // Uncomment to use internal pullup for filament runout pins if the sensor is defined.
#define FILAMENT_RUNOUT_SCRIPT "M600"
#endif
//=========================================================================== //===========================================================================
//=========================== Manual Bed Leveling =========================== //=========================== Manual Bed Leveling ===========================

Loading…
Cancel
Save