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

IDEX clean up (#11690)

Browse Source
This commit is contained in:
Roxy-3D
2018-09-02 10:18:59 -05:00
committed by GitHub
parent 8c11220042
commit 7680b64aa6
15 changed files with 4517 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
Marlin/src/gcode/calibrate/G28.cpp
View File

@ -174,6 +174,11 @@ void GcodeSuite::G28(const bool always_home_all) {
}
#endif
#if ENABLED(DUAL_X_CARRIAGE)
bool IDEX_saved_duplication_state = extruder_duplication_enabled;
DualXMode IDEX_saved_mode = dual_x_carriage_mode;
#endif
#if ENABLED(MARLIN_DEV_MODE)
if (parser.seen('S')) {
LOOP_XYZ(a) set_axis_is_at_home((AxisEnum)a);
@ -229,7 +234,7 @@ void GcodeSuite::G28(const bool always_home_all) {
tool_change(0, 0, true);
#endif
#if ENABLED(DUAL_X_CARRIAGE)
#if ENABLED(DUAL_X_CARRIAGE) || ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)
extruder_duplication_enabled = false;
#endif
@ -354,6 +359,39 @@ void GcodeSuite::G28(const bool always_home_all) {
#endif // !DELTA (G28)
/**
*
* This code block allows the DXC mode to survive (and function) across a G28 if it is an IDEX
* machine and the printer is currently in DXC_DUPLICATION_MODE.
* This is important because it lets a user use the LCD Panel to set an IDEX Duplication mode, and
* then print a standard GCode file that contains a single print that does a G28 and has no other
* IDEX specific commands in it.
*
**/
#if ENABLED(DUAL_X_CARRIAGE)
if (dual_x_carriage_mode == DXC_DUPLICATION_MODE) {
// Always home the 2nd (right) extruder first
active_extruder = 1;
homeaxis(X_AXIS);
// Remember this extruder's position for later tool change
inactive_extruder_x_pos = current_position[X_AXIS];
// Home the 1st (left) extruder
active_extruder = 0;
homeaxis(X_AXIS);
// Consider the active extruder to be parked
COPY(raised_parked_position, current_position);
delayed_move_time = 0;
active_extruder_parked = true;
extruder_duplication_enabled = IDEX_saved_duplication_state;
dual_x_carriage_mode = IDEX_saved_mode;
}
#endif
endstops.not_homing();
#if ENABLED(DELTA) && ENABLED(DELTA_HOME_TO_SAFE_ZONE)

75
Marlin/src/gcode/control/M605.cpp
View File

@ -27,24 +27,37 @@
#include "../gcode.h"
#include "../../module/motion.h"
#include "../../module/stepper.h"
#include "../../module/tool_change.h"
#include "../../module/planner.h"
#if ENABLED(DUAL_X_CARRIAGE)
/**
* M605: Set dual x-carriage movement mode
*
* M605 : Restore user specified DEFAULT_DUAL_X_CARRIAGE_MODE
* M605 S0: Full control mode. The slicer has full control over x-carriage movement
* M605 S1: Auto-park mode. The inactive head will auto park/unpark without slicer involvement
* M605 S2 [Xnnn] [Rmmm]: Duplication mode. The second extruder will duplicate the first with nnn
* units x-offset and an optional differential hotend temperature of
* mmm degrees. E.g., with "M605 S2 X100 R2" the second extruder will duplicate
* the first with a spacing of 100mm in the x direction and 2 degrees hotter.
* M605 S3 : Enable Symmetric Duplication mode. The second extruder will duplicate the first extruder's
* movement similar to the M605 S2 mode. However, the second extruder will be producing
* a mirror image of the first extruder. The initial x-offset and temperature differential are
* set with M605 S2 [Xnnn] [Rmmm] and then followed with a M605 S3 to start the mirrored movement.
* M605 W : IDEX What? command.
*
* Note: the X axis should be homed after changing dual x-carriage mode.
*/
void GcodeSuite::M605() {
planner.synchronize();
if (parser.seen('S')) dual_x_carriage_mode = (DualXMode)parser.value_byte();
if (parser.seen('S')) {
DualXMode previous_mode, requested_mode = (DualXMode)parser.value_byte();
previous_mode = dual_x_carriage_mode;
dual_x_carriage_mode = (DualXMode)parser.value_byte();
switch (dual_x_carriage_mode) {
case DXC_FULL_CONTROL_MODE:
case DXC_AUTO_PARK_MODE:
@ -52,16 +65,7 @@
case DXC_DUPLICATION_MODE:
if (parser.seen('X')) duplicate_extruder_x_offset = MAX(parser.value_linear_units(), X2_MIN_POS - x_home_pos(0));
if (parser.seen('R')) duplicate_extruder_temp_offset = parser.value_celsius_diff();
SERIAL_ECHO_START();
SERIAL_ECHOPGM(MSG_HOTEND_OFFSET);
SERIAL_CHAR(' ');
SERIAL_ECHO(hotend_offset[X_AXIS][0]);
SERIAL_CHAR(',');
SERIAL_ECHO(hotend_offset[Y_AXIS][0]);
SERIAL_CHAR(' ');
SERIAL_ECHO(duplicate_extruder_x_offset);
SERIAL_CHAR(',');
SERIAL_ECHOLN(hotend_offset[Y_AXIS][1]);
if (active_extruder != 0) tool_change(0);
break;
default:
dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
@ -70,6 +74,55 @@
active_extruder_parked = false;
extruder_duplication_enabled = false;
delayed_move_time = 0;
} else
if (!parser.seen('W')) // if no S or W parameter, the DXC mode gets reset to the user's default
dual_x_carriage_mode = DEFAULT_DUAL_X_CARRIAGE_MODE;
if (parser.seen('W')) {
SERIAL_ECHO_START();
SERIAL_ECHOPGM("IDEX mode: ");
switch (dual_x_carriage_mode) {
case DXC_FULL_CONTROL_MODE:
SERIAL_ECHOPGM("DXC_FULL_CONTROL_MODE\n");
break;
case DXC_AUTO_PARK_MODE:
SERIAL_ECHOPGM("DXC_AUTO_PARK_MODE\n");
break;
case DXC_DUPLICATION_MODE:
SERIAL_ECHOPGM("DXC_DUPLICATION_MODE\n");
break;
}
SERIAL_ECHOPGM("Active Ext: ");
SERIAL_ECHO((int) active_extruder);
if (active_extruder_parked == false)
SERIAL_ECHOPGM(" NOT ");
SERIAL_ECHOPGM(" parked.\n");
SERIAL_ECHOPGM("active_extruder_x_pos: ");
SERIAL_ECHO( current_position[X_AXIS]);
SERIAL_ECHOPGM(" inactive_extruder_x_pos: ");
SERIAL_ECHO( inactive_extruder_x_pos);
SERIAL_ECHOPGM("\n1st extruder x_home_pos(): ");
SERIAL_ECHO(x_home_pos(0));
SERIAL_ECHOPGM("\n2nd extruder x_home_pos(): ");
SERIAL_ECHO(x_home_pos(1));
SERIAL_ECHOPGM("\nextruder_duplication_enabled: ");
SERIAL_ECHO(extruder_duplication_enabled);
SERIAL_ECHOPGM("\nduplicate_extruder_x_offset: ");
SERIAL_ECHO(duplicate_extruder_x_offset);
SERIAL_ECHOPGM("\nduplicate_extruder_temp_offset: ");
SERIAL_ECHO(duplicate_extruder_temp_offset);
SERIAL_ECHOPGM("\ndelayed_move_time: ");
SERIAL_ECHO(delayed_move_time);
SERIAL_ECHOPGM("\n");
}
}
#elif ENABLED(DUAL_NOZZLE_DUPLICATION_MODE)

13
Marlin/src/gcode/queue.cpp
View File

@ -138,6 +138,17 @@ inline bool _enqueuecommand(const char* cmd, bool say_ok=false
* Enqueue with Serial Echo
*/
bool enqueue_and_echo_command(const char* cmd) {
//SERIAL_ECHO("enqueue_and_echo_command(\"");
//SERIAL_ECHO(cmd);
//SERIAL_ECHO("\") \n");
//
if ( *cmd == 0 || *cmd == '\n' || *cmd == 'r')
//{
//SERIAL_ECHO("Null command found... Did not queue!\n");
return true;
//}
if (_enqueuecommand(cmd)) {
SERIAL_ECHO_START();
SERIAL_ECHOPAIR(MSG_ENQUEUEING, cmd);
@ -155,7 +166,7 @@ bool enqueue_and_echo_command(const char* cmd) {
static bool drain_injected_commands_P() {
if (injected_commands_P != NULL) {
size_t i = 0;
char c, cmd[30];
char c, cmd[60];
strncpy_P(cmd, injected_commands_P, sizeof(cmd) - 1);
cmd[sizeof(cmd) - 1] = '\0';
while ((c = cmd[i]) && c != '\n') i++; // find the end of this gcode command