소스 검색

Forgot to include reference to Servo in makefile

Gord Christmas 12 년 전
부모
커밋
96624f0f31
1개의 변경된 파일10개의 추가작업 그리고 10개의 파일을 삭제
  1. 10
    10
      Marlin/Makefile

+ 10
- 10
Marlin/Makefile 파일 보기

1
 # Sprinter Arduino Project Makefile
1
 # Sprinter Arduino Project Makefile
2
-# 
2
+#
3
 # Makefile Based on:
3
 # Makefile Based on:
4
 # Arduino 0011 Makefile
4
 # Arduino 0011 Makefile
5
 # Arduino adaptation by mellis, eighthave, oli.keller
5
 # Arduino adaptation by mellis, eighthave, oli.keller
6
 # Marlin adaption by Daid
6
 # Marlin adaption by Daid
7
 #
7
 #
8
 # This has been tested with Arduino 0022.
8
 # This has been tested with Arduino 0022.
9
-# 
9
+#
10
 # This makefile allows you to build sketches from the command line
10
 # This makefile allows you to build sketches from the command line
11
 # without the Arduino environment (or Java).
11
 # without the Arduino environment (or Java).
12
 #
12
 #
21
 #     (e.g. UPLOAD_PORT = /dev/tty.USB0).  If the exact name of this file
21
 #     (e.g. UPLOAD_PORT = /dev/tty.USB0).  If the exact name of this file
22
 #     changes, you can use * as a wildcard (e.g. UPLOAD_PORT = /dev/tty.usb*).
22
 #     changes, you can use * as a wildcard (e.g. UPLOAD_PORT = /dev/tty.usb*).
23
 #
23
 #
24
-#  3. Set the line containing "MCU" to match your board's processor. 
24
+#  3. Set the line containing "MCU" to match your board's processor.
25
 #     Older one's are atmega8 based, newer ones like Arduino Mini, Bluetooth
25
 #     Older one's are atmega8 based, newer ones like Arduino Mini, Bluetooth
26
 #     or Diecimila have the atmega168.  If you're using a LilyPad Arduino,
26
 #     or Diecimila have the atmega168.  If you're using a LilyPad Arduino,
27
 #     change F_CPU to 8000000. If you are using Gen7 electronics, you
27
 #     change F_CPU to 8000000. If you are using Gen7 electronics, you
44
 ARDUINO_VERSION      ?= 22
44
 ARDUINO_VERSION      ?= 22
45
 
45
 
46
 # You can optionally set a path to the avr-gcc tools. Requires a trailing slash. (ex: /usr/local/avr-gcc/bin)
46
 # You can optionally set a path to the avr-gcc tools. Requires a trailing slash. (ex: /usr/local/avr-gcc/bin)
47
-AVR_TOOLS_PATH ?= 
47
+AVR_TOOLS_PATH ?=
48
 
48
 
49
 #Programmer configuration
49
 #Programmer configuration
50
 UPLOAD_RATE        ?= 115200
50
 UPLOAD_RATE        ?= 115200
213
 	SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp		\
213
 	SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp		\
214
 	stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp \
214
 	stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp \
215
 	watchdog.cpp
215
 	watchdog.cpp
216
-CXXSRC += LiquidCrystal.cpp ultralcd.cpp SPI.cpp
216
+CXXSRC += LiquidCrystal.cpp ultralcd.cpp SPI.cpp Servo.cpp
217
 
217
 
218
 #Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version
218
 #Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version
219
 ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
219
 ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
317
 # Default target.
317
 # Default target.
318
 all: sizeafter
318
 all: sizeafter
319
 
319
 
320
-build: $(BUILD_DIR) elf hex 
320
+build: $(BUILD_DIR) elf hex
321
 
321
 
322
 # Creates the object directory
322
 # Creates the object directory
323
-$(BUILD_DIR): 
323
+$(BUILD_DIR):
324
 	$P mkdir -p $(BUILD_DIR)
324
 	$P mkdir -p $(BUILD_DIR)
325
 
325
 
326
 elf: $(BUILD_DIR)/$(TARGET).elf
326
 elf: $(BUILD_DIR)/$(TARGET).elf
327
 hex: $(BUILD_DIR)/$(TARGET).hex
327
 hex: $(BUILD_DIR)/$(TARGET).hex
328
 eep: $(BUILD_DIR)/$(TARGET).eep
328
 eep: $(BUILD_DIR)/$(TARGET).eep
329
-lss: $(BUILD_DIR)/$(TARGET).lss 
329
+lss: $(BUILD_DIR)/$(TARGET).lss
330
 sym: $(BUILD_DIR)/$(TARGET).sym
330
 sym: $(BUILD_DIR)/$(TARGET).sym
331
 
331
 
332
-# Program the device.  
332
+# Program the device.
333
 # Do not try to reset an arduino if it's not one
333
 # Do not try to reset an arduino if it's not one
334
 upload: $(BUILD_DIR)/$(TARGET).hex
334
 upload: $(BUILD_DIR)/$(TARGET).hex
335
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
335
 ifeq (${AVRDUDE_PROGRAMMER}, arduino)
356
 	--change-section-address .data-0x800000 \
356
 	--change-section-address .data-0x800000 \
357
 	--change-section-address .bss-0x800000 \
357
 	--change-section-address .bss-0x800000 \
358
 	--change-section-address .noinit-0x800000 \
358
 	--change-section-address .noinit-0x800000 \
359
-	--change-section-address .eeprom-0x810000 
359
+	--change-section-address .eeprom-0x810000
360
 
360
 
361
 
361
 
362
 coff: $(BUILD_DIR)/$(TARGET).elf
362
 coff: $(BUILD_DIR)/$(TARGET).elf

Loading…
취소
저장