Browse Source

Rename SPI class to avoid conflict (good?)

Scott Lahteine 7 years ago
parent
commit
9c21191f74
2 changed files with 3 additions and 3 deletions
  1. 2
    2
      Marlin/src/libs/private_spi.h
  2. 1
    1
      Marlin/src/module/temperature.cpp

+ 2
- 2
Marlin/src/libs/private_spi.h View File

27
 #include <stdint.h>
27
 #include <stdint.h>
28
 
28
 
29
 template<uint8_t MisoPin, uint8_t MosiPin, uint8_t SckPin>
29
 template<uint8_t MisoPin, uint8_t MosiPin, uint8_t SckPin>
30
-class SPI {
30
+class SPIclass {
31
   static SoftSPI<MisoPin, MosiPin, SckPin> softSPI;
31
   static SoftSPI<MisoPin, MosiPin, SckPin> softSPI;
32
   public:
32
   public:
33
     FORCE_INLINE static void init() { softSPI.begin(); }
33
     FORCE_INLINE static void init() { softSPI.begin(); }
38
 
38
 
39
 // Hardware SPI
39
 // Hardware SPI
40
 template<>
40
 template<>
41
-class SPI<MISO_PIN, MOSI_PIN, SCK_PIN> {
41
+class SPIclass<MISO_PIN, MOSI_PIN, SCK_PIN> {
42
   public:
42
   public:
43
     FORCE_INLINE static void init() {
43
     FORCE_INLINE static void init() {
44
         OUT_WRITE(SCK_PIN, LOW);
44
         OUT_WRITE(SCK_PIN, LOW);

+ 1
- 1
Marlin/src/module/temperature.cpp View File

981
   #ifndef MAX6675_DO_PIN
981
   #ifndef MAX6675_DO_PIN
982
     #define MAX6675_DO_PIN MISO_PIN
982
     #define MAX6675_DO_PIN MISO_PIN
983
   #endif
983
   #endif
984
-  SPI<MAX6675_DO_PIN, MOSI_PIN, MAX6675_SCK_PIN> max6675_spi;
984
+  SPIclass<MAX6675_DO_PIN, MOSI_PIN, MAX6675_SCK_PIN> max6675_spi;
985
 #endif
985
 #endif
986
 
986
 
987
 /**
987
 /**

Loading…
Cancel
Save