From 49148e76706e5e24c2ba7f6ccc1d7ec4736ab2f3 Mon Sep 17 00:00:00 2001
From: root <root@ka-ata-killa.ourano.james.local>
Date: Wed, 3 Mar 2021 15:24:13 +0000
Subject: support cheap chinese blue pill boards, make usb dfu compatible with
 dfuse

---
 app/Makefile | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

(limited to 'app/Makefile')

diff --git a/app/Makefile b/app/Makefile
index dc5503b..e264ad4 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -24,7 +24,7 @@ PROG=serial_over_dp
 V=1
 default: ${PROG}.elf
 
-CSRCS= main.c cdcacm.c dfu.c i2c_bb.c vuart.c ring.c usart.c i2c_hw.c ticker.c ddc.c
+CSRCS= main.c cdcacm.c dfu.c i2c_bb.c vuart.c ring.c usart.c i2c_hw.c ticker.c ddc.c dummy_kb.c usb.c
 HSRCS = project.h
 
 
@@ -38,14 +38,37 @@ VID=$(shell printf '\#include "id.h"\nID_VENDOR' | ${CC} -I.. -E - | grep -v ^\#
 
 INCLUDES +=  -I..
 
-dfu:${PROG}.dfu
-	dfu-util -R -a 0 -d ${VID}:${DID} -s 0x08002000:leave -D $<
+
+%.bin: %.elf
+	$(Q)$(OBJCOPY) -Obinary $(*).elf $(*).bin
+
+%.dfu:%.bin
+	../tools/dfuse-pack.py -D 0x483:0xff03 -b 0x08002000:$< $@
+
+dfu:${PROG}.bin
+	dfu-util -R -a 0 -d 0483:ff03,0483:df11 -s 0x08002000:leave -D $<
 
 program: ${PROG}.elf
 	echo halt | nc -t localhost 4444
 	echo flash write_image erase ${PWD}/$< 0x2000 | nc -t localhost 4444
 	echo reset run | nc -t localhost 4444
 
+ds:
+	$(Q)$(OOCD) -f $(OOCD_INTERFACE) \
+		    -f $(OOCD_BOARD) \
+
+debug: ${PROG}.elf
+	${PREFIX}-gdb -x gdb.script ${PROG}.elf 
+
+reset:
+	$(Q)$(OOCD) -f $(OOCD_INTERFACE) \
+		    -f $(OOCD_BOARD) \
+		-c "init" -c "reset run" \
+		-c shutdown
+
+
+
+
 protos:
 	echo -n > prototypes.h
 	${CPROTO} $(INCLUDES) $(DEFINES) -e -v ${CSRCS} > prototypes.h.tmp
-- 
cgit v1.2.3