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

Fix softspi variant conditional for 1284p
master
Scott Lahteine 8 years ago committed by GitHub
commit 857dec0990

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

@ -29,7 +29,11 @@
#include "temperature.h" #include "temperature.h"
#include "thermistortables.h" #include "thermistortables.h"
#include "language.h" #include "language.h"
#include "spi.h"
#if ENABLED(HEATER_0_USES_MAX6675)
#include "spi.h"
#endif
#if ENABLED(BABYSTEPPING) #if ENABLED(BABYSTEPPING)
#include "stepper.h" #include "stepper.h"
#endif #endif

Loading…
Cancel
Save