0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1638 from AnHardt/warning4

Browse source 
delta[3] not used when DELTA not defined.
This commit is contained in:
Scott Lahteine 2015-03-18 19:07:55 -07:00
parent 10711ccc6a f8c4d43886
commit 8664c6d465
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Marlin/Marlin_main.cpp
View file

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