CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fix softspi variant conditional for 1284p
This commit is contained in:
Scott Lahteine 2017-04-15 16:33:50 -05:00 committed by GitHub
commit 857dec0990
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/softspi.h
View File

@ -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

4
Marlin/temperature.cpp
View File

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