The unified diff between revisions [64de686d..] and [4f22e7ef..] 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 [4f22e7ef7d3064e3b51a5b868a4722f3f13c747b]
#
# patch "Makefile"
#  from [3c0587750b990cb4dc04f8caccec5088db10298c]
#    to [33137b98e954e7abaca672f6ad561d1367b25d30]
#
============================================================
--- Makefile	3c0587750b990cb4dc04f8caccec5088db10298c
+++ Makefile	33137b98e954e7abaca672f6ad561d1367b25d30
@@ -5,8 +5,10 @@ CSRCS+=fisqrt.c stick.c trig.c motor.c l
 SSRCS=crt0.s
 CSRCS=main.c i2c.c wmp.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
 
-#PROJOPTS=-DUSE_UART -DSEND_DCM
+#PROJOPTS=-DUSE_UART -DSEND_DCM -DSTICK_DEBUG_CALIBRATE
+PROJOPTS=-DTIMER_CPPM
 
 COPTIM?=-O1
 CFLAGS=-march=armv4t -msoft-float $(COPTIM) -Wall -Werror -Wextra $(PROJOPTS)
@@ -36,6 +38,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