From dd19e744766d0ef0a9225b08b0d23d6a850c2813 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Sun, 11 Mar 2018 10:28:46 -0500
Subject: [PATCH] Cleanup trailing whitespace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
@Bob-the-Kuhn — Please set your git options to remove trailing whitespace on commit.
---
Marlin/src/HAL/HAL_DUE/HAL_spi_Due.cpp | 26 +++++++++++++-------------
Marlin/src/pins/pins_DUE3DOM_MINI.h | 4 ++--
Marlin/src/pins/pins_RAMPS_FD_V1.h | 8 +++-----
3 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/Marlin/src/HAL/HAL_DUE/HAL_spi_Due.cpp b/Marlin/src/HAL/HAL_DUE/HAL_spi_Due.cpp
index 0f1aa47fc2..9b06b24562 100644
--- a/Marlin/src/HAL/HAL_DUE/HAL_spi_Due.cpp
+++ b/Marlin/src/HAL/HAL_DUE/HAL_spi_Due.cpp
@@ -532,7 +532,7 @@
(void) spiTransferTx(token);
spiTxBlock(buf,512);
WRITE(SS_PIN, HIGH);
-
+
#else // let calling routine control SDSS
void spiBegin() {
SET_OUTPUT(SS_PIN);
@@ -564,7 +564,7 @@
spiTxBlock(buf,512);
#endif
-
+
}
/**
@@ -602,7 +602,7 @@
#if MB(ALLIGATOR)
WRITE(SS_PIN, HIGH);
- #endif
+ #endif
WRITE(MOSI_PIN, HIGH);
WRITE(SCK_PIN, LOW);
}
@@ -616,11 +616,11 @@
#else
- #if MB(ALLIGATOR)
-
+ #if MB(ALLIGATOR)
+
// slave selects controlled by SPI controller
// doesn't support changing SPI speeds for SD card
-
+
// --------------------------------------------------------------------------
// hardware SPI
// --------------------------------------------------------------------------
@@ -666,15 +666,15 @@
WRITE(SPI_FLASH_CS, HIGH );
WRITE(SS_PIN, HIGH );
#endif // MB(ALLIGATOR)
-
+
OUT_WRITE(SDSS,0);
-
+
PIO_Configure(
g_APinDescription[SPI_PIN].pPort,
g_APinDescription[SPI_PIN].ulPinType,
g_APinDescription[SPI_PIN].ulPin,
g_APinDescription[SPI_PIN].ulPinConfiguration);
-
+
spiInit(1);
spiInitMaded = true;
}
@@ -824,7 +824,7 @@
}
#else // U8G compatible hardware SPI
-
+
void spiInit(uint8_t spiRate = 6 ) { // default to slowest rate if not specified)
// 8.4 MHz, 4 MHz, 2 MHz, 1 MHz, 0.5 MHz, 0.329 MHz, 0.329 MHz
int spiDueDividors[] = { 10, 21, 42, 84, 168, 255, 255 };
@@ -849,7 +849,7 @@
/* SPI mode 0, 8 Bit data transfer, baud rate */
SPI0->SPI_CSR[0] = SPI_CSR_SCBR(spiDueDividors[spiRate]) | 1;
- }
+ }
static uint8_t spiTransfer(uint8_t data) {
@@ -897,8 +897,8 @@
spiTransfer(token);
for (uint16_t i = 0; i < 512; i++)
spiTransfer(buf[i]);
- }
-
+ }
+
#endif //MB(ALLIGATOR)
#endif // ENABLED(SOFTWARE_SPI)
diff --git a/Marlin/src/pins/pins_DUE3DOM_MINI.h b/Marlin/src/pins/pins_DUE3DOM_MINI.h
index 9695e3ae42..c16708cfe7 100644
--- a/Marlin/src/pins/pins_DUE3DOM_MINI.h
+++ b/Marlin/src/pins/pins_DUE3DOM_MINI.h
@@ -156,7 +156,7 @@
#define BTN_ENC 37
#define BEEPER_PIN -1
-
+
#elif ENABLED(MINIPANEL)
#define BTN_EN1 52
#define BTN_EN2 50
@@ -166,6 +166,6 @@
#define BEEPER_PIN 41
#define DOGLCD_A0 46
#define DOGLCD_CS 45
-
+
#endif // SPARK_FULL_GRAPHICS
#endif // ULTRA_LCD
diff --git a/Marlin/src/pins/pins_RAMPS_FD_V1.h b/Marlin/src/pins/pins_RAMPS_FD_V1.h
index d5483f4ad2..0be7d424be 100644
--- a/Marlin/src/pins/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/pins_RAMPS_FD_V1.h
@@ -141,15 +141,13 @@
//
#if ENABLED(ULTRA_LCD)
// ramps-fd lcd adaptor
-
-
+
#define BEEPER_PIN 37
#define BTN_EN1 33
#define BTN_EN2 31
#define BTN_ENC 35
#define SD_DETECT_PIN 49
-
#if ENABLED(NEWPANEL)
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
@@ -158,11 +156,11 @@
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
#endif
-
+
#if ENABLED(MINIPANEL)
#define DOGLCD_CS 25
#define DOGLCD_A0 27
- #endif
+ #endif
#endif // ULTRA_LCD
#if ENABLED(HAVE_TMC2208)