3DPrinting/MarlinFirmware
0
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2025-01-31 06:02:16 +00:00
Code Issues Releases Wiki Activity

boolval revised (#8017)

Browse source
This commit is contained in:
Luc Van Daele 2017-10-18 21:19:01 +02:00 committed by Roxy-3D
parent 84470f6b2a
commit 2a88a3fd33
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Marlin/Marlin_main.cpp
View file

@ -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

2
Marlin/gcode.h
View file

@ -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; }