From 9c21191f74de06cfb9b966c0135cb05cd668a7a2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 15 Sep 2017 20:47:04 -0500 Subject: [PATCH] Rename SPI class to avoid conflict (good?) --- Marlin/src/libs/private_spi.h | 4 ++-- Marlin/src/module/temperature.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Marlin/src/libs/private_spi.h b/Marlin/src/libs/private_spi.h index d124124fd7..7998de7bea 100644 --- a/Marlin/src/libs/private_spi.h +++ b/Marlin/src/libs/private_spi.h @@ -27,7 +27,7 @@ #include template -class SPI { +class SPIclass { static SoftSPI softSPI; public: FORCE_INLINE static void init() { softSPI.begin(); } @@ -38,7 +38,7 @@ class SPI { // Hardware SPI template<> -class SPI { +class SPIclass { public: FORCE_INLINE static void init() { OUT_WRITE(SCK_PIN, LOW); diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 57eb529f2a..5bf392fdae 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -981,7 +981,7 @@ void Temperature::updateTemperaturesFromRawValues() { #ifndef MAX6675_DO_PIN #define MAX6675_DO_PIN MISO_PIN #endif - SPI max6675_spi; + SPIclass max6675_spi; #endif /**