From 712e23c3835b582e9098fc8e9f0b13d8fb0fb5a9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 17 Jan 2019 18:03:58 -0600 Subject: [PATCH] Fix up some whitespace --- Marlin/src/module/temperature.cpp | 2 +- Marlin/src/pins/pins_BIQU_SKR_V1.1.h | 2 +- Marlin/src/sd/Sd2Card.cpp | 9 ++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 6e1c93d752..93cadd0641 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -162,7 +162,7 @@ int16_t Temperature::current_temperature_raw[HOTENDS], // = { 0 } #endif if (target >= FAN_COUNT) return; - + fan_speed[target] = speed; #if ENABLED(ULTRA_LCD) lcd_tmpfan_speed[target] = speed; diff --git a/Marlin/src/pins/pins_BIQU_SKR_V1.1.h b/Marlin/src/pins/pins_BIQU_SKR_V1.1.h index 3ff9d1b21b..306ce50b1b 100644 --- a/Marlin/src/pins/pins_BIQU_SKR_V1.1.h +++ b/Marlin/src/pins/pins_BIQU_SKR_V1.1.h @@ -78,7 +78,7 @@ #define FAN1_PIN P2_04 #else #define HEATER_1_PIN P2_04 -#endif +#endif #define FAN_PIN P2_03 #define HEATER_BED_PIN P2_05 diff --git a/Marlin/src/sd/Sd2Card.cpp b/Marlin/src/sd/Sd2Card.cpp index 6b5acf6d34..2011b0cea1 100644 --- a/Marlin/src/sd/Sd2Card.cpp +++ b/Marlin/src/sd/Sd2Card.cpp @@ -525,10 +525,7 @@ bool Sd2Card::readStop() { */ bool Sd2Card::setSckRate(const uint8_t sckRateID) { const bool success = (sckRateID <= 6); - if (success) - spiRate_ = sckRateID; - else - error(SD_CARD_ERROR_SCK_RATE); + if (success) spiRate_ = sckRateID; else error(SD_CARD_ERROR_SCK_RATE); return success; } @@ -539,9 +536,7 @@ bool Sd2Card::setSckRate(const uint8_t sckRateID) { */ bool Sd2Card::waitNotBusy(const millis_t timeout_ms) { const millis_t wait_timeout = millis() + timeout_ms; - while (spiRec() != 0xFF) - if (ELAPSED(millis(), wait_timeout)) return false; - + while (spiRec() != 0xFF) if (ELAPSED(millis(), wait_timeout)) return false; return true; }