From 6760ddb28daf9901d3fc17e7e4523dcacfebc70d Mon Sep 17 00:00:00 2001 From: borisbstyle Date: Mon, 6 Mar 2017 11:09:14 +0100 Subject: [PATCH] Bump version --- src/main/build/version.h | 2 +- stm32.mak | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100755 stm32.mak diff --git a/src/main/build/version.h b/src/main/build/version.h index 400719fae5..58f492dad1 100644 --- a/src/main/build/version.h +++ b/src/main/build/version.h @@ -18,7 +18,7 @@ #define FC_FIRMWARE_NAME "Betaflight" #define FC_VERSION_MAJOR 3 // increment when a major release is made (big new feature, etc) #define FC_VERSION_MINOR 1 // increment when a minor release is made (small new feature, change etc) -#define FC_VERSION_PATCH_LEVEL 6 // increment when a bug is fixed +#define FC_VERSION_PATCH_LEVEL 7 // increment when a bug is fixed #define STR_HELPER(x) #x #define STR(x) STR_HELPER(x) diff --git a/stm32.mak b/stm32.mak new file mode 100755 index 0000000000..be44f9d384 --- /dev/null +++ b/stm32.mak @@ -0,0 +1,33 @@ +#This file is generated by VisualGDB. +#It contains GCC settings automatically derived from the board support package (BSP). +#DO NOT EDIT MANUALLY. THE FILE WILL BE OVERWRITTEN. +#Use VisualGDB Project Properties dialog or modify Makefile or per-configuration .mak files instead. + +#VisualGDB provides BSP_ROOT and TOOLCHAIN_ROOT via environment when running Make. The line below will only be active if GNU Make is started manually. +BSP_ROOT ?= $(LOCALAPPDATA)/VisualGDB/EmbeddedBSPs/arm-eabi/com.sysprogs.arm.stm32 +EFP_BASE ?= $(LOCALAPPDATA)/VisualGDB/EmbeddedEFPs +TOOLCHAIN_ROOT ?= D:/development/betaflight/tools/gcc-arm-none-eabi-6-2017-q1-update + +#Embedded toolchain +CC := $(TOOLCHAIN_ROOT)/bin/arm-none-eabi-gcc.exe +CXX := $(TOOLCHAIN_ROOT)/bin/arm-none-eabi-g++.exe +LD := $(CXX) +AR := $(TOOLCHAIN_ROOT)/bin/arm-none-eabi-ar.exe +OBJCOPY := $(TOOLCHAIN_ROOT)/bin/arm-none-eabi-objcopy.exe + +#Additional flags +PREPROCESSOR_MACROS += ARM_MATH_CM4 STM32F302CC stm32_flash_layout STM32F302xC +INCLUDE_DIRS += . $(BSP_ROOT)/STM32F3xxxx/STM32F3xx_HAL_Driver/Inc $(BSP_ROOT)/STM32F3xxxx/STM32F3xx_HAL_Driver/Inc/Legacy $(BSP_ROOT)/STM32F3xxxx/CMSIS_HAL/Device/ST/STM32F3xx/Include $(BSP_ROOT)/STM32F3xxxx/CMSIS_HAL/Include +LIBRARY_DIRS += +LIBRARY_NAMES += +ADDITIONAL_LINKER_INPUTS += +MACOS_FRAMEWORKS += +LINUX_PACKAGES += + +CFLAGS += +CXXFLAGS += +ASFLAGS += -mfpu=fpv4-sp-d16 +LDFLAGS += +COMMONFLAGS += -mcpu=cortex-m4 -mthumb -mfloat-abi=soft +LINKER_SCRIPT := $(BSP_ROOT)/STM32F3xxxx/LinkerScripts/STM32F302CC_flash.lds +