From 1a447d0047331409fffe66dab7d45045b203578f Mon Sep 17 00:00:00 2001 From: benlye Date: Fri, 14 Apr 2017 18:46:09 +0100 Subject: [PATCH 1/2] Fix variant conditional for 1284p --- Marlin/softspi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/softspi.h b/Marlin/softspi.h index ef529d817..2edd45ae5 100644 --- a/Marlin/softspi.h +++ b/Marlin/softspi.h @@ -195,7 +195,7 @@ static const pin_map_t pinMap[] = { || defined(__AVR_ATmega324__)\ || defined(__AVR_ATmega16__) -#ifdef defined(VARIANT_MIGHTY) +#if defined(VARIANT_MIGHTY) // Mighty Layout static const pin_map_t pinMap[] = { {&DDRB, &PINB, &PORTB, 0}, // B0 0 From 0a2f60fab48baea6748facc0f4ade2f71abaf655 Mon Sep 17 00:00:00 2001 From: benlye Date: Sat, 15 Apr 2017 16:22:42 +0100 Subject: [PATCH 2/2] Make spi.h inclusion conditional spi.h is only needed if HEATER_0_USES_MAX6675 is defined, so making its inclusion conditional on HEATER_0_USES_MAX6675 being defined. --- Marlin/temperature.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Marlin/temperature.cpp b/Marlin/temperature.cpp index ce95eaadf..0155a00d5 100644 --- a/Marlin/temperature.cpp +++ b/Marlin/temperature.cpp @@ -29,7 +29,11 @@ #include "temperature.h" #include "thermistortables.h" #include "language.h" -#include "spi.h" + +#if ENABLED(HEATER_0_USES_MAX6675) + #include "spi.h" +#endif + #if ENABLED(BABYSTEPPING) #include "stepper.h" #endif