Browse Source

Merge pull request #6342 from benlye/benlye-fix-softspi

Fix softspi variant conditional for 1284p
Scott Lahteine 8 years ago
parent
commit
857dec0990
2 changed files with 6 additions and 2 deletions
  1. 1
    1
      Marlin/softspi.h
  2. 5
    1
      Marlin/temperature.cpp

+ 1
- 1
Marlin/softspi.h View File

195
 || defined(__AVR_ATmega324__)\
195
 || defined(__AVR_ATmega324__)\
196
 || defined(__AVR_ATmega16__)
196
 || defined(__AVR_ATmega16__)
197
 
197
 
198
-#ifdef defined(VARIANT_MIGHTY)
198
+#if defined(VARIANT_MIGHTY)
199
 // Mighty Layout
199
 // Mighty Layout
200
 static const pin_map_t pinMap[] = {
200
 static const pin_map_t pinMap[] = {
201
   {&DDRB, &PINB, &PORTB, 0},  // B0  0
201
   {&DDRB, &PINB, &PORTB, 0},  // B0  0

+ 5
- 1
Marlin/temperature.cpp View File

29
 #include "temperature.h"
29
 #include "temperature.h"
30
 #include "thermistortables.h"
30
 #include "thermistortables.h"
31
 #include "language.h"
31
 #include "language.h"
32
-#include "spi.h"
32
+
33
+#if ENABLED(HEATER_0_USES_MAX6675)
34
+  #include "spi.h"
35
+#endif
36
+
33
 #if ENABLED(BABYSTEPPING)
37
 #if ENABLED(BABYSTEPPING)
34
   #include "stepper.h"
38
   #include "stepper.h"
35
 #endif
39
 #endif

Loading…
Cancel
Save