From 93aad54dc17f73e66b781ac8c82fd5a37ba99b8f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 24 Mar 2017 05:53:19 -0500 Subject: [PATCH] Clean up code, remove _now command function --- Marlin/Marlin.h | 1 - Marlin/Marlin_main.cpp | 4 ---- Marlin/UBL_G29.cpp | 3 ++- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 7254d345e8..87169cbe53 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -244,7 +244,6 @@ inline bool IsRunning() { return Running; } inline bool IsStopped() { return !Running; } bool enqueue_and_echo_command(const char* cmd, bool say_ok=false); //put a single ASCII command at the end of the current buffer or return false when it is full -void enqueue_and_echo_command_now(const char* cmd); // enqueue now, only return when the command has been enqueued void enqueue_and_echo_commands_P(const char* cmd); //put one or many ASCII commands at the end of the current buffer, read from flash void clear_command_queue(); diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index f0ec84f201..4149b30ccc 100755 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -896,10 +896,6 @@ bool enqueue_and_echo_command(const char* cmd, bool say_ok/*=false*/) { return false; } -void enqueue_and_echo_command_now(const char* cmd) { - while (!enqueue_and_echo_command(cmd)) idle(); -} - void setup_killpin() { #if HAS_KILL SET_INPUT_PULLUP(KILL_PIN); diff --git a/Marlin/UBL_G29.cpp b/Marlin/UBL_G29.cpp index e1835e74cb..87f725fc66 100644 --- a/Marlin/UBL_G29.cpp +++ b/Marlin/UBL_G29.cpp @@ -1109,7 +1109,7 @@ const uint16_t k = E2END - ubl.eeprom_start; SERIAL_PROTOCOLPGM("Unified Bed Leveling System Version 1.00 "); - if (ubl.state.active) + if (ubl.state.active) SERIAL_PROTOCOLCHAR('A'); else SERIAL_PROTOCOLPGM("In"); @@ -1363,6 +1363,7 @@ do_blocking_move_to_z(Z_CLEARANCE_DEPLOY_PROBE); // Move the nozzle to where we are going to edit do_blocking_move_to_xy(LOGICAL_X_POSITION(rawx), LOGICAL_Y_POSITION(rawy)); + float new_z = ubl.z_values[location.x_index][location.y_index]; round_off = (int32_t)(new_z * 1000.0); // we chop off the last digits just to be clean. We are rounding to the