The unified diff between revisions [64de686d..] and [056a532c..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'Makefile'

#
# old_revision [64de686d701acb9539dc52fe0bff299405612ab0]
# new_revision [056a532c92301bcb224e1f786c5f6720e8acf3eb]
#
# patch "Makefile"
#  from [3c0587750b990cb4dc04f8caccec5088db10298c]
#    to [a00b5065a42f23ab2b81041b1b16d667283bc4d5]
#
============================================================
--- Makefile	3c0587750b990cb4dc04f8caccec5088db10298c
+++ Makefile	a00b5065a42f23ab2b81041b1b16d667283bc4d5
@@ -3,12 +3,17 @@ SSRCS=crt0.s
 NAME=quad
 
 SSRCS=crt0.s
-CSRCS=main.c i2c.c wmp.c timer.c interrupt.c uart.c event.c matrix.c dcm.c
+CSRCS=main.c i2c.c mpu6050.c timer.c interrupt.c uart.c event.c matrix.c dcm.c
 CSRCS+=fisqrt.c stick.c trig.c motor.c led.c watchdog.c panic.c status.c
+CSRCS+=thrust.c sensors.c spi.c sdcard.c log.c
 
-#PROJOPTS=-DUSE_UART -DSEND_DCM
+#PROJOPTS=-DUSE_UART -DSEND_DCM -DSTICK_DEBUG_CALIBRATE
+PROJOPTS=-DTIMER_CPPM -DI2C_FAST
+#PROJOPTS=-DTIMER_CPPM -DUSE_UART -DPANIC_32BIT -DPANIC_CHECKPOINT -DI2C_FAST -DSEND_DCM
+#PROJOPTS=-DTIMER_CPPM -DPANIC_32BIT -DPANIC_CHECKPOINT -DI2C_FAST -DSEND_DCM
+#PROJOPTS=-DTIMER_CPPM -DPANIC_32BIT -DPANIC_CHECKPOINT -DI2C_FAST -DUSE_UART -DSEND_DCM
 
-COPTIM?=-O1
+COPTIM?=-Os
 CFLAGS=-march=armv4t -msoft-float $(COPTIM) -Wall -Werror -Wextra $(PROJOPTS)
 
 LDSCRIPT=lpc2103_flash.ld
@@ -36,6 +41,8 @@ OBJS=$(SOBJS) $(COBJS)
 
 .SUFFIXES: .elf .hex .bin
 
+$(OBJS): Makefile
+
 $(NAME).elf: $(OBJS)
 	$(CC) $(CFLAGS) -nostdlib -nostartfiles -T $(LDSCRIPT) -Wl,-Map -Wl,$(NAME).map -o $(NAME).elf $(OBJS) -lgcc