Merge pull request #6266 from thinkyhead/rc_cleanup_after
Cleanup after recent merges
This commit is contained in:
Scott Lahteine
commit
98c9de11e1
|
|
@ -596,7 +596,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -623,16 +623,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1547,33 +1547,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1777,7 +1777,6 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
lcd_status_printf_P(0, PSTR(MSG_HOME " %s%s%s " MSG_FIRST), xx ? MSG_X : "", yy ? MSG_Y : "", zz ? MSG_Z : "");
|
lcd_status_printf_P(0, PSTR(MSG_HOME " %s%s%s " MSG_FIRST), xx ? MSG_X : "", yy ? MSG_Y : "", zz ? MSG_Z : "");
|
||||||
#endif
|
#endif
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
@ -1974,7 +1973,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
|
|
||||||
#if HAS_BED_PROBE
|
#if HAS_BED_PROBE
|
||||||
|
|
||||||
// TRIGGERED_WHEN_STOWED_TEST can easily be extended to servo probes, ... if needed.
|
// TRIGGERED_WHEN_STOWED_TEST can easily be extended to servo probes, ... if needed.
|
||||||
#if ENABLED(PROBE_IS_TRIGGERED_WHEN_STOWED_TEST)
|
#if ENABLED(PROBE_IS_TRIGGERED_WHEN_STOWED_TEST)
|
||||||
#if ENABLED(Z_MIN_PROBE_ENDSTOP)
|
#if ENABLED(Z_MIN_PROBE_ENDSTOP)
|
||||||
#define _TRIGGERED_WHEN_STOWED_TEST (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING)
|
#define _TRIGGERED_WHEN_STOWED_TEST (READ(Z_MIN_PROBE_PIN) != Z_MIN_PROBE_ENDSTOP_INVERTING)
|
||||||
|
|
@ -1983,7 +1982,6 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
#if ENABLED(BLTOUCH)
|
#if ENABLED(BLTOUCH)
|
||||||
void bltouch_command(int angle) {
|
void bltouch_command(int angle) {
|
||||||
servo[Z_ENDSTOP_SERVO_NR].move(angle); // Give the BL-Touch the command and wait
|
servo[Z_ENDSTOP_SERVO_NR].move(angle); // Give the BL-Touch the command and wait
|
||||||
|
|
@ -1995,7 +1993,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
bltouch_command(BLTOUCH_RESET); // try to reset it.
|
bltouch_command(BLTOUCH_RESET); // try to reset it.
|
||||||
bltouch_command(BLTOUCH_DEPLOY); // Also needs to deploy and stow to
|
bltouch_command(BLTOUCH_DEPLOY); // Also needs to deploy and stow to
|
||||||
bltouch_command(BLTOUCH_STOW); // clear the triggered condition.
|
bltouch_command(BLTOUCH_STOW); // clear the triggered condition.
|
||||||
safe_delay(1500); // wait for internal self test to complete
|
safe_delay(1500); // wait for internal self test to complete
|
||||||
// measured completion time was 0.65 seconds
|
// measured completion time was 0.65 seconds
|
||||||
// after reset, deploy & stow sequence
|
// after reset, deploy & stow sequence
|
||||||
if (TEST_BLTOUCH()) { // If it still claims to be triggered...
|
if (TEST_BLTOUCH()) { // If it still claims to be triggered...
|
||||||
|
|
@ -2206,8 +2204,7 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
// - Raise to the BETWEEN height
|
// - Raise to the BETWEEN height
|
||||||
// - Return the probed Z position
|
// - Return the probed Z position
|
||||||
//
|
//
|
||||||
//float probe_pt(const float &x, const float &y, const bool stow = true, const int verbose_level = 1) {
|
float probe_pt(const float x, const float y, const bool stow/*=true*/, const int verbose_level/*=1*/) {
|
||||||
float probe_pt(const float x, const float y, const bool stow, const int verbose_level) {
|
|
||||||
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
||||||
if (DEBUGGING(LEVELING)) {
|
if (DEBUGGING(LEVELING)) {
|
||||||
SERIAL_ECHOPAIR(">>> probe_pt(", x);
|
SERIAL_ECHOPAIR(">>> probe_pt(", x);
|
||||||
|
|
@ -2371,9 +2368,9 @@ static void clean_up_after_endstop_or_probe_move() {
|
||||||
//
|
//
|
||||||
// Enable if you prefer your output in JSON format
|
// Enable if you prefer your output in JSON format
|
||||||
// suitable for SCAD or JavaScript mesh visualizers.
|
// suitable for SCAD or JavaScript mesh visualizers.
|
||||||
//
|
//
|
||||||
// Visualize meshes in OpenSCAD using the included script.
|
// Visualize meshes in OpenSCAD using the included script.
|
||||||
//
|
//
|
||||||
// buildroot/shared/scripts/MarlinMesh.scad
|
// buildroot/shared/scripts/MarlinMesh.scad
|
||||||
//
|
//
|
||||||
//#define SCAD_MESH_OUTPUT
|
//#define SCAD_MESH_OUTPUT
|
||||||
|
|
@ -5319,27 +5316,18 @@ inline void gcode_M42() {
|
||||||
|
|
||||||
#include "pinsDebug.h"
|
#include "pinsDebug.h"
|
||||||
|
|
||||||
|
|
||||||
inline void toggle_pins() {
|
inline void toggle_pins() {
|
||||||
int pin, j, start = 0, I_flag = 0, end = NUM_DIGITAL_PINS - 1, wait = 500, repeat = 1;
|
int pin, j;
|
||||||
|
|
||||||
if (code_seen('R'))
|
bool I_flag = code_seen('I') ? code_value_bool() : false;
|
||||||
repeat = code_value_int();
|
|
||||||
|
|
||||||
if (code_seen('S'))
|
int repeat = code_seen('R') ? code_value_int() : 1,
|
||||||
start = code_value_int();
|
start = code_seen('S') ? code_value_int() : 0,
|
||||||
|
end = code_seen('E') ? code_value_int() : NUM_DIGITAL_PINS - 1,
|
||||||
|
wait = code_seen('W') ? code_value_int() : 500;
|
||||||
|
|
||||||
if (code_seen('E'))
|
for (pin = start; pin <= end; pin++) {
|
||||||
end = code_value_int();
|
if (!I_flag && pin_is_protected(pin)) {
|
||||||
|
|
||||||
if (code_seen('I') )
|
|
||||||
I_flag++;
|
|
||||||
|
|
||||||
if (code_seen('W'))
|
|
||||||
wait = code_value_int();
|
|
||||||
|
|
||||||
for(pin = start; pin <= end; pin++) {
|
|
||||||
if ( I_flag == 0 && pin_is_protected(pin)) {
|
|
||||||
SERIAL_ECHOPAIR("Sensitive Pin: ", pin);
|
SERIAL_ECHOPAIR("Sensitive Pin: ", pin);
|
||||||
SERIAL_ECHOPGM(" untouched.\n");
|
SERIAL_ECHOPGM(" untouched.\n");
|
||||||
}
|
}
|
||||||
|
|
@ -5348,22 +5336,17 @@ inline void gcode_M42() {
|
||||||
pinMode(pin, OUTPUT);
|
pinMode(pin, OUTPUT);
|
||||||
for(j = 0; j < repeat; j++) {
|
for(j = 0; j < repeat; j++) {
|
||||||
digitalWrite(pin, 0);
|
digitalWrite(pin, 0);
|
||||||
idle();
|
safe_delay(wait);
|
||||||
delay(wait);
|
|
||||||
digitalWrite(pin, 1);
|
digitalWrite(pin, 1);
|
||||||
idle();
|
safe_delay(wait);
|
||||||
delay(wait);
|
|
||||||
digitalWrite(pin, 0);
|
digitalWrite(pin, 0);
|
||||||
idle();
|
safe_delay(wait);
|
||||||
delay(wait);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SERIAL_ECHOPGM("\n");
|
SERIAL_ECHOPGM("\n");
|
||||||
}
|
}
|
||||||
SERIAL_ECHOPGM("Done\n");
|
SERIAL_ECHOPGM("Done\n");
|
||||||
return;
|
} // toggle_pins
|
||||||
} // toggle pin(s)
|
|
||||||
|
|
||||||
|
|
||||||
inline void servo_probe_test(){
|
inline void servo_probe_test(){
|
||||||
#if !(NUM_SERVOS >= 1 && HAS_SERVO_0)
|
#if !(NUM_SERVOS >= 1 && HAS_SERVO_0)
|
||||||
|
|
@ -5452,7 +5435,7 @@ inline void gcode_M42() {
|
||||||
if (probe_counter == 0) SERIAL_PROTOCOLLNPGM("trigger not detected");
|
if (probe_counter == 0) SERIAL_PROTOCOLLNPGM("trigger not detected");
|
||||||
} // measure active signal length
|
} // measure active signal length
|
||||||
#endif
|
#endif
|
||||||
} // servo_probe_test
|
} // servo_probe_test
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* M43: Pin debug - report pin state, watch pins, toggle pins and servo probe test/report
|
* M43: Pin debug - report pin state, watch pins, toggle pins and servo probe test/report
|
||||||
|
|
@ -5481,7 +5464,6 @@ inline void gcode_M42() {
|
||||||
* M43 S - Servo probe test
|
* M43 S - Servo probe test
|
||||||
* P<index> - Probe index (optional - defaults to 0
|
* P<index> - Probe index (optional - defaults to 0
|
||||||
*/
|
*/
|
||||||
|
|
||||||
inline void gcode_M43() {
|
inline void gcode_M43() {
|
||||||
|
|
||||||
if (code_seen('T')) { // must be first ot else it's "S" and "E" parameters will execute endstop or servo test
|
if (code_seen('T')) { // must be first ot else it's "S" and "E" parameters will execute endstop or servo test
|
||||||
|
|
@ -5503,7 +5485,6 @@ inline void gcode_M42() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// Get the range of pins to test or watch
|
// Get the range of pins to test or watch
|
||||||
int first_pin = 0, last_pin = NUM_DIGITAL_PINS - 1;
|
int first_pin = 0, last_pin = NUM_DIGITAL_PINS - 1;
|
||||||
if (code_seen('P')) {
|
if (code_seen('P')) {
|
||||||
|
|
@ -5511,10 +5492,10 @@ inline void gcode_M42() {
|
||||||
if (first_pin > NUM_DIGITAL_PINS - 1) return;
|
if (first_pin > NUM_DIGITAL_PINS - 1) return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool ignore_protection = code_seen('I');
|
bool ignore_protection = code_seen('I') ? code_value_bool() : false;
|
||||||
|
|
||||||
// Watch until click, M108, or reset
|
// Watch until click, M108, or reset
|
||||||
if (code_seen('W')) { // watch digital pins
|
if (code_seen('W') && code_value_bool()) { // watch digital pins
|
||||||
SERIAL_PROTOCOLLNPGM("Watching pins");
|
SERIAL_PROTOCOLLNPGM("Watching pins");
|
||||||
byte pin_state[last_pin - first_pin + 1];
|
byte pin_state[last_pin - first_pin + 1];
|
||||||
for (int8_t pin = first_pin; pin <= last_pin; pin++) {
|
for (int8_t pin = first_pin; pin <= last_pin; pin++) {
|
||||||
|
|
@ -5558,7 +5539,6 @@ inline void gcode_M42() {
|
||||||
report_pin_state_extended(pin, ignore_protection);
|
report_pin_state_extended(pin, ignore_protection);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#endif // PINS_DEBUGGING
|
#endif // PINS_DEBUGGING
|
||||||
|
|
||||||
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
|
#if ENABLED(Z_MIN_PROBE_REPEATABILITY_TEST)
|
||||||
|
|
@ -6041,17 +6021,18 @@ inline void gcode_M105() {
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef MIN_COOLING_SLOPE_DEG
|
|
||||||
#define MIN_COOLING_SLOPE_DEG 1.50
|
|
||||||
#endif
|
|
||||||
#ifndef MIN_COOLING_SLOPE_TIME
|
|
||||||
#define MIN_COOLING_SLOPE_TIME 60
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* M109: Sxxx Wait for extruder(s) to reach temperature. Waits only when heating.
|
* M109: Sxxx Wait for extruder(s) to reach temperature. Waits only when heating.
|
||||||
* Rxxx Wait for extruder(s) to reach temperature. Waits when heating and cooling.
|
* Rxxx Wait for extruder(s) to reach temperature. Waits when heating and cooling.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#ifndef MIN_COOLING_SLOPE_DEG
|
||||||
|
#define MIN_COOLING_SLOPE_DEG 1.50
|
||||||
|
#endif
|
||||||
|
#ifndef MIN_COOLING_SLOPE_TIME
|
||||||
|
#define MIN_COOLING_SLOPE_TIME 60
|
||||||
|
#endif
|
||||||
|
|
||||||
inline void gcode_M109() {
|
inline void gcode_M109() {
|
||||||
|
|
||||||
if (get_target_extruder_from_command(109)) return;
|
if (get_target_extruder_from_command(109)) return;
|
||||||
|
|
@ -6275,11 +6256,11 @@ inline void gcode_M109() {
|
||||||
residency_start_ms = now;
|
residency_start_ms = now;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif //TEMP_BED_RESIDENCY_TIME > 0
|
#endif // TEMP_BED_RESIDENCY_TIME > 0
|
||||||
|
|
||||||
// Prevent a wait-forever situation if R is misused i.e. M190 R0
|
// Prevent a wait-forever situation if R is misused i.e. M190 R0
|
||||||
if (wants_to_cool) {
|
if (wants_to_cool) {
|
||||||
// break after MIN_COOLING_SLOPE_TIME_BED seconds
|
// Break after MIN_COOLING_SLOPE_TIME_BED seconds
|
||||||
// if the temperature did not drop at least MIN_COOLING_SLOPE_DEG_BED
|
// if the temperature did not drop at least MIN_COOLING_SLOPE_DEG_BED
|
||||||
if (!next_cool_check_ms || ELAPSED(now, next_cool_check_ms)) {
|
if (!next_cool_check_ms || ELAPSED(now, next_cool_check_ms)) {
|
||||||
if (old_temp - temp < MIN_COOLING_SLOPE_DEG_BED) break;
|
if (old_temp - temp < MIN_COOLING_SLOPE_DEG_BED) break;
|
||||||
|
|
@ -6307,7 +6288,7 @@ inline void gcode_M110() {
|
||||||
* M111: Set the debug level
|
* M111: Set the debug level
|
||||||
*/
|
*/
|
||||||
inline void gcode_M111() {
|
inline void gcode_M111() {
|
||||||
marlin_debug_flags = code_seen('S') ? code_value_byte() : (uint8_t) DEBUG_NONE;
|
marlin_debug_flags = code_seen('S') ? code_value_byte() : (uint8_t)DEBUG_NONE;
|
||||||
|
|
||||||
const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO;
|
const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO;
|
||||||
const static char str_debug_2[] PROGMEM = MSG_DEBUG_INFO;
|
const static char str_debug_2[] PROGMEM = MSG_DEBUG_INFO;
|
||||||
|
|
@ -6463,7 +6444,6 @@ inline void gcode_M140() {
|
||||||
#if ENABLED(ULTIPANEL)
|
#if ENABLED(ULTIPANEL)
|
||||||
powersupply = true;
|
powersupply = true;
|
||||||
LCD_MESSAGEPGM(WELCOME_MSG);
|
LCD_MESSAGEPGM(WELCOME_MSG);
|
||||||
lcd_update();
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -6496,7 +6476,6 @@ inline void gcode_M81() {
|
||||||
powersupply = false;
|
powersupply = false;
|
||||||
#endif
|
#endif
|
||||||
LCD_MESSAGEPGM(MACHINE_NAME " " MSG_OFF ".");
|
LCD_MESSAGEPGM(MACHINE_NAME " " MSG_OFF ".");
|
||||||
lcd_update();
|
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -7774,7 +7753,7 @@ void quickstop_stepper() {
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if ENABLED(MESH_BED_LEVELING)
|
#if ENABLED(MESH_BED_LEVELING)
|
||||||
/**
|
/**
|
||||||
* M421: Set a single Mesh Bed Leveling Z coordinate
|
* M421: Set a single Mesh Bed Leveling Z coordinate
|
||||||
* Use either 'M421 X<linear> Y<linear> Z<linear>' or 'M421 I<xindex> J<yindex> Z<linear>'
|
* Use either 'M421 X<linear> Y<linear> Z<linear>' or 'M421 I<xindex> J<yindex> Z<linear>'
|
||||||
|
|
|
||||||
|
|
@ -595,7 +595,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -622,16 +622,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1546,33 +1546,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -579,7 +579,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -606,16 +606,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1530,33 +1530,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -579,7 +579,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -606,16 +606,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1530,33 +1530,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -587,7 +587,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -614,16 +614,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1538,33 +1538,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -590,7 +590,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -617,16 +617,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 15 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 15 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1541,33 +1541,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 2.00 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 2.00 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.60 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.60 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -625,7 +625,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -652,16 +652,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1580,33 +1580,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -596,7 +596,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -623,16 +623,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1547,33 +1547,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -596,7 +596,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -623,16 +623,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 10 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1547,33 +1547,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -596,7 +596,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -623,16 +623,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1547,33 +1547,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -595,7 +595,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -622,16 +622,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1548,33 +1548,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -611,7 +611,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -638,16 +638,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1562,33 +1562,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -616,7 +616,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -643,16 +643,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1567,33 +1567,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -647,7 +647,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -674,16 +674,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 15 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 15 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1598,33 +1598,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -587,7 +587,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -614,16 +614,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1538,33 +1538,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -596,7 +596,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -623,16 +623,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1547,33 +1547,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -654,7 +654,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -681,16 +681,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0.25 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0.25 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 2000
|
#define XY_PROBE_SPEED 2000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
#define PROBE_DOUBLE_TOUCH
|
#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1654,33 +1654,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 1.75 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -641,7 +641,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -668,16 +668,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 4000
|
#define XY_PROBE_SPEED 4000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1638,33 +1638,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -634,7 +634,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -661,16 +661,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -10 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -3.5 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 4000
|
#define XY_PROBE_SPEED 4000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1634,33 +1634,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -635,7 +635,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -665,16 +665,16 @@
|
||||||
* not giving someone a head crash. Use something like G29 Z-0.2 to adjust as needed.
|
* not giving someone a head crash. Use something like G29 Z-0.2 to adjust as needed.
|
||||||
*/
|
*/
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -17.25 // Increase this if the first layer is too thin (remember: it's a negative number so increase means closer to zero).
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -17.25 // Increase this if the first layer is too thin (remember: it's a negative number so increase means closer to zero).
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1641,33 +1641,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -654,7 +654,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -681,16 +681,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0 // Z probe to nozzle Y offset: -front +behind
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER 0.0 // Z probe to nozzle Y offset: -front +behind
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3 // Z probe to nozzle Z offset: -below (always!)
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER 0.3 // Z probe to nozzle Z offset: -below (always!)
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1649,33 +1649,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -599,7 +599,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -626,16 +626,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1550,33 +1550,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -592,7 +592,7 @@
|
||||||
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
* is enabled then it also applies to Z_PROBE_SPEED_SLOW.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Enable if you have a Z probe mounted on a sled like those designed by Charles Bell. */
|
// Enable if you have a Z probe mounted on a sled like those designed by Charles Bell.
|
||||||
//#define Z_PROBE_SLED
|
//#define Z_PROBE_SLED
|
||||||
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
//#define SLED_DOCKING_OFFSET 5 // The extra distance the X axis must travel to pickup the sled. 0 should be fine but you can push it further if you'd like.
|
||||||
|
|
||||||
|
|
@ -619,16 +619,16 @@
|
||||||
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
#define Y_PROBE_OFFSET_FROM_EXTRUDER -29 // Y offset: -front +behind [the nozzle]
|
||||||
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
#define Z_PROBE_OFFSET_FROM_EXTRUDER -12.35 // Z offset: -below +above [the nozzle]
|
||||||
|
|
||||||
/* X and Y axis travel speed (mm/m) between probes */
|
// X and Y axis travel speed (mm/m) between probes
|
||||||
#define XY_PROBE_SPEED 8000
|
#define XY_PROBE_SPEED 8000
|
||||||
|
|
||||||
/* Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH) */
|
// Speed for the first approach when double-probing (with PROBE_DOUBLE_TOUCH)
|
||||||
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
#define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
|
||||||
|
|
||||||
/* Speed for the "accurate" probe of each point */
|
// Speed for the "accurate" probe of each point
|
||||||
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
#define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
|
||||||
|
|
||||||
/* Use double touch for probing */
|
// Use double touch for probing
|
||||||
//#define PROBE_DOUBLE_TOUCH
|
//#define PROBE_DOUBLE_TOUCH
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -1543,33 +1543,39 @@
|
||||||
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
// With this option servos are powered only during movement, then turned off to prevent jitter.
|
||||||
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
//#define DEACTIVATE_SERVOS_AFTER_MOVE
|
||||||
|
|
||||||
/**********************************************************************\
|
/**
|
||||||
* Support for a filament diameter sensor
|
* Filament Width Sensor
|
||||||
* Also allows adjustment of diameter at print time (vs at slicing)
|
|
||||||
* Single extruder only at this point (extruder 0)
|
|
||||||
*
|
*
|
||||||
* Motherboards
|
* Measures the filament width in real-time and adjusts
|
||||||
* 34 - RAMPS1.4 - uses Analog input 5 on the AUX2 connector
|
* flow rate to compensate for any irregularities.
|
||||||
* 81 - Printrboard - Uses Analog input 2 on the Exp1 connector (version B,C,D,E)
|
*
|
||||||
* 301 - Rambo - uses Analog input 3
|
* Also allows the measured filament diameter to set the
|
||||||
* Note may require analog pins to be defined for different motherboards
|
* extrusion rate, so the slicer only has to specify the
|
||||||
**********************************************************************/
|
* volume.
|
||||||
// Uncomment below to enable
|
*
|
||||||
|
* Only a single extruder is supported at this time.
|
||||||
|
*
|
||||||
|
* 34 RAMPS_14 : Analog input 5 on the AUX2 connector
|
||||||
|
* 81 PRINTRBOARD : Analog input 2 on the Exp1 connector (version B,C,D,E)
|
||||||
|
* 301 RAMBO : Analog input 3
|
||||||
|
*
|
||||||
|
* Note: May require analog pins to be defined for other boards.
|
||||||
|
*/
|
||||||
//#define FILAMENT_WIDTH_SENSOR
|
//#define FILAMENT_WIDTH_SENSOR
|
||||||
|
|
||||||
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 //Enter the diameter (in mm) of the filament generally used (3.0 mm or 1.75 mm) - this is then used in the slicer software. Used for sensor reading validation
|
#define DEFAULT_NOMINAL_FILAMENT_DIA 3.00 // (mm) Diameter of the filament generally used (3.0 or 1.75mm), also used in the slicer. Used to validate sensor reading.
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 //The number of the extruder that has the filament sensor (0,1,2)
|
#define FILAMENT_SENSOR_EXTRUDER_NUM 0 // Index of the extruder that has the filament sensor (0,1,2,3)
|
||||||
#define MEASUREMENT_DELAY_CM 14 //measurement delay in cm. This is the distance from filament sensor to middle of barrel
|
#define MEASUREMENT_DELAY_CM 14 // (cm) The distance from the filament sensor to the melting chamber
|
||||||
|
|
||||||
#define MEASURED_UPPER_LIMIT 3.30 //upper limit factor used for sensor reading validation in mm
|
#define MEASURED_UPPER_LIMIT 3.30 // (mm) Upper limit used to validate sensor reading
|
||||||
#define MEASURED_LOWER_LIMIT 1.90 //lower limit factor for sensor reading validation in mm
|
#define MEASURED_LOWER_LIMIT 1.90 // (mm) Lower limit used to validate sensor reading
|
||||||
#define MAX_MEASUREMENT_DELAY 20 //delay buffer size in bytes (1 byte = 1cm)- limits maximum measurement delay allowable (must be larger than MEASUREMENT_DELAY_CM and lower number saves RAM)
|
#define MAX_MEASUREMENT_DELAY 20 // (bytes) Buffer size for stored measurements (1 byte per cm). Must be larger than MEASUREMENT_DELAY_CM.
|
||||||
|
|
||||||
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA //set measured to nominal initially
|
#define DEFAULT_MEASURED_FILAMENT_DIA DEFAULT_NOMINAL_FILAMENT_DIA // Set measured to nominal initially
|
||||||
|
|
||||||
//When using an LCD, uncomment the line below to display the Filament sensor data on the last line instead of status. Status will appear for 5 sec.
|
// Display filament width on the LCD status line. Status messages will expire after 5 seconds.
|
||||||
//#define FILAMENT_LCD_DISPLAY
|
//#define FILAMENT_LCD_DISPLAY
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -303,6 +303,9 @@
|
||||||
#if !defined(E3_AUTO_FAN_PIN) && defined(ORIG_E3_AUTO_FAN_PIN)
|
#if !defined(E3_AUTO_FAN_PIN) && defined(ORIG_E3_AUTO_FAN_PIN)
|
||||||
#define E3_AUTO_FAN_PIN ORIG_E3_AUTO_FAN_PIN
|
#define E3_AUTO_FAN_PIN ORIG_E3_AUTO_FAN_PIN
|
||||||
#endif
|
#endif
|
||||||
|
#if !defined(E4_AUTO_FAN_PIN) && defined(ORIG_E4_AUTO_FAN_PIN)
|
||||||
|
#define E4_AUTO_FAN_PIN ORIG_E4_AUTO_FAN_PIN
|
||||||
|
#endif
|
||||||
|
|
||||||
// List of pins which to ignore when asked to change by gcode, 0 and 1 are RX and TX, do not mess with those!
|
// List of pins which to ignore when asked to change by gcode, 0 and 1 are RX and TX, do not mess with those!
|
||||||
#define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, E0_MS1_PIN, E0_MS2_PIN,
|
#define _E0_PINS E0_STEP_PIN, E0_DIR_PIN, E0_ENABLE_PIN, E0_MS1_PIN, E0_MS2_PIN,
|
||||||
|
|
|
||||||
|
|
@ -80,16 +80,16 @@ bool endstop_monitor_flag = false;
|
||||||
|
|
||||||
const char* const pin_array[][3] PROGMEM = {
|
const char* const pin_array[][3] PROGMEM = {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* [pin name] [pin number] [is digital or analog] 1 = digital, 0 = analog
|
* [pin name] [pin number] [is digital or analog] 1 = digital, 0 = analog
|
||||||
* Each entry takes up 6 bytes in FLASH:
|
* Each entry takes up 6 bytes in FLASH:
|
||||||
* 2 byte pointer to location of the name string
|
* 2 byte pointer to location of the name string
|
||||||
* 2 bytes containing the pin number
|
* 2 bytes containing the pin number
|
||||||
* analog pin numbers were convereted to digital when the array was created
|
* analog pin numbers were convereted to digital when the array was created
|
||||||
* 2 bytes containing the digital/analog bool flag
|
* 2 bytes containing the digital/analog bool flag
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// manually add pins ...
|
// manually add pins ...
|
||||||
#if SERIAL_PORT == 0
|
#if SERIAL_PORT == 0
|
||||||
#if AVR_ATmega2560_FAMILY
|
#if AVR_ATmega2560_FAMILY
|
||||||
{RXD_NAME, 0, 1},
|
{RXD_NAME, 0, 1},
|
||||||
|
|
@ -109,7 +109,8 @@ const char* const pin_array[][3] PROGMEM = {
|
||||||
|
|
||||||
#define n_array (sizeof (pin_array) / sizeof (const char *))/3
|
#define n_array (sizeof (pin_array) / sizeof (const char *))/3
|
||||||
|
|
||||||
#if !defined(TIMER1B) // working with Teensyduino extension so need to re-define some things
|
#ifndef TIMER1B
|
||||||
|
// working with Teensyduino extension so need to re-define some things
|
||||||
#include "pinsDebug_Teensyduino.h"
|
#include "pinsDebug_Teensyduino.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
@ -132,7 +133,7 @@ static bool pwm_status(uint8_t pin) {
|
||||||
switch(digitalPinToTimer(pin)) {
|
switch(digitalPinToTimer(pin)) {
|
||||||
|
|
||||||
#if defined(TCCR0A) && defined(COM0A1)
|
#if defined(TCCR0A) && defined(COM0A1)
|
||||||
#if defined (TIMER0A)
|
#ifdef TIMER0A
|
||||||
PWM_CASE(0,A);
|
PWM_CASE(0,A);
|
||||||
#endif
|
#endif
|
||||||
PWM_CASE(0,B);
|
PWM_CASE(0,B);
|
||||||
|
|
@ -141,7 +142,7 @@ static bool pwm_status(uint8_t pin) {
|
||||||
#if defined(TCCR1A) && defined(COM1A1)
|
#if defined(TCCR1A) && defined(COM1A1)
|
||||||
PWM_CASE(1,A);
|
PWM_CASE(1,A);
|
||||||
PWM_CASE(1,B);
|
PWM_CASE(1,B);
|
||||||
#if defined(COM1C1) && defined (TIMER1C)
|
#if defined(COM1C1) && defined(TIMER1C)
|
||||||
PWM_CASE(1,C);
|
PWM_CASE(1,C);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
@ -200,13 +201,13 @@ const uint8_t* const PWM_other[][3] PROGMEM = {
|
||||||
|
|
||||||
const uint8_t* const PWM_OCR[][3] PROGMEM = {
|
const uint8_t* const PWM_OCR[][3] PROGMEM = {
|
||||||
|
|
||||||
#if defined (TIMER0A)
|
#ifdef TIMER0A
|
||||||
{&OCR0A,&OCR0B,0},
|
{&OCR0A,&OCR0B,0},
|
||||||
#else
|
#else
|
||||||
{0,&OCR0B,0},
|
{0,&OCR0B,0},
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(COM1C1) && defined (TIMER1C)
|
#if defined(COM1C1) && defined(TIMER1C)
|
||||||
{ (const uint8_t*) &OCR1A, (const uint8_t*) &OCR1B, (const uint8_t*) &OCR1C},
|
{ (const uint8_t*) &OCR1A, (const uint8_t*) &OCR1B, (const uint8_t*) &OCR1C},
|
||||||
#else
|
#else
|
||||||
{ (const uint8_t*) &OCR1A, (const uint8_t*) &OCR1B,0},
|
{ (const uint8_t*) &OCR1A, (const uint8_t*) &OCR1B,0},
|
||||||
|
|
@ -217,7 +218,7 @@ const uint8_t* const PWM_OCR[][3] PROGMEM = {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(TCCR3A) && defined(COM3A1)
|
#if defined(TCCR3A) && defined(COM3A1)
|
||||||
#if defined(COM3C1)
|
#ifdef COM3C1
|
||||||
{ (const uint8_t*) &OCR3A, (const uint8_t*) &OCR3B, (const uint8_t*) &OCR3C},
|
{ (const uint8_t*) &OCR3A, (const uint8_t*) &OCR3B, (const uint8_t*) &OCR3C},
|
||||||
#else
|
#else
|
||||||
{ (const uint8_t*) &OCR3A, (const uint8_t*) &OCR3B,0},
|
{ (const uint8_t*) &OCR3A, (const uint8_t*) &OCR3B,0},
|
||||||
|
|
@ -279,12 +280,12 @@ void com_print(uint8_t N, uint8_t Z) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void timer_prefix(uint8_t T, char L, uint8_t N){ // T - timer L - pwm n - WGM bit layout
|
void timer_prefix(uint8_t T, char L, uint8_t N) { // T - timer L - pwm n - WGM bit layout
|
||||||
char buffer[20]; // for the sprintf statements
|
char buffer[20]; // for the sprintf statements
|
||||||
uint8_t *TCCRB = (uint8_t*) TCCR_B(T);
|
uint8_t *TCCRB = (uint8_t*)TCCR_B(T);
|
||||||
uint8_t *TCCRA = (uint8_t*) TCCR_A(T);
|
uint8_t *TCCRA = (uint8_t*)TCCR_A(T);
|
||||||
uint8_t WGM = (((*TCCRB & _BV(WGM_2)) >> 1) | (*TCCRA & (_BV(WGM_0) | _BV(WGM_1))));
|
uint8_t WGM = (((*TCCRB & _BV(WGM_2)) >> 1) | (*TCCRA & (_BV(WGM_0) | _BV(WGM_1))));
|
||||||
if (N == 4) WGM |= ((*TCCRB & _BV(WGM_3)) >> 1);
|
if (N == 4) WGM |= ((*TCCRB & _BV(WGM_3)) >> 1);
|
||||||
|
|
||||||
SERIAL_PROTOCOLPGM(" TIMER");
|
SERIAL_PROTOCOLPGM(" TIMER");
|
||||||
SERIAL_PROTOCOLCHAR(T + '0');
|
SERIAL_PROTOCOLCHAR(T + '0');
|
||||||
|
|
@ -323,18 +324,15 @@ void timer_prefix(uint8_t T, char L, uint8_t N){ // T - timer L - pwm n - W
|
||||||
if (TEST(*TMSK, TOIE)) err_prob_interrupt();
|
if (TEST(*TMSK, TOIE)) err_prob_interrupt();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
static void pwm_details(uint8_t pin) {
|
static void pwm_details(uint8_t pin) {
|
||||||
char buffer[20]; // for the sprintf statements
|
char buffer[20]; // for the sprintf statements
|
||||||
uint8_t WGM;
|
uint8_t WGM;
|
||||||
|
|
||||||
switch(digitalPinToTimer(pin)) {
|
switch(digitalPinToTimer(pin)) {
|
||||||
|
|
||||||
|
|
||||||
#if defined(TCCR0A) && defined(COM0A1)
|
#if defined(TCCR0A) && defined(COM0A1)
|
||||||
|
|
||||||
#if defined (TIMER0A)
|
#ifdef TIMER0A
|
||||||
case TIMER0A:
|
case TIMER0A:
|
||||||
timer_prefix(0,'A',3);
|
timer_prefix(0,'A',3);
|
||||||
break;
|
break;
|
||||||
|
|
@ -351,7 +349,7 @@ static void pwm_details(uint8_t pin) {
|
||||||
case TIMER1B:
|
case TIMER1B:
|
||||||
timer_prefix(1,'B',4);
|
timer_prefix(1,'B',4);
|
||||||
break;
|
break;
|
||||||
#if defined(COM1C1) && defined (TIMER1C)
|
#if defined(COM1C1) && defined(TIMER1C)
|
||||||
case TIMER1C:
|
case TIMER1C:
|
||||||
timer_prefix(1,'C',4);
|
timer_prefix(1,'C',4);
|
||||||
break;
|
break;
|
||||||
|
|
@ -374,7 +372,7 @@ static void pwm_details(uint8_t pin) {
|
||||||
case TIMER3B:
|
case TIMER3B:
|
||||||
timer_prefix(3,'B',4);
|
timer_prefix(3,'B',4);
|
||||||
break;
|
break;
|
||||||
#if defined(COM3C1)
|
#ifdef COM3C1
|
||||||
case TIMER3C:
|
case TIMER3C:
|
||||||
timer_prefix(3,'C',4);
|
timer_prefix(3,'C',4);
|
||||||
break;
|
break;
|
||||||
|
|
@ -410,17 +408,15 @@ static void pwm_details(uint8_t pin) {
|
||||||
}
|
}
|
||||||
SERIAL_PROTOCOLPGM(" ");
|
SERIAL_PROTOCOLPGM(" ");
|
||||||
|
|
||||||
// on pins that have two PWMs, print info on second PWM
|
// on pins that have two PWMs, print info on second PWM
|
||||||
#if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY
|
#if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY
|
||||||
// looking for port B7 - PWMs 0A and 1C
|
// looking for port B7 - PWMs 0A and 1C
|
||||||
if ( ('B' == digitalPinToPort(pin) + 64) && (0x80 == digitalPinToBitMask(pin))) {
|
if ( ('B' == digitalPinToPort(pin) + 64) && (0x80 == digitalPinToBitMask(pin))) {
|
||||||
#if !defined(TEENSYDUINO_IDE)
|
#ifndef TEENSYDUINO_IDE
|
||||||
SERIAL_EOL;
|
SERIAL_PROTOCOLPGM("\n . TIMER1C is also tied to this pin ");
|
||||||
SERIAL_PROTOCOLPGM (" . TIMER1C is also tied to this pin ");
|
|
||||||
timer_prefix(1,'C',4);
|
timer_prefix(1,'C',4);
|
||||||
#else
|
#else
|
||||||
SERIAL_EOL;
|
SERIAL_PROTOCOLPGM("\n . TIMER0A is also tied to this pin ");
|
||||||
SERIAL_PROTOCOLPGM (" . TIMER0A is also tied to this pin ");
|
|
||||||
timer_prefix(0,'A',3);
|
timer_prefix(0,'A',3);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
@ -429,7 +425,7 @@ static void pwm_details(uint8_t pin) {
|
||||||
|
|
||||||
bool get_pinMode(int8_t pin) { return *portModeRegister(digitalPinToPort(pin)) & digitalPinToBitMask(pin); }
|
bool get_pinMode(int8_t pin) { return *portModeRegister(digitalPinToPort(pin)) & digitalPinToBitMask(pin); }
|
||||||
|
|
||||||
#if !defined(digitalRead_mod) // use Teensyduino's version of digitalRead - it doesn't disable the PWMs
|
#ifndef digitalRead_mod // use Teensyduino's version of digitalRead - it doesn't disable the PWMs
|
||||||
int digitalRead_mod(int8_t pin) { // same as digitalRead except the PWM stop section has been removed
|
int digitalRead_mod(int8_t pin) { // same as digitalRead except the PWM stop section has been removed
|
||||||
uint8_t port = digitalPinToPort(pin);
|
uint8_t port = digitalPinToPort(pin);
|
||||||
return (port != NOT_A_PIN) && (*portInputRegister(port) & digitalPinToBitMask(pin)) ? HIGH : LOW;
|
return (port != NOT_A_PIN) && (*portInputRegister(port) & digitalPinToBitMask(pin)) ? HIGH : LOW;
|
||||||
|
|
@ -437,34 +433,31 @@ bool get_pinMode(int8_t pin) { return *portModeRegister(digitalPinToPort(pin)) &
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
void print_port(int8_t pin) { // print port number
|
void print_port(int8_t pin) { // print port number
|
||||||
#if defined(digitalPinToPort)
|
#ifdef digitalPinToPort
|
||||||
SERIAL_PROTOCOLPGM(" Port: ");
|
SERIAL_PROTOCOLPGM(" Port: ");
|
||||||
uint8_t x = digitalPinToPort(pin) + 64;
|
uint8_t x = digitalPinToPort(pin) + 64;
|
||||||
SERIAL_CHAR(x);
|
SERIAL_CHAR(x);
|
||||||
uint8_t temp = digitalPinToBitMask(pin);
|
uint8_t temp = digitalPinToBitMask(pin);
|
||||||
for (x = '0'; (x < '9' && !(temp == 1)); x++){
|
for (x = '0'; x < '9' && temp != 1; x++) temp >>= 1;
|
||||||
temp = temp >> 1;
|
|
||||||
}
|
|
||||||
SERIAL_CHAR(x);
|
SERIAL_CHAR(x);
|
||||||
#else
|
#else
|
||||||
SERIAL_PROTOCOLPGM(" ")
|
SERIAL_PROTOCOLPGM(" ");
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// pretty report with PWM info
|
// pretty report with PWM info
|
||||||
inline void report_pin_state_extended(int8_t pin, bool ignore, bool extended = true) {
|
inline void report_pin_state_extended(int8_t pin, bool ignore, bool extended = true) {
|
||||||
uint8_t temp_char;
|
uint8_t temp_char;
|
||||||
char *name_mem_pointer;
|
char *name_mem_pointer;
|
||||||
char buffer[30]; // for the sprintf statements
|
char buffer[30]; // for the sprintf statements
|
||||||
bool found = false;
|
bool found = false,
|
||||||
bool multi_name_pin = false;
|
multi_name_pin = false;
|
||||||
for (uint8_t x = 0; x < n_array; x++) { // scan entire array and report all instances of this pin
|
for (uint8_t x = 0; x < n_array; x++) { // scan entire array and report all instances of this pin
|
||||||
if (pgm_read_byte(&pin_array[x][1]) == pin) {
|
if (pgm_read_byte(&pin_array[x][1]) == pin) {
|
||||||
if (found == true) multi_name_pin = true;
|
if (found) multi_name_pin = true;
|
||||||
found = true;
|
found = true;
|
||||||
if (multi_name_pin == false) { // report digitial and analog pin number only on the first time through
|
if (!multi_name_pin) { // report digitial and analog pin number only on the first time through
|
||||||
sprintf(buffer, "PIN:% 3d ", pin); // digital pin number
|
sprintf(buffer, "PIN: %3d ", pin); // digital pin number
|
||||||
SERIAL_ECHO(buffer);
|
SERIAL_ECHO(buffer);
|
||||||
print_port(pin);
|
print_port(pin);
|
||||||
if (IS_ANALOG(pin)) {
|
if (IS_ANALOG(pin)) {
|
||||||
|
|
@ -479,7 +472,7 @@ inline void report_pin_state_extended(int8_t pin, bool ignore, bool extended = t
|
||||||
temp_char = pgm_read_byte(name_mem_pointer + y);
|
temp_char = pgm_read_byte(name_mem_pointer + y);
|
||||||
if (temp_char != 0) MYSERIAL.write(temp_char);
|
if (temp_char != 0) MYSERIAL.write(temp_char);
|
||||||
else {
|
else {
|
||||||
for (uint8_t i = 0; i < 28 - y; i++) MYSERIAL.write(" ");
|
for (uint8_t i = 0; i < 28 - y; i++) MYSERIAL.write(' ');
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -487,12 +480,12 @@ inline void report_pin_state_extended(int8_t pin, bool ignore, bool extended = t
|
||||||
SERIAL_ECHOPGM("protected ");
|
SERIAL_ECHOPGM("protected ");
|
||||||
else {
|
else {
|
||||||
if (!(pgm_read_byte(&pin_array[x][2]))) {
|
if (!(pgm_read_byte(&pin_array[x][2]))) {
|
||||||
sprintf(buffer, "Analog in =% 5d", analogRead(pin - analogInputToDigitalPin(0)));
|
sprintf(buffer, "Analog in = %5d", analogRead(pin - analogInputToDigitalPin(0)));
|
||||||
SERIAL_ECHO(buffer);
|
SERIAL_ECHO(buffer);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (!get_pinMode(pin)) {
|
if (!get_pinMode(pin)) {
|
||||||
// pinMode(pin, INPUT_PULLUP); // make sure input isn't floating - stopped doing this
|
//pinMode(pin, INPUT_PULLUP); // make sure input isn't floating - stopped doing this
|
||||||
// because this could interfere with inductive/capacitive
|
// because this could interfere with inductive/capacitive
|
||||||
// sensors (high impedance voltage divider) and with PT100 amplifier
|
// sensors (high impedance voltage divider) and with PT100 amplifier
|
||||||
SERIAL_PROTOCOLPAIR("Input = ", digitalRead_mod(pin));
|
SERIAL_PROTOCOLPAIR("Input = ", digitalRead_mod(pin));
|
||||||
|
|
@ -502,43 +495,41 @@ inline void report_pin_state_extended(int8_t pin, bool ignore, bool extended = t
|
||||||
}
|
}
|
||||||
else SERIAL_PROTOCOLPAIR("Output = ", digitalRead_mod(pin));
|
else SERIAL_PROTOCOLPAIR("Output = ", digitalRead_mod(pin));
|
||||||
}
|
}
|
||||||
if (multi_name_pin == false && extended) pwm_details(pin); // report PWM capabilities only on the first pass & only if doing an extended report
|
if (!multi_name_pin && extended) pwm_details(pin); // report PWM capabilities only on the first pass & only if doing an extended report
|
||||||
}
|
}
|
||||||
SERIAL_EOL;
|
SERIAL_EOL;
|
||||||
} // end of IF
|
} // end of IF
|
||||||
} // end of for loop
|
} // end of for loop
|
||||||
|
|
||||||
if (found == false) {
|
if (!found) {
|
||||||
sprintf(buffer, "PIN:% 3d ", pin);
|
sprintf(buffer, "PIN: %3d ", pin);
|
||||||
SERIAL_ECHO(buffer);
|
SERIAL_ECHO(buffer);
|
||||||
print_port(pin);
|
print_port(pin);
|
||||||
if (IS_ANALOG(pin)) {
|
if (IS_ANALOG(pin)) {
|
||||||
sprintf(buffer, " (A%2d) ", int(pin - analogInputToDigitalPin(0))); // analog pin number
|
sprintf(buffer, " (A%2d) ", int(pin - analogInputToDigitalPin(0))); // analog pin number
|
||||||
SERIAL_ECHO(buffer);
|
SERIAL_ECHO(buffer);
|
||||||
}
|
}
|
||||||
else SERIAL_ECHOPGM(" "); // add padding if not an analog pin
|
else
|
||||||
|
SERIAL_ECHOPGM(" "); // add padding if not an analog pin
|
||||||
SERIAL_ECHOPGM("<unused/unknown>");
|
SERIAL_ECHOPGM("<unused/unknown>");
|
||||||
if (get_pinMode(pin)) {
|
if (get_pinMode(pin))
|
||||||
SERIAL_PROTOCOLPAIR(" Output = ", digitalRead_mod(pin));
|
SERIAL_PROTOCOLPAIR(" Output = ", digitalRead_mod(pin));
|
||||||
}
|
|
||||||
else {
|
else {
|
||||||
if (IS_ANALOG(pin)) {
|
if (IS_ANALOG(pin)) {
|
||||||
sprintf(buffer, " Analog in =% 5d", analogRead(pin - analogInputToDigitalPin(0)));
|
sprintf(buffer, " Analog in = %5d", analogRead(pin - analogInputToDigitalPin(0)));
|
||||||
SERIAL_ECHO(buffer);
|
SERIAL_ECHO(buffer);
|
||||||
}
|
}
|
||||||
else {
|
else
|
||||||
SERIAL_ECHOPGM(" "); // add padding if not an analog pin
|
SERIAL_ECHOPGM(" "); // add padding if not an analog pin
|
||||||
}
|
|
||||||
SERIAL_PROTOCOLPAIR(" Input = ", digitalRead_mod(pin));
|
SERIAL_PROTOCOLPAIR(" Input = ", digitalRead_mod(pin));
|
||||||
}
|
}
|
||||||
// if (!pwm_status(pin)) SERIAL_ECHOPGM(" "); // add padding if it's not a PWM pin
|
//if (!pwm_status(pin)) SERIAL_ECHOCHAR(' '); // add padding if it's not a PWM pin
|
||||||
if (extended) pwm_details(pin); // report PWM capabilities only if doing an extended report
|
if (extended) pwm_details(pin); // report PWM capabilities only if doing an extended report
|
||||||
SERIAL_EOL;
|
SERIAL_EOL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inline void report_pin_state(int8_t pin) {
|
inline void report_pin_state(int8_t pin) {
|
||||||
|
|
||||||
report_pin_state_extended(pin, false, false);
|
report_pin_state_extended(pin, false, false);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -346,8 +346,6 @@ ISR(TIMER1_COMPA_vect) {
|
||||||
|
|
||||||
void Stepper::isr() {
|
void Stepper::isr() {
|
||||||
|
|
||||||
static uint32_t step_remaining = 0;
|
|
||||||
|
|
||||||
uint16_t ocr_val;
|
uint16_t ocr_val;
|
||||||
|
|
||||||
#define ENDSTOP_NOMINAL_OCR_VAL 3000 // check endstops every 1.5ms to guarantee two stepper ISRs within 5ms for BLTouch
|
#define ENDSTOP_NOMINAL_OCR_VAL 3000 // check endstops every 1.5ms to guarantee two stepper ISRs within 5ms for BLTouch
|
||||||
|
|
@ -364,6 +362,7 @@ void Stepper::isr() {
|
||||||
#if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
|
#if ENABLED(ENDSTOP_INTERRUPTS_FEATURE)
|
||||||
#define SPLIT(L) _SPLIT(L)
|
#define SPLIT(L) _SPLIT(L)
|
||||||
#else // sample endstops in between step pulses
|
#else // sample endstops in between step pulses
|
||||||
|
static uint32_t step_remaining = 0;
|
||||||
#define SPLIT(L) do { \
|
#define SPLIT(L) do { \
|
||||||
_SPLIT(L); \
|
_SPLIT(L); \
|
||||||
if (ENDSTOPS_ENABLED && L > ENDSTOP_NOMINAL_OCR_VAL) { \
|
if (ENDSTOPS_ENABLED && L > ENDSTOP_NOMINAL_OCR_VAL) { \
|
||||||
|
|
@ -391,7 +390,7 @@ void Stepper::isr() {
|
||||||
_ENABLE_ISRs(); // re-enable ISRs
|
_ENABLE_ISRs(); // re-enable ISRs
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
# endif
|
#endif
|
||||||
|
|
||||||
if (cleaning_buffer_counter) {
|
if (cleaning_buffer_counter) {
|
||||||
--cleaning_buffer_counter;
|
--cleaning_buffer_counter;
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
/*
|
/**
|
||||||
* Marlin 3D Printer Firmware
|
* Marlin 3D Printer Firmware
|
||||||
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||||
*
|
*
|
||||||
|
|
|
||||||
Reference in a new issue