Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

respect NO_MOTION_AFTER_HOMING and HOME_AFTER_DEACTIVATE with G38 and G30 #27229

Closed
wants to merge 3 commits into from
Closed

respect NO_MOTION_AFTER_HOMING and HOME_AFTER_DEACTIVATE with G38 and G30 #27229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
515726f
G38 and G30 respect HOME_AFTER_DEACTIVATE
DerAndere1 Jul 1, 2024
0176da7
include MarlinCore.h
DerAndere1 Jul 1, 2024
2f8bd8f
fixup
DerAndere1 Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Marlin/src/gcode/probe/G30.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

#include "../gcode.h"
#include "../../module/motion.h"
#include "../../MarlinCore.h"
#include "../../module/probe.h"
#include "../../feature/bedlevel/bedlevel.h"
#include "../../lcd/marlinui.h"
Expand All @@ -50,6 +51,8 @@
*/
void GcodeSuite::G30() {

if (!MOTION_CONDITIONS) return;

xy_pos_t old_pos = current_position,
probepos = current_position;

Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/gcode/probe/G38.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

#include "../../module/endstops.h"
#include "../../module/motion.h"
#include "../../MarlinCore.h"
#include "../../module/planner.h"
#include "../../module/probe.h"

Expand Down Expand Up @@ -106,6 +107,8 @@ inline bool G38_run_probe() {
*/
void GcodeSuite::G38(const int8_t subcode) {

if (!MOTION_CONDITIONS) return;

// Get X Y Z E F
get_destination_from_command();

Expand Down