diff options
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 41 |
1 files changed, 30 insertions, 11 deletions
@@ -17,6 +17,9 @@ OD := arm-none-eabi-objdump ARCH = $(shell uname -m) OS = $(shell uname) +VENDOR_ID = 1EAF +PRODUCT_ID = 0003 + ifeq ($(OS),Linux) DFU = dfu-util else @@ -28,13 +31,17 @@ LIB_PATH = libmaple OUTDIRS = $(BUILD_PATH)/$(LIB_PATH)\ $(BUILD_PATH)/wirish \ - $(BUILD_PATH)/wirish/comm + $(BUILD_PATH)/wirish/comm \ + $(BUILD_PATH)/$(LIB_PATH)/usb \ + $(BUILD_PATH)/$(LIB_PATH)/usb/usb_lib INCLUDES = -I$(LIB_PATH) \ -I./ \ -Iwirish \ - -Iwirish/comm + -Iwirish/comm \ + -I$(LIB_PATH)/usb \ + -I$(LIB_PATH)/usb/usb_lib # default is to upload to flash #DEFFLAGS = VECT_TAB_BASE @@ -54,9 +61,6 @@ LFLAGS = -Tstm32conf/$(LINKER) -L stm32conf/lanchon-stm32 \ CPFLAGS = -v -Obinary ODFLAGS = -S -# main source file -MAIN=main.c - CSRC = libmaple/systick.c \ libmaple/timers.c \ libmaple/adc.c \ @@ -67,7 +71,6 @@ CSRC = libmaple/systick.c \ libmaple/nvic.c \ libmaple/usart.c \ libmaple/util.c \ - libmaple/usb.c \ libmaple/rcc.c \ libmaple/flash.c \ libmaple/spi.c \ @@ -77,15 +80,23 @@ CSRC = libmaple/systick.c \ wirish/time.c \ wirish/pwm.c \ wirish/ext_interrupts.c \ - wirish/wirish_digital.c + wirish/wirish_digital.c \ + libmaple/usb/usb.c \ + libmaple/usb/usb_callbacks.c \ + libmaple/usb/usb_hardware.c \ + libmaple/usb/descriptors.c \ + libmaple/usb/usb_lib/usb_core.c \ + libmaple/usb/usb_lib/usb_init.c \ + libmaple/usb/usb_lib/usb_int.c \ + libmaple/usb/usb_lib/usb_mem.c \ + libmaple/usb/usb_lib/usb_regs.c \ CPPSRC = wirish/wirish_math.cpp \ wirish/Print.cpp \ wirish/comm/HardwareSerial.cpp \ - wirish/comm/HardwareUsb.cpp \ wirish/comm/HardwareSPI.cpp \ wirish/cxxabi-compat.cpp \ - main.cpp + main.cpp # i really have no idea what i'm doing meep += $(CSRC) @@ -129,6 +140,10 @@ info: all: info +tags: + etags `find . -name "*.c" -o -name "*.cpp" -o -name "*.h"` + @echo "Made TAGS file for EMACS code browsing" + $(BUILD_PATH): mkdir -p build @@ -183,10 +198,14 @@ jtag: $(BUILD_PATH)/main.bin @echo "JTAG build" program_ram: ram - $(DFU) -a0 -d 0110:1001 -D build/main.bin -R + ./reset.py + sleep 1 + $(DFU) -a0 -d $(VENDOR_ID):$(PRODUCT_ID) -D build/main.bin -R program_flash: flash - $(DFU) -a1 -d 0110:1001 -D build/main.bin -R + ./reset.py + sleep 1 + $(DFU) -a1 -d $(VENDOR_ID):$(PRODUCT_ID) -D build/main.bin -R program_jtag: jtag openocd -f stm32conf/flash.cfg |