Sfoglia il codice sorgente

Rename SPI class to avoid conflict (good?)

Scott Lahteine 7 anni fa
parent
commit
9c21191f74
2 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  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 Vedi File

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

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

@@ -981,7 +981,7 @@ void Temperature::updateTemperaturesFromRawValues() {
981 981
   #ifndef MAX6675_DO_PIN
982 982
     #define MAX6675_DO_PIN MISO_PIN
983 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 985
 #endif
986 986
 
987 987
 /**

Loading…
Annulla
Salva