Project update for CLion, some includes register fix
This commit is contained in:
Dmitriy Semenov
1
.gitignore
vendored
1
.gitignore
vendored
@@ -11,3 +11,4 @@
|
||||
/firmware/Release/
|
||||
/bootloader/Debug/
|
||||
/bootloader/Release/
|
||||
*debug*
|
||||
|
||||
8
firmware/.idea/.gitignore
generated
vendored
Normal file
8
firmware/.idea/.gitignore
generated
vendored
Normal file
@@ -0,0 +1,8 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
1
firmware/.idea/.name
generated
Normal file
1
firmware/.idea/.name
generated
Normal file
@@ -0,0 +1 @@
|
||||
BMS_v3
|
||||
|
After Width: | Height: | Size: 6 B |
2
firmware/.idea/firmware.iml
generated
Normal file
2
firmware/.idea/firmware.iml
generated
Normal file
@@ -0,0 +1,2 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module classpath="CMake" type="CPP_MODULE" version="4" />
|
||||
14
firmware/.idea/misc.xml
generated
Normal file
14
firmware/.idea/misc.xml
generated
Normal file
@@ -0,0 +1,14 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
|
||||
<component name="CidrRootsConfiguration">
|
||||
<sourceRoots>
|
||||
<file path="$PROJECT_DIR$/Core" />
|
||||
<file path="$PROJECT_DIR$/Drivers" />
|
||||
<file path="$PROJECT_DIR$/Middlewares" />
|
||||
<file path="$PROJECT_DIR$/USB_DEVICE" />
|
||||
<file path="$PROJECT_DIR$/USB_Device_Library" />
|
||||
<file path="$PROJECT_DIR$/startup" />
|
||||
</sourceRoots>
|
||||
</component>
|
||||
</project>
|
||||
8
firmware/.idea/modules.xml
generated
Normal file
8
firmware/.idea/modules.xml
generated
Normal file
@@ -0,0 +1,8 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/firmware.iml" filepath="$PROJECT_DIR$/.idea/firmware.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
6
firmware/.idea/vcs.xml
generated
Normal file
6
firmware/.idea/vcs.xml
generated
Normal file
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
99
firmware/CMakeLists.txt
Normal file
99
firmware/CMakeLists.txt
Normal file
@@ -0,0 +1,99 @@
|
||||
#THIS FILE IS AUTO GENERATED FROM THE TEMPLATE! DO NOT CHANGE!
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
set(CMAKE_SYSTEM_VERSION 1)
|
||||
cmake_minimum_required(VERSION 3.24)
|
||||
|
||||
# specify cross-compilers and tools
|
||||
set(CMAKE_C_COMPILER arm-none-eabi-gcc)
|
||||
set(CMAKE_CXX_COMPILER arm-none-eabi-g++)
|
||||
set(CMAKE_ASM_COMPILER arm-none-eabi-gcc)
|
||||
set(CMAKE_AR arm-none-eabi-ar)
|
||||
set(CMAKE_OBJCOPY arm-none-eabi-objcopy)
|
||||
set(CMAKE_OBJDUMP arm-none-eabi-objdump)
|
||||
set(SIZE arm-none-eabi-size)
|
||||
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
||||
|
||||
# project settings
|
||||
project(BMS_v3 C CXX ASM)
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_C_STANDARD 11)
|
||||
|
||||
#Uncomment for hardware floating point
|
||||
#add_compile_definitions(ARM_MATH_CM4;ARM_MATH_MATRIX_CHECK;ARM_MATH_ROUNDING)
|
||||
#add_compile_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16)
|
||||
#add_link_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16)
|
||||
|
||||
#Uncomment for software floating point
|
||||
#add_compile_options(-mfloat-abi=soft)
|
||||
#
|
||||
#add_compile_options(-mcpu=cortex-m4 -mthumb -mthumb-interwork)
|
||||
#add_compile_options(-ffunction-sections -fdata-sections -fno-common -fmessage-length=0)
|
||||
|
||||
add_compile_options(-mcpu=cortex-m3 -mthumb -mthumb-interwork)
|
||||
add_compile_options(-ffunction-sections -fdata-sections -fno-common -fmessage-length=0)
|
||||
add_compile_options(-fcommon)
|
||||
|
||||
# uncomment to mitigate c++17 absolute addresses warnings
|
||||
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-register")
|
||||
|
||||
# Enable assembler files preprocessing
|
||||
add_compile_options($<$<COMPILE_LANGUAGE:ASM>:-x$<SEMICOLON>assembler-with-cpp>)
|
||||
|
||||
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
|
||||
message(STATUS "Maximum optimization for speed")
|
||||
add_compile_options(-Ofast)
|
||||
elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
|
||||
message(STATUS "Maximum optimization for speed, debug info included")
|
||||
add_compile_options(-Ofast -g)
|
||||
elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
|
||||
message(STATUS "Maximum optimization for size")
|
||||
add_compile_options(-Os)
|
||||
else ()
|
||||
message(STATUS "Minimal optimization, debug info included")
|
||||
add_compile_options(-Og -g)
|
||||
endif ()
|
||||
|
||||
include_directories(
|
||||
Core/Inc
|
||||
|
||||
Drivers/CMSIS/Device/ST/STM32F1xx/Include
|
||||
Drivers/CMSIS/Include
|
||||
|
||||
Drivers/STM32F1xx_HAL_Driver/Inc
|
||||
Drivers/STM32F1xx_HAL_Driver/Inc/Legacy
|
||||
|
||||
Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc
|
||||
Middlewares/ST/STM32_USB_Device_Library/Core/Inc
|
||||
|
||||
Middlewares/Third_Party/FatFs/src
|
||||
|
||||
USB_DEVICE/App
|
||||
USB_DEVICE/Target
|
||||
)
|
||||
|
||||
add_definitions(-DDEBUG -DUSE_HAL_DRIVER -DSTM32F107xC)
|
||||
|
||||
file(GLOB_RECURSE SOURCES "startup/*.*" "USB_DEVICE/*.*" "Middlewares/*.*" "Drivers/*.*" "Core/*.*")
|
||||
|
||||
#set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/)
|
||||
#
|
||||
#add_link_options(-Wl,-gc-sections,--print-memory-usage,-Map=${PROJECT_BINARY_DIR}/${PROJECT_NAME}.map)
|
||||
#add_link_options(-mcpu=cortex-m4 -mthumb -mthumb-interwork)
|
||||
#add_link_options(-T ${LINKER_SCRIPT})
|
||||
|
||||
set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/STM32F107VCTx_FLASH.ld)
|
||||
|
||||
add_link_options(-Wl,-gc-sections,--print-memory-usage,-Map=${PROJECT_BINARY_DIR}/${PROJECT_NAME}.map)
|
||||
add_link_options(-mcpu=cortex-m3 -mthumb -mthumb-interwork)
|
||||
add_link_options(-T ${LINKER_SCRIPT})
|
||||
|
||||
add_executable(${PROJECT_NAME}.elf ${SOURCES} ${LINKER_SCRIPT})
|
||||
|
||||
set(HEX_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.hex)
|
||||
set(BIN_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.bin)
|
||||
|
||||
add_custom_command(TARGET ${PROJECT_NAME}.elf POST_BUILD
|
||||
COMMAND ${CMAKE_OBJCOPY} -Oihex $<TARGET_FILE:${PROJECT_NAME}.elf> ${HEX_FILE}
|
||||
COMMAND ${CMAKE_OBJCOPY} -Obinary $<TARGET_FILE:${PROJECT_NAME}.elf> ${BIN_FILE}
|
||||
COMMENT "Building ${HEX_FILE}
|
||||
Building ${BIN_FILE}")
|
||||
101
firmware/CMakeLists_template.txt
Normal file
101
firmware/CMakeLists_template.txt
Normal file
@@ -0,0 +1,101 @@
|
||||
#${templateWarning}
|
||||
set(CMAKE_SYSTEM_NAME Generic)
|
||||
set(CMAKE_SYSTEM_VERSION 1)
|
||||
${cmakeRequiredVersion}
|
||||
# specify cross-compilers and tools
|
||||
set(CMAKE_C_COMPILER arm-none-eabi-gcc)
|
||||
set(CMAKE_CXX_COMPILER arm-none-eabi-g++)
|
||||
set(CMAKE_ASM_COMPILER arm-none-eabi-gcc)
|
||||
set(CMAKE_AR arm-none-eabi-ar)
|
||||
set(CMAKE_OBJCOPY arm-none-eabi-objcopy)
|
||||
set(CMAKE_OBJDUMP arm-none-eabi-objdump)
|
||||
set(SIZE arm-none-eabi-size)
|
||||
set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY)
|
||||
|
||||
# project settings
|
||||
project(${projectName} C CXX ASM)
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_C_STANDARD 11)
|
||||
|
||||
#Uncomment for hardware floating point
|
||||
#add_compile_definitions(ARM_MATH_CM4;ARM_MATH_MATRIX_CHECK;ARM_MATH_ROUNDING)
|
||||
#add_compile_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16)
|
||||
#add_link_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16)
|
||||
|
||||
#Uncomment for software floating point
|
||||
#add_compile_options(-mfloat-abi=soft)
|
||||
|
||||
#add_compile_options(-mcpu=${mcpu} -mthumb -mthumb-interwork)
|
||||
#add_compile_options(-ffunction-sections -fdata-sections -fno-common -fmessage-length=0)
|
||||
|
||||
add_compile_options(-mcpu=cortex-m3 -mthumb -mthumb-interwork)
|
||||
add_compile_options(-ffunction-sections -fdata-sections -fno-common -fmessage-length=0)
|
||||
add_compile_options(-fcommon)
|
||||
|
||||
# uncomment to mitigate c++17 absolute addresses warnings
|
||||
#set(CMAKE_CXX_FLAGS "$${CMAKE_CXX_FLAGS} -Wno-register")
|
||||
|
||||
# Enable assembler files preprocessing
|
||||
add_compile_options($<$<COMPILE_LANGUAGE:ASM>:-x$<SEMICOLON>assembler-with-cpp>)
|
||||
|
||||
if ("$${CMAKE_BUILD_TYPE}" STREQUAL "Release")
|
||||
message(STATUS "Maximum optimization for speed")
|
||||
add_compile_options(-Ofast)
|
||||
elseif ("$${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo")
|
||||
message(STATUS "Maximum optimization for speed, debug info included")
|
||||
add_compile_options(-Ofast -g)
|
||||
elseif ("$${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel")
|
||||
message(STATUS "Maximum optimization for size")
|
||||
add_compile_options(-Os)
|
||||
else ()
|
||||
message(STATUS "Minimal optimization, debug info included")
|
||||
add_compile_options(-Og -g)
|
||||
endif ()
|
||||
|
||||
#include_directories(${includes})
|
||||
include_directories(
|
||||
Core/Inc
|
||||
|
||||
Drivers/CMSIS/Device/ST/STM32F1xx/Include
|
||||
Drivers/CMSIS/Include
|
||||
|
||||
Drivers/STM32F1xx_HAL_Driver/Inc
|
||||
Drivers/STM32F1xx_HAL_Driver/Inc/Legacy
|
||||
|
||||
Middlewares/ST/STM32_USB_Device_Library/Class/CDC/Inc
|
||||
Middlewares/ST/STM32_USB_Device_Library/Core/Inc
|
||||
|
||||
Middlewares/Third_Party/FatFs/src
|
||||
|
||||
USB_DEVICE/App
|
||||
USB_DEVICE/Target
|
||||
)
|
||||
|
||||
#add_definitions(${defines})
|
||||
add_definitions(-DDEBUG -DUSE_HAL_DRIVER -DSTM32F107xC)
|
||||
|
||||
|
||||
file(GLOB_RECURSE SOURCES ${sources})
|
||||
|
||||
#set(LINKER_SCRIPT $${CMAKE_SOURCE_DIR}/${linkerScript})
|
||||
|
||||
#add_link_options(-Wl,-gc-sections,--print-memory-usage,-Map=$${PROJECT_BINARY_DIR}/$${PROJECT_NAME}.map)
|
||||
#add_link_options(-mcpu=${mcpu} -mthumb -mthumb-interwork)
|
||||
#add_link_options(-T $${LINKER_SCRIPT})
|
||||
|
||||
set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/STM32F107VCTX_FLASH.ld)
|
||||
|
||||
add_link_options(-Wl,-gc-sections,--print-memory-usage,-Map=${PROJECT_BINARY_DIR}/${PROJECT_NAME}.map)
|
||||
add_link_options(-mcpu=cortex-m3 -mthumb -mthumb-interwork)
|
||||
add_link_options(-T ${LINKER_SCRIPT})
|
||||
|
||||
add_executable($${PROJECT_NAME}.elf $${SOURCES} $${LINKER_SCRIPT})
|
||||
|
||||
set(HEX_FILE $${PROJECT_BINARY_DIR}/$${PROJECT_NAME}.hex)
|
||||
set(BIN_FILE $${PROJECT_BINARY_DIR}/$${PROJECT_NAME}.bin)
|
||||
|
||||
add_custom_command(TARGET $${PROJECT_NAME}.elf POST_BUILD
|
||||
COMMAND $${CMAKE_OBJCOPY} -Oihex $<TARGET_FILE:$${PROJECT_NAME}.elf> $${HEX_FILE}
|
||||
COMMAND $${CMAKE_OBJCOPY} -Obinary $<TARGET_FILE:$${PROJECT_NAME}.elf> $${BIN_FILE}
|
||||
COMMENT "Building $${HEX_FILE}
|
||||
Building $${BIN_FILE}")
|
||||
@@ -30,7 +30,7 @@
|
||||
#define __GSMMODULE_H
|
||||
|
||||
#include "main.h"
|
||||
#include "modconfig.h"
|
||||
#include "modConfig.h"
|
||||
|
||||
//#include "string.h"
|
||||
//#include "stdlib.h"
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
#include <stdio.h>
|
||||
#include <stdarg.h>
|
||||
#include "driverHWUART2.h"
|
||||
#include "libRingBuffer.h"
|
||||
#include "libRingbuffer.h"
|
||||
|
||||
#define RINGBUFFERSIZE 1024
|
||||
|
||||
|
||||
Reference in New Issue
Block a user