Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Makefile build #6373

Merged
merged 2 commits into from
Apr 17, 2017
Merged

Fix Makefile build #6373

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6095c9
fix missing serial.cpp in Makefile
mtowara Apr 14, 2017
150b15c
fix compiler errors generated by more stringent flags in Makefile:
mtowara Apr 17, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
temperature.cpp cardreader.cpp configuration_store.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 \
printcounter.cpp nozzle.cpp
printcounter.cpp nozzle.cpp serial.cpp
ifeq ($(LIQUID_TWI2), 0)
CXXSRC += LiquidCrystal.cpp
else
Expand Down
16 changes: 8 additions & 8 deletions Marlin/pinsDebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
#if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY)
static const unsigned char RXD_NAME[] PROGMEM = {"RXD"};
static const unsigned char TXD_NAME[] PROGMEM = {"TXD"};
static const char RXD_NAME[] PROGMEM = {"RXD"};
static const char TXD_NAME[] PROGMEM = {"TXD"};
#endif

/////////////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -92,11 +92,11 @@ const char* const pin_array[][3] PROGMEM = {
// manually add pins ...
#if SERIAL_PORT == 0
#if AVR_ATmega2560_FAMILY
{RXD_NAME, 0, 1},
{TXD_NAME, 1, 1},
{RXD_NAME, "0", "1"},
{TXD_NAME, "1", "1"},
#elif AVR_ATmega1284_FAMILY
{RXD_NAME, 8, 1},
{TXD_NAME, 9, 1},
{RXD_NAME, "8", "1"},
{TXD_NAME, "9", "1"},
#endif
#endif

Expand Down Expand Up @@ -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},
{&TCCR1A, &TCCR1B, &TIMSK1},
#if defined(TCCR2A) && defined(COM2A1)
Expand All @@ -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
{&OCR0A,&OCR0B,0},
Expand Down