From 7a500b4a8b6480d15d6656f05fe023841c2fbea3 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 10 Jan 2021 15:35:35 +0100 Subject: [PATCH 1/4] Correct board JSON, add missing CMSIS files --- .../src/Libraries/cmsis/core_cmFunc.h | 87 +++++++++++++++++++ .../src/Libraries/cmsis/core_cmInstr.h | 87 +++++++++++++++++++ .../buildroot/boards/STM32F030C8.json | 3 +- 3 files changed, 176 insertions(+), 1 deletion(-) create mode 100644 firmware/S42BV1.0/Close_loop/src/Libraries/cmsis/core_cmFunc.h create mode 100644 firmware/S42BV1.0/Close_loop/src/Libraries/cmsis/core_cmInstr.h diff --git a/firmware/S42BV1.0/Close_loop/src/Libraries/cmsis/core_cmFunc.h b/firmware/S42BV1.0/Close_loop/src/Libraries/cmsis/core_cmFunc.h new file mode 100644 index 0000000..652a48a --- /dev/null +++ b/firmware/S42BV1.0/Close_loop/src/Libraries/cmsis/core_cmFunc.h @@ -0,0 +1,87 @@ +/**************************************************************************//** + * @file core_cmFunc.h + * @brief CMSIS Cortex-M Core Function Access Header File + * @version V4.30 + * @date 20. October 2015 + ******************************************************************************/ +/* Copyright (c) 2009 - 2015 ARM LIMITED + + All rights reserved. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + - Neither the name of ARM nor the names of its contributors may be used + to endorse or promote products derived from this software without + specific prior written permission. + * + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS AND CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + ---------------------------------------------------------------------------*/ + + +#if defined ( __ICCARM__ ) + #pragma system_include /* treat file as system include file for MISRA check */ +#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) + #pragma clang system_header /* treat file as system include file */ +#endif + +#ifndef __CORE_CMFUNC_H +#define __CORE_CMFUNC_H + + +/* ########################### Core Function Access ########################### */ +/** \ingroup CMSIS_Core_FunctionInterface + \defgroup CMSIS_Core_RegAccFunctions CMSIS Core Register Access Functions + @{ +*/ + +/*------------------ RealView Compiler -----------------*/ +#if defined ( __CC_ARM ) + #include "cmsis_armcc.h" + +/*------------------ ARM Compiler V6 -------------------*/ +#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) + #include "cmsis_armcc_V6.h" + +/*------------------ GNU Compiler ----------------------*/ +#elif defined ( __GNUC__ ) + #include "cmsis_gcc.h" + +/*------------------ ICC Compiler ----------------------*/ +#elif defined ( __ICCARM__ ) + #include + +/*------------------ TI CCS Compiler -------------------*/ +#elif defined ( __TMS470__ ) + #include + +/*------------------ TASKING Compiler ------------------*/ +#elif defined ( __TASKING__ ) + /* + * The CMSIS functions have been implemented as intrinsics in the compiler. + * Please use "carm -?i" to get an up to date list of all intrinsics, + * Including the CMSIS ones. + */ + +/*------------------ COSMIC Compiler -------------------*/ +#elif defined ( __CSMC__ ) + #include + +#endif + +/*@} end of CMSIS_Core_RegAccFunctions */ + +#endif /* __CORE_CMFUNC_H */ diff --git a/firmware/S42BV1.0/Close_loop/src/Libraries/cmsis/core_cmInstr.h b/firmware/S42BV1.0/Close_loop/src/Libraries/cmsis/core_cmInstr.h new file mode 100644 index 0000000..f474b0e --- /dev/null +++ b/firmware/S42BV1.0/Close_loop/src/Libraries/cmsis/core_cmInstr.h @@ -0,0 +1,87 @@ +/**************************************************************************//** + * @file core_cmInstr.h + * @brief CMSIS Cortex-M Core Instruction Access Header File + * @version V4.30 + * @date 20. October 2015 + ******************************************************************************/ +/* Copyright (c) 2009 - 2015 ARM LIMITED + + All rights reserved. + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are met: + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + - Neither the name of ARM nor the names of its contributors may be used + to endorse or promote products derived from this software without + specific prior written permission. + * + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL COPYRIGHT HOLDERS AND CONTRIBUTORS BE + LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + POSSIBILITY OF SUCH DAMAGE. + ---------------------------------------------------------------------------*/ + + +#if defined ( __ICCARM__ ) + #pragma system_include /* treat file as system include file for MISRA check */ +#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) + #pragma clang system_header /* treat file as system include file */ +#endif + +#ifndef __CORE_CMINSTR_H +#define __CORE_CMINSTR_H + + +/* ########################## Core Instruction Access ######################### */ +/** \defgroup CMSIS_Core_InstructionInterface CMSIS Core Instruction Interface + Access to dedicated instructions + @{ +*/ + +/*------------------ RealView Compiler -----------------*/ +#if defined ( __CC_ARM ) + #include "cmsis_armcc.h" + +/*------------------ ARM Compiler V6 -------------------*/ +#elif defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050) + #include "cmsis_armcc_V6.h" + +/*------------------ GNU Compiler ----------------------*/ +#elif defined ( __GNUC__ ) + #include "cmsis_gcc.h" + +/*------------------ ICC Compiler ----------------------*/ +#elif defined ( __ICCARM__ ) + #include + +/*------------------ TI CCS Compiler -------------------*/ +#elif defined ( __TMS470__ ) + #include + +/*------------------ TASKING Compiler ------------------*/ +#elif defined ( __TASKING__ ) + /* + * The CMSIS functions have been implemented as intrinsics in the compiler. + * Please use "carm -?i" to get an up to date list of all intrinsics, + * Including the CMSIS ones. + */ + +/*------------------ COSMIC Compiler -------------------*/ +#elif defined ( __CSMC__ ) + #include + +#endif + +/*@}*/ /* end of group CMSIS_Core_InstructionInterface */ + +#endif /* __CORE_CMINSTR_H */ diff --git a/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json b/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json index ae4fd63..2c315ef 100644 --- a/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json +++ b/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json @@ -14,8 +14,9 @@ "0x0004" ] ], - "ldscript": "STM32F030C8_FLASH.ld", + "ldscript": "buildroot/ldscripts/STM32F030C8_FLASH.ld", "mcu": "stm32f030c8t6", + "product_line": "STM32F030X8", "variant": "stm32f0" }, "debug": { From cc7910f039c0922f3f3c59abb134132b53dbdae5 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 10 Jan 2021 15:36:27 +0100 Subject: [PATCH 2/4] Correct indentation --- firmware/S42BV1.0/buildroot/boards/STM32F030C8.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json b/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json index 2c315ef..b4017e5 100644 --- a/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json +++ b/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json @@ -14,7 +14,7 @@ "0x0004" ] ], - "ldscript": "buildroot/ldscripts/STM32F030C8_FLASH.ld", + "ldscript": "buildroot/ldscripts/STM32F030C8_FLASH.ld", "mcu": "stm32f030c8t6", "product_line": "STM32F030X8", "variant": "stm32f0" From 06441cf451578bfe87f1c83baed85da66208e576 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 10 Jan 2021 15:36:55 +0100 Subject: [PATCH 3/4] Correct indentation --- firmware/S42BV1.0/buildroot/boards/STM32F030C8.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json b/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json index b4017e5..2c315ef 100644 --- a/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json +++ b/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json @@ -14,7 +14,7 @@ "0x0004" ] ], - "ldscript": "buildroot/ldscripts/STM32F030C8_FLASH.ld", + "ldscript": "buildroot/ldscripts/STM32F030C8_FLASH.ld", "mcu": "stm32f030c8t6", "product_line": "STM32F030X8", "variant": "stm32f0" From 14946b0d035471cda309a58c07867b225ef35509 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 10 Jan 2021 15:37:28 +0100 Subject: [PATCH 4/4] Correct indentation --- firmware/S42BV1.0/buildroot/boards/STM32F030C8.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json b/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json index 2c315ef..43ec2a9 100644 --- a/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json +++ b/firmware/S42BV1.0/buildroot/boards/STM32F030C8.json @@ -16,7 +16,7 @@ ], "ldscript": "buildroot/ldscripts/STM32F030C8_FLASH.ld", "mcu": "stm32f030c8t6", - "product_line": "STM32F030X8", + "product_line": "STM32F030X8", "variant": "stm32f0" }, "debug": {