Browse Source

Tweak 'echo_not_entered' used by MBL's G29

Scott Lahteine 6 years ago
parent
commit
bed15fcd81
1 changed files with 9 additions and 17 deletions
  1. 9
    17
      Marlin/src/gcode/bedlevel/mbl/G29.cpp

+ 9
- 17
Marlin/src/gcode/bedlevel/mbl/G29.cpp View File

@@ -39,7 +39,7 @@
39 39
 #include "../../../module/stepper.h"
40 40
 
41 41
 // Save 130 bytes with non-duplication of PSTR
42
-void echo_not_entered() { SERIAL_PROTOCOLLNPGM(" not entered."); }
42
+inline void echo_not_entered(const char c) { SERIAL_CHAR(c); SERIAL_PROTOCOLLNPGM(" not entered."); }
43 43
 
44 44
 /**
45 45
  * G29: Mesh-based Z probe, probes a grid and produces a
@@ -165,10 +165,8 @@ void GcodeSuite::G29() {
165 165
           return;
166 166
         }
167 167
       }
168
-      else {
169
-        SERIAL_CHAR('X'); echo_not_entered();
170
-        return;
171
-      }
168
+      else
169
+        return echo_not_entered('X');
172 170
 
173 171
       if (parser.seenval('Y')) {
174 172
         py = parser.value_int() - 1;
@@ -178,26 +176,20 @@ void GcodeSuite::G29() {
178 176
           return;
179 177
         }
180 178
       }
181
-      else {
182
-        SERIAL_CHAR('Y'); echo_not_entered();
183
-        return;
184
-      }
179
+      else
180
+        return echo_not_entered('Y');
185 181
 
186 182
       if (parser.seenval('Z'))
187 183
         mbl.z_values[px][py] = parser.value_linear_units();
188
-      else {
189
-        SERIAL_CHAR('Z'); echo_not_entered();
190
-        return;
191
-      }
184
+      else
185
+        return echo_not_entered('Z');
192 186
       break;
193 187
 
194 188
     case MeshSetZOffset:
195 189
       if (parser.seenval('Z'))
196 190
         mbl.z_offset = parser.value_linear_units();
197
-      else {
198
-        SERIAL_CHAR('Z'); echo_not_entered();
199
-        return;
200
-      }
191
+      else
192
+        return echo_not_entered('Z');
201 193
       break;
202 194
 
203 195
     case MeshReset:

Loading…
Cancel
Save