From d7f5c0817447f51ef30b3e4c65f21022513c62e7 Mon Sep 17 00:00:00 2001 From: Michael Moon Date: Thu, 24 Mar 2011 11:26:11 +1100 Subject: [PATCH] all defines live in config.h now, remove from Makefile --- Makefile | 29 ++--------------------------- extruder/Makefile | 21 +++------------------ 2 files changed, 5 insertions(+), 45 deletions(-) diff --git a/Makefile b/Makefile index efe86ac..188b6d2 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # # # 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 # @@ -41,32 +41,6 @@ F_CPU = 16000000L # F_CPU = 8000000L 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" # @@ -86,6 +60,7 @@ AVRDUDECONF = /etc/avrdude.conf ############################################################################## PROGPORT = /dev/arduino +# PROGPORT = /dev/ttyUSB0 # atmega168 #PROGBAUD = 19200 diff --git a/extruder/Makefile b/extruder/Makefile index 5e57c7f..f16c88d 100644 --- a/extruder/Makefile +++ b/extruder/Makefile @@ -53,25 +53,7 @@ CC = $(ARCH)gcc OBJDUMP = $(ARCH)objdump 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 += "-DDEBUG=1" OPTIMIZE = -Os -ffunction-sections -finline-functions-called-once # OPTIMIZE = -O0 @@ -89,7 +71,10 @@ AVRDUDECONF = /etc/avrdude.conf # MODE="0660" # # # ############################################################################## + PROGPORT = /dev/arduino +# PROGPORT = /dev/ttyUSB0 + PROGBAUD = 57600 OBJ = $(patsubst %.c,%.o,${SOURCES})