diff --git a/.gitmodules b/.gitmodules index 5635b65..00cf1d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,7 @@ [submodule "stm-firmware/shellmatta"] path = stm-firmware/shellmatta url = https://git.shimatta.de/mhu/shellmatta +[submodule "c-style-checker"] + path = c-style-checker + url = https://git.shimatta.de/mhu/c-style-checker.git + branch = master diff --git a/c-style-checker b/c-style-checker new file mode 160000 index 0000000..3a58e3d --- /dev/null +++ b/c-style-checker @@ -0,0 +1 @@ +Subproject commit 3a58e3dd1c2ef6de78df89c8fdc7ba96b51cd4e0 diff --git a/stm-firmware/Makefile b/stm-firmware/Makefile index cac9070..284cefd 100644 --- a/stm-firmware/Makefile +++ b/stm-firmware/Makefile @@ -82,7 +82,6 @@ default: $(target).elf %.hex: %.elf $(QUIET)$(OBJCOPY) -O ihex $^ $@ - #Linking $(target).elf: $(OBJ) $(ASOBJ) @echo [LD] $@ @@ -103,7 +102,10 @@ $(ASOBJ): $(QUIET)$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ $(@:$(OBJDIR)/%.S.o=%.S) -.PHONY: qtproject clean mrproper objcopy disassemble +.PHONY: qtproject clean mrproper objcopy disassemble program + +program: $(target).elf + ./program-device.sh $< disassemble: $(target).elf $(QUIET)$(OBJDUMP) -D -s $< > $(target).lss diff --git a/stm-firmware/program-device.sh b/stm-firmware/program-device.sh index bcb13b7..780d4db 100755 --- a/stm-firmware/program-device.sh +++ b/stm-firmware/program-device.sh @@ -1,5 +1,10 @@ #!/bin/bash +if [[ -z $1 ]]; then + echo "Usage: $0 " + exit -1 +fi + JLinkGDBServer -if SWD -device STM32F407VE & sleep 2 @@ -12,7 +17,7 @@ if [[ $gdbpid == "" ]]; then exit fi -arm-none-eabi-gdb -x program-device.gdb reflow-controller.elf +arm-none-eabi-gdb -x program-device.gdb $1 sleep 2 kill $gdbpid