Skip to content

Commit

Permalink
move block to above function
Browse files Browse the repository at this point in the history
  • Loading branch information
classicrocker883 committed May 4, 2024
1 parent 8af5721 commit f1346fa
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
5 changes: 2 additions & 3 deletions Marlin/src/feature/bedlevel/ubl/ubl_G29.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,8 @@
#define SIZE_OF_LITTLE_RAISE 1
#define BIG_RAISE_NOT_NEEDED 0

G29_parameters_t unified_bed_leveling::param;

/**
* @brief G29: Unified Bed Leveling by Roxy
*
Expand Down Expand Up @@ -302,9 +304,6 @@
* 3-Point and Grid Based leveling. Combining their contributions we now have the functionality and
* features of all three systems combined
*/

G29_parameters_t unified_bed_leveling::param;

void unified_bed_leveling::G29() {

bool probe_deployed = false;
Expand Down
4 changes: 4 additions & 0 deletions Marlin/src/gcode/bedlevel/G26.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,10 @@ typedef struct {
* @details Used to interactively edit the mesh by placing the
* nozzle in a problem area and doing a G29 P4 R command
*
* Usage:
* G26 [B<temp>] [C<bool>] [D] [F<linear>] [H<linear>] [I<index>] [K<bool>] [L<linear>]
* [O<linear>] [P<linear>] [Q<float>] [R<int>] [S<float>] [U<linear>] [X<linear>] [Y<linear>]
*
* Parameters:
*
* @param B Bed Temperature
Expand Down
15 changes: 7 additions & 8 deletions Marlin/src/gcode/calibrate/G76_M871.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@
#include "../../feature/probe_temp_comp.h"
#include "../../lcd/marlinui.h"

#if ALL(PTC_PROBE, PTC_BED)

static void say_waiting_for() { SERIAL_ECHOPGM("Waiting for "); }
static void say_waiting_for_probe_heating() { say_waiting_for(); SERIAL_ECHOLNPGM("probe heating."); }
static void say_successfully_calibrated() { SERIAL_ECHOPGM("Successfully calibrated"); }
static void say_failed_to_calibrate() { SERIAL_ECHOPGM("!Failed to calibrate"); }

/**
* @brief G76: Calibrate probe and/or bed temperature offsets
*
Expand Down Expand Up @@ -85,14 +92,6 @@
* so the hotend fan would not cool my probe constantly. Alternatively you could just
* make sure the fan is not running while running the calibration process
*/

#if ALL(PTC_PROBE, PTC_BED)

static void say_waiting_for() { SERIAL_ECHOPGM("Waiting for "); }
static void say_waiting_for_probe_heating() { say_waiting_for(); SERIAL_ECHOLNPGM("probe heating."); }
static void say_successfully_calibrated() { SERIAL_ECHOPGM("Successfully calibrated"); }
static void say_failed_to_calibrate() { SERIAL_ECHOPGM("!Failed to calibrate"); }

void GcodeSuite::G76() {
auto report_temps = [](millis_t &ntr, millis_t timeout=0) {
idle_no_sleep();
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/probe/M851.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

/**
* @brief M851: Set the nozzle-to-probe offsets in current units
*
* Usage:
* M851 [X<linear>] [Y<linear>] [Z<linear>]
*
Expand Down

0 comments on commit f1346fa

Please sign in to comment.