josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

all defines live in config.h now, remove from Makefile

This commit is contained in:
Michael Moon 2011-03-24 11:26:11 +11:00
parent 918e3be84c
commit d7f5c08174
2 changed files with 5 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Makefile
View File

@ -2,7 +2,7 @@
# # # #
# Teacup - alternative firmware for repraps # # Teacup - alternative firmware for repraps #
# # # #
# by Triffid Hunter, Traumflug, jakepoz # # by Triffid Hunter, Traumflug, jakepoz, Markus Hitter, many others #
# # # #
# # # #
# This firmware is Copyright (C) 2009-2010 Michael Moon aka Triffid_Hunter # # This firmware is Copyright (C) 2009-2010 Michael Moon aka Triffid_Hunter #
@ -41,32 +41,6 @@ F_CPU = 16000000L
# F_CPU = 8000000L # F_CPU = 8000000L
DEFS = -DF_CPU=$(F_CPU) DEFS = -DF_CPU=$(F_CPU)
##############################################################################
# #
# Available Defines: #
# #
# DEBUG #
# enables tons of debugging output. may cause host-side talkers to choke #
# XONXOFF #
# enables XON/XOFF flow control for stupid or crude talkers #
# ACCELERATION_REPRAP #
# enables reprap-style acceleration #
# ACCELERATION_RAMPING #
# enables start/stop ramping #
# ACCELERATION_TEMPORAL #
# enables experimental temporal step algorithm - not technically a type of #
# acceleration, but since it controls step timing it seems appropriate #
# GEN3 #
# build for standard reprap electronics instead of your custom rig #
# HOST #
# this is the motherboard for GEN3- don't touch! Extruder has its own #
# Makefile. #
# #
##############################################################################
# DEFS = -DF_CPU=$(F_CPU) -DHOST -DGEN3
# DEFS += "-DDEBUG=1"
############################################################################## ##############################################################################
# # # #
# Programmer settings for "make program" # # Programmer settings for "make program" #
@ -86,6 +60,7 @@ AVRDUDECONF = /etc/avrdude.conf
############################################################################## ##############################################################################
PROGPORT = /dev/arduino PROGPORT = /dev/arduino
# PROGPORT = /dev/ttyUSB0
# atmega168 # atmega168
#PROGBAUD = 19200 #PROGBAUD = 19200

21
extruder/Makefile
View File

@ -53,25 +53,7 @@ CC = $(ARCH)gcc
OBJDUMP = $(ARCH)objdump OBJDUMP = $(ARCH)objdump
OBJCOPY = $(ARCH)objcopy OBJCOPY = $(ARCH)objcopy
##############################################################################
# #
# Available Defines: #
# #
# DEBUG #
# enables tons of debugging output. may cause host-side talkers to choke #
# XONXOFF #
# enables XON/XOFF flow control for stupid or crude talkers #
# ACCELERATION_REPRAP #
# enables reprap-style acceleration #
# ACCELERATION_RAMPING #
# enables start/stop ramping #
# GEN3 #
# build for standard reprap electronics instead of your custom rig #
# #
##############################################################################
DEFS = -DF_CPU=$(F_CPU) DEFS = -DF_CPU=$(F_CPU)
# DEFS += "-DDEBUG=1"
OPTIMIZE = -Os -ffunction-sections -finline-functions-called-once OPTIMIZE = -Os -ffunction-sections -finline-functions-called-once
# OPTIMIZE = -O0 # OPTIMIZE = -O0
@ -89,7 +71,10 @@ AVRDUDECONF = /etc/avrdude.conf
# MODE="0660" # # MODE="0660" #
# # # #
############################################################################## ##############################################################################
PROGPORT = /dev/arduino PROGPORT = /dev/arduino
# PROGPORT = /dev/ttyUSB0
PROGBAUD = 57600 PROGBAUD = 57600
OBJ = $(patsubst %.c,%.o,${SOURCES}) OBJ = $(patsubst %.c,%.o,${SOURCES})