From 381afbb70af0aa6010351d4d920b166da15ed6d7 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Wed, 16 Nov 2016 01:06:26 -0300 Subject: [PATCH 1/2] Simplifying STM32F4XX library definitions, some minor changes on Makefile --- Globals.h | 13 ------------- Makefile | 3 ++- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/Globals.h b/Globals.h index 9e18082..82d4f8e 100644 --- a/Globals.h +++ b/Globals.h @@ -21,15 +21,6 @@ #if defined(STM32F4XX) || defined(STM32F4) #include "stm32f4xx.h" -#include "stm32f4xx_gpio.h" -#include "stm32f4xx_rcc.h" -#include "stm32f4xx_dac.h" -#include "stm32f4xx_adc.h" -#include "stm32f4xx_tim.h" -#include "stm32f4xx_usart.h" -#include "misc.h" -#include -#include #else #include #endif @@ -42,11 +33,7 @@ #error "Unknown processor type" #endif -#if defined(STM32F4XX) || defined(STM32F4) -#include "cmsis.h" -#else #include -#endif enum MMDVM_STATE { STATE_IDLE = 0, diff --git a/Makefile b/Makefile index 96cd0e9..f5816d1 100644 --- a/Makefile +++ b/Makefile @@ -24,7 +24,7 @@ CXXSOURCES=$(shell find . -name '*.cpp') INC=$(shell find . -name '*.h' -exec dirname {} \; | uniq) INCLUDES=$(INC:%=-I%) # Find libraries -INCLUDES_LIBS=libarm_cortexM4lf_math.a +INCLUDES_LIBS=STM32F4XX_Lib/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a LINK_LIBS= # Create object list OBJECTS=$(ASOURCES:%.s=%.o) @@ -70,6 +70,7 @@ $(BINDIR)/$(BINHEX): $(BINDIR)/$(BINELF) @echo "Objcopy from ELF to IHEX complete!\n" $(BINDIR)/$(BINELF): $(OBJECTS) + @mkdir -p $(@D) $(CXX) $(OBJECTS) $(LDFLAGS) -o $@ @echo "Linking complete!\n" $(SIZE) $(BINDIR)/$(BINELF) From 9098161032aa3a5ce7405b22bae1b15f66fc4f09 Mon Sep 17 00:00:00 2001 From: Andy CA6JAU Date: Wed, 16 Nov 2016 01:57:17 -0300 Subject: [PATCH 2/2] Update CooCox project files --- MMDVM_STM32F4xx.cogui | 968 +++++++++++++++++++-------------------- MMDVM_STM32F4xx.comarker | 44 +- MMDVM_STM32F4xx.coproj | 138 +++--- 3 files changed, 578 insertions(+), 572 deletions(-) diff --git a/MMDVM_STM32F4xx.cogui b/MMDVM_STM32F4xx.cogui index 0b4cff9..7834d26 100644 --- a/MMDVM_STM32F4xx.cogui +++ b/MMDVM_STM32F4xx.cogui @@ -1,485 +1,485 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MMDVM_STM32F4xx.comarker b/MMDVM_STM32F4xx.comarker index b78ac1c..22e5da1 100644 --- a/MMDVM_STM32F4xx.comarker +++ b/MMDVM_STM32F4xx.comarker @@ -1,23 +1,23 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/MMDVM_STM32F4xx.coproj b/MMDVM_STM32F4xx.coproj index c0fa940..95312cb 100644 --- a/MMDVM_STM32F4xx.coproj +++ b/MMDVM_STM32F4xx.coproj @@ -25,17 +25,14 @@