The unified diff between revisions [23a3e9a5..] and [3dc5e7ac..] is displayed below. It can also be downloaded as a raw diff.

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

#
# old_revision [23a3e9a50b4034343e3bd217d2c225dcaec064dd]
# new_revision [3dc5e7ac4bcb952cc267892653dd78ed095d8778]
#
# patch "Makefile"
#  from [d61625cad3fe90d5ffd933b03b2f322afc177d10]
#    to [e817116cfe37ab4bd4f4abad195ca23aebe4dffc]
#
============================================================
--- Makefile	d61625cad3fe90d5ffd933b03b2f322afc177d10
+++ Makefile	e817116cfe37ab4bd4f4abad195ca23aebe4dffc
@@ -3,15 +3,30 @@ 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+=fisqrt.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 hmc5883l.c mpl3115a2.c
 
-COPTIM?=-O1
-CFLAGS=-march=armv4t -msoft-float $(COPTIM) -Wall -Werror -Wextra
+#PROJOPTS=-DUSE_UART -DSEND_DCM -DSTICK_DEBUG_CALIBRATE
+PROJOPTS=-DTIMER_CPPM -DI2C_FAST
+#PROJOPTS=-DTIMER_CPPM -DI2C_FAST -DUSE_UART
+#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?=-Os
+CFLAGS=-march=armv4t -msoft-float $(COPTIM) -Wall -Werror -Wextra $(PROJOPTS)
+
 LDSCRIPT=lpc2103_flash.ld
+
+# To build with the Clang Static Analyzer, use
+#     scan-build --use-cc=arm-elf-gcc make
+# And uncomment the following line:
 CC=arm-elf-gcc
+
 OBJCOPY=arm-elf-objcopy
+LINT=splint
+LINTFLAGS=-booltype bool -nolib +charint
 
 CLEANOBJS=$(OBJS) $(NAME).hex $(NAME).elf $(NAME).bin $(NAME).map .depend
 
@@ -27,6 +42,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
 
@@ -45,4 +62,7 @@ depend:
 depend:
 	$(CC) -MM $(CFLAGS) -nostdlib -nostartfiles $(CSRCS) >.depend
 
+lint:
+	$(LINT) $(LINTFLAGS) $(CSRCS)
+
 .sinclude ".depend"