Merge branch 'dev' into ui

This commit is contained in:
Mario Hüttel 2020-04-18 01:42:30 +02:00
commit f119433814
4 changed files with 15 additions and 3 deletions

4
.gitmodules vendored
View File

@ -1,3 +1,7 @@
[submodule "stm-firmware/shellmatta"] [submodule "stm-firmware/shellmatta"]
path = stm-firmware/shellmatta path = stm-firmware/shellmatta
url = https://git.shimatta.de/mhu/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

1
c-style-checker Submodule

@ -0,0 +1 @@
Subproject commit 3a58e3dd1c2ef6de78df89c8fdc7ba96b51cd4e0

View File

@ -82,7 +82,6 @@ default: $(target).elf
%.hex: %.elf %.hex: %.elf
$(QUIET)$(OBJCOPY) -O ihex $^ $@ $(QUIET)$(OBJCOPY) -O ihex $^ $@
#Linking #Linking
$(target).elf: $(OBJ) $(ASOBJ) $(target).elf: $(OBJ) $(ASOBJ)
@echo [LD] $@ @echo [LD] $@
@ -103,7 +102,10 @@ $(ASOBJ):
$(QUIET)$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ $(@:$(OBJDIR)/%.S.o=%.S) $(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 disassemble: $(target).elf
$(QUIET)$(OBJDUMP) -D -s $< > $(target).lss $(QUIET)$(OBJDUMP) -D -s $< > $(target).lss

View File

@ -1,5 +1,10 @@
#!/bin/bash #!/bin/bash
if [[ -z $1 ]]; then
echo "Usage: $0 <ELF-file>"
exit -1
fi
JLinkGDBServer -if SWD -device STM32F407VE & JLinkGDBServer -if SWD -device STM32F407VE &
sleep 2 sleep 2
@ -12,7 +17,7 @@ if [[ $gdbpid == "" ]]; then
exit exit
fi fi
arm-none-eabi-gdb -x program-device.gdb reflow-controller.elf arm-none-eabi-gdb -x program-device.gdb $1
sleep 2 sleep 2
kill $gdbpid kill $gdbpid