From 2a88a3fd33c3b293a23ed8f82c8e7de86d367c2f Mon Sep 17 00:00:00 2001 From: Luc Van Daele Date: Wed, 18 Oct 2017 21:19:01 +0200 Subject: [PATCH] boolval revised (#8017) --- Marlin/Marlin_main.cpp | 8 ++++---- Marlin/gcode.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 21fff14eb..41c06e3eb 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -5296,7 +5296,7 @@ void home_all_axes() { gcode_G28(true); } * * X Probe X position (default current X) * Y Probe Y position (default current Y) - * S0 Leave the probe deployed + * E Engage the probe for each probe */ inline void gcode_G30() { 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); } setup_for_endstop_or_probe_move(); - const float measured_z = probe_pt(xpos, ypos, parser.boolval('S', true), 1); + const float measured_z = probe_pt(xpos, ypos, parser.boolval('E'), 1); if (!isnan(measured_z)) { SERIAL_PROTOCOLPAIR("Bed X: ", FIXFLOAT(xpos)); @@ -5439,7 +5439,7 @@ void home_all_axes() { gcode_G28(true); } return; } - const bool towers_set = parser.boolval('T', true), + const bool towers_set = !parser.boolval('T'), stow_after_each = parser.boolval('E'), _0p_calibration = probe_points == 0, _1p_calibration = probe_points == 1, @@ -9644,7 +9644,7 @@ inline void gcode_M502() { * M503: print settings currently in memory */ inline void gcode_M503() { - (void)settings.report(!parser.boolval('S', true)); + (void)settings.report(parser.boolval('S')); } #endif diff --git a/Marlin/gcode.h b/Marlin/gcode.h index 36549b851..8c255ef7b 100644 --- a/Marlin/gcode.h +++ b/Marlin/gcode.h @@ -307,7 +307,7 @@ public: // Provide simple value accessors with default option FORCE_INLINE static float floatval(const char c, const float dval=0.0) { return seenval(c) ? value_float() : dval; } - FORCE_INLINE static bool boolval(const char c, const bool dval=false) { return seen(c) ? value_bool() : dval; } + FORCE_INLINE static bool boolval(const char c) { return seenval(c) ? value_bool() : seen(c); } FORCE_INLINE static uint8_t byteval(const char c, const uint8_t dval=0) { return seenval(c) ? value_byte() : dval; } FORCE_INLINE static int16_t intval(const char c, const int16_t dval=0) { return seenval(c) ? value_int() : dval; } FORCE_INLINE static uint16_t ushortval(const char c, const uint16_t dval=0) { return seenval(c) ? value_ushort() : dval; }