Skip to content

Commit dc8cc96

Browse files
DerAndere1LCh-77
DerAndere1
authored and
LCh-77
committed
🩹 Fix some parameters w/out values (MarlinFirmware#24051)
1 parent 90bbdb8 commit dc8cc96

File tree

16 files changed

+35
-62
lines changed

16 files changed

+35
-62
lines changed

‎Marlin/src/gcode/calibrate/M666.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
DEBUG_SECTION(log_M666, "M666", DEBUGGING(LEVELING));
4646
bool is_err = false, is_set = false;
4747
LOOP_NUM_AXES(i) {
48-
if (parser.seen(AXIS_CHAR(i))) {
48+
if (parser.seenval(AXIS_CHAR(i))) {
4949
is_set = true;
5050
const float v = parser.value_linear_units();
5151
if (v > 0)

‎Marlin/src/gcode/config/M281.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ void GcodeSuite::M281() {
4747
return;
4848
}
4949
#endif
50-
if (parser.seen('L')) servo_angles[servo_index][0] = parser.value_int();
51-
if (parser.seen('U')) servo_angles[servo_index][1] = parser.value_int();
50+
if (parser.seenval('L')) servo_angles[servo_index][0] = parser.value_int();
51+
if (parser.seenval('U')) servo_angles[servo_index][1] = parser.value_int();
5252
}
5353
else
5454
SERIAL_ERROR_MSG("Servo ", servo_index, " out of range");

‎Marlin/src/gcode/config/M304.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@
3636
*/
3737
void GcodeSuite::M304() {
3838
if (!parser.seen("PID")) return M304_report();
39-
if (parser.seen('P')) thermalManager.temp_bed.pid.Kp = parser.value_float();
40-
if (parser.seen('I')) thermalManager.temp_bed.pid.Ki = scalePID_i(parser.value_float());
41-
if (parser.seen('D')) thermalManager.temp_bed.pid.Kd = scalePID_d(parser.value_float());
39+
if (parser.seenval('P')) thermalManager.temp_bed.pid.Kp = parser.value_float();
40+
if (parser.seenval('I')) thermalManager.temp_bed.pid.Ki = scalePID_i(parser.value_float());
41+
if (parser.seenval('D')) thermalManager.temp_bed.pid.Kd = scalePID_d(parser.value_float());
4242
}
4343

4444
void GcodeSuite::M304_report(const bool forReplay/*=true*/) {

‎Marlin/src/gcode/config/M305.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,19 +52,19 @@ void GcodeSuite::M305() {
5252
if (t_index >= (USER_THERMISTORS) || (do_set && t_index < 0))
5353
SERIAL_ECHO_MSG("!Invalid index. (0 <= P <= ", USER_THERMISTORS - 1, ")");
5454
else if (do_set) {
55-
if (parser.seen('R')) // Pullup resistor value
55+
if (parser.seenval('R')) // Pullup resistor value
5656
if (!thermalManager.set_pull_up_res(t_index, parser.value_float()))
5757
SERIAL_ECHO_MSG("!Invalid series resistance. (0 < R < 1000000)");
5858

59-
if (parser.seen('T')) // Resistance at 25C
59+
if (parser.seenval('T')) // Resistance at 25C
6060
if (!thermalManager.set_res25(t_index, parser.value_float()))
6161
SERIAL_ECHO_MSG("!Invalid 25C resistance. (0 < T < 10000000)");
6262

63-
if (parser.seen('B')) // Beta value
63+
if (parser.seenval('B')) // Beta value
6464
if (!thermalManager.set_beta(t_index, parser.value_float()))
6565
SERIAL_ECHO_MSG("!Invalid beta. (0 < B < 1000000)");
6666

67-
if (parser.seen('C')) // Steinhart-Hart C coefficient
67+
if (parser.seenval('C')) // Steinhart-Hart C coefficient
6868
if (!thermalManager.set_sh_coeff(t_index, parser.value_float()))
6969
SERIAL_ECHO_MSG("!Invalid Steinhart-Hart C coeff. (-0.01 < C < +0.01)");
7070
} // If not setting then report parameters

‎Marlin/src/gcode/control/M17_M18_M84.cpp

+4-22
Original file line numberDiff line numberDiff line change
@@ -128,17 +128,8 @@ void GcodeSuite::M17() {
128128
stepper.enable_e_steppers();
129129
}
130130
#endif
131-
NUM_AXIS_CODE(
132-
if (parser.seen_test('X')) stepper.enable_axis(X_AXIS),
133-
if (parser.seen_test('Y')) stepper.enable_axis(Y_AXIS),
134-
if (parser.seen_test('Z')) stepper.enable_axis(Z_AXIS),
135-
if (parser.seen_test(AXIS4_NAME)) stepper.enable_axis(I_AXIS),
136-
if (parser.seen_test(AXIS5_NAME)) stepper.enable_axis(J_AXIS),
137-
if (parser.seen_test(AXIS6_NAME)) stepper.enable_axis(K_AXIS),
138-
if (parser.seen_test(AXIS7_NAME)) stepper.enable_axis(U_AXIS),
139-
if (parser.seen_test(AXIS8_NAME)) stepper.enable_axis(V_AXIS),
140-
if (parser.seen_test(AXIS9_NAME)) stepper.enable_axis(W_AXIS)
141-
);
131+
LOOP_NUM_AXES(a)
132+
if (parser.seen_test(AXIS_CHAR(a))) stepper.enable_axis((AxisEnum)a);
142133
}
143134
}
144135
else {
@@ -235,17 +226,8 @@ void GcodeSuite::M18_M84() {
235226
stepper.disable_e_steppers();
236227
}
237228
#endif
238-
NUM_AXIS_CODE(
239-
if (parser.seen_test('X')) stepper.disable_axis(X_AXIS),
240-
if (parser.seen_test('Y')) stepper.disable_axis(Y_AXIS),
241-
if (parser.seen_test('Z')) stepper.disable_axis(Z_AXIS),
242-
if (parser.seen_test(AXIS4_NAME)) stepper.disable_axis(I_AXIS),
243-
if (parser.seen_test(AXIS5_NAME)) stepper.disable_axis(J_AXIS),
244-
if (parser.seen_test(AXIS6_NAME)) stepper.disable_axis(K_AXIS),
245-
if (parser.seen_test(AXIS7_NAME)) stepper.disable_axis(U_AXIS),
246-
if (parser.seen_test(AXIS8_NAME)) stepper.disable_axis(V_AXIS),
247-
if (parser.seen_test(AXIS9_NAME)) stepper.disable_axis(W_AXIS)
248-
);
229+
LOOP_NUM_AXES(a)
230+
if (parser.seen_test(AXIS_CHAR(a))) stepper.disable_axis((AxisEnum)a);
249231
}
250232
}
251233
else

‎Marlin/src/gcode/control/M280.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void GcodeSuite::M280() {
4848
const int anew = parser.value_int();
4949
if (anew >= 0) {
5050
#if ENABLED(POLARGRAPH)
51-
if (parser.seen('T')) { // (ms) Total duration of servo move
51+
if (parser.seenval('T')) { // (ms) Total duration of servo move
5252
const int16_t t = constrain(parser.value_int(), 0, 10000);
5353
const int aold = servo[servo_index].read();
5454
millis_t now = millis();

‎Marlin/src/gcode/control/M3-M5.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
8989
// Laser power in inline mode
9090
cutter.inline_direction(is_M4); // Should always be unused
9191
#if ENABLED(SPINDLE_LASER_USE_PWM)
92-
if (parser.seen('O')) {
92+
if (parser.seenval('O')) {
9393
cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
9494
cutter.inline_ocr_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
9595
}

‎Marlin/src/gcode/control/M350_M351.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
*/
4242
void GcodeSuite::M350() {
4343
if (parser.seen('S')) LOOP_DISTINCT_AXES(i) stepper.microstep_mode(i, parser.value_byte());
44-
LOOP_LOGICAL_AXES(i) if (parser.seen(AXIS_CHAR(i))) stepper.microstep_mode(i, parser.value_byte());
44+
LOOP_LOGICAL_AXES(i) if (parser.seenval(AXIS_CHAR(i))) stepper.microstep_mode(i, parser.value_byte());
4545
TERN_(HAS_M350_B_PARAM, if (parser.seenval('B')) stepper.microstep_mode(E_AXIS + 1, parser.value_byte()));
4646
stepper.microstep_readings();
4747
}

‎Marlin/src/gcode/control/M605.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
void GcodeSuite::M605() {
6565
planner.synchronize();
6666

67-
if (parser.seen('S')) {
67+
if (parser.seenval('S')) {
6868
const DualXMode previous_mode = dual_x_carriage_mode;
6969

7070
dual_x_carriage_mode = (DualXMode)parser.value_byte();
@@ -78,8 +78,8 @@
7878

7979
case DXC_DUPLICATION_MODE:
8080
// Set the X offset, but no less than the safety gap
81-
if (parser.seen('X')) duplicate_extruder_x_offset = _MAX(parser.value_linear_units(), (X2_MIN_POS) - (X1_MIN_POS));
82-
if (parser.seen('R')) duplicate_extruder_temp_offset = parser.value_celsius_diff();
81+
if (parser.seenval('X')) duplicate_extruder_x_offset = _MAX(parser.value_linear_units(), (X2_MIN_POS) - (X1_MIN_POS));
82+
if (parser.seenval('R')) duplicate_extruder_temp_offset = parser.value_celsius_diff();
8383
// Always switch back to tool 0
8484
if (active_extruder != 0) tool_change(0);
8585
break;

‎Marlin/src/gcode/feature/cancel/M486.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ void GcodeSuite::M486() {
4444
cancelable.object_count = parser.intval('T', 1);
4545
}
4646

47-
if (parser.seen('S'))
47+
if (parser.seenval('S'))
4848
cancelable.set_active_object(parser.value_int());
4949

5050
if (parser.seen('C')) cancelable.cancel_active_object();
5151

52-
if (parser.seen('P')) cancelable.cancel_object(parser.value_int());
52+
if (parser.seenval('P')) cancelable.cancel_object(parser.value_int());
5353

54-
if (parser.seen('U')) cancelable.uncancel_object(parser.value_int());
54+
if (parser.seenval('U')) cancelable.uncancel_object(parser.value_int());
5555
}
5656

5757
#endif // CANCEL_OBJECTS

‎Marlin/src/gcode/feature/i2c/M260_M261.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@
4545
*/
4646
void GcodeSuite::M260() {
4747
// Set the target address
48-
if (parser.seen('A')) i2c.address(parser.value_byte());
48+
if (parser.seenval('A')) i2c.address(parser.value_byte());
4949

5050
// Add a new byte to the buffer
51-
if (parser.seen('B')) i2c.addbyte(parser.value_byte());
51+
if (parser.seenval('B')) i2c.addbyte(parser.value_byte());
5252

5353
// Flush the buffer to the bus
5454
if (parser.seen('S')) i2c.send();
@@ -63,7 +63,7 @@ void GcodeSuite::M260() {
6363
* Usage: M261 A<slave device address base 10> B<number of bytes> S<style>
6464
*/
6565
void GcodeSuite::M261() {
66-
if (parser.seen('A')) i2c.address(parser.value_byte());
66+
if (parser.seenval('A')) i2c.address(parser.value_byte());
6767

6868
const uint8_t bytes = parser.byteval('B', 1), // Bytes to request
6969
style = parser.byteval('S'); // Serial output style (ASCII, HEX etc)

‎Marlin/src/gcode/feature/pause/G61.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ void GcodeSuite::G61() {
7171
if (parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W))) {
7272
DEBUG_ECHOPGM(STR_RESTORING_POS " S", slot);
7373
LOOP_NUM_AXES(i) {
74-
destination[i] = parser.seen(AXIS_CHAR(i))
74+
destination[i] = parser.seenval(AXIS_CHAR(i))
7575
? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
7676
: current_position[i];
7777
DEBUG_CHAR(' ', AXIS_CHAR(i));

‎Marlin/src/gcode/feature/pause/M603.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ void GcodeSuite::M603() {
4848
if (target_extruder < 0) return;
4949

5050
// Unload length
51-
if (parser.seen('U')) {
51+
if (parser.seenval('U')) {
5252
fc_settings[target_extruder].unload_length = ABS(parser.value_axis_units(E_AXIS));
5353
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
5454
NOMORE(fc_settings[target_extruder].unload_length, EXTRUDE_MAXLENGTH);
5555
#endif
5656
}
5757

5858
// Load length
59-
if (parser.seen('L')) {
59+
if (parser.seenval('L')) {
6060
fc_settings[target_extruder].load_length = ABS(parser.value_axis_units(E_AXIS));
6161
#if ENABLED(PREVENT_LENGTHY_EXTRUDE)
6262
NOMORE(fc_settings[target_extruder].load_length, EXTRUDE_MAXLENGTH);

‎Marlin/src/gcode/feature/pause/M701_M702.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void GcodeSuite::M701() {
106106
#else
107107
constexpr float purge_length = ADVANCED_PAUSE_PURGE_LENGTH,
108108
slow_load_length = FILAMENT_CHANGE_SLOW_LOAD_LENGTH;
109-
const float fast_load_length = ABS(parser.seen('L') ? parser.value_axis_units(E_AXIS)
109+
const float fast_load_length = ABS(parser.seenval('L') ? parser.value_axis_units(E_AXIS)
110110
: fc_settings[active_extruder].load_length);
111111
load_filament(
112112
slow_load_length, fast_load_length, purge_length,

‎Marlin/src/gcode/feature/runout/M412.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ void GcodeSuite::M412() {
4848
if (seenR || seenS) runout.reset();
4949
if (seenS) runout.enabled = parser.value_bool();
5050
#if HAS_FILAMENT_RUNOUT_DISTANCE
51-
if (parser.seen('D')) runout.set_runout_distance(parser.value_linear_units());
51+
if (parser.seenval('D')) runout.set_runout_distance(parser.value_linear_units());
5252
#endif
5353
}
5454
else {

‎Marlin/src/gcode/geometry/M206_M428.cpp

+4-13
Original file line numberDiff line numberDiff line change
@@ -39,20 +39,11 @@
3939
*/
4040
void GcodeSuite::M206() {
4141
if (!parser.seen_any()) return M206_report();
42-
NUM_AXIS_CODE(
43-
if (parser.seen('X')) set_home_offset(X_AXIS, parser.value_linear_units()),
44-
if (parser.seen('Y')) set_home_offset(Y_AXIS, parser.value_linear_units()),
45-
if (parser.seen('Z')) set_home_offset(Z_AXIS, parser.value_linear_units()),
46-
if (parser.seen(AXIS4_NAME)) set_home_offset(I_AXIS, parser.TERN(AXIS4_ROTATES, value_float, value_linear_units)()),
47-
if (parser.seen(AXIS5_NAME)) set_home_offset(J_AXIS, parser.TERN(AXIS5_ROTATES, value_float, value_linear_units)()),
48-
if (parser.seen(AXIS6_NAME)) set_home_offset(K_AXIS, parser.TERN(AXIS6_ROTATES, value_float, value_linear_units)()),
49-
if (parser.seen(AXIS7_NAME)) set_home_offset(U_AXIS, parser.TERN(AXIS7_ROTATES, value_float, value_linear_units)()),
50-
if (parser.seen(AXIS8_NAME)) set_home_offset(V_AXIS, parser.TERN(AXIS8_ROTATES, value_float, value_linear_units)()),
51-
if (parser.seen(AXIS9_NAME)) set_home_offset(W_AXIS, parser.TERN(AXIS9_ROTATES, value_float, value_linear_units)())
52-
);
42+
LOOP_NUM_AXES(a)
43+
if (parser.seenval(AXIS_CHAR(a))) set_home_offset((AxisEnum)a, parser.value_axis_units((AxisEnum)a));
5344
#if ENABLED(MORGAN_SCARA)
54-
if (parser.seen('T')) set_home_offset(A_AXIS, parser.value_float()); // Theta
55-
if (parser.seen('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
45+
if (parser.seenval('T')) set_home_offset(A_AXIS, parser.value_float()); // Theta
46+
if (parser.seenval('P')) set_home_offset(B_AXIS, parser.value_float()); // Psi
5647
#endif
5748

5849
report_current_position();

0 commit comments

Comments
 (0)