therm Changeset - 1900ee8afb4a · protofusion repositories

Parent rev.

Child rev.

[Not reviewed]

cortex-f0

13 1 13

Ethan Zonca - 9 years ago 2015-11-28 12:19:52
ez@ethanzonca.com

Rorganize

14 files changed with 16 insertions and 8 deletions:

Makefile

system/interrupts.c

system/interrupts.h

rename

system/startup_stm32f042x6.s

rename

system/syslib.c

rename

system/syslib.h

rename

system/usb_device.c

rename

system/usb_device.h

rename

system/usbd_cdc_if.c

rename

system/usbd_cdc_if.h

rename

system/usbd_conf.c

rename

system/usbd_conf.h

rename

system/usbd_desc.c

rename

system/usbd_desc.h

rename

0 comments (0 inline, 0 general)

Makefile

➞

Show inline comments

@@ @@ -10,7 +10,8 @@ @@
 # SOURCES: list of sources in the user application
 SOURCES = main.c usbd_conf.c usbd_cdc_if.c usb_device.c usbd_desc.c stm32f0xx_it.c system_stm32f0xx.c gpio.c spi.c ssd1306.c stringhelpers.c display.c syslib.c storage.c flash.c max31855.c max31865.c
 SOURCES = main.c system/usbd_conf.c system/usbd_cdc_if.c system/usb_device.c system/usbd_desc.c system/interrupts.c system/system_stm32f0xx.c gpio.c spi.c ssd1306.c stringhelpers.c display.c system/syslib.c storage.c flash.c max31855.c max31865.c
 #SRC = $(shell find . -name *.c)
 # TARGET: name of the user application
 TARGET = main
@@ @@ -24,7 +25,7 @@ LD_SCRIPT = stm32f042c6_flash.ld @@
 # USER_DEFS user defined macros
 USER_DEFS = -D HSI48_VALUE=48000000 -D HSE_VALUE=16000000
 # USER_INCLUDES: user defined includes
 USER_INCLUDES =
+USER_INCLUDES = -Isystem
 # USB_INCLUDES: includes for the usb library
 USB_INCLUDES = -Imiddlewares/ST/STM32_USB_Device_Library/Core/Inc
@@ @@ -135,8 +136,11 @@ usb: $(USB_OBJECTS) @@
 # build the user application
 #######################################
 SYSTEM_BUILD_DIR = $(BUILD_DIR)/system
 # list of user program objects
 OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(SOURCES:.c=.o)))
 #OBJECTS = $(addprefix $(BUILD_DIR)/,$(notdir $(SOURCES:.c=.o)))
 OBJECTS = $(addprefix $(BUILD_DIR)/,$(SOURCES:.c=.o))
 # add an object for the startup code
 OBJECTS += $(BUILD_DIR)/startup_stm32f042x6.o
@@ @@ -144,21 +148,25 @@ OBJECTS += $(BUILD_DIR)/startup_stm32f04 @@
 LIBS = -lstm32cube -lc -lm -lnosys
 LDFLAGS = -T $(LD_SCRIPT) -L $(CUBELIB_BUILD_DIR) $(LIBS) $(USER_LDFLAGS)
 $(BUILD_DIR)/$(TARGET).hex: $(BUILD_DIR)/$(TARGET).elf
+$(BUILD_DIR)/$(TARGET).hex: $(BUILD_DIR)/$(TARGET).elf | $(SYSTEM_BUILD_DIR)
 	$(OBJCOPY) -O ihex $(BUILD_DIR)/$(TARGET).elf $@
 	$(OBJCOPY) -O binary $(BUILD_DIR)/$(TARGET).elf $(BUILD_DIR)/$(TARGET).bin
 $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) $(USB_OBJECTS) $(CUBELIB)
+$(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) $(USB_OBJECTS) $(CUBELIB) | $(SYSTEM_BUILD_DIR)
 	$(CC) -o $@ $(CFLAGS) $(USER_LDFLAGS) $(OBJECTS) $(USB_OBJECTS) \
 		-L$(CUBELIB_BUILD_DIR) -static $(LIBS) -Xlinker \
 		-Map=$(BUILD_DIR)/$(TARGET).map \
 		-T $(LD_SCRIPT)
 	$(SIZE) $@
 $(BUILD_DIR)/%.o: %.c | $(BUILD_DIR)
 $(SYSTEM_BUILD_DIR):
 	@echo $(SYSTEM_BUILD_DIR)
 	$(MKDIR) $@
 $(BUILD_DIR)/%.o: %.c | $(BUILD_DIR) $(SYSTEM_BUILD_DIR)
 	$(CC) $(CFLAGS) -Os -c -o $@ $^
 $(BUILD_DIR)/%.o: %.s | $(BUILD_DIR)
+$(BUILD_DIR)/%.o: %.s | $(BUILD_DIR) $(SYSTEM_BUILD_DIR)
 	$(CC) $(CFLAGS) -c -o $@ $^
 $(BUILD_DIR):

system/interrupts.c

➞

Show inline comments

@@ file renamed from stm32f0xx_it.c to system/interrupts.c @@
@@ @@ -34,7 +34,7 @@ @@
 /* Includes ------------------------------------------------------------------*/
 #include "stm32f0xx_hal.h"
 #include "stm32f0xx.h"
-#include "stm32f0xx_it.h"
+#include "interrupts.h"
 /* USER CODE BEGIN 0 */
 /* USER CODE END 0 */

system/interrupts.h

➞

Show inline comments

file renamed from stm32f0xx_it.h to system/interrupts.h

system/startup_stm32f042x6.s

➞

Show inline comments

file renamed from startup_stm32f042x6.s to system/startup_stm32f042x6.s

system/syslib.c

➞

Show inline comments

file renamed from syslib.c to system/syslib.c

system/syslib.h

➞

Show inline comments

file renamed from syslib.h to system/syslib.h

system/usb_device.c

➞

Show inline comments

file renamed from usb_device.c to system/usb_device.c

system/usb_device.h

➞

Show inline comments

file renamed from usb_device.h to system/usb_device.h

system/usbd_cdc_if.c

➞

Show inline comments

file renamed from usbd_cdc_if.c to system/usbd_cdc_if.c

system/usbd_cdc_if.h

➞

Show inline comments

file renamed from usbd_cdc_if.h to system/usbd_cdc_if.h

system/usbd_conf.c

➞

Show inline comments

file renamed from usbd_conf.c to system/usbd_conf.c

system/usbd_conf.h

➞

Show inline comments

file renamed from usbd_conf.h to system/usbd_conf.h

system/usbd_desc.c

➞

Show inline comments

file renamed from usbd_desc.c to system/usbd_desc.c

system/usbd_desc.h

➞

Show inline comments

file renamed from usbd_desc.h to system/usbd_desc.h

0 comments (0 inline, 0 general)