SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Rename SPI class to avoid conflict (good?)

Browse source
This commit is contained in:
Scott Lahteine 2017-09-15 20:47:04 -05:00
parent 51f195e698
commit 9c21191f74
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/libs/private_spi.h
View file

@ -27,7 +27,7 @@
#include <stdint.h> #include <stdint.h>
template<uint8_t MisoPin, uint8_t MosiPin, uint8_t SckPin> template<uint8_t MisoPin, uint8_t MosiPin, uint8_t SckPin>
class SPI { class SPIclass {
static SoftSPI<MisoPin, MosiPin, SckPin> softSPI; static SoftSPI<MisoPin, MosiPin, SckPin> softSPI;
public: public:
FORCE_INLINE static void init() { softSPI.begin(); } FORCE_INLINE static void init() { softSPI.begin(); }
@ -38,7 +38,7 @@ class SPI {
// Hardware SPI // Hardware SPI
template<> template<>
class SPI<MISO_PIN, MOSI_PIN, SCK_PIN> { class SPIclass<MISO_PIN, MOSI_PIN, SCK_PIN> {
public: public:
FORCE_INLINE static void init() { FORCE_INLINE static void init() {
OUT_WRITE(SCK_PIN, LOW); OUT_WRITE(SCK_PIN, LOW);

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

@ -981,7 +981,7 @@ void Temperature::updateTemperaturesFromRawValues() {
#ifndef MAX6675_DO_PIN #ifndef MAX6675_DO_PIN
#define MAX6675_DO_PIN MISO_PIN #define MAX6675_DO_PIN MISO_PIN
#endif #endif
SPI<MAX6675_DO_PIN, MOSI_PIN, MAX6675_SCK_PIN> max6675_spi; SPIclass<MAX6675_DO_PIN, MOSI_PIN, MAX6675_SCK_PIN> max6675_spi;
#endif #endif
/** /**