SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix trailing whitespace

Browse source
This commit is contained in:
Scott Lahteine 2019-02-12 14:25:35 -06:00
parent bace52afd7
commit 894f5c24a8
3 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Marlin/src/HAL/HAL_ESP32/i2s.cpp
View file

@ -162,19 +162,19 @@ int i2s_init() {
periph_module_enable(PERIPH_I2S0_MODULE); periph_module_enable(PERIPH_I2S0_MODULE);
/** /**
* Each i2s transfer will take * Each i2s transfer will take
* fpll = PLL_D2_CLK -- clka_en = 0 * fpll = PLL_D2_CLK -- clka_en = 0
* *
* fi2s = fpll / N + b/a -- N = clkm_div_num * fi2s = fpll / N + b/a -- N = clkm_div_num
* fi2s = 160MHz / 2 * fi2s = 160MHz / 2
* fi2s = 80MHz * fi2s = 80MHz
* *
* fbclk = fi2s / M -- M = tx_bck_div_num * fbclk = fi2s / M -- M = tx_bck_div_num
* fbclk = 80MHz / 2 * fbclk = 80MHz / 2
* fbclk = 40MHz * fbclk = 40MHz
* *
* fwclk = fbclk / 32 * fwclk = fbclk / 32
* *
* for fwclk = 250kHz (4uS pulse time) * for fwclk = 250kHz (4uS pulse time)
* N = 10 * N = 10
* M = 20 * M = 20

2
Marlin/src/gcode/control/M380_M381.cpp
View file

@ -45,7 +45,7 @@ void GcodeSuite::M380() {
* M381: Disable all solenoids if EXT_SOLENOID * M381: Disable all solenoids if EXT_SOLENOID
* Disable selected/active solenoid if MANUAL_SOLENOID_CONTROL * Disable selected/active solenoid if MANUAL_SOLENOID_CONTROL
*/ */
void GcodeSuite::M381() { void GcodeSuite::M381() {
#if ENABLED(MANUAL_SOLENOID_CONTROL) #if ENABLED(MANUAL_SOLENOID_CONTROL)
disable_solenoid(parser.intval('S', active_extruder)); disable_solenoid(parser.intval('S', active_extruder));
#else #else

10
Marlin/src/module/tool_change.cpp
View file

@ -133,7 +133,7 @@
parkingslowspeed, // M951 J parkingslowspeed, // M951 J
parkinghighspeed , // M951 H parkinghighspeed , // M951 H
parkingtraveldistance, // M951 D parkingtraveldistance, // M951 D
compensationmultiplier; compensationmultiplier;
inline void magnetic_parking_extruder_tool_change(const uint8_t tmp_extruder) { inline void magnetic_parking_extruder_tool_change(const uint8_t tmp_extruder) {
@ -178,20 +178,20 @@
// STEP 2 // STEP 2
current_position[X_AXIS] = grabpos + offsetcompensation; current_position[X_AXIS] = grabpos + offsetcompensation;
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) { if (DEBUGGING(LEVELING)) {
SERIAL_ECHOPAIR("(2) Couple extruder ", int(tmp_extruder)); SERIAL_ECHOPAIR("(2) Couple extruder ", int(tmp_extruder));
DEBUG_POS(" to new extruder GrabPos", current_position); DEBUG_POS(" to new extruder GrabPos", current_position);
} }
#endif #endif
planner.buffer_line(current_position, mpe_settings.slow_feedrate, tmp_extruder); planner.buffer_line(current_position, mpe_settings.slow_feedrate, tmp_extruder);
planner.synchronize(); planner.synchronize();
// Delay before moving tool, to allow magnetic coupling // Delay before moving tool, to allow magnetic coupling
gcode.dwell(150); gcode.dwell(150);
// STEP 3 // STEP 3
current_position[X_AXIS] = mpe_settings.parking_xpos[tmp_extruder] + offsetcompensation; current_position[X_AXIS] = mpe_settings.parking_xpos[tmp_extruder] + offsetcompensation;