Skip to content

Commit 81dae6a

Browse files
committed
Update to reflect changes on bugfix
Specificaly merging this PR MarlinFirmware#25498
1 parent d1aef73 commit 81dae6a

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

Marlin/src/lcd/menu/menu_tramming_wizard.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@
4545
#include "../../feature/bedlevel/bedlevel.h"
4646
#endif
4747

48+
//#define SIMULATOR_TESTING
49+
4850
static uint8_t tram_target = 0;
4951
static float z_measured[G35_PROBE_COUNT];
5052
static Flags<G35_PROBE_COUNT> z_isvalid;
@@ -63,7 +65,6 @@ static bool menu_mode_measure = true;
6365

6466
static void menu_tramming_wizard();
6567

66-
//#define SIMULATOR_TESTING
6768
#ifdef SIMULATOR_TESTING
6869
/*
6970
* Mock function for probing in simulator, where "probe.probe_at_point" always returns 0.
@@ -130,13 +131,10 @@ static bool _probe_single_point() {
130131
set_bed_leveling_enabled(false);
131132
#endif
132133

133-
do_blocking_move_to_z(TERN(BLTOUCH, Z_CLEARANCE_DEPLOY_PROBE, Z_CLEARANCE_BETWEEN_PROBES));
134-
135-
// Stow after each point with BLTouch "HIGH SPEED" mode for push-pin safety
136134
const float z_probed_height = probing_reference && z_isvalid[tram_target] ?
137135
z_measured[tram_target] :
138136
#ifndef SIMULATOR_TESTING
139-
probe.probe_at_point(tramming_points[tram_target], TERN0(BLTOUCH, bltouch.high_speed_mode) ? PROBE_PT_STOW : PROBE_PT_RAISE, 0, true)
137+
probe.probe_at_point(tramming_points[tram_target], PROBE_PT_RAISE, 0, true)
140138
#else
141139
_mock_probe_at_point(tramming_points[tram_target]);
142140
#endif

0 commit comments

Comments
 (0)