bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

FWRETRACT as a feature

Browse Source
This commit is contained in:
Scott Lahteine
2017-09-07 22:40:32 -05:00
parent 722786966a
commit a98e9874db
12 changed files with 362 additions and 242 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/src/gcode/feature/fwretract/G10_G11.h → Marlin/src/gcode/feature/fwretract/G10_G11.cpp
View File

@ -20,15 +20,23 @@
*
*/
#include "../../../inc/MarlinConfig.h"
#if ENABLED(FWRETRACT)
#include "../../../feature/fwretract.h"
#include "../../gcode.h"
#include "../../../module/motion.h"
/**
* G10 - Retract filament according to settings of M207
*/
void gcode_G10() {
void GcodeSuite::G10() {
#if EXTRUDERS > 1
const bool rs = parser.boolval('S');
retracted_swap[active_extruder] = rs; // Use 'S' for swap, default to false
fwretract.retracted_swap[active_extruder] = rs; // Use 'S' for swap, default to false
#endif
retract(true
fwretract.retract(true
#if EXTRUDERS > 1
, rs
#endif
@ -38,4 +46,6 @@ void gcode_G10() {
/**
* G11 - Recover filament according to settings of M208
*/
void gcode_G11() { retract(false); }
void GcodeSuite::G11() { fwretract.retract(false); }
#endif // FWRETRACT

19
Marlin/src/gcode/feature/fwretract/M207.h → Marlin/src/gcode/feature/fwretract/M207.cpp
View File

@ -20,6 +20,13 @@
*
*/
#include "../../../inc/MarlinConfig.h"
#if ENABLED(FWRETRACT)
#include "../../../feature/fwretract.h"
#include "../../gcode.h"
/**
* M207: Set firmware retraction values
*
@ -28,9 +35,11 @@
* F[units/min] retract_feedrate_mm_s
* Z[units] retract_zlift
*/
void gcode_M207() {
if (parser.seen('S')) retract_length = parser.value_axis_units(E_AXIS);
if (parser.seen('F')) retract_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
if (parser.seen('Z')) retract_zlift = parser.value_linear_units();
if (parser.seen('W')) swap_retract_length = parser.value_axis_units(E_AXIS);
void GcodeSuite::M207() {
if (parser.seen('S')) fwretract.retract_length = parser.value_axis_units(E_AXIS);
if (parser.seen('F')) fwretract.retract_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
if (parser.seen('Z')) fwretract.retract_zlift = parser.value_linear_units();
if (parser.seen('W')) fwretract.swap_retract_length = parser.value_axis_units(E_AXIS);
}
#endif // FWRETRACT

19
Marlin/src/gcode/feature/fwretract/M208.h → Marlin/src/gcode/feature/fwretract/M208.cpp
View File

@ -20,6 +20,13 @@
*
*/
#include "../../../inc/MarlinConfig.h"
#if ENABLED(FWRETRACT)
#include "../../../feature/fwretract.h"
#include "../../gcode.h"
/**
* M208: Set firmware un-retraction values
*
@ -28,9 +35,11 @@
* F[units/min] retract_recover_feedrate_mm_s
* R[units/min] swap_retract_recover_feedrate_mm_s
*/
void gcode_M208() {
if (parser.seen('S')) retract_recover_length = parser.value_axis_units(E_AXIS);
if (parser.seen('F')) retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
if (parser.seen('R')) swap_retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
if (parser.seen('W')) swap_retract_recover_length = parser.value_axis_units(E_AXIS);
void GcodeSuite::M208() {
if (parser.seen('S')) fwretract.retract_recover_length = parser.value_axis_units(E_AXIS);
if (parser.seen('F')) fwretract.retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
if (parser.seen('R')) fwretract.swap_retract_recover_feedrate_mm_s = MMM_TO_MMS(parser.value_axis_units(E_AXIS));
if (parser.seen('W')) fwretract.swap_retract_recover_length = parser.value_axis_units(E_AXIS);
}
#endif // FWRETRACT

15
Marlin/src/gcode/feature/fwretract/M209.h → Marlin/src/gcode/feature/fwretract/M209.cpp
View File

@ -20,16 +20,25 @@
*
*/
#include "../../../inc/MarlinConfig.h"
#if ENABLED(FWRETRACT)
#include "../../../feature/fwretract.h"
#include "../../gcode.h"
/**
* M209: Enable automatic retract (M209 S1)
* For slicers that don't support G10/11, reversed extrude-only
* moves will be classified as retraction.
*/
void gcode_M209() {
void GcodeSuite::M209() {
if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
if (parser.seen('S')) {
autoretract_enabled = parser.value_bool();
for (uint8_t i = 0; i < EXTRUDERS; i++) retracted[i] = false;
fwretract.autoretract_enabled = parser.value_bool();
for (uint8_t i = 0; i < EXTRUDERS; i++) fwretract.retracted[i] = false;
}
}
}
#endif // FWRETRACT

14
Marlin/src/gcode/gcode.cpp
View File

@ -754,16 +754,10 @@ void GcodeSuite::process_next_command() {
#endif
#if ENABLED(FWRETRACT)
case 207: // M207: Set Retract Length, Feedrate, and Z lift
M207();
break;
case 208: // M208: Set Recover (unretract) Additional Length and Feedrate
M208();
break;
case 209: // M209: Turn Automatic Retract Detection on/off
if (MIN_AUTORETRACT <= MAX_AUTORETRACT) M209();
break;
#endif // FWRETRACT
case 207: M207(); break; // M207: Set Retract Length, Feedrate, and Z lift
case 208: M208(); break; // M208: Set Recover (unretract) Additional Length and Feedrate
case 209: if (MIN_AUTORETRACT <= MAX_AUTORETRACT) M209(); break; // M209: Turn Automatic Retract Detection on/off
#endif
case 211: // M211: Enable, Disable, and/or Report software endstops
gcode_M211();

12
Marlin/src/gcode/motion/G0_G1.cpp
View File

@ -25,6 +25,10 @@
#include "../../Marlin.h"
#if ENABLED(FWRETRACT)
#include "../../feature/fwretract.h"
#endif
#include "../../sd/cardreader.h"
extern float destination[XYZE];
@ -41,18 +45,20 @@ void GcodeSuite::G0_G1(
get_destination_from_command(); // For X Y Z E F
#if ENABLED(FWRETRACT)
if (MIN_AUTORETRACT <= MAX_AUTORETRACT) {
// When M209 Autoretract is enabled, convert E-only moves to firmware retract/recover moves
if (autoretract_enabled && parser.seen('E') && !(parser.seen('X') || parser.seen('Y') || parser.seen('Z'))) {
if (fwretract.autoretract_enabled && parser.seen('E') && !(parser.seen('X') || parser.seen('Y') || parser.seen('Z'))) {
const float echange = destination[E_AXIS] - current_position[E_AXIS];
// Is this a retract or recover move?
if (WITHIN(FABS(echange), MIN_AUTORETRACT, MAX_AUTORETRACT) && retracted[active_extruder] == (echange > 0.0)) {
if (WITHIN(FABS(echange), MIN_AUTORETRACT, MAX_AUTORETRACT) && fwretract.retracted[active_extruder] == (echange > 0.0)) {
current_position[E_AXIS] = destination[E_AXIS]; // Hide a G1-based retract/recover from calculations
sync_plan_position_e(); // AND from the planner
return retract(echange < 0.0); // Firmware-based retract/recover (double-retract ignored)
return fwretract.retract(echange < 0.0); // Firmware-based retract/recover (double-retract ignored)
}
}
}
#endif // FWRETRACT
#if IS_SCARA