Merge branch 'dev' into ui

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

stm-firmware/program-device.sh

@@ -1,5 +1,10 @@
 #!/bin/bash
 
+if [[ -z $1 ]]; then
+	echo "Usage: $0 <ELF-file>"
+	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