From 522ea178a4ec0963a00294447c54736b10d3415f Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 28 Apr 2018 11:24:58 -0500 Subject: [PATCH] Clear up trailing whitespace --- Marlin/Marlin_main.cpp | 22 +++++++++++----------- Marlin/temperature.h | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 66d9b5246..3134bdd4e 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2224,8 +2224,8 @@ void clean_up_after_endstop_or_probe_move() { while (thermalManager.isHeatingBed()) safe_delay(200); lcd_reset_status(); } - #endif - + #endif + // Deploy BLTouch at the start of any probe #if ENABLED(BLTOUCH) if (set_bltouch_deployed(true)) return true; @@ -2939,7 +2939,7 @@ static void do_homing_move(const AxisEnum axis, const float distance, const floa SERIAL_EOL(); } #endif - + #if HOMING_Z_WITH_PROBE && HAS_HEATED_BED && ENABLED(WAIT_FOR_BED_HEATER) // Wait for bed to heat back up between probing points if (axis == Z_AXIS && distance < 0 && thermalManager.isHeatingBed()) { @@ -5678,7 +5678,7 @@ void home_all_axes() { gcode_G28(true); } /** * kinematics routines and auto tune matrix scaling parameters: - * see https://github.com/LVD-AC/Marlin-AC/tree/1.1.x-AC/documentation for + * see https://github.com/LVD-AC/Marlin-AC/tree/1.1.x-AC/documentation for * - formulae for approximative forward kinematics in the end-stop displacement matrix * - definition of the matrix scaling parameters */ @@ -5692,7 +5692,7 @@ void home_all_axes() { gcode_G28(true); } pos[Y_AXIS] = sin(a) * r; pos[Z_AXIS] = z_pt[rad]; inverse_kinematics(pos); - LOOP_XYZ(axis) mm_at_pt_axis[rad][axis] = delta[axis]; + LOOP_XYZ(axis) mm_at_pt_axis[rad][axis] = delta[axis]; } } @@ -5756,7 +5756,7 @@ void home_all_axes() { gcode_G28(true); } delta_t[ABC] = {0.0}; delta_r = diff; - calc_kinematics_diff_probe_points(z_pt, delta_e, delta_r, delta_t); + calc_kinematics_diff_probe_points(z_pt, delta_e, delta_r, delta_t); r_fac = -(z_pt[__A] + z_pt[__B] + z_pt[__C] + z_pt[_BC] + z_pt[_CA] + z_pt[_AB]) / 6.0; r_fac = diff / r_fac / 3.0; // 1/(3*delta_Z) return r_fac; @@ -5773,7 +5773,7 @@ void home_all_axes() { gcode_G28(true); } LOOP_XYZ(axis) { LOOP_XYZ(axis_2) delta_t[axis_2] = 0.0; delta_t[axis] = diff; - calc_kinematics_diff_probe_points(z_pt, delta_e, delta_r, delta_t); + calc_kinematics_diff_probe_points(z_pt, delta_e, delta_r, delta_t); a_fac += z_pt[uint8_t((axis * _4P_STEP) - _7P_STEP + NPP) % NPP + 1] / 6.0; a_fac -= z_pt[uint8_t((axis * _4P_STEP) + 1 + _7P_STEP)] / 6.0; } @@ -5955,7 +5955,7 @@ void home_all_axes() { gcode_G28(true); } /** * convergence matrices: - * see https://github.com/LVD-AC/Marlin-AC/tree/1.1.x-AC/documentation for + * see https://github.com/LVD-AC/Marlin-AC/tree/1.1.x-AC/documentation for * - definition of the matrix scaling parameters * - matrices for 4 and 7 point calibration */ @@ -6021,7 +6021,7 @@ void home_all_axes() { gcode_G28(true); } delta_radius += r_delta; LOOP_XYZ(axis) delta_tower_angle_trim[axis] += t_delta[axis]; } - else if (zero_std_dev >= test_precision) { + else if (zero_std_dev >= test_precision) { // roll back COPY(delta_endstop_adj, e_old); delta_radius = r_old; @@ -6047,7 +6047,7 @@ void home_all_axes() { gcode_G28(true); } NOMORE(zero_std_dev_min, zero_std_dev); // print report - + if (verbose_level == 3) print_calibration_results(z_at_pt, _tower_results, _opposite_results); @@ -12423,7 +12423,7 @@ void process_parsed_command() { #endif case 999: gcode_M999(); break; // M999: Restart after being Stopped - + default: parser.unknown_command_error(); } break; diff --git a/Marlin/temperature.h b/Marlin/temperature.h index 128007a83..8d1754565 100644 --- a/Marlin/temperature.h +++ b/Marlin/temperature.h @@ -196,7 +196,7 @@ class Temperature { FORCE_INLINE static bool hotEnoughToExtrude(const uint8_t e) { return !tooColdToExtrude(e); } FORCE_INLINE static bool targetHotEnoughToExtrude(const uint8_t e) { return !targetTooColdToExtrude(e); } - private: + private: static volatile bool temp_meas_ready; static uint16_t raw_temp_value[MAX_EXTRUDERS];