Przeglądaj źródła

Followup to probe_at_point change (#15342)

Robby Candra 5 lat temu
rodzic
commit
9c288a682d

+ 2
- 2
Marlin/src/feature/bedlevel/ubl/ubl.cpp Wyświetl plik

177
       serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n"));
177
       serialprintPGM(csv ? PSTR("CSV:\n") : PSTR("LCD:\n"));
178
     }
178
     }
179
 
179
 
180
-    // Add XY probe offset from extruder because probe_pt() subtracts them when
181
-    // moving to the xy position to be measured. This ensures better agreement between
180
+    // Add XY probe offset from extruder because probe_at_point() subtracts them when
181
+    // moving to the XY position to be measured. This ensures better agreement between
182
     // the current Z position after G28 and the mesh values.
182
     // the current Z position after G28 and the mesh values.
183
     const float current_xi = find_closest_x_index(current_position[X_AXIS] + probe_offset[X_AXIS]),
183
     const float current_xi = find_closest_x_index(current_position[X_AXIS] + probe_offset[X_AXIS]),
184
                 current_yi = find_closest_y_index(current_position[Y_AXIS] + probe_offset[Y_AXIS]);
184
                 current_yi = find_closest_y_index(current_position[Y_AXIS] + probe_offset[Y_AXIS]);

+ 1
- 1
Marlin/src/gcode/calibrate/G34_M422.cpp Wyświetl plik

277
     // After this operation the z position needs correction
277
     // After this operation the z position needs correction
278
     set_axis_is_not_at_home(Z_AXIS);
278
     set_axis_is_not_at_home(Z_AXIS);
279
 
279
 
280
-    // Stow the probe, as the last call to probe_pt(...) left
280
+    // Stow the probe, as the last call to probe_at_point(...) left
281
     // the probe deployed if it was successful.
281
     // the probe deployed if it was successful.
282
     STOW_PROBE();
282
     STOW_PROBE();
283
 
283
 

+ 3
- 3
Marlin/src/module/probe.cpp Wyświetl plik

532
 /**
532
 /**
533
  * @brief Probe at the current XY (possibly more than once) to find the bed Z.
533
  * @brief Probe at the current XY (possibly more than once) to find the bed Z.
534
  *
534
  *
535
- * @details Used by probe_pt to get the bed Z height at the current XY.
535
+ * @details Used by probe_at_point to get the bed Z height at the current XY.
536
  *          Leaves current_position[Z_AXIS] at the height where the probe triggered.
536
  *          Leaves current_position[Z_AXIS] at the height where the probe triggered.
537
  *
537
  *
538
  * @return The Z position of the bed at the current XY or NAN on error.
538
  * @return The Z position of the bed at the current XY or NAN on error.
686
 float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) {
686
 float probe_at_point(const float &rx, const float &ry, const ProbePtRaise raise_after/*=PROBE_PT_NONE*/, const uint8_t verbose_level/*=0*/, const bool probe_relative/*=true*/) {
687
   if (DEBUGGING(LEVELING)) {
687
   if (DEBUGGING(LEVELING)) {
688
     DEBUG_ECHOLNPAIR(
688
     DEBUG_ECHOLNPAIR(
689
-      ">>> probe_pt(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
689
+      ">>> probe_at_point(", LOGICAL_X_POSITION(rx), ", ", LOGICAL_Y_POSITION(ry),
690
       ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none",
690
       ", ", raise_after == PROBE_PT_RAISE ? "raise" : raise_after == PROBE_PT_STOW ? "stow" : "none",
691
       ", ", int(verbose_level),
691
       ", ", int(verbose_level),
692
       ", ", probe_relative ? "probe" : "nozzle", "_relative)"
692
       ", ", probe_relative ? "probe" : "nozzle", "_relative)"
743
     SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
743
     SERIAL_ERROR_MSG(MSG_ERR_PROBING_FAILED);
744
   }
744
   }
745
 
745
 
746
-  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< probe_pt");
746
+  if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("<<< probe_at_point");
747
 
747
 
748
   return measured_z;
748
   return measured_z;
749
 }
749
 }

Ładowanie…
Anuluj
Zapisz