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

Compile error fix! Fix for merge artifacts.

Browse Source
This commit is contained in:
Edward Patel
2015-04-05 04:16:16 +02:00
parent 0e6514e7bd
commit 2f0081bbb5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/Marlin_main.cpp
View File

@@ -2045,6 +2045,9 @@ inline void gcode_G28() {
return; return;
} }
int ix, iy;
float z;
switch(state) { switch(state) {
case MeshReport: case MeshReport:
if (mbl.active) { if (mbl.active) {
@@ -2078,7 +2081,6 @@ inline void gcode_G28() {
SERIAL_PROTOCOLLNPGM("Start mesh probing with \"G29 S1\" first."); SERIAL_PROTOCOLLNPGM("Start mesh probing with \"G29 S1\" first.");
return; return;
} }
int ix, iy;
if (probe_point == 0) { if (probe_point == 0) {
// Set Z to a positive value before recording the first Z. // Set Z to a positive value before recording the first Z.
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
@@ -2115,8 +2117,6 @@ inline void gcode_G28() {
break; break;
case MeshSet: case MeshSet:
int ix, iy;
float z;
if (code_seen('X') || code_seen('x')) { if (code_seen('X') || code_seen('x')) {
ix = code_value_long()-1; ix = code_value_long()-1;
if (ix < 0 || ix >= MESH_NUM_X_POINTS) { if (ix < 0 || ix >= MESH_NUM_X_POINTS) {