From 4eb81a69e668f0b9d7b64c837390eb1b1f9004e4 Mon Sep 17 00:00:00 2001 From: daid303 Date: Wed, 27 Feb 2013 12:32:07 +0100 Subject: [PATCH] Only compile the new extruder offset code if you have multiple extruders. --- Marlin/Marlin_main.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 0ea6ccd..3725546 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -157,11 +157,13 @@ float add_homeing[3]={0,0,0}; float min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS }; float max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS }; // Extruder offset, only in XY plane +#if EXTRUDERS > 1 float extruder_offset[2][EXTRUDERS] = { #if defined(EXTRUDER_OFFSET_X) && defined(EXTRUDER_OFFSET_Y) EXTRUDER_OFFSET_X, EXTRUDER_OFFSET_Y #endif -}; +}; +#endif uint8_t active_extruder = 0; int fanSpeed=0; @@ -1378,7 +1380,8 @@ void process_commands() } }break; - #endif // FWRETRACT + #endif // FWRETRACT + #if EXTRUDERS > 1 case 218: // M218 - set hotend offset (in mm), T X Y { if(setTargetedHotend(218)){ @@ -1402,7 +1405,8 @@ void process_commands() SERIAL_ECHO(extruder_offset[Y_AXIS][tmp_extruder]); } SERIAL_ECHOLN(""); - }break; + }break; + #endif case 220: // M220 S- set speed factor override percentage { if(code_seen('S')) @@ -1734,6 +1738,7 @@ void process_commands() feedrate = next_feedrate; } } + #if EXTRUDERS > 1 if(tmp_extruder != active_extruder) { // Save current position to return to after applying extruder offset memcpy(destination, current_position, sizeof(destination)); @@ -1751,7 +1756,8 @@ void process_commands() if(make_move && Stopped == false) { prepare_move(); } - } + } + #endif SERIAL_ECHO_START; SERIAL_ECHO(MSG_ACTIVE_EXTRUDER); SERIAL_PROTOCOLLN((int)active_extruder);