From 894f5c24a8894b6344d2f88cc03d4d977f4af178 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 12 Feb 2019 14:25:35 -0600 Subject: [PATCH] Fix trailing whitespace --- Marlin/src/HAL/HAL_ESP32/i2s.cpp | 10 +++++----- Marlin/src/gcode/control/M380_M381.cpp | 2 +- Marlin/src/module/tool_change.cpp | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Marlin/src/HAL/HAL_ESP32/i2s.cpp b/Marlin/src/HAL/HAL_ESP32/i2s.cpp index 8928a10e3b..490af62164 100644 --- a/Marlin/src/HAL/HAL_ESP32/i2s.cpp +++ b/Marlin/src/HAL/HAL_ESP32/i2s.cpp @@ -162,19 +162,19 @@ int i2s_init() { periph_module_enable(PERIPH_I2S0_MODULE); /** - * Each i2s transfer will take + * Each i2s transfer will take * fpll = PLL_D2_CLK -- clka_en = 0 - * + * * fi2s = fpll / N + b/a -- N = clkm_div_num * fi2s = 160MHz / 2 * fi2s = 80MHz - * + * * fbclk = fi2s / M -- M = tx_bck_div_num * fbclk = 80MHz / 2 * fbclk = 40MHz - * + * * fwclk = fbclk / 32 - * + * * for fwclk = 250kHz (4uS pulse time) * N = 10 * M = 20 diff --git a/Marlin/src/gcode/control/M380_M381.cpp b/Marlin/src/gcode/control/M380_M381.cpp index ab5dac4d3b..5598f4aed0 100644 --- a/Marlin/src/gcode/control/M380_M381.cpp +++ b/Marlin/src/gcode/control/M380_M381.cpp @@ -45,7 +45,7 @@ void GcodeSuite::M380() { * M381: Disable all solenoids if EXT_SOLENOID * Disable selected/active solenoid if MANUAL_SOLENOID_CONTROL */ -void GcodeSuite::M381() { +void GcodeSuite::M381() { #if ENABLED(MANUAL_SOLENOID_CONTROL) disable_solenoid(parser.intval('S', active_extruder)); #else diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp index f561f02a02..c77f7f08e9 100644 --- a/Marlin/src/module/tool_change.cpp +++ b/Marlin/src/module/tool_change.cpp @@ -133,7 +133,7 @@ parkingslowspeed, // M951 J parkinghighspeed , // M951 H parkingtraveldistance, // M951 D - compensationmultiplier; + compensationmultiplier; inline void magnetic_parking_extruder_tool_change(const uint8_t tmp_extruder) { @@ -178,20 +178,20 @@ // STEP 2 current_position[X_AXIS] = grabpos + offsetcompensation; - + #if ENABLED(DEBUG_LEVELING_FEATURE) if (DEBUGGING(LEVELING)) { SERIAL_ECHOPAIR("(2) Couple extruder ", int(tmp_extruder)); DEBUG_POS(" to new extruder GrabPos", current_position); } #endif - + planner.buffer_line(current_position, mpe_settings.slow_feedrate, tmp_extruder); planner.synchronize(); - + // Delay before moving tool, to allow magnetic coupling gcode.dwell(150); - + // STEP 3 current_position[X_AXIS] = mpe_settings.parking_xpos[tmp_extruder] + offsetcompensation;