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

Merge pull request #6373 from mtowara/mt_makefile_fix

Browse Source 
Fix Makefile build
This commit is contained in:
Scott Lahteine 2017-04-17 16:16:37 -05:00 committed by GitHub
commit ba4a005ceb
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Makefile
View File

@ -296,7 +296,7 @@ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
temperature.cpp cardreader.cpp configuration_store.cpp \ temperature.cpp cardreader.cpp configuration_store.cpp \
watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \ watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
dac_mcp4728.cpp vector_3.cpp qr_solve.cpp endstops.cpp stopwatch.cpp utility.cpp \ dac_mcp4728.cpp vector_3.cpp qr_solve.cpp endstops.cpp stopwatch.cpp utility.cpp \
printcounter.cpp nozzle.cpp printcounter.cpp nozzle.cpp serial.cpp
ifeq ($(LIQUID_TWI2), 0) ifeq ($(LIQUID_TWI2), 0)
CXXSRC += LiquidCrystal.cpp CXXSRC += LiquidCrystal.cpp
else else

16
Marlin/pinsDebug.h
View File

@ -59,8 +59,8 @@ bool endstop_monitor_flag = false;
// manually add pins that have names that are macros which don't play well with these macros // manually add pins that have names that are macros which don't play well with these macros
#if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY) #if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY)
static const unsigned char RXD_NAME[] PROGMEM = {"RXD"}; static const char RXD_NAME[] PROGMEM = {"RXD"};
static const unsigned char TXD_NAME[] PROGMEM = {"TXD"}; static const char TXD_NAME[] PROGMEM = {"TXD"};
#endif #endif
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
@ -92,11 +92,11 @@ const char* const pin_array[][3] PROGMEM = {
// manually add pins ... // manually add pins ...
#if SERIAL_PORT == 0 #if SERIAL_PORT == 0
#if AVR_ATmega2560_FAMILY #if AVR_ATmega2560_FAMILY
{RXD_NAME, 0, 1}, {RXD_NAME, "0", "1"},
{TXD_NAME, 1, 1}, {TXD_NAME, "1", "1"},
#elif AVR_ATmega1284_FAMILY #elif AVR_ATmega1284_FAMILY
{RXD_NAME, 8, 1}, {RXD_NAME, "8", "1"},
{TXD_NAME, 9, 1}, {TXD_NAME, "9", "1"},
#endif #endif
#endif #endif
@ -181,7 +181,7 @@ static bool pwm_status(uint8_t pin) {
const uint8_t* const PWM_other[][3] PROGMEM = { const volatile uint8_t* const PWM_other[][3] PROGMEM = {
{&TCCR0A, &TCCR0B, &TIMSK0}, {&TCCR0A, &TCCR0B, &TIMSK0},
{&TCCR1A, &TCCR1B, &TIMSK1}, {&TCCR1A, &TCCR1B, &TIMSK1},
#if defined(TCCR2A) && defined(COM2A1) #if defined(TCCR2A) && defined(COM2A1)
@ -199,7 +199,7 @@ const uint8_t* const PWM_other[][3] PROGMEM = {
}; };
const uint8_t* const PWM_OCR[][3] PROGMEM = { const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
#ifdef TIMER0A #ifdef TIMER0A
{&OCR0A,&OCR0B,0}, {&OCR0A,&OCR0B,0},