Browse Source

Only compile the new extruder offset code if you have multiple extruders.

daid303 11 years ago
parent
commit
4eb81a69e6
1 changed files with 10 additions and 4 deletions
  1. 10
    4
      Marlin/Marlin_main.cpp

+ 10
- 4
Marlin/Marlin_main.cpp View File

@@ -157,11 +157,13 @@ float add_homeing[3]={0,0,0};
157 157
 float min_pos[3] = { X_MIN_POS, Y_MIN_POS, Z_MIN_POS };
158 158
 float max_pos[3] = { X_MAX_POS, Y_MAX_POS, Z_MAX_POS };
159 159
 // Extruder offset, only in XY plane
160
+#if EXTRUDERS > 1
160 161
 float extruder_offset[2][EXTRUDERS] = { 
161 162
 #if defined(EXTRUDER_OFFSET_X) && defined(EXTRUDER_OFFSET_Y)
162 163
   EXTRUDER_OFFSET_X, EXTRUDER_OFFSET_Y 
163 164
 #endif
164
-}; 
165
+}; 
166
+#endif
165 167
 uint8_t active_extruder = 0;
166 168
 int fanSpeed=0;
167 169
 
@@ -1378,7 +1380,8 @@ void process_commands()
1378 1380
       }
1379 1381
       
1380 1382
     }break;
1381
-    #endif // FWRETRACT
1383
+    #endif // FWRETRACT
1384
+    #if EXTRUDERS > 1
1382 1385
     case 218: // M218 - set hotend offset (in mm), T<extruder_number> X<offset_on_X> Y<offset_on_Y>
1383 1386
     {
1384 1387
       if(setTargetedHotend(218)){
@@ -1402,7 +1405,8 @@ void process_commands()
1402 1405
          SERIAL_ECHO(extruder_offset[Y_AXIS][tmp_extruder]);
1403 1406
       }
1404 1407
       SERIAL_ECHOLN("");
1405
-    }break;
1408
+    }break;
1409
+    #endif
1406 1410
     case 220: // M220 S<factor in percent>- set speed factor override percentage
1407 1411
     {
1408 1412
       if(code_seen('S')) 
@@ -1734,6 +1738,7 @@ void process_commands()
1734 1738
           feedrate = next_feedrate;
1735 1739
         }
1736 1740
       }
1741
+      #if EXTRUDERS > 1
1737 1742
       if(tmp_extruder != active_extruder) {
1738 1743
         // Save current position to return to after applying extruder offset
1739 1744
         memcpy(destination, current_position, sizeof(destination));
@@ -1751,7 +1756,8 @@ void process_commands()
1751 1756
         if(make_move && Stopped == false) {
1752 1757
            prepare_move();
1753 1758
         }
1754
-      }
1759
+      }
1760
+      #endif
1755 1761
       SERIAL_ECHO_START;
1756 1762
       SERIAL_ECHO(MSG_ACTIVE_EXTRUDER);
1757 1763
       SERIAL_PROTOCOLLN((int)active_extruder);

Loading…
Cancel
Save