From 7f8ea7105ff303f17b2726ae735f5b66023b21c9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 2 Mar 2015 20:14:37 -0800 Subject: [PATCH] Arrange ProbeAction values bitwise --- Marlin/Marlin_main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 24ce89659..db5bfac85 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -1200,7 +1200,7 @@ static void retract_z_probe() { #endif } -enum ProbeAction { ProbeEngageRetract, ProbeEngage, ProbeStay, ProbeRetract }; +enum ProbeAction { ProbeStay, ProbeEngage, ProbeRetract, ProbeEngageRetract }; /// Probe bed height at position (x,y), returns the measured z value static float probe_pt(float x, float y, float z_before, ProbeAction retract_action=ProbeEngageRetract) { @@ -1209,14 +1209,14 @@ static float probe_pt(float x, float y, float z_before, ProbeAction retract_acti do_blocking_move_to(x - X_PROBE_OFFSET_FROM_EXTRUDER, y - Y_PROBE_OFFSET_FROM_EXTRUDER, current_position[Z_AXIS]); #ifndef Z_PROBE_SLED - if (retract_action == ProbeEngageRetract || retract_action == ProbeEngage) engage_z_probe(); + if (retract_action & ProbeEngage) engage_z_probe(); #endif run_z_probe(); float measured_z = current_position[Z_AXIS]; #ifndef Z_PROBE_SLED - if (retract_action == ProbeEngageRetract || retract_action == ProbeRetract) retract_z_probe(); + if (retract_action & ProbeRetract) retract_z_probe(); #endif SERIAL_PROTOCOLPGM(MSG_BED);