Ver código fonte

🩹 Fix some parameters w/out values (#24051)

DerAndere 2 anos atrás
pai
commit
2ee39b62f3
Nenhuma conta vinculada ao e-mail do autor do commit

+ 1
- 1
Marlin/src/gcode/calibrate/M666.cpp Ver arquivo

@@ -45,7 +45,7 @@
45 45
     DEBUG_SECTION(log_M666, "M666", DEBUGGING(LEVELING));
46 46
     bool is_err = false, is_set = false;
47 47
     LOOP_NUM_AXES(i) {
48
-      if (parser.seen(AXIS_CHAR(i))) {
48
+      if (parser.seenval(AXIS_CHAR(i))) {
49 49
         is_set = true;
50 50
         const float v = parser.value_linear_units();
51 51
         if (v > 0)

+ 2
- 2
Marlin/src/gcode/config/M281.cpp Ver arquivo

@@ -47,8 +47,8 @@ void GcodeSuite::M281() {
47 47
         return;
48 48
       }
49 49
     #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();
52 52
   }
53 53
   else
54 54
     SERIAL_ERROR_MSG("Servo ", servo_index, " out of range");

+ 3
- 3
Marlin/src/gcode/config/M304.cpp Ver arquivo

@@ -36,9 +36,9 @@
36 36
  */
37 37
 void GcodeSuite::M304() {
38 38
   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());
42 42
 }
43 43
 
44 44
 void GcodeSuite::M304_report(const bool forReplay/*=true*/) {

+ 4
- 4
Marlin/src/gcode/config/M305.cpp Ver arquivo

@@ -52,19 +52,19 @@ void GcodeSuite::M305() {
52 52
   if (t_index >= (USER_THERMISTORS) || (do_set && t_index < 0))
53 53
     SERIAL_ECHO_MSG("!Invalid index. (0 <= P <= ", USER_THERMISTORS - 1, ")");
54 54
   else if (do_set) {
55
-    if (parser.seen('R')) // Pullup resistor value
55
+    if (parser.seenval('R')) // Pullup resistor value
56 56
       if (!thermalManager.set_pull_up_res(t_index, parser.value_float()))
57 57
         SERIAL_ECHO_MSG("!Invalid series resistance. (0 < R < 1000000)");
58 58
 
59
-    if (parser.seen('T')) // Resistance at 25C
59
+    if (parser.seenval('T')) // Resistance at 25C
60 60
       if (!thermalManager.set_res25(t_index, parser.value_float()))
61 61
         SERIAL_ECHO_MSG("!Invalid 25C resistance. (0 < T < 10000000)");
62 62
 
63
-    if (parser.seen('B')) // Beta value
63
+    if (parser.seenval('B')) // Beta value
64 64
       if (!thermalManager.set_beta(t_index, parser.value_float()))
65 65
         SERIAL_ECHO_MSG("!Invalid beta. (0 < B < 1000000)");
66 66
 
67
-    if (parser.seen('C')) // Steinhart-Hart C coefficient
67
+    if (parser.seenval('C')) // Steinhart-Hart C coefficient
68 68
       if (!thermalManager.set_sh_coeff(t_index, parser.value_float()))
69 69
         SERIAL_ECHO_MSG("!Invalid Steinhart-Hart C coeff. (-0.01 < C < +0.01)");
70 70
   }                       // If not setting then report parameters

+ 4
- 22
Marlin/src/gcode/control/M17_M18_M84.cpp Ver arquivo

@@ -128,17 +128,8 @@ void GcodeSuite::M17() {
128 128
             stepper.enable_e_steppers();
129 129
         }
130 130
       #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);
142 133
     }
143 134
   }
144 135
   else {
@@ -235,17 +226,8 @@ void GcodeSuite::M18_M84() {
235 226
               stepper.disable_e_steppers();
236 227
           }
237 228
         #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);
249 231
       }
250 232
     }
251 233
     else

+ 1
- 1
Marlin/src/gcode/control/M280.cpp Ver arquivo

@@ -48,7 +48,7 @@ void GcodeSuite::M280() {
48 48
       const int anew = parser.value_int();
49 49
       if (anew >= 0) {
50 50
         #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
52 52
             const int16_t t = constrain(parser.value_int(), 0, 10000);
53 53
             const int aold = servo[servo_index].read();
54 54
             millis_t now = millis();

+ 1
- 1
Marlin/src/gcode/control/M3-M5.cpp Ver arquivo

@@ -89,7 +89,7 @@ void GcodeSuite::M3_M4(const bool is_M4) {
89 89
       // Laser power in inline mode
90 90
       cutter.inline_direction(is_M4); // Should always be unused
91 91
       #if ENABLED(SPINDLE_LASER_USE_PWM)
92
-        if (parser.seen('O')) {
92
+        if (parser.seenval('O')) {
93 93
           cutter.unitPower = cutter.power_to_range(parser.value_byte(), 0);
94 94
           cutter.inline_ocr_power(cutter.unitPower); // The OCR is a value from 0 to 255 (uint8_t)
95 95
         }

+ 1
- 1
Marlin/src/gcode/control/M350_M351.cpp Ver arquivo

@@ -41,7 +41,7 @@
41 41
  */
42 42
 void GcodeSuite::M350() {
43 43
   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());
45 45
   TERN_(HAS_M350_B_PARAM, if (parser.seenval('B')) stepper.microstep_mode(E_AXIS + 1, parser.value_byte()));
46 46
   stepper.microstep_readings();
47 47
 }

+ 3
- 3
Marlin/src/gcode/control/M605.cpp Ver arquivo

@@ -64,7 +64,7 @@
64 64
   void GcodeSuite::M605() {
65 65
     planner.synchronize();
66 66
 
67
-    if (parser.seen('S')) {
67
+    if (parser.seenval('S')) {
68 68
       const DualXMode previous_mode = dual_x_carriage_mode;
69 69
 
70 70
       dual_x_carriage_mode = (DualXMode)parser.value_byte();
@@ -78,8 +78,8 @@
78 78
 
79 79
         case DXC_DUPLICATION_MODE:
80 80
           // 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();
83 83
           // Always switch back to tool 0
84 84
           if (active_extruder != 0) tool_change(0);
85 85
           break;

+ 3
- 3
Marlin/src/gcode/feature/cancel/M486.cpp Ver arquivo

@@ -44,14 +44,14 @@ void GcodeSuite::M486() {
44 44
     cancelable.object_count = parser.intval('T', 1);
45 45
   }
46 46
 
47
-  if (parser.seen('S'))
47
+  if (parser.seenval('S'))
48 48
     cancelable.set_active_object(parser.value_int());
49 49
 
50 50
   if (parser.seen('C')) cancelable.cancel_active_object();
51 51
 
52
-  if (parser.seen('P')) cancelable.cancel_object(parser.value_int());
52
+  if (parser.seenval('P')) cancelable.cancel_object(parser.value_int());
53 53
 
54
-  if (parser.seen('U')) cancelable.uncancel_object(parser.value_int());
54
+  if (parser.seenval('U')) cancelable.uncancel_object(parser.value_int());
55 55
 }
56 56
 
57 57
 #endif // CANCEL_OBJECTS

+ 3
- 3
Marlin/src/gcode/feature/i2c/M260_M261.cpp Ver arquivo

@@ -45,10 +45,10 @@
45 45
  */
46 46
 void GcodeSuite::M260() {
47 47
   // Set the target address
48
-  if (parser.seen('A')) i2c.address(parser.value_byte());
48
+  if (parser.seenval('A')) i2c.address(parser.value_byte());
49 49
 
50 50
   // 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());
52 52
 
53 53
   // Flush the buffer to the bus
54 54
   if (parser.seen('S')) i2c.send();
@@ -63,7 +63,7 @@ void GcodeSuite::M260() {
63 63
  * Usage: M261 A<slave device address base 10> B<number of bytes> S<style>
64 64
  */
65 65
 void GcodeSuite::M261() {
66
-  if (parser.seen('A')) i2c.address(parser.value_byte());
66
+  if (parser.seenval('A')) i2c.address(parser.value_byte());
67 67
 
68 68
   const uint8_t bytes = parser.byteval('B', 1),   // Bytes to request
69 69
                 style = parser.byteval('S');      // Serial output style (ASCII, HEX etc)

+ 1
- 1
Marlin/src/gcode/feature/pause/G61.cpp Ver arquivo

@@ -71,7 +71,7 @@ void GcodeSuite::G61() {
71 71
     if (parser.seen(NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W))) {
72 72
       DEBUG_ECHOPGM(STR_RESTORING_POS " S", slot);
73 73
       LOOP_NUM_AXES(i) {
74
-        destination[i] = parser.seen(AXIS_CHAR(i))
74
+        destination[i] = parser.seenval(AXIS_CHAR(i))
75 75
           ? stored_position[slot][i] + parser.value_axis_units((AxisEnum)i)
76 76
           : current_position[i];
77 77
         DEBUG_CHAR(' ', AXIS_CHAR(i));

+ 2
- 2
Marlin/src/gcode/feature/pause/M603.cpp Ver arquivo

@@ -48,7 +48,7 @@ void GcodeSuite::M603() {
48 48
   if (target_extruder < 0) return;
49 49
 
50 50
   // Unload length
51
-  if (parser.seen('U')) {
51
+  if (parser.seenval('U')) {
52 52
     fc_settings[target_extruder].unload_length = ABS(parser.value_axis_units(E_AXIS));
53 53
     #if ENABLED(PREVENT_LENGTHY_EXTRUDE)
54 54
       NOMORE(fc_settings[target_extruder].unload_length, EXTRUDE_MAXLENGTH);
@@ -56,7 +56,7 @@ void GcodeSuite::M603() {
56 56
   }
57 57
 
58 58
   // Load length
59
-  if (parser.seen('L')) {
59
+  if (parser.seenval('L')) {
60 60
     fc_settings[target_extruder].load_length = ABS(parser.value_axis_units(E_AXIS));
61 61
     #if ENABLED(PREVENT_LENGTHY_EXTRUDE)
62 62
       NOMORE(fc_settings[target_extruder].load_length, EXTRUDE_MAXLENGTH);

+ 1
- 1
Marlin/src/gcode/feature/pause/M701_M702.cpp Ver arquivo

@@ -106,7 +106,7 @@ void GcodeSuite::M701() {
106 106
   #else
107 107
     constexpr float     purge_length = ADVANCED_PAUSE_PURGE_LENGTH,
108 108
                     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)
110 110
                                                             : fc_settings[active_extruder].load_length);
111 111
     load_filament(
112 112
       slow_load_length, fast_load_length, purge_length,

+ 1
- 1
Marlin/src/gcode/feature/runout/M412.cpp Ver arquivo

@@ -48,7 +48,7 @@ void GcodeSuite::M412() {
48 48
     if (seenR || seenS) runout.reset();
49 49
     if (seenS) runout.enabled = parser.value_bool();
50 50
     #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());
52 52
     #endif
53 53
   }
54 54
   else {

+ 4
- 13
Marlin/src/gcode/geometry/M206_M428.cpp Ver arquivo

@@ -39,20 +39,11 @@
39 39
  */
40 40
 void GcodeSuite::M206() {
41 41
   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));
53 44
   #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
56 47
   #endif
57 48
 
58 49
   report_current_position();

Carregando…
Cancelar
Salvar