Browse Source

Merge pull request #6373 from mtowara/mt_makefile_fix

Fix Makefile build
Scott Lahteine 7 years ago
parent
commit
ba4a005ceb
2 changed files with 9 additions and 9 deletions
  1. 1
    1
      Marlin/Makefile
  2. 8
    8
      Marlin/pinsDebug.h

+ 1
- 1
Marlin/Makefile View File

296
 	temperature.cpp cardreader.cpp configuration_store.cpp \
296
 	temperature.cpp cardreader.cpp configuration_store.cpp \
297
 	watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
297
 	watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
298
 	dac_mcp4728.cpp vector_3.cpp qr_solve.cpp endstops.cpp stopwatch.cpp utility.cpp \
298
 	dac_mcp4728.cpp vector_3.cpp qr_solve.cpp endstops.cpp stopwatch.cpp utility.cpp \
299
-	printcounter.cpp nozzle.cpp
299
+	printcounter.cpp nozzle.cpp serial.cpp
300
 ifeq ($(LIQUID_TWI2), 0)
300
 ifeq ($(LIQUID_TWI2), 0)
301
 CXXSRC += LiquidCrystal.cpp
301
 CXXSRC += LiquidCrystal.cpp
302
 else
302
 else

+ 8
- 8
Marlin/pinsDebug.h View File

59
 
59
 
60
 // manually add pins that have names that are macros which don't play well with these macros
60
 // manually add pins that have names that are macros which don't play well with these macros
61
 #if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY)
61
 #if SERIAL_PORT == 0 && (AVR_ATmega2560_FAMILY || AVR_ATmega1284_FAMILY)
62
-  static const unsigned char RXD_NAME[] PROGMEM = {"RXD"};
63
-  static const unsigned char TXD_NAME[] PROGMEM = {"TXD"};
62
+  static const char RXD_NAME[] PROGMEM = {"RXD"};
63
+  static const char TXD_NAME[] PROGMEM = {"TXD"};
64
 #endif
64
 #endif
65
 
65
 
66
 /////////////////////////////////////////////////////////////////////////////
66
 /////////////////////////////////////////////////////////////////////////////
92
   // manually add pins ...
92
   // manually add pins ...
93
   #if SERIAL_PORT == 0
93
   #if SERIAL_PORT == 0
94
     #if AVR_ATmega2560_FAMILY
94
     #if AVR_ATmega2560_FAMILY
95
-      {RXD_NAME, 0, 1},
96
-      {TXD_NAME, 1, 1},
95
+      {RXD_NAME, "0", "1"},
96
+      {TXD_NAME, "1", "1"},
97
     #elif AVR_ATmega1284_FAMILY
97
     #elif AVR_ATmega1284_FAMILY
98
-      {RXD_NAME, 8, 1},
99
-      {TXD_NAME, 9, 1},
98
+      {RXD_NAME, "8", "1"},
99
+      {TXD_NAME, "9", "1"},
100
     #endif
100
     #endif
101
   #endif
101
   #endif
102
 
102
 
181
 
181
 
182
 
182
 
183
 
183
 
184
-const uint8_t* const PWM_other[][3] PROGMEM = {
184
+const volatile uint8_t* const PWM_other[][3] PROGMEM = {
185
     {&TCCR0A, &TCCR0B, &TIMSK0},
185
     {&TCCR0A, &TCCR0B, &TIMSK0},
186
     {&TCCR1A, &TCCR1B, &TIMSK1},
186
     {&TCCR1A, &TCCR1B, &TIMSK1},
187
   #if defined(TCCR2A) && defined(COM2A1)
187
   #if defined(TCCR2A) && defined(COM2A1)
199
 };
199
 };
200
 
200
 
201
 
201
 
202
-const uint8_t* const PWM_OCR[][3] PROGMEM = {
202
+const volatile uint8_t* const PWM_OCR[][3] PROGMEM = {
203
 
203
 
204
   #ifdef TIMER0A
204
   #ifdef TIMER0A
205
     {&OCR0A,&OCR0B,0},
205
     {&OCR0A,&OCR0B,0},

Loading…
Cancel
Save