CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix up some whitespace

Browse Source
This commit is contained in:
Scott Lahteine 2019-01-17 18:03:58 -06:00
parent 20c20dacb7
commit 712e23c383
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/module/temperature.cpp
View File

@ -162,7 +162,7 @@ int16_t Temperature::current_temperature_raw[HOTENDS], // = { 0 }
#endif #endif
if (target >= FAN_COUNT) return; if (target >= FAN_COUNT) return;
fan_speed[target] = speed; fan_speed[target] = speed;
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
lcd_tmpfan_speed[target] = speed; lcd_tmpfan_speed[target] = speed;

2
Marlin/src/pins/pins_BIQU_SKR_V1.1.h
View File

@ -78,7 +78,7 @@
#define FAN1_PIN P2_04 #define FAN1_PIN P2_04
#else #else
#define HEATER_1_PIN P2_04 #define HEATER_1_PIN P2_04
#endif #endif
#define FAN_PIN P2_03 #define FAN_PIN P2_03
#define HEATER_BED_PIN P2_05 #define HEATER_BED_PIN P2_05

9
Marlin/src/sd/Sd2Card.cpp
View File

@ -525,10 +525,7 @@ bool Sd2Card::readStop() {
*/ */
bool Sd2Card::setSckRate(const uint8_t sckRateID) { bool Sd2Card::setSckRate(const uint8_t sckRateID) {
const bool success = (sckRateID <= 6); const bool success = (sckRateID <= 6);
if (success) if (success) spiRate_ = sckRateID; else error(SD_CARD_ERROR_SCK_RATE);
spiRate_ = sckRateID;
else
error(SD_CARD_ERROR_SCK_RATE);
return success; return success;
} }
@ -539,9 +536,7 @@ bool Sd2Card::setSckRate(const uint8_t sckRateID) {
*/ */
bool Sd2Card::waitNotBusy(const millis_t timeout_ms) { bool Sd2Card::waitNotBusy(const millis_t timeout_ms) {
const millis_t wait_timeout = millis() + timeout_ms; const millis_t wait_timeout = millis() + timeout_ms;
while (spiRec() != 0xFF) while (spiRec() != 0xFF) if (ELAPSED(millis(), wait_timeout)) return false;
if (ELAPSED(millis(), wait_timeout)) return false;
return true; return true;
} }