From 7dfb8becdb0e6ab3e3fc2c3824d7e3276617e45f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Sun, 17 May 2015 01:48:51 -0700
Subject: [PATCH] Adjust some names and types in Marlin_main.cpp
---
Marlin/Marlin_main.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 7aa6b1b44b..28207b8385 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -997,7 +997,7 @@ XYZ_CONSTS_FROM_CONFIG(signed char, home_dir, HOME_DIR);
#endif //DUAL_X_CARRIAGE
-static void axis_is_at_home(int axis) {
+static void axis_is_at_home(AxisEnum axis) {
#ifdef DUAL_X_CARRIAGE
if (axis == X_AXIS) {
@@ -1422,27 +1422,27 @@ static void setup_for_endstop_move() {
};
// 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=ProbeDeployAndStow, int verbose_level=1) {
+ static float probe_pt(float x, float y, float z_before, ProbeAction probe_action=ProbeDeployAndStow, int verbose_level=1) {
// move to right place
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], z_before); // this also updates current_position
do_blocking_move_to(x - X_PROBE_OFFSET_FROM_EXTRUDER, y - Y_PROBE_OFFSET_FROM_EXTRUDER, current_position[Z_AXIS]); // this also updates current_position
#if !defined(Z_PROBE_SLED) && !defined(Z_PROBE_ALLEN_KEY)
- if (retract_action & ProbeDeploy) deploy_z_probe();
+ if (probe_action & ProbeDeploy) deploy_z_probe();
#endif
run_z_probe();
float measured_z = current_position[Z_AXIS];
#if Z_RAISE_BETWEEN_PROBINGS > 0
- if (retract_action == ProbeStay) {
+ if (probe_action == ProbeStay) {
do_blocking_move_to(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] + Z_RAISE_BETWEEN_PROBINGS); // this also updates current_position
st_synchronize();
}
#endif
#if !defined(Z_PROBE_SLED) && !defined(Z_PROBE_ALLEN_KEY)
- if (retract_action & ProbeStow) stow_z_probe();
+ if (probe_action & ProbeStow) stow_z_probe();
#endif
if (verbose_level > 2) {
@@ -5082,7 +5082,7 @@ inline void gcode_M999() {
* F[mm/min] Set the movement feedrate
*/
inline void gcode_T() {
- int tmp_extruder = code_value();
+ uint16_t tmp_extruder = code_value_short();
if (tmp_extruder >= EXTRUDERS) {
SERIAL_ECHO_START;
SERIAL_CHAR('T');
@@ -5595,7 +5595,7 @@ void process_next_command() {
gcode_M400();
break;
- #if defined(ENABLE_AUTO_BED_LEVELING) && (defined(SERVO_ENDSTOPS) || defined(Z_PROBE_ALLEN_KEY)) && not defined(Z_PROBE_SLED)
+ #if defined(ENABLE_AUTO_BED_LEVELING) && (defined(SERVO_ENDSTOPS) || defined(Z_PROBE_ALLEN_KEY)) && !defined(Z_PROBE_SLED)
case 401:
gcode_M401();
break;
--
GitLab