Browse Source

Merge pull request #1638 from AnHardt/warning4

delta[3] not used when DELTA not defined.
Scott Lahteine 10 years ago
parent
commit
8664c6d465
1 changed files with 1 additions and 4 deletions
  1. 1
    4
      Marlin/Marlin_main.cpp

+ 1
- 4
Marlin/Marlin_main.cpp View File

@@ -357,6 +357,7 @@ int fanSpeed = 0;
357 357
 
358 358
 #ifdef SCARA
359 359
   float axis_scaling[3] = { 1, 1, 1 };    // Build size scaling, default to 1
360
+  static float delta[3] = { 0, 0, 0 };		
360 361
 #endif        
361 362
 
362 363
 bool cancel_heatup = false;
@@ -383,10 +384,6 @@ const char echomagic[] PROGMEM = "echo:";
383 384
 const char axis_codes[NUM_AXIS] = {'X', 'Y', 'Z', 'E'};
384 385
 static float destination[NUM_AXIS] = { 0, 0, 0, 0 };
385 386
 
386
-#ifndef DELTA
387
-  static float delta[3] = { 0, 0, 0 };
388
-#endif
389
-
390 387
 static float offset[3] = { 0, 0, 0 };
391 388
 static bool home_all_axis = true;
392 389
 static float feedrate = 1500.0, next_feedrate, saved_feedrate;

Loading…
Cancel
Save