From 8c7ee88332652e7e79f6c1e4baacabe2183f7e8e Mon Sep 17 00:00:00 2001
From: root <root@ka-ata-killa.ourano.james.local>
Date: Tue, 2 Mar 2021 12:54:03 +0000
Subject: working, with hybrid FLL/PLL, new refclk input and support for
 max7219 displays, neo 5 and neo 7 and a bazillion other fixes

---
 app/Makefile | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

(limited to 'app/Makefile')

diff --git a/app/Makefile b/app/Makefile
index 4a007a6..526a58f 100644
--- a/app/Makefile
+++ b/app/Makefile
@@ -19,14 +19,14 @@
 
 
 CPROTO=cproto
-PROG=roofclock
+PROG=clockv2
 
 LDSCRIPT = ${PROG}.ld
 
 V=1
 default: ${PROG}.elf
 
-CSRCS=led.c ticker.c ring.c usart.c stdio.c lwip_glue.c steth.c msf.c abs.c pll.c main.c time_fn.c ntp.c dcf77.c util.c stats.c gps.c hexdump.c bits.c  max7219.c  report.c sysclk.c cdcacm.c usb.c dfu.c
+CSRCS=led.c ticker.c ring.c usart.c stdio.c lwip_glue.c steth.c msf.c abs.c pll.c main.c time_fn.c ntp.c dcf77.c util.c stats.c gps.c hexdump.c bits.c  max7219.c  report.c sysclk.c cdcacm.c usb.c dfu.c adc.c dummy_kb.c ref.c ptp.c
 HSRCS= events.h  gps.h  project.h  ring.h  steth.h  time_fn.h  ubx.h
 
 
@@ -70,7 +70,7 @@ OBJS=${MYOBJS} ${LWIP_OBJS}
 include ../Makefile.include
 
 CFLAGS+=-Wno-redundant-decls -Wno-unused-parameter
-CPPFLAGS        += -I.. -I../libopencm3-local  -I${LWIP_PATH}/${LWIP}/src/include -Ilwip -I${LWIP_PATH}/${LWIP}/src/include/ipv4 -I${LWIP_LOCAL}/port/stm32f4x7 -I. 
+CPPFLAGS        += -I.. -I. -I../libopencm3-local  -Ilwip -I${LWIP_PATH}/${LWIP}/src/include -I${LWIP_PATH}/${LWIP}/src/include/ipv4 -I${LWIP_LOCAL}/port/stm32f4x7 
 
 
 LDLIBS+= -lm
@@ -81,7 +81,6 @@ fish: ${OBJS}
 #HOST=clock-lnx
 #HOST=10.32.91.140
 HOST=tick
-HOST=10.32.96.46
 
 
 reset:
@@ -91,33 +90,19 @@ reset:
 			-c shutdown
 
 
-
-test-dfu: ${PROG}.dfu 
-	../dfu-util/src/dfu-util -v -R -a 0 -d ${VID}:${DID} -s 0x08004000:leave -D $<
-	$(Q)$(OOCD) -f ../oocd/interface/$(OOCD_INTERFACE).cfg \
-			-f ../oocd/board/$(OOCD_BOARD).cfg \
-		        -c "init" -c "dump_image readback.img  0x8004000 0x7c000" \
-			-c shutdown
-
-	hexdump -C ${PROG}.dfu > a
-	hexdump -C readback.img> b
-	diff -uN a b > c
-
-
 fl: ${PROG}.hex
 	ssh ${HOST} flash_stm32 < ${PROG}.hex
 
 
-DID=$(shell printf '\#include "id.h"\nID_PRODUCT' | ${CC} -I.. -E - | grep -v ^\# )
-VID=$(shell printf '\#include "id.h"\nID_VENDOR' | ${CC} -I.. -E - | grep -v ^\# )
+%.bin: %.elf
+	$(Q)$(OBJCOPY) -Obinary $(*).elf $(*).bin
 
+%.dfu:%.bin
+	../tools/dfuse-pack.py -D 0x483:0xff03 -b 0x08004000:$< $@
 
-%.dfu: %.elf
-	@#printf "  OBJCOPY $(*).dfu\n"
-	$(Q)$(OBJCOPY) -Obinary $(*).elf $(*).dfu
+dfu:${PROG}.bin
+	dfu-util -R -a 0 -d 0483:ff03,0483:df11 -s 0x08004000:leave -D $<
 
-dfu:${PROG}.dfu
-	dfu-util -R -a 0 -d ${VID}:${DID} -s 0x08004000:leave -D $<
 
 
 program: ${PROG}.hex
-- 
cgit v1.2.3