stm-firmware/Makefile

@@ -5,7 +5,7 @@
 #Add Files and Folders below#########################################################
 CFILES 	= main.c syscalls.c setup/system_stm32f4xx.c systick.c
 ASFILES = boot/startup_stm32f4xx.S
-INCLUDEPATH = -Iinclude
+INCLUDEPATH = -Icmsis -Iinclude
 
 OBJDIR = obj
 target	= reflow-controller
@@ -75,8 +75,6 @@ CFLAGS += -Wall -Wextra -Wold-style-declaration -Wuninitialized -Wmaybe-uninitia
 OBJ = $(CFILES:%.c=$(OBJDIR)/%.c.o)
 ASOBJ += $(ASFILES:%.S=$(OBJDIR)/%.S.o)
 
-all: default
-
 default: $(target).elf
 
 %.bin: %.elf
@@ -104,7 +102,7 @@ $(ASOBJ):
 	$(QUIET)$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ $(@:$(OBJDIR)/%.S.o=%.S)	
 
 
-.PHONY: qtproject-legacy qtproject  clean mrproper objcopy disassemble program
+.PHONY: qtproject clean mrproper objcopy disassemble program
 
 program: $(target).elf
 	./program-device.sh $<
@@ -120,9 +118,7 @@ mrproper: clean
 clean:
 	@echo "Cleaning up derived files..."
 	$(QUIET)rm -f $(target).elf $(target).bin $(target).hex $(OBJ) $(ASOBJ) $(mapfile).map $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)
-	$(QUIET)rm -rf $(OBJDIR)/*
+qtproject:
-
-qtproject-legacy:
 	echo -e "TEMPLATE = app\nCONFIG -= console app_bundle qt" > $(target).pro
 	echo -e "SOURCES += $(CFILES) $(ASFILES)" >> $(target).pro
 	echo -ne "INCLUDEPATH += " >> $(target).pro
@@ -132,22 +128,4 @@ qtproject-legacy:
 	echo -ne "\nDEFINES += " >> $(target).pro
 	echo "$(DEFINES)" | sed "s/-D//g" >> $(target).pro
 
-qtproject:
-	$(QUIET)rm -f $(target).files $(target).cflags $(target).config $(target).creator $(target).includes $(target).creator.user
-	echo "Generating source file list"
-	$(QUIET)echo "$(CFILES)" | tr ' ' '\n' > $(target).files
-	@echo -n "Appending found header files from folders "
-	@echo `echo $(INCLUDEPATH) | sed "s/-I//g"`
-	$(QUIET)for dir in `echo $(INCLUDEPATH) | sed "s/-I//g"`; do \
-		find `echo "$${dir}"` -name "*.h" >> $(target).files; \
-	done
-	@echo "Generating CFLAGS File"
-	$(QUIET)echo "" > $(target).cflags
-	@echo "Generating includes files"
-	$(QUIET)echo $(INCLUDEPATH) | sed "s/-I/,/g" | tr , '\n' | sed "/^$$/d" > $(target).includes;
-	@echo "Generating config file"
-	$(QUIET)echo $(DEFINES) | sed "s/-D/,#define /g" | tr , '\n' | sed "/^$$/d" > $(target).config
-	@echo "Generating creator file"
-	$(QUIET)echo "[GENERAL]" > $(target).creator
-	
 -include $(CFILES:%.c=$(OBJDIR)/%.c.d) $(ASFILES:%.S=$(OBJDIR)/%.S.d)

stm-firmware/shellmatta

@@ -1 +1 @@
-Subproject commit 73e8f0af036e6e35cfa696cebf35726bed8ed299
+Subproject commit 6c76dfc7aed2594579f09d0b797d6a51cffff343