Skip to content

Commit 376e940

Browse files
thinkyheadquiret
andcommitted
🎨 LPC_SOFTWARE_SPI => SOFTWARE_SPI
Co-Authored-By: Martin Turski <turningtides@outlook.de>
1 parent ebe3fe0 commit 376e940

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

Marlin/src/HAL/LINUX/spi_pins.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
#include "../../inc/MarlinConfigPre.h"
2626

2727
#if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
28-
#define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
29-
// needed due to the speed and mode required for communicating with each device being different.
30-
// This requirement can be removed if the SPI access to these devices is updated to use
31-
// spiBeginTransaction.
28+
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
29+
// needed due to the speed and mode required for communicating with each device being different.
30+
// This requirement can be removed if the SPI access to these devices is updated to use
31+
// spiBeginTransaction.
3232
#endif
3333

3434
// Onboard SD

Marlin/src/HAL/LPC1768/HAL_SPI.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
// ------------------------
6161
// Public functions
6262
// ------------------------
63-
#if ENABLED(LPC_SOFTWARE_SPI)
63+
#if ENABLED(SOFTWARE_SPI)
6464

6565
// Software SPI
6666

@@ -161,7 +161,7 @@
161161
// TODO: Implement this method
162162
}
163163

164-
#endif // LPC_SOFTWARE_SPI
164+
#endif // SOFTWARE_SPI
165165

166166
/**
167167
* @brief Wait until TXE (tx empty) flag is set and BSY (busy) flag unset.

Marlin/src/HAL/LPC1768/spi_pins.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@
2424
#include "../../core/macros.h"
2525

2626
#if BOTH(SDSUPPORT, HAS_MARLINUI_U8GLIB) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
27-
#define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
28-
// needed due to the speed and mode required for communicating with each device being different.
29-
// This requirement can be removed if the SPI access to these devices is updated to use
30-
// spiBeginTransaction.
27+
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
28+
// needed due to the speed and mode required for communicating with each device being different.
29+
// This requirement can be removed if the SPI access to these devices is updated to use
30+
// spiBeginTransaction.
3131
#endif
3232

3333
/** onboard SD card */

Marlin/src/HAL/NATIVE_SIM/spi_pins.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "../../inc/MarlinConfigPre.h"
2626

2727
#if BOTH(HAS_MARLINUI_U8GLIB, SDSUPPORT) && (LCD_PINS_D4 == SD_SCK_PIN || LCD_PINS_ENABLE == SD_MOSI_PIN || DOGLCD_SCK == SD_SCK_PIN || DOGLCD_MOSI == SD_MOSI_PIN)
28-
#define LPC_SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
28+
#define SOFTWARE_SPI // If the SD card and LCD adapter share the same SPI pins, then software SPI is currently
2929
// needed due to the speed and mode required for communicating with each device being different.
3030
// This requirement can be removed if the SPI access to these devices is updated to use
3131
// spiBeginTransaction.

Marlin/src/pins/lpc1768/pins_MKS_SBASE.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
#define SD_MISO_PIN P1_23 // J8-3 (moved from EXP2 P0.8)
187187
#define SD_MOSI_PIN P2_12 // J8-4 (moved from EXP2 P0.9)
188188
#define SD_SS_PIN P0_28
189-
#define LPC_SOFTWARE_SPI // With a custom cable we need software SPI because the
189+
#define SOFTWARE_SPI // With a custom cable we need software SPI because the
190190
// selected pins are not on a hardware SPI controller
191191
#elif SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
192192
#define SD_SCK_PIN P0_07

0 commit comments

Comments
 (0)