Unsignedio
/
MMDVM
mirror of https://github.com/markqvist/MMDVM.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Simplifying STM32F4XX library definitions, some minor changes on Makefile

48kHz
Andy CA6JAU 2016-11-16 01:06:26 -03:00
parent 7ac999dac7
commit 381afbb70a
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Globals.h
View File

@ -21,15 +21,6 @@
#if defined(STM32F4XX) || defined(STM32F4) #if defined(STM32F4XX) || defined(STM32F4)
#include "stm32f4xx.h" #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 <string.h>
#include <stddef.h>
#else #else
#include <Arduino.h> #include <Arduino.h>
#endif #endif
@ -42,11 +33,7 @@
#error "Unknown processor type" #error "Unknown processor type"
#endif #endif
#if defined(STM32F4XX) || defined(STM32F4)
#include "cmsis.h"
#else
#include <arm_math.h> #include <arm_math.h>
#endif
enum MMDVM_STATE { enum MMDVM_STATE {
STATE_IDLE = 0, STATE_IDLE = 0,

3
Makefile
View File

@ -24,7 +24,7 @@ CXXSOURCES=$(shell find . -name '*.cpp')
INC=$(shell find . -name '*.h' -exec dirname {} \; | uniq) INC=$(shell find . -name '*.h' -exec dirname {} \; | uniq)
INCLUDES=$(INC:%=-I%) INCLUDES=$(INC:%=-I%)
# Find libraries # Find libraries
INCLUDES_LIBS=libarm_cortexM4lf_math.a INCLUDES_LIBS=STM32F4XX_Lib/CMSIS/Lib/GCC/libarm_cortexM4lf_math.a
LINK_LIBS= LINK_LIBS=
# Create object list # Create object list
OBJECTS=$(ASOURCES:%.s=%.o) OBJECTS=$(ASOURCES:%.s=%.o)
@ -70,6 +70,7 @@ $(BINDIR)/$(BINHEX): $(BINDIR)/$(BINELF)
@echo "Objcopy from ELF to IHEX complete!\n" @echo "Objcopy from ELF to IHEX complete!\n"
$(BINDIR)/$(BINELF): $(OBJECTS) $(BINDIR)/$(BINELF): $(OBJECTS)
@mkdir -p $(@D)
$(CXX) $(OBJECTS) $(LDFLAGS) -o $@ $(CXX) $(OBJECTS) $(LDFLAGS) -o $@
@echo "Linking complete!\n" @echo "Linking complete!\n"
$(SIZE) $(BINDIR)/$(BINELF) $(SIZE) $(BINDIR)/$(BINELF)