Browse Source

boolval revised (#8017)

Luc Van Daele 7 years ago
parent
commit
2a88a3fd33
2 changed files with 5 additions and 5 deletions
  1. 4
    4
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/gcode.h

+ 4
- 4
Marlin/Marlin_main.cpp View File

@@ -5296,7 +5296,7 @@ void home_all_axes() { gcode_G28(true); }
5296 5296
    *
5297 5297
    *   X   Probe X position (default current X)
5298 5298
    *   Y   Probe Y position (default current Y)
5299
-   *   S0  Leave the probe deployed
5299
+   *   E   Engage the probe for each probe
5300 5300
    */
5301 5301
   inline void gcode_G30() {
5302 5302
     const float xpos = parser.linearval('X', current_position[X_AXIS] + X_PROBE_OFFSET_FROM_EXTRUDER),
@@ -5311,7 +5311,7 @@ void home_all_axes() { gcode_G28(true); }
5311 5311
 
5312 5312
     setup_for_endstop_or_probe_move();
5313 5313
 
5314
-    const float measured_z = probe_pt(xpos, ypos, parser.boolval('S', true), 1);
5314
+    const float measured_z = probe_pt(xpos, ypos, parser.boolval('E'), 1);
5315 5315
 
5316 5316
     if (!isnan(measured_z)) {
5317 5317
       SERIAL_PROTOCOLPAIR("Bed X: ", FIXFLOAT(xpos));
@@ -5439,7 +5439,7 @@ void home_all_axes() { gcode_G28(true); }
5439 5439
         return;
5440 5440
       }
5441 5441
 
5442
-      const bool towers_set           = parser.boolval('T', true),
5442
+      const bool towers_set           = !parser.boolval('T'),
5443 5443
                  stow_after_each      = parser.boolval('E'),
5444 5444
                  _0p_calibration      = probe_points == 0,
5445 5445
                  _1p_calibration      = probe_points == 1,
@@ -9644,7 +9644,7 @@ inline void gcode_M502() {
9644 9644
    * M503: print settings currently in memory
9645 9645
    */
9646 9646
   inline void gcode_M503() {
9647
-    (void)settings.report(!parser.boolval('S', true));
9647
+    (void)settings.report(parser.boolval('S'));
9648 9648
   }
9649 9649
 #endif
9650 9650
 

+ 1
- 1
Marlin/gcode.h View File

@@ -307,7 +307,7 @@ public:
307 307
 
308 308
   // Provide simple value accessors with default option
309 309
   FORCE_INLINE static float    floatval(const char c, const float dval=0.0)   { return seenval(c) ? value_float()        : dval; }
310
-  FORCE_INLINE static bool     boolval(const char c, const bool dval=false)   { return seen(c)    ? value_bool()         : dval; }
310
+  FORCE_INLINE static bool     boolval(const char c)                          { return seenval(c) ? value_bool()      : seen(c); }
311 311
   FORCE_INLINE static uint8_t  byteval(const char c, const uint8_t dval=0)    { return seenval(c) ? value_byte()         : dval; }
312 312
   FORCE_INLINE static int16_t  intval(const char c, const int16_t dval=0)     { return seenval(c) ? value_int()          : dval; }
313 313
   FORCE_INLINE static uint16_t ushortval(const char c, const uint16_t dval=0) { return seenval(c) ? value_ushort()       : dval; }

Loading…
Cancel
Save